Browse Source

Clarify some variable names

pull/25/head
Anders Jenbo 7 years ago
parent
commit
7e3889cc0b
  1. 6
      Source/diablo.cpp
  2. 2
      Source/diablo.h
  3. 16
      Source/mainmenu.cpp
  4. 7
      Stub/diablo.cpp
  5. 12
      Stub/main_test.cpp
  6. 10
      Stub/test_menu.cpp

6
Source/diablo.cpp

@ -16,7 +16,7 @@ BOOL gbRunGameResult;
int zoomflag; // weak
BOOL gbProcessPlayers;
int glEndSeed[NUMLEVELS];
BOOL dword_5256E8;
BOOL gbLoadGame;
HINSTANCE ghInst; // idb
int DebugMonsters[10];
char cineflag; // weak
@ -104,7 +104,7 @@ BOOL __fastcall StartGame(BOOL bNewGame, BOOL bSinglePlayer)
do {
fExitProgram = FALSE;
dword_5256E8 = 0;
gbLoadGame = FALSE;
if (!NetInit(bSinglePlayer, &fExitProgram)) {
gbRunGameResult = !fExitProgram;
@ -119,7 +119,7 @@ BOOL __fastcall StartGame(BOOL bNewGame, BOOL bSinglePlayer)
InitPortals();
InitDungMsgs(myplr);
}
if (!gbValidSaveFile || !dword_5256E8)
if (!gbValidSaveFile || !gbLoadGame)
uMsg = WM_DIABNEWGAME;
else
uMsg = WM_DIABLOADGAME;

2
Source/diablo.h

@ -16,7 +16,7 @@ extern BOOL gbRunGameResult;
extern int zoomflag; // weak
extern BOOL gbProcessPlayers;
extern int glEndSeed[NUMLEVELS];
extern BOOL dword_5256E8;
extern BOOL gbLoadGame;
extern HINSTANCE ghInst; // idb
extern int DebugMonsters[10];
extern char cineflag; // weak

16
Source/mainmenu.cpp

@ -37,34 +37,34 @@ int __stdcall mainmenu_select_hero_dialog(
BOOL *multi)
{
int a6 = 1;
int a5 = 0;
int dlgresult = 0;
if (gbMaxPlayers == 1) {
if (!UiSelHeroSingDialog(
pfile_ui_set_hero_infos,
pfile_ui_save_create,
pfile_delete_save,
pfile_ui_set_class_stats,
&a5,
&dlgresult,
gszHero,
&gnDifficulty))
TermMsg("Unable to display SelHeroSing");
if (a5 == 2)
dword_5256E8 = TRUE;
if (dlgresult == 2)
gbLoadGame = TRUE;
else
dword_5256E8 = FALSE;
gbLoadGame = FALSE;
} else if (!UiSelHeroMultDialog(
pfile_ui_set_hero_infos,
pfile_ui_save_create,
pfile_delete_save,
pfile_ui_set_class_stats,
&a5,
&dlgresult,
&a6,
gszHero)) {
TermMsg("Can't load multiplayer dialog");
TedlgresultrmMsg("Can't load multiplayer dialog");
}
if (a5 == 4) {
if (dlgresult == 4) {
SErrSetLastError(1223);
return 0;
}

7
Stub/diablo.cpp

@ -26,7 +26,7 @@ int gbRunGameResult; // weak
int zoomflag; // weak
int gbProcessPlayers; // weak
int glEndSeed[NUMLEVELS];
int dword_5256E8; // weak
BOOL gbLoadGame;
HINSTANCE ghInst; // idb
int DebugMonsters[10];
char cineflag; // weak
@ -135,11 +135,11 @@ BOOL __fastcall StartGame(BOOL a1, BOOL bSinglePlayer)
while ( 1 )
{
pfExitProgram = 0;
dword_5256E8 = 0;
gbLoadGame = FALSE;
if ( !NetInit(v2, &pfExitProgram) )
break;
byte_678640 = 0;
if ( (v3 || !gbValidSaveFile) && (InitLevels(), InitQuests(), InitPortals(), InitDungMsgs(myplr), !gbValidSaveFile) || (v4 = WM_DIABLOADGAME, !dword_5256E8) )
if ( (v3 || !gbValidSaveFile) && (InitLevels(), InitQuests(), InitPortals(), InitDungMsgs(myplr), !gbValidSaveFile) || (v4 = WM_DIABLOADGAME, !gbLoadGame) )
{
v4 = WM_DIABNEWGAME;
}
@ -155,7 +155,6 @@ LABEL_11:
return gbRunGameResult;
}
// 525698: using guessed type int gbRunGameResult;
// 5256E8: using guessed type int dword_5256E8;
// 678640: using guessed type char byte_678640;
void __fastcall run_game_loop(unsigned int uMsg)

12
Stub/main_test.cpp

@ -16,7 +16,7 @@ const char *__asan_default_options()
static void init()
{
//init_archives();
//encrypt_init_lookup_table();
@ -70,7 +70,7 @@ void XStartGame()
// printf("V2 STUFF : %i bSinglePlayer : %i", v2, &pfExitProgram);
// pfExitProgram = 0;
// dword_5256E8 = 0;
// gbLoadGame = FALSE;
// byte_678640 = 0;
// InitLevels();
// InitQuests();
@ -89,11 +89,11 @@ void XStartGame()
int main(int argc, char **argv)
{
//printf("Start\n\n");
//music_start(5);
//#define O(f) fprintf(stderr, "offsetof(%s) = %d\n", #f, offsetof(PlayerStruct, f))
//
// O(_pRSplType);
@ -113,10 +113,10 @@ int main(int argc, char **argv)
// test_levelgen();
// test_newgame();
WinMain(NULL, NULL, argc > 1 ? argv[1] : "", 0);
eprintf("Done!\n");
return 0;
}
}

10
Stub/test_menu.cpp

@ -105,7 +105,7 @@ int __fastcall TEMP_diablo_init_menu(int a1, int bSinglePlayer)
while ( 1 )
{
pfExitProgram = 0;
dword_5256E8 = 0;
gbLoadGame = FALSE;
if ( !NetInit(v2, &pfExitProgram) )
break;
byte_678640 = 0;
@ -394,10 +394,10 @@ int __stdcall mainmenu_select_hero_dialog(const struct _SNETPROGRAMDATA *u1,cons
// TermMsg("Unable to display SelHeroSing");
// if ( a5 == 2 )
// {
// dword_5256E8 = 1;
// gbLoadGame = TRUE;
// goto LABEL_6;
// }
// dword_5256E8 = 0;
// gbLoadGame = FALSE;
// }
// else if ( !UiSelHeroMultDialog(
// pfile_ui_set_hero_infos,
@ -740,7 +740,7 @@ void __cdecl paint_title_screen()
}
char *the_long_ass_credits[] =
char *the_long_ass_credits[] =
{
"","","","","","","","","","","","",
"$-- Devilution --",
@ -2179,7 +2179,7 @@ void __cdecl mainmenu_loop()
{
break;
}
TranslateMessage(&Msg);
TranslateMessage(&Msg);
DispatchMessage(&Msg);
}
if(gbStopGame) {

Loading…
Cancel
Save