zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-21 19:51:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix kill count management in CopyFriendliness when used on corpses.

Browse source
This commit is contained in:
Christoph Oelckers 2024-10-04 18:33:53 +02:00
parent 5b1f0fdc86
commit ccbebfcf34
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/playsim/p_mobj.cpp
View file

@ -803,7 +803,7 @@ DEFINE_ACTION_FUNCTION(AActor, GiveInventoryType)
void AActor::CopyFriendliness (AActor *other, bool changeTarget, bool resetHealth) void AActor::CopyFriendliness (AActor *other, bool changeTarget, bool resetHealth)
{ {
Level->total_monsters -= CountsAsKill(); if (health > 0) Level->total_monsters -= CountsAsKill();
TIDtoHate = other->TIDtoHate; TIDtoHate = other->TIDtoHate;
LastLookActor = other->LastLookActor; LastLookActor = other->LastLookActor;
LastLookPlayerNumber = other->LastLookPlayerNumber; LastLookPlayerNumber = other->LastLookPlayerNumber;
@ -818,7 +818,7 @@ void AActor::CopyFriendliness (AActor *other, bool changeTarget, bool resetHealt
LastHeard = target = other->target; LastHeard = target = other->target;
} }
if (resetHealth) health = SpawnHealth(); if (resetHealth) health = SpawnHealth();
Level->total_monsters += CountsAsKill(); if (health > 0) Level->total_monsters += CountsAsKill();
} }
DEFINE_ACTION_FUNCTION(AActor, CopyFriendliness) DEFINE_ACTION_FUNCTION(AActor, CopyFriendliness)