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

Preserve killer_objnum when a dead player takes additional damage

Browse source
This commit is contained in:
Kp 2017-04-30 16:25:19 +00:00
parent 4f6c8575f2
commit 26cb93d24f
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
similar/main/collide.cpp
View file

@ -2087,6 +2087,15 @@ void apply_damage_to_player(object &playerobj, const cobjptridx_t killer, fix da
if (get_player_id(playerobj) == Player_num) { //is this the local player?
PALETTE_FLASH_ADD(f2i(damage)*4,-f2i(damage/2),-f2i(damage/2)); //flash red
if (playerobj.shields < 0)
{
/*
* If player is already dead (but Player_dead_state has not
* caught up yet), preserve the original killer data.
*/
assert(playerobj.flags & OF_SHOULD_BE_DEAD);
return;
}
const auto shields = (playerobj.shields -= damage);
if (shields < 0)