From 1806b0ff933586d47953cbcb43980e4d8a41a3fe Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Sun, 21 Oct 2018 03:43:01 +0200 Subject: [PATCH] Format gamemenu.cpp --- Source/gamemenu.cpp | 393 +++++++++++++++++++++----------------------- 1 file changed, 186 insertions(+), 207 deletions(-) diff --git a/Source/gamemenu.cpp b/Source/gamemenu.cpp index 86cec6f12..b2ba11f5d 100644 --- a/Source/gamemenu.cpp +++ b/Source/gamemenu.cpp @@ -2,31 +2,28 @@ #include "../types.h" -TMenuItem sgSingleMenu[6] = -{ - { 0x80000000, "Save Game", &gamemenu_save_game }, - { 0x80000000, "Options", &gamemenu_options }, - { 0x80000000, "New Game", &gamemenu_new_game }, - { 0x80000000, "Load Game", &gamemenu_load_game }, - { 0x80000000, "Quit Diablo", &gamemenu_quit_game }, - { 0x80000000, NULL, NULL } +TMenuItem sgSingleMenu[6] = { + { 0x80000000, "Save Game", &gamemenu_save_game }, + { 0x80000000, "Options", &gamemenu_options }, + { 0x80000000, "New Game", &gamemenu_new_game }, + { 0x80000000, "Load Game", &gamemenu_load_game }, + { 0x80000000, "Quit Diablo", &gamemenu_quit_game }, + { 0x80000000, NULL, NULL } }; -TMenuItem sgMultiMenu[5] = -{ - { 0x80000000, "Options", &gamemenu_options }, - { 0x80000000, "New Game", &gamemenu_new_game }, - { 0x80000000, "Restart In Town", &gamemenu_restart_town }, - { 0x80000000, "Quit Diablo", &gamemenu_quit_game }, - { 0x80000000, NULL, NULL } +TMenuItem sgMultiMenu[5] = { + { 0x80000000, "Options", &gamemenu_options }, + { 0x80000000, "New Game", &gamemenu_new_game }, + { 0x80000000, "Restart In Town", &gamemenu_restart_town }, + { 0x80000000, "Quit Diablo", &gamemenu_quit_game }, + { 0x80000000, NULL, NULL } }; -TMenuItem sgOptionMenu[6] = -{ - { 0xC0000000, NULL, (void (__cdecl *)(void))&gamemenu_music_volume }, - { 0xC0000000, NULL, (void (__cdecl *)(void))&gamemenu_sound_volume }, - { 0xC0000000, "Gamma", (void (__cdecl *)(void))&gamemenu_gamma }, - { 0x80000000, NULL, &gamemenu_color_cycling }, - { 0x80000000, "Previous Menu", &gamemenu_previous }, - { 0x80000000, NULL, NULL } +TMenuItem sgOptionMenu[6] = { + { 0xC0000000, NULL, (void(__cdecl *)(void)) & gamemenu_music_volume }, + { 0xC0000000, NULL, (void(__cdecl *)(void)) & gamemenu_sound_volume }, + { 0xC0000000, "Gamma", (void(__cdecl *)(void)) & gamemenu_gamma }, + { 0x80000000, NULL, &gamemenu_color_cycling }, + { 0x80000000, "Previous Menu", &gamemenu_previous }, + { 0x80000000, NULL, NULL } }; char *music_toggle_names[] = { "Music", "Music Disabled" }; char *sound_toggle_names[] = { "Sound", "Sound Disabled" }; @@ -34,280 +31,262 @@ char *color_cycling_toggle_names[] = { "Color Cycling Off", "Color Cycling On" } void __cdecl gamemenu_previous() { - void (__cdecl *v0)(); // edx - TMenuItem *v1; // ecx - - if ( gbMaxPlayers == 1 ) - { - v0 = gamemenu_enable_single; - v1 = sgSingleMenu; - } - else - { - v0 = gamemenu_enable_multi; - v1 = sgMultiMenu; - } - gmenu_call_proc(v1, v0); - PressEscKey(); + void(__cdecl * v0)(); // edx + TMenuItem *v1; // ecx + + if (gbMaxPlayers == 1) { + v0 = gamemenu_enable_single; + v1 = sgSingleMenu; + } else { + v0 = gamemenu_enable_multi; + v1 = sgMultiMenu; + } + gmenu_call_proc(v1, v0); + PressEscKey(); } // 679660: using guessed type char gbMaxPlayers; void __cdecl gamemenu_enable_single() { - bool v0; // dl + bool v0; // dl - gmenu_enable(&sgSingleMenu[3], gbValidSaveFile); - v0 = 0; - if ( plr[myplr]._pmode != PM_DEATH && !deathflag ) - v0 = 1; - gmenu_enable(sgSingleMenu, v0); + gmenu_enable(&sgSingleMenu[3], gbValidSaveFile); + v0 = 0; + if (plr[myplr]._pmode != PM_DEATH && !deathflag) + v0 = 1; + gmenu_enable(sgSingleMenu, v0); } void __cdecl gamemenu_enable_multi() { - gmenu_enable(&sgMultiMenu[2], deathflag); + gmenu_enable(&sgMultiMenu[2], deathflag); } void __cdecl gamemenu_off() { - gmenu_call_proc(0, 0); + gmenu_call_proc(0, 0); } void __cdecl gamemenu_handle_previous() { - if ( gmenu_exception() ) - gamemenu_off(); - else - gamemenu_previous(); + if (gmenu_exception()) + gamemenu_off(); + else + gamemenu_previous(); } void __cdecl gamemenu_new_game() { - int i; // eax - - for(i = 0; i < 4; i++) - { - plr[i]._pmode = PM_QUIT; - plr[i]._pInvincible = 1; - } - - deathflag = FALSE; - drawpanflag = 255; - scrollrt_draw_game_screen(1); - gbRunGame = FALSE; - gamemenu_off(); + int i; // eax + + for (i = 0; i < 4; i++) { + plr[i]._pmode = PM_QUIT; + plr[i]._pInvincible = 1; + } + + deathflag = FALSE; + drawpanflag = 255; + scrollrt_draw_game_screen(1); + gbRunGame = FALSE; + gamemenu_off(); } // 52571C: using guessed type int drawpanflag; void __cdecl gamemenu_quit_game() { - gamemenu_new_game(); - gbRunGameResult = 0; + gamemenu_new_game(); + gbRunGameResult = 0; } // 525698: using guessed type int gbRunGameResult; void __cdecl gamemenu_load_game() { - WNDPROC saveProc; // edi - - saveProc = SetWindowProc(DisableInputWndProc); - gamemenu_off(); - SetCursor(0); - InitDiabloMsg(10); - drawpanflag = 255; - DrawAndBlit(); - LoadGame(FALSE); - ClrDiabloMsg(); - PaletteFadeOut(8); - deathflag = FALSE; - drawpanflag = 255; - DrawAndBlit(); - PaletteFadeIn(8); - SetCursor(CURSOR_HAND); - interface_msg_pump(); - SetWindowProc(saveProc); + WNDPROC saveProc; // edi + + saveProc = SetWindowProc(DisableInputWndProc); + gamemenu_off(); + SetCursor(0); + InitDiabloMsg(10); + drawpanflag = 255; + DrawAndBlit(); + LoadGame(FALSE); + ClrDiabloMsg(); + PaletteFadeOut(8); + deathflag = FALSE; + drawpanflag = 255; + DrawAndBlit(); + PaletteFadeIn(8); + SetCursor(CURSOR_HAND); + interface_msg_pump(); + SetWindowProc(saveProc); } // 52571C: using guessed type int drawpanflag; void __cdecl gamemenu_save_game() { - WNDPROC saveProc; // edi - - if ( pcurs == CURSOR_HAND ) - { - if ( plr[myplr]._pmode == PM_DEATH || deathflag ) - { - gamemenu_off(); - } - else - { - saveProc = SetWindowProc(DisableInputWndProc); - SetCursor(0); - gamemenu_off(); - InitDiabloMsg(11); - drawpanflag = 255; - DrawAndBlit(); - SaveGame(); - ClrDiabloMsg(); - drawpanflag = 255; - SetCursor(CURSOR_HAND); - interface_msg_pump(); - SetWindowProc(saveProc); - } - } + WNDPROC saveProc; // edi + + if (pcurs == CURSOR_HAND) { + if (plr[myplr]._pmode == PM_DEATH || deathflag) { + gamemenu_off(); + } else { + saveProc = SetWindowProc(DisableInputWndProc); + SetCursor(0); + gamemenu_off(); + InitDiabloMsg(11); + drawpanflag = 255; + DrawAndBlit(); + SaveGame(); + ClrDiabloMsg(); + drawpanflag = 255; + SetCursor(CURSOR_HAND); + interface_msg_pump(); + SetWindowProc(saveProc); + } + } } // 52571C: using guessed type int drawpanflag; void __cdecl gamemenu_restart_town() { - NetSendCmd(TRUE, CMD_RETOWN); + NetSendCmd(TRUE, CMD_RETOWN); } void __cdecl gamemenu_options() { - gamemenu_get_music(); - gamemenu_get_sound(); - gamemenu_get_gamma(); - gamemenu_get_color_cycling(); - gmenu_call_proc(sgOptionMenu, 0); + gamemenu_get_music(); + gamemenu_get_sound(); + gamemenu_get_gamma(); + gamemenu_get_color_cycling(); + gmenu_call_proc(sgOptionMenu, 0); } void __cdecl gamemenu_get_music() { - gamemenu_sound_music_toggle(music_toggle_names, sgOptionMenu, sound_get_or_set_music_volume(1)); + gamemenu_sound_music_toggle(music_toggle_names, sgOptionMenu, sound_get_or_set_music_volume(1)); } void __fastcall gamemenu_sound_music_toggle(char **names, TMenuItem *menu_item, int gamma) { - if ( gbSndInited ) - { - menu_item->dwFlags |= 0xC0000000; - menu_item->pszStr = *names; - gmenu_slider_3(menu_item, 17); - gmenu_slider_1(menu_item, VOLUME_MIN, VOLUME_MAX, gamma); - } - else - { - menu_item->dwFlags &= 0x3F000000; - menu_item->pszStr = names[1]; - } + if (gbSndInited) { + menu_item->dwFlags |= 0xC0000000; + menu_item->pszStr = *names; + gmenu_slider_3(menu_item, 17); + gmenu_slider_1(menu_item, VOLUME_MIN, VOLUME_MAX, gamma); + } else { + menu_item->dwFlags &= 0x3F000000; + menu_item->pszStr = names[1]; + } } void __cdecl gamemenu_get_sound() { - gamemenu_sound_music_toggle(sound_toggle_names, &sgOptionMenu[1], sound_get_or_set_sound_volume(1)); + gamemenu_sound_music_toggle(sound_toggle_names, &sgOptionMenu[1], sound_get_or_set_sound_volume(1)); } void __cdecl gamemenu_get_color_cycling() { - sgOptionMenu[3].pszStr = color_cycling_toggle_names[palette_get_colour_cycling()]; + sgOptionMenu[3].pszStr = color_cycling_toggle_names[palette_get_colour_cycling()]; } void __cdecl gamemenu_get_gamma() { - gmenu_slider_3(&sgOptionMenu[2], 15); - gmenu_slider_1(&sgOptionMenu[2], 30, 100, UpdateGamma(0)); + gmenu_slider_3(&sgOptionMenu[2], 15); + gmenu_slider_1(&sgOptionMenu[2], 30, 100, UpdateGamma(0)); } void __fastcall gamemenu_music_volume(int a1) { - int v1; // esi - - if ( a1 ) - { - if ( gbMusicOn ) - { - gbMusicOn = FALSE; - music_stop(); - sound_get_or_set_music_volume(VOLUME_MIN); - goto LABEL_11; - } - gbMusicOn = TRUE; - sound_get_or_set_music_volume(VOLUME_MAX); -LABEL_10: - music_start((unsigned char)leveltype); - goto LABEL_11; - } - v1 = gamemenu_slider_music_sound(sgOptionMenu); - sound_get_or_set_music_volume(v1); - if ( v1 != VOLUME_MIN ) - { - if ( gbMusicOn ) - goto LABEL_11; - gbMusicOn = TRUE; - goto LABEL_10; - } - if ( gbMusicOn ) - { - gbMusicOn = FALSE; - music_stop(); - } + int v1; // esi + + if (a1) { + if (gbMusicOn) { + gbMusicOn = FALSE; + music_stop(); + sound_get_or_set_music_volume(VOLUME_MIN); + goto LABEL_11; + } + gbMusicOn = TRUE; + sound_get_or_set_music_volume(VOLUME_MAX); + LABEL_10: + music_start((unsigned char)leveltype); + goto LABEL_11; + } + v1 = gamemenu_slider_music_sound(sgOptionMenu); + sound_get_or_set_music_volume(v1); + if (v1 != VOLUME_MIN) { + if (gbMusicOn) + goto LABEL_11; + gbMusicOn = TRUE; + goto LABEL_10; + } + if (gbMusicOn) { + gbMusicOn = FALSE; + music_stop(); + } LABEL_11: - gamemenu_get_music(); + gamemenu_get_music(); } // 5BB1ED: using guessed type char leveltype; int __fastcall gamemenu_slider_music_sound(TMenuItem *menu_item) { - return gmenu_slider_get(menu_item, VOLUME_MIN, VOLUME_MAX); + return gmenu_slider_get(menu_item, VOLUME_MIN, VOLUME_MAX); } void __fastcall gamemenu_sound_volume(int a1) { - int v1; // ecx - int v2; // esi - - if ( a1 ) { - if ( gbSoundOn ) { - gbSoundOn = FALSE; - FreeMonsterSnd(); - v1 = VOLUME_MIN; - } else { - gbSoundOn = TRUE; - } - sound_get_or_set_sound_volume(VOLUME_MAX); - } else { - v2 = gamemenu_slider_music_sound(&sgOptionMenu[1]); - sound_get_or_set_sound_volume(v2); - if ( v2 == VOLUME_MIN ) { - if ( gbSoundOn ) { - gbSoundOn = FALSE; - FreeMonsterSnd(); - } - } else if ( !gbSoundOn ) { - gbSoundOn = TRUE; - } - } - PlaySFX(IS_TITLEMOV); - gamemenu_get_sound(); + int v1; // ecx + int v2; // esi + + if (a1) { + if (gbSoundOn) { + gbSoundOn = FALSE; + FreeMonsterSnd(); + v1 = VOLUME_MIN; + } else { + gbSoundOn = TRUE; + } + sound_get_or_set_sound_volume(VOLUME_MAX); + } else { + v2 = gamemenu_slider_music_sound(&sgOptionMenu[1]); + sound_get_or_set_sound_volume(v2); + if (v2 == VOLUME_MIN) { + if (gbSoundOn) { + gbSoundOn = FALSE; + FreeMonsterSnd(); + } + } else if (!gbSoundOn) { + gbSoundOn = TRUE; + } + } + PlaySFX(IS_TITLEMOV); + gamemenu_get_sound(); } void __fastcall gamemenu_gamma(int a1) { - int v1; // eax - int v2; // eax - - if ( a1 ) - { - v1 = -(UpdateGamma(0) != 30); - _LOBYTE(v1) = v1 & 0xBA; - v2 = v1 + 100; - } - else - { - v2 = gamemenu_slider_gamma(); - } - UpdateGamma(v2); - gamemenu_get_gamma(); + int v1; // eax + int v2; // eax + + if (a1) { + v1 = -(UpdateGamma(0) != 30); + _LOBYTE(v1) = v1 & 0xBA; + v2 = v1 + 100; + } else { + v2 = gamemenu_slider_gamma(); + } + UpdateGamma(v2); + gamemenu_get_gamma(); } int __cdecl gamemenu_slider_gamma() { - return gmenu_slider_get(&sgOptionMenu[2], 30, 100); + return gmenu_slider_get(&sgOptionMenu[2], 30, 100); } void __cdecl gamemenu_color_cycling() { - palette_set_color_cycling(palette_get_colour_cycling() == 0); - sgOptionMenu[3].pszStr = color_cycling_toggle_names[palette_get_colour_cycling() & 1]; + palette_set_color_cycling(palette_get_colour_cycling() == 0); + sgOptionMenu[3].pszStr = color_cycling_toggle_names[palette_get_colour_cycling() & 1]; }