From acfb040b362b4ed9f072a95898b17af993411010 Mon Sep 17 00:00:00 2001 From: Sydney Biscuit Date: Sat, 17 Aug 2019 11:08:29 -0700 Subject: [PATCH] rename message_loop(), other vars --- Forms/options.cpp | 16 ++++++++-------- pinball.h | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Forms/options.cpp b/Forms/options.cpp index 73fda2c..a3f084f 100644 --- a/Forms/options.cpp +++ b/Forms/options.cpp @@ -145,7 +145,7 @@ void __stdcall options_uninit() { options_set_int(0, "Sounds", (BYTE)options); options_set_int(0, "Music", (BYTE)phkResult); - options_set_int(0, "FullScreen", (BYTE)dword_102822C); + options_set_int(0, "FullScreen", (BYTE)fullscreen_toggle); options_set_int(0, "Players", (BYTE)dword_1028234); options_set_int(0, "Left Flippper key", (BYTE)dword_1028238); options_set_int(0, "Right Flipper key", (BYTE)dword_102823C); @@ -204,8 +204,8 @@ HMENU __stdcall options_toggle(UINT uIDCheckItem) midi_play_pb_theme(0); return options_menu_check(uIDCheckItem, v3); case 0x193u: - v2 = dword_102822C == 0; - dword_102822C = (HKEY)(dword_102822C == 0); + v2 = fullscreen_toggle == 0; + fullscreen_toggle = (HKEY)(fullscreen_toggle == 0); v3 = v2; fullscrn_set_screen_mode(v2); return options_menu_check(uIDCheckItem, v3); @@ -473,9 +473,9 @@ void __stdcall options_init(HMENU a1) hMenu = a1; options = (HKEY)1; phkResult = 0; - dword_102822C = 0; + fullscreen_toggle = 0; dword_1028228 = (HKEY)5; - dword_1028230 = (HKEY)2; + application_priority = (HKEY)2; *(_DWORD *)&dword_1028250 = 90; *(_DWORD *)&dword_1028254 = 191; *(_DWORD *)&dword_1028258 = 32; @@ -498,8 +498,8 @@ void __stdcall options_init(HMENU a1) options = options_get_int(0, "Sounds", options); phkResult = options_get_int(0, "Music", phkResult); dword_1028228 = options_get_int(0, "Average", dword_1028228); - dword_102822C = options_get_int(0, "FullScreen", dword_102822C); - dword_1028230 = options_get_int(0, "Priority_Adjustment", dword_1028230); + fullscreen_toggle = options_get_int(0, "FullScreen", fullscreen_toggle); + application_priority = options_get_int(0, "Priority_Adjustment", application_priority); dword_1028234 = options_get_int(0, "Players", dword_1028234); dword_1028238 = options_get_int(0, "Left Flippper key", dword_1028238); dword_102823C = options_get_int(0, "Right Flipper key", dword_102823C); @@ -510,7 +510,7 @@ void __stdcall options_init(HMENU a1) options_menu_check(0xC9u, (int)options); Sound_Enable(0, 7, (int)options); options_menu_check(0xCAu, (int)phkResult); - options_menu_check(0x193u, (int)dword_102822C); + options_menu_check(0x193u, (int)fullscreen_toggle); options_menu_check(0x198u, dword_1028234 == (HKEY)1); options_menu_check(0x199u, dword_1028234 == (HKEY)2); options_menu_check(0x19Au, dword_1028234 == (HKEY)3); diff --git a/pinball.h b/pinball.h index d4feaec..6d4897e 100644 --- a/pinball.h +++ b/pinball.h @@ -153,7 +153,7 @@ INT __stdcall a_dialog(HINSTANCE hInstance, HWND hWnd, int a3); void __stdcall __noreturn winmain_memalloc_failure(); // idb HANDLE __stdcall adjust_priority(int a1); LRESULT __stdcall message_handler(HWND hWnd, UINT Msg, WPARAM wParam, int a4); -signed int sub_10082A9(); +signed int message_loop(); int __stdcall WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd); double __stdcall normalize_2d(float *a1); double __stdcall ray_intersect_circle(float *a1, float *a2); @@ -1501,7 +1501,7 @@ float flt_1028198; // weak float flt_102819C; // weak int then; // weak _UNKNOWN gfr_display; // weak -int dword_10281C8; // weak +int displaying_splashscreen; // weak UINT iFrostUniqueMsg; // idb int last_mouse_y; // idb int now; // weak