From d5d4517712f6063c28a2a8bd836c1b7ed93392b1 Mon Sep 17 00:00:00 2001 From: Kp Date: Fri, 28 Oct 2016 03:39:42 +0000 Subject: [PATCH] Pass player object to init_ammo_and_energy --- similar/main/gameseq.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/similar/main/gameseq.cpp b/similar/main/gameseq.cpp index 36efc7d28..c9bdf8e4b 100644 --- a/similar/main/gameseq.cpp +++ b/similar/main/gameseq.cpp @@ -310,16 +310,16 @@ void init_player_stats_game(ubyte pnum) #endif } -static void init_ammo_and_energy(void) +static void init_ammo_and_energy(object &plrobj) { - auto &player_info = get_local_plrobj().ctype.player_info; + auto &player_info = plrobj.ctype.player_info; { auto &energy = player_info.energy; if (energy < INITIAL_ENERGY) energy = INITIAL_ENERGY; } { - auto &shields = get_local_plrobj().shields; + auto &shields = plrobj.shields; if (shields < StartingShields) shields = StartingShields; } @@ -368,7 +368,7 @@ void init_player_stats_level(const secret_restore secret_flag) player_info.mission.hostages_on_board = 0; if (secret_flag == secret_restore::none) { - init_ammo_and_energy(); + init_ammo_and_energy(plrobj); auto &powerup_flags = player_info.powerup_flags; powerup_flags &= ~(PLAYER_FLAGS_INVULNERABLE | PLAYER_FLAGS_CLOAKED);