Align player kill count attribution with PrBoom+

This change breaks savegame compatibility by pulling in lastenemy field from Boom.
dirkd · Nov 18, 2021 · db100ff · db100ff
1 parent 3e3fe6b
commit db100ff
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/src/doom/p_inter.c b/src/doom/p_inter.c
@@ -754,13 +754,20 @@ P_KillMobj
         {
             if (!deathmatch)
             {
-                // add kill to first player who is still ingame
-                for (unsigned int plridx = 0; plridx < MAXPLAYERS; plridx++)
+                if (target->lastenemy && target->lastenemy->health > 0 && target->lastenemy->player)
                 {
-                    if (playeringame[plridx])
+                    target->lastenemy->player->killcount++;
+                }
+                else
+                {
+                    // add kill to first player who is still ingame
+                    for (unsigned int plridx = 0; plridx < MAXPLAYERS; plridx++)
                     {
-                        players[plridx].killcount++;
-                        break;
+                        if (playeringame[plridx])
+                        {
+                            players[plridx].killcount++;
+                            break;
+                        }
                     }
                 }
             }
@@ -994,6 +1001,10 @@ P_DamageMobj
     {
 	// if not intent on another player,
 	// chase after this one
+        if ( !target->lastenemy || target->lastenemy->health <= 0
+             || !target->lastenemy->player)
+           target->lastenemy = target->target;
+
 	target->target = source;
 	target->threshold = BASETHRESHOLD;
 	if (target->state == &states[target->info->spawnstate]

diff --git a/src/doom/p_mobj.c b/src/doom/p_mobj.c
@@ -680,6 +680,8 @@ P_SpawnMobjSafe
     mobj->oldz = mobj->z;
     mobj->oldangle = mobj->angle;
 
+    mobj->lastenemy = NULL;
+
     // [crispy] height of the spawnstate's first sprite in pixels
     if (!info->actualheight)
     {

diff --git a/src/doom/p_mobj.h b/src/doom/p_mobj.h
@@ -293,6 +293,9 @@ typedef struct mobj_s
     fixed_t		oldz;
     angle_t		oldangle;
 
+    // last known enemy
+    struct mobj_s*	lastenemy;
+
 } mobj_t;