Browse Source

Clean up some bools

pull/25/head
Anders Jenbo 8 years ago
parent
commit
8e2d0df643
  1. 4
      Source/diablo.cpp
  2. 2
      Source/diablo.h
  3. 3
      Source/effects.cpp
  4. 9
      Source/gamemenu.cpp
  5. 2
      Source/loadsave.cpp
  6. 5
      Source/sound.cpp

4
Source/diablo.cpp

@ -15,7 +15,7 @@ BOOL gbRunGame; // weak
int glMid3Seed[NUMLEVELS];
int gbRunGameResult; // weak
int zoomflag; // weak
int gbProcessPlayers; // weak
BOOL gbProcessPlayers; // weak
int glEndSeed[NUMLEVELS];
int dword_5256E8; // weak
HINSTANCE ghInst; // idb
@ -162,7 +162,7 @@ void __fastcall run_game_loop(int uMsg)
control_update_life_mana();
msg_process_net_packets();
gbRunGame = TRUE;
gbProcessPlayers = 1;
gbProcessPlayers = TRUE;
gbRunGameResult = 1;
drawpanflag = 255;
DrawAndBlit();

2
Source/diablo.h

@ -15,7 +15,7 @@ extern BOOL gbRunGame; // weak
extern int glMid3Seed[NUMLEVELS];
extern int gbRunGameResult; // weak
extern int zoomflag; // weak
extern int gbProcessPlayers; // weak
extern BOOL gbProcessPlayers; // weak
extern int glEndSeed[NUMLEVELS];
extern int dword_5256E8; // weak
extern HINSTANCE ghInst; // idb

3
Source/effects.cpp

@ -975,7 +975,6 @@ void __fastcall PlayEffect(int i, int mode)
snd_play_snd(snd, lVolume, lPan);
}
// 4A22D5: using guessed type char gbSoundOn;
// 676194: using guessed type char gbBufferMsgs;
BOOL __fastcall calc_snd_position(int x, int y, int *plVolume, int *plPan)
@ -1037,7 +1036,6 @@ void __fastcall PlaySFX_priv(TSFX *pSFX, BOOL loc, int x, int y)
if ( pSFX->pSnd )
snd_play_snd(pSFX->pSnd, lVolume, lPan);
}
// 4A22D5: using guessed type char gbSoundOn;
// 676194: using guessed type char gbBufferMsgs;
// 679660: using guessed type char gbMaxPlayers;
@ -1243,4 +1241,3 @@ void __stdcall effects_play_sound(char *snd_file)
}
}
// 4A22D5: using guessed type char gbSoundOn;

9
Source/gamemenu.cpp

@ -261,11 +261,11 @@ void __fastcall gamemenu_sound_volume(int a1)
if ( a1 ) {
if ( gbSoundOn ) {
gbSoundOn = 0;
gbSoundOn = FALSE;
FreeMonsterSnd();
v1 = VOLUME_MIN;
} else {
gbSoundOn = 1;
gbSoundOn = TRUE;
}
sound_get_or_set_sound_volume(VOLUME_MAX);
} else {
@ -273,17 +273,16 @@ void __fastcall gamemenu_sound_volume(int a1)
sound_get_or_set_sound_volume(v2);
if ( v2 == VOLUME_MIN ) {
if ( gbSoundOn ) {
gbSoundOn = 0;
gbSoundOn = FALSE;
FreeMonsterSnd();
}
} else if ( !gbSoundOn ) {
gbSoundOn = 1;
gbSoundOn = TRUE;
}
}
PlaySFX(IS_TITLEMOV);
gamemenu_get_sound();
}
// 4A22D5: using guessed type char gbSoundOn;
void __fastcall gamemenu_gamma(int a1)
{

2
Source/loadsave.cpp

@ -169,7 +169,7 @@ void __fastcall LoadGame(BOOL firstflag)
missiles_process_charge();
ResetPal();
SetCursor(CURSOR_HAND);
gbProcessPlayers = 1;
gbProcessPlayers = TRUE;
}
// 5256A0: using guessed type int gbProcessPlayers;
// 5BB1ED: using guessed type char leveltype;

5
Source/sound.cpp

@ -17,7 +17,7 @@ const int sound_inf = 0x7F800000; // weak
/* data */
UCHAR gbMusicOn = 1; // weak
UCHAR gbSoundOn = 1; // weak
UCHAR gbSoundOn = TRUE;
char gbDupSounds = 1; // weak
int sgnMusicTrack = 6;
char *sgszMusicTracks[NUM_MUSIC] = {
@ -127,7 +127,6 @@ void __fastcall snd_play_snd(TSnd *pSnd, int lVolume, int lPan)
pSnd->start_tc = tc;
}
// 4A22D5: using guessed type char gbSoundOn;
LPDIRECTSOUNDBUFFER __fastcall sound_dup_channel(LPDIRECTSOUNDBUFFER DSB)
{
@ -258,8 +257,6 @@ void __fastcall snd_init(HWND hWnd)
gbSndInited = sglpDS != NULL;
}
// 4A22D4: using guessed type char gbMusicOn;
// 4A22D5: using guessed type char gbSoundOn;
void __fastcall sound_load_volume(char *value_name, int *value)
{

Loading…
Cancel
Save