TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Pass local player to skip_create_egg_powerup

Browse source
This commit is contained in:
Kp 2016-10-02 00:34:42 +00:00
parent e9eaf53c8a
commit 04eeda8486
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
similar/main/fireball.cpp
View file

@ -972,12 +972,12 @@ objptridx_t drop_powerup(int type, int id, int num, const vms_vector &init_vel,
}
#if defined(DXX_BUILD_DESCENT_II)
static bool skip_create_egg_powerup(powerup_type_t powerup)
static bool skip_create_egg_powerup(const object &player, powerup_type_t powerup)
{
fix current;
auto &player_info = get_local_plrobj().ctype.player_info;
auto &player_info = player.ctype.player_info;
if (powerup == POW_SHIELD_BOOST)
current = get_local_plrobj().shields;
current = player.shields;
else if (powerup == POW_ENERGY)
current = player_info.energy;
else
@ -1008,7 +1008,7 @@ objptridx_t object_create_robot_egg(int type, int id, int num, const vms_vector
{
if (type == OBJ_POWERUP)
{
if (skip_create_egg_powerup(static_cast<powerup_type_t>(id)))
if (skip_create_egg_powerup(get_local_plrobj(), static_cast<powerup_type_t>(id)))
return object_none;
}
}