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

Pass object &to powerup_grab_cheat

Browse source
This commit is contained in:
Kp 2016-04-23 17:59:47 +00:00
parent 3677e7036e
commit b46ddf26e7
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/game.cpp
View file

@ -1742,7 +1742,7 @@ void FireLaser()
// -------------------------------------------------------------------------------------------------------
// If player is close enough to objnum, which ought to be a powerup, pick it up!
// This could easily be made difficulty level dependent.
static void powerup_grab_cheat(const vobjptr_t player, const vobjptridx_t powerup)
static void powerup_grab_cheat(object &player, const vobjptridx_t powerup)
{
fix powerup_size;
fix player_size;
@ -1750,12 +1750,12 @@ static void powerup_grab_cheat(const vobjptr_t player, const vobjptridx_t poweru
Assert(powerup->type == OBJ_POWERUP);
powerup_size = powerup->size;
player_size = player->size;
player_size = player.size;
const auto dist = vm_vec_dist_quick(powerup->pos, player->pos);
const auto dist = vm_vec_dist_quick(powerup->pos, player.pos);
if ((dist < 2*(powerup_size + player_size)) && !(powerup->flags & OF_SHOULD_BE_DEAD)) {
const auto collision_point = vm_vec_avg(powerup->pos, player->pos);
const auto collision_point = vm_vec_avg(powerup->pos, player.pos);
collide_player_and_powerup(player, powerup, collision_point);
}
}