From 456d651f55fab317eef33ee0dad66376efd73162 Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Mon, 15 Oct 2018 00:24:48 +0200
Subject: [PATCH] Clean up more bools related to sound.cpp

---
 Source/diablo.cpp   | 12 +++---------
 Source/diablo.h     |  4 ++--
 Source/gamemenu.cpp | 10 ++++------
 Source/loadsave.cpp |  1 -
 Source/monster.cpp  | 10 ++--------
 Source/movie.cpp    |  7 ++-----
 Source/movie.h      |  4 ++--
 Source/multi.cpp    |  2 --
 Source/scrollrt.cpp |  1 -
 Source/sound.cpp    | 10 ++++------
 Source/sound.h      |  8 ++++----
 11 files changed, 23 insertions(+), 46 deletions(-)

diff --git a/Source/diablo.cpp b/Source/diablo.cpp
index 4537ea335..e6dc7ad0e 100644
--- a/Source/diablo.cpp
+++ b/Source/diablo.cpp
@@ -11,11 +11,11 @@ int MouseY; // idb
 int MouseX; // idb
 bool gbGameLoopStartup; // idb
 int glSeedTbl[NUMLEVELS];
-BOOL gbRunGame; // weak
+BOOL gbRunGame;
 int glMid3Seed[NUMLEVELS];
 int gbRunGameResult; // weak
 int zoomflag; // weak
-BOOL gbProcessPlayers; // weak
+BOOL gbProcessPlayers;
 int glEndSeed[NUMLEVELS];
 int dword_5256E8; // weak
 HINSTANCE ghInst; // idb
@@ -225,9 +225,7 @@ void __fastcall run_game_loop(int uMsg)
 		DoEnding();
 	}
 }
-// 525650: using guessed type int gbRunGame;
 // 525698: using guessed type int gbRunGameResult;
-// 5256A0: using guessed type int gbProcessPlayers;
 // 525718: using guessed type char cineflag;
 // 52571C: using guessed type int drawpanflag;
 // 679660: using guessed type char gbMaxPlayers;
@@ -364,7 +362,7 @@ void __fastcall diablo_parse_flags(char *args)
 		}
 		else if ( !_strcmpi("ds_noduplicates", args) )
 		{
-			gbDupSounds = 0;
+			gbDupSounds = FALSE;
 			args += strlen("ds_noduplicates");
 		}
 		else
@@ -464,7 +462,6 @@ void __fastcall diablo_parse_flags(char *args)
 		}
 	}
 }
-// 4A22D6: using guessed type char gbDupSounds;
 // 52A548: using guessed type char gbBackBuf;
 // 52A549: using guessed type char gbEmulate;
 
@@ -832,7 +829,6 @@ LRESULT __stdcall GM_Game(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 	gmenu_on_mouse_move((unsigned short)lParam);
 	return 0;
 }
-// 525650: using guessed type int gbRunGame;
 // 525698: using guessed type int gbRunGameResult;
 // 52571C: using guessed type int drawpanflag;
 // 525748: using guessed type char sgbMouseDown;
@@ -2180,7 +2176,6 @@ void __fastcall game_loop(bool bStartup)
 		timeout_cursor(1);
 	}
 }
-// 525650: using guessed type int gbRunGame;
 // 679660: using guessed type char gbMaxPlayers;
 
 void __cdecl game_logic()
@@ -2233,7 +2228,6 @@ void __cdecl game_logic()
 		}
 	}
 }
-// 5256A0: using guessed type int gbProcessPlayers;
 // 525718: using guessed type char cineflag;
 // 52571C: using guessed type int drawpanflag;
 // 525740: using guessed type int PauseMode;
diff --git a/Source/diablo.h b/Source/diablo.h
index 81426e40f..6f28b83c2 100644
--- a/Source/diablo.h
+++ b/Source/diablo.h
@@ -11,11 +11,11 @@ extern int MouseY; // idb
 extern int MouseX; // idb
 extern bool gbGameLoopStartup; // idb
 extern int glSeedTbl[NUMLEVELS];
-extern BOOL gbRunGame; // weak
+extern BOOL gbRunGame;
 extern int glMid3Seed[NUMLEVELS];
 extern int gbRunGameResult; // weak
 extern int zoomflag; // weak
-extern BOOL gbProcessPlayers; // weak
+extern BOOL gbProcessPlayers;
 extern int glEndSeed[NUMLEVELS];
 extern int dword_5256E8; // weak
 extern HINSTANCE ghInst; // idb
diff --git a/Source/gamemenu.cpp b/Source/gamemenu.cpp
index 888fa2c65..86cec6f12 100644
--- a/Source/gamemenu.cpp
+++ b/Source/gamemenu.cpp
@@ -97,7 +97,6 @@ void __cdecl gamemenu_new_game()
 	gbRunGame = FALSE;
 	gamemenu_off();
 }
-// 525650: using guessed type int gbRunGame;
 // 52571C: using guessed type int drawpanflag;
 
 void __cdecl gamemenu_quit_game()
