From 5987a5a8d7aa75ff585d8cccfe93433315fb7388 Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Thu, 14 Nov 2019 01:55:28 +0000
Subject: [PATCH] Clean-up Organya.cpp

---
 src/Organya.cpp | 14 +++++++-------
 src/Organya.h   | 17 +++++++++++------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/Organya.cpp b/src/Organya.cpp
index b7e8fc17..2fb1d3c7 100644
--- a/src/Organya.cpp
+++ b/src/Organya.cpp
@@ -456,7 +456,7 @@ void PlayDramObject(unsigned char key, int mode, signed char track)
 	}
 }
 
-OrgData::OrgData()
+OrgData::OrgData(void)
 {
 	int i;
 
@@ -773,7 +773,7 @@ static BOOL nameless_flag;
 // タイマー精度を設定する。 (Set timer accuracy.)
 // この関数はアプリケーション初期化時に一度呼び出す。 (This function is called once when the application is initialized.)
 /*■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■*/
-BOOL InitMMTimer()
+BOOL InitMMTimer(void)
 {
 	TIMECAPS tc;
 	MMRESULT ret;
@@ -846,7 +846,7 @@ VOID CALLBACK TimerProc(UINT uTID,UINT uMsg,DWORD_PTR dwUser,DWORD_PTR dwParam1,
 // タイマーリソースを開放する。 (Release timer resources.)
 // アプリケーション終了時に一度呼び出す。 (Call once when the application ends.)
 /*■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■*/
-BOOL QuitMMTimer()
+BOOL QuitMMTimer(void)
 {
 	MMRESULT ret;
 
@@ -876,7 +876,7 @@ long play_p;
 NOTELIST *play_np[MAXTRACK];
 long now_leng[MAXMELODY];
 
-void OrgData::PlayData()
+void OrgData::PlayData(void)
 {
 	int i;
 
@@ -1029,7 +1029,7 @@ BOOL ChangeOrganyaVolume(signed int volume)
 	return TRUE;
 }
 
-void StopOrganyaMusic()
+void StopOrganyaMusic(void)
 {
 	if (lpDS == NULL)
 		return;
@@ -1048,12 +1048,12 @@ void StopOrganyaMusic()
 	Sleep(100);
 }
 
-void SetOrganyaFadeout()
+void SetOrganyaFadeout(void)
 {
 	bFadeout = TRUE;
 }
 
-void EndOrganya()
+void EndOrganya(void)
 {
 	if (lpDS == NULL)
 		return;
diff --git a/src/Organya.h b/src/Organya.h
index 53bdb5b9..b0e5a792 100644
--- a/src/Organya.h
+++ b/src/Organya.h
@@ -1,5 +1,10 @@
 #pragma once
 
+#ifdef FIX_BUGS
+// The original source code forgot to set this (you can tell because, in the original EXE,
+// the DSBUFFERDESC structs in Organya.cpp have a different size to the ones in Sound.cpp)
+#define DIRECTSOUND_VERSION 0x500
+#endif
 #include <dsound.h>
 
 #include "WindowsWrapper.h"
@@ -11,14 +16,14 @@
 extern BOOL g_mute[MAXTRACK];	// Used by the debug Mute menu
 
 BOOL MakeOrganyaWave(signed char track, signed char wave_no, signed char pipi);
-void OrganyaPlayData();
+void OrganyaPlayData(void);
 void SetPlayPointer(long x);
 BOOL LoadOrganya(const char *name);
 void SetOrganyaPosition(unsigned int x);
-unsigned int GetOrganyaPosition();
-void PlayOrganyaMusic();
+unsigned int GetOrganyaPosition(void);
+void PlayOrganyaMusic(void);
 BOOL ChangeOrganyaVolume(signed int volume);
-void StopOrganyaMusic();
-void SetOrganyaFadeout();
+void StopOrganyaMusic(void);
+void SetOrganyaFadeout(void);
 BOOL StartOrganya(LPDIRECTSOUND lpDS, const char *wave_filename);
-void EndOrganya();
+void EndOrganya(void);