diff options
| author | Iru Cai <mytbk920423@gmail.com> | 2018-09-12 16:15:39 +0800 |
|---|---|---|
| committer | Iru Cai <mytbk920423@gmail.com> | 2018-09-12 16:15:39 +0800 |
| commit | 42782654cc0b16f1d805d9192103df13dab44a97 (patch) | |
| tree | 30ddd8c2079ca5c3ba0ab1d7f85e94486af120a1 | |
| parent | 778bb68cd50b3b98101ddbcb6a705592748f13cb (diff) | |
| download | rich4-42782654cc0b16f1d805d9192103df13dab44a97.tar.xz | |
name player_info.f21 as who_plays
| -rw-r--r-- | csrc/cards_ui.c | 2 | ||||
| -rw-r--r-- | csrc/loadsave.c | 2 | ||||
| -rw-r--r-- | csrc/media_init.c | 2 | ||||
| -rw-r--r-- | csrc/player_info.h | 2 | ||||
| -rw-r--r-- | csrc/tools_ui.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/csrc/cards_ui.c b/csrc/cards_ui.c index 5d9abb5..41c27c0 100644 --- a/csrc/cards_ui.c +++ b/csrc/cards_ui.c @@ -151,7 +151,7 @@ void cards_ui() uint8_t mem[8]; /* esp + 0x90 */ eax = current_player * 0x68; - uint8_t dl = players[current_player].f21; + uint8_t dl = players[current_player].who_plays; if (dl == 1) { fcn.0041d546(); edi = eax = read_mkf(mkf_panel, 11, NULL, NULL); diff --git a/csrc/loadsave.c b/csrc/loadsave.c index cc1dd64..1aa2b7a 100644 --- a/csrc/loadsave.c +++ b/csrc/loadsave.c @@ -241,7 +241,7 @@ void fcn_00407ad2() if (*(char*)(0x496b7d+esi) == 0 && *(char*)(0x496bcc+esi) == 0) { #endif - if (players[ebx].f21 == 0 && player[ebx].f100 == 0) { + if (players[ebx].who_plays == 0 && player[ebx].f100 == 0) { eax = *(int32_t*)(0x498eb0+eax); edx = *(int16_t*)(eax + 0xe); /* sign ext */ eax += 0xc; diff --git a/csrc/media_init.c b/csrc/media_init.c index 7130dd7..0f9843e 100644 --- a/csrc/media_init.c +++ b/csrc/media_init.c @@ -184,7 +184,7 @@ LRESULT CALLBACK kbdProc( if (b_46cafe != 0 && dw_46cad8 == 1) { uint32_t ebx = 0; for (size_t i = 0; i < nplayers; i++) { - if (players[i].f21 == 1 && + if (players[i].who_plays == 1 && players[i].days_in_hotel == 0 && players[i].days_disappearing == 0 && players[i].days_in_prison == 0 && diff --git a/csrc/player_info.h b/csrc/player_info.h index 616422b..f1305f1 100644 --- a/csrc/player_info.h +++ b/csrc/player_info.h @@ -14,7 +14,7 @@ typedef struct uint8_t ndices; /* 0x496b7a */ uint8_t character; uint8_t f20; - uint8_t f21; /* 0x496b7d */ + uint8_t who_plays; /* 0: not alive, 1: human, 2: computer @0x496b7d */ uint8_t f22; uint8_t f23; uint8_t f24; diff --git a/csrc/tools_ui.c b/csrc/tools_ui.c index a397374..840f53c 100644 --- a/csrc/tools_ui.c +++ b/csrc/tools_ui.c @@ -115,7 +115,7 @@ LRESULT CALLBACK toolsProc(HWND hWnd, UINT message, WPARAM wp, LPARAM lp) void tools_ui() { - dl = players[current_player].f21; + dl = players[current_player].who_plays; if (dl != 1) goto 0x447f82; |