@@ -218,12 +217,12 @@ void __fastcall gamemenu_music_volume(int a1)
 	{
 		if ( gbMusicOn )
 		{
-			gbMusicOn = 0;
+			gbMusicOn = FALSE;
 			music_stop();
 			sound_get_or_set_music_volume(VOLUME_MIN);
 			goto LABEL_11;
 		}
-		gbMusicOn = 1;
+		gbMusicOn = TRUE;
 		sound_get_or_set_music_volume(VOLUME_MAX);
 LABEL_10:
 		music_start((unsigned char)leveltype);
@@ -235,18 +234,17 @@ LABEL_10:
 	{
 		if ( gbMusicOn )
 			goto LABEL_11;
-		gbMusicOn = 1;
+		gbMusicOn = TRUE;
 		goto LABEL_10;
 	}
 	if ( gbMusicOn )
 	{
-		gbMusicOn = 0;
+		gbMusicOn = FALSE;
 		music_stop();
 	}
 LABEL_11:
 	gamemenu_get_music();
 }
-// 4A22D4: using guessed type char gbMusicOn;
 // 5BB1ED: using guessed type char leveltype;
 
 int __fastcall gamemenu_slider_music_sound(TMenuItem *menu_item)
diff --git a/Source/loadsave.cpp b/Source/loadsave.cpp
index 9dd3c2c2e..62f997368 100644
--- a/Source/loadsave.cpp
+++ b/Source/loadsave.cpp
@@ -171,7 +171,6 @@ void __fastcall LoadGame(BOOL firstflag)
 	SetCursor(CURSOR_HAND);
 	gbProcessPlayers = TRUE;
 }
-// 5256A0: using guessed type int gbProcessPlayers;
 // 5BB1ED: using guessed type char leveltype;
 // 5CF31D: using guessed type char setlevel;
 
diff --git a/Source/monster.cpp b/Source/monster.cpp
index 73b6eb38a..37f3043fd 100644
--- a/Source/monster.cpp
+++ b/Source/monster.cpp
@@ -2333,7 +2333,7 @@ void __fastcall M_DiabloDeath(int i, BOOL sendmsg)
 	quests[QTYPE_MOD]._qactive = 3;
 	if ( v2 )
 		NetSendCmdQuest(TRUE, 5u);
-	gbProcessPlayers = 0;
+	gbProcessPlayers = FALSE;
 	_LOBYTE(sgbSaveSoundOn) = gbSoundOn;
 	v4 = 0;
 	for ( j = 0; j < nummonsters; ++j )
@@ -2378,8 +2378,6 @@ void __fastcall M_DiabloDeath(int i, BOOL sendmsg)
 	monster[v3]._mVar5 = (signed __int64)((double)(v12 - v13) / v11);
 	monster[v3]._mVar6 = (signed __int64)((double)(v14 - (monster[v3]._my << 16)) / v11);
 }
-// 4A22D5: using guessed type char gbSoundOn;
-// 5256A0: using guessed type int gbProcessPlayers;
 // 64D32C: using guessed type int sgbSaveSoundOn;
 
 void __fastcall M2MStartHit(int mid, int i, int dam)
@@ -3794,7 +3792,7 @@ void __cdecl DoEnding()
 	play_movie("gendata\\Diabend.smk", 0);
 
 	BOOL bMusicOn = gbMusicOn;
-	gbMusicOn = 1;
+	gbMusicOn = TRUE;
 
 	int musicVolume = sound_get_or_set_music_volume(1);
 	sound_get_or_set_music_volume(0);
@@ -3808,8 +3806,6 @@ void __cdecl DoEnding()
 	sound_get_or_set_music_volume(musicVolume);
 	gbMusicOn = bMusicOn;
 }
-// 4A22D4: using guessed type char gbMusicOn;
-// 659AFC: using guessed type int loop_movie;
 // 679660: using guessed type char gbMaxPlayers;
 
 void __cdecl PrepDoEnding()
@@ -3836,8 +3832,6 @@ void __cdecl PrepDoEnding()
 		}
 	}
 }
-// 4A22D5: using guessed type char gbSoundOn;
-// 525650: using guessed type int gbRunGame;
 // 525718: using guessed type char cineflag;
 // 64D32C: using guessed type int sgbSaveSoundOn;
 // 679660: using guessed type char gbMaxPlayers;
diff --git a/Source/movie.cpp b/Source/movie.cpp
index 41736e1f6..1012863c3 100644
--- a/Source/movie.cpp
+++ b/Source/movie.cpp
@@ -3,8 +3,8 @@
 #include "../types.h"
 
 int movie_cpp_init_value; // weak
-char movie_playing;       // weak
-BOOL loop_movie;          // weak
+BYTE movie_playing;
+BOOL loop_movie;
 
 const int movie_inf = 0x7F800000; // weak
 
@@ -54,8 +54,6 @@ void __fastcall play_movie(char *pszMovie, BOOL user_can_close)
     sound_disable_music(FALSE);
 }
 // 634980: using guessed type int gbActive;
