diff options
| author | Iru Cai <mytbk920423@gmail.com> | 2018-09-25 07:43:02 +0800 |
|---|---|---|
| committer | Iru Cai <mytbk920423@gmail.com> | 2018-09-25 07:45:07 +0800 |
| commit | f38b1e589c9a8000911ce14642f496c4267b71d6 (patch) | |
| tree | c861aa7556e744cf5d3cce3ce37b3cad098f412e /csrc/media_init.c | |
| parent | 0248e480c58e8e1de8f64d258999634b1db06cd0 (diff) | |
| download | rich4-f38b1e589c9a8000911ce14642f496c4267b71d6.tar.xz | |
name fcn_4018e7 as register_wait_callback, and move it to window_util
Diffstat (limited to 'csrc/media_init.c')
| -rw-r--r-- | csrc/media_init.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/csrc/media_init.c b/csrc/media_init.c index 6ba19f8..eae6081 100644 --- a/csrc/media_init.c +++ b/csrc/media_init.c @@ -7,6 +7,7 @@ #include "data_struct.h" #include "player_info.h" #include "sound_struct.h" +#include "window_util.h" DDSURFACEDESC sfdesc1; // 0x0048a068 DDSURFACEDESC sfdesc2; // 0x0048a0f8 @@ -186,7 +187,7 @@ LRESULT CALLBACK kbdProc( /* hotkey 0x497172 */ k = R4_KEY(global_rich4_cfg.hotkeys[5]); /* cancel */ if (wParam == k && R4_KEY_RELEASED(lParam)) { - if (b_46cafe != 0 && dw_46cad8 == 1) { + if (b_46cafe != 0 && cb_top == 1) { uint32_t ebx = 0; for (size_t i = 0; i < nplayers; i++) { if (players[i].who_plays == 1 && @@ -672,7 +673,8 @@ bool initialize() mid_status[5] = 0; memset(0x4990f0, 0, 4); dw_474938 = malloc(387200); - dw_474930 = dw_474934 = dw_46cad8 = 0; + dw_474930 = dw_474934 = 0; + cb_top = 0; windowCallbacks[0] = NULL; b_47e771 = 0; return 1; |