diff options
| -rw-r--r-- | csrc/game_init.c | 2 | ||||
| -rw-r--r-- | csrc/loadsave.c | 4 | ||||
| -rw-r--r-- | csrc/main.c | 2 | ||||
| -rw-r--r-- | csrc/media_init.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/csrc/game_init.c b/csrc/game_init.c index 9b62001..93eab02 100644 --- a/csrc/game_init.c +++ b/csrc/game_init.c @@ -121,7 +121,7 @@ int init_new_game(int a0) if (res == 1) { nplayers = dw_46cb3c + 2; - dw_499104 = dw_49910c = 0; + dw_499104 = current_player = 0; game_initial_fund = initial_fund[dw_46cb40]; memset(0x499120, 0, 60); memset(0x49915c, 0, 60); diff --git a/csrc/loadsave.c b/csrc/loadsave.c index 622d44c..e234490 100644 --- a/csrc/loadsave.c +++ b/csrc/loadsave.c @@ -334,7 +334,7 @@ int load_checkpoint(int n) } fread(0x4967e0, 0xc, 0x1c, fp); - fread(0x49910c, 4, 1, fp); + fread(¤t_player, 4, 1, fp); fread(0x499118, 4, 1, fp); fread(0x499110, 4, 1, fp); fread(0x49911c, 4, 1, fp); @@ -406,7 +406,7 @@ int load_checkpoint(int n) fread(*(int*)(0x48f294+esi), 1, *(int*)0x498e94, fp); } fcn_00407ad2(); - eax = (*(int*)0x49910c) * 0x34; + eax = current_player * 0x34; *(char*)(0x498ea0 + eax) |= 0x80; srand(GetTickCount()); diff --git a/csrc/main.c b/csrc/main.c index 22345f2..ece32c4 100644 --- a/csrc/main.c +++ b/csrc/main.c @@ -159,7 +159,7 @@ start_msg_loop: fcn_004192f7(); if (b_46cafa != 0) fcn_0040d7c4(); - eax = dw_49910c * 0x34; + eax = current_player * 0x34; if (b_498ea2[eax] == 0) { if (b_498ea0[eax] != 0x80) { dl = b_498ea0[eax] & 0x7f; diff --git a/csrc/media_init.c b/csrc/media_init.c index 3164718..166edb9 100644 --- a/csrc/media_init.c +++ b/csrc/media_init.c @@ -359,7 +359,7 @@ L401306: /* hotkey 49719a */ k = R4_KEY(global_rich4_cfg.hotkeys[25]); if (modded_key == k) { - eax = dw_49910c; + eax = current_player; *(char*)(0x48be24 + eax)--; *(char*)(0x48be24 + eax) &= 3; fcn_00415f69(1); @@ -368,7 +368,7 @@ L401306: /* hotkey 49719c */ k = R4_KEY(global_rich4_cfg.hotkeys[26]); if (modded_key == k) { - eax = dw_49910c; + eax = current_player; *(char*)(0x48be24 + eax)++; *(char*)(0x48be24 + eax) &= 3; fcn_00415f69(1); |