-// 659AF8: using guessed type int movie_playing;
-// 659AFC: using guessed type int loop_movie;
 
 LRESULT __stdcall MovieWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
 {
@@ -76,4 +74,3 @@ LRESULT __stdcall MovieWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam
 
     return MainWndProc(hWnd, Msg, wParam, lParam);
 }
-// 659AF8: using guessed type int movie_playing;
diff --git a/Source/movie.h b/Source/movie.h
index 04295d87e..3a0d08a5e 100644
--- a/Source/movie.h
+++ b/Source/movie.h
@@ -3,8 +3,8 @@
 #define __MOVIE_H__
 
 extern int movie_cpp_init_value; // weak
-extern char movie_playing; // weak
-extern BOOL loop_movie; // weak
+extern BYTE movie_playing;
+extern BOOL loop_movie;
 
 void __cdecl movie_cpp_init();
 void __fastcall play_movie(char *pszMovie, BOOL user_can_close);
diff --git a/Source/multi.cpp b/Source/multi.cpp
index 865ff6c15..620beea7a 100644
--- a/Source/multi.cpp
+++ b/Source/multi.cpp
@@ -405,7 +405,6 @@ int __cdecl multi_handle_delta()
 	multi_mon_seeds();
 	return 1;
 }
-// 525650: using guessed type int gbRunGame;
 // 678628: using guessed type int dword_678628;
 // 67862D: using guessed type char gbGameDestroyed;
 // 679661: using guessed type char sgbTimeout;
@@ -499,7 +498,6 @@ void __cdecl multi_begin_timeout()
 		}
 	}
 }
-// 525650: using guessed type int gbRunGame;
 // 67862D: using guessed type char gbGameDestroyed;
 // 678644: using guessed type int sglTimeoutStart;
 // 679661: using guessed type char sgbTimeout;
diff --git a/Source/scrollrt.cpp b/Source/scrollrt.cpp
index 6aa3d19f5..bb944595c 100644
--- a/Source/scrollrt.cpp
+++ b/Source/scrollrt.cpp
@@ -3388,6 +3388,5 @@ void __cdecl DrawAndBlit()
 	}
 }
 // 4B8960: using guessed type int talkflag;
-// 525650: using guessed type int gbRunGame;
 // 52571C: using guessed type int drawpanflag;
 // 5BB1ED: using guessed type char leveltype;
diff --git a/Source/sound.cpp b/Source/sound.cpp
index ce528b697..283019f26 100644
--- a/Source/sound.cpp
+++ b/Source/sound.cpp
@@ -8,7 +8,7 @@ LPDIRECTSOUND sglpDS;
 char gbSndInited;
 int sglMusicVolume;
 int sglSoundVolume;
-HMODULE hDsound_dll; // idb
+HMODULE hDsound_dll;
 HANDLE sgpMusicTrack;
 LPDIRECTSOUNDBUFFER sglpDSB;
 
@@ -16,9 +16,9 @@ const int sound_inf = 0x7F800000; // weak
 
 /* data */
 
-UCHAR gbMusicOn = 1;  // weak
-UCHAR gbSoundOn = TRUE;
-char gbDupSounds = 1; // weak
+BYTE gbMusicOn = TRUE;
+BYTE gbSoundOn = TRUE;
+BYTE gbDupSounds = TRUE;
 int sgnMusicTrack = 6;
 char *sgszMusicTracks[NUM_MUSIC] = {
     "Music\\DTowne.wav",
@@ -146,7 +146,6 @@ LPDIRECTSOUNDBUFFER __fastcall sound_dup_channel(LPDIRECTSOUNDBUFFER DSB)
 
     return NULL;
 }
-// 4A22D6: using guessed type char gbDupSounds;
 
 BOOL __fastcall sound_file_reload(TSnd *sound_file, LPDIRECTSOUNDBUFFER DSB)
 {
@@ -380,7 +379,6 @@ void __fastcall music_start(int nTrack)
         }
     }
 }
-// 4A22D4: using guessed type char gbMusicOn;
 
 void __fastcall sound_disable_music(BOOL disable)
 {
diff --git a/Source/sound.h b/Source/sound.h
index 3bf9190a4..0d235f9f6 100644
--- a/Source/sound.h
+++ b/Source/sound.h
@@ -8,7 +8,7 @@ extern LPDIRECTSOUND sglpDS;
 extern char gbSndInited;
 extern int sglMusicVolume;
 extern int sglSoundVolume;
-extern HMODULE hDsound_dll; // idb
+extern HMODULE hDsound_dll;
 extern void *sgpMusicTrack;
 extern IDirectSoundBuffer *sglpDSB;
 
@@ -40,9 +40,9 @@ extern const int sound_inf; // weak
 
 /* data */
 
-extern UCHAR gbMusicOn;
-extern UCHAR gbSoundOn;
-extern char gbDupSounds; // weak
+extern BYTE gbMusicOn;
+extern BYTE gbSoundOn;
+extern BYTE gbDupSounds;
 extern int sgnMusicTrack;
 extern char *sgszMusicTracks[6];
 extern char unk_volume[4][2];