Fix level kill/item totals if a SPAWNER attack fails

CHANGELOG.txt

@@ -156,5 +156,6 @@ Bugs fixed
 - Fixed pre-EC legacy issue: Things were visible while changing positions via teleportation
 - Fixed pre-EC legacy issue: Death from other means than the actual sector damage in a "death exit" sector would not
   properly exit the level
+- Fixed failed object spawns from a SPAWNER-type attack still counting toward the total amount of kills/items in a level
 
 

source_files/edge/p_action.cc

@@ -54,6 +54,7 @@
 #include "rad_trig.h"
 #include "s_sound.h"
 #include "w_wad.h"
+#include "f_interm.h" // wi_stats
 
 #include "AlmostEquals.h"
 
@@ -2334,6 +2335,10 @@ static void ObjectSpawning(mobj_t * parent, angle_t angle)
 	// Blocking line detected between object and spawnpoint?
 	if (P_MapCheckBlockingLine(parent, child))
 	{
+		if (child->flags & MF_COUNTKILL)
+			wi_stats.kills--;
+		if (child->flags & MF_COUNTITEM)
+			wi_stats.items--;
 		// -KM- 1999/01/31 Explode objects over remove them.
 		// -AJA- 2000/02/01: Remove now the default.
 		if (attack->flags & AF_KillFailedSpawn)
@@ -2350,6 +2355,10 @@ static void ObjectSpawning(mobj_t * parent, angle_t angle)
 	// If the object cannot move from its position, remove it or kill it.
 	if (!P_TryMove(child, child->x, child->y))
 	{
+		if (child->flags & MF_COUNTKILL)
+			wi_stats.kills--;
+		if (child->flags & MF_COUNTITEM)
+			wi_stats.items--;
 		if (attack->flags & AF_KillFailedSpawn)
 			P_KillMobj(parent, child, NULL);
 		else

source_files/edge/p_mobj.cc

@@ -2214,7 +2214,7 @@ mobj_t *P_MobjCreateObject(float x, float y, float z, const mobjtype_c *info)
 
 	if (level_flags.fastparm)
 	{
-		// MBF21: Use explicit Fast speed value if provided
+		// Use explicit Fast speed value if provided
 		if (info->fast_speed > -1)
 			mobj->speed = info->fast_speed;
 		else