Minor tweaks

releasenotes.md

@@ -66,6 +66,7 @@
 * The fuzz effect from spectres and the partial invisibility power-up now:
   * Doesn't cause the status bar to bleed into the player's view while the console is open.
   * Freezes along with everything else when freeze mode is enabled.
+* Flying monsters no longer nudge corpses beneath them when the `r_corpses_nudge` CVAR is `on`.
 
 ![](https://github.com/bradharding/www.doomretro.com/raw/master/wiki/bigdivider.png)
 

src/c_cmds.c

@@ -4443,13 +4443,6 @@ static bool map_func1(char *cmd, char *parms)
             }
             else if (sscanf(parm, "E%1iM%i", &mapcmdepisode, &mapcmdmap) == 2)
                 result = (chex && mapcmdepisode > 1 ? false : (W_CheckNumForName(parm) >= 0));
-            else if (FREEDOOM && sscanf(parm, "C%1iM%1i", &mapcmdepisode, &mapcmdmap) == 2)
-            {
-                char    lump[5];
-
-                M_snprintf(lump, sizeof(lump), "E%iM%i", mapcmdepisode, mapcmdmap);
-                result = (W_CheckNumForName(lump) >= 0);
-            }
         }
 
         if (!result)
@@ -5085,15 +5078,7 @@ static void mapstats_func2(char *cmd, char *parms)
         return;
     }
 
-    if (FREEDOOM1)
-    {
-        char    lumpname[6];
-
-        M_snprintf(lumpname, sizeof(lumpname), "E%iM%i", gameepisode, gamemap);
-        lump = W_CheckNumForName(lumpname);
-        wadtype = lumpinfo[lump]->wadfile->type;
-    }
-    else if (BTSX || KDIKDIZD || legacyofrust)
+    if (BTSX || KDIKDIZD || legacyofrust)
     {
         char    lumpname[6];
 

src/m_array.h

@@ -65,8 +65,6 @@ inline static void array_clear(const void *v)
         array_ptr(v)->size = 0;
 }
 
-#define array_grow(v, n)    ((v) = M_ArrayGrow((v), sizeof(*(v)), n))
-
 #define array_push(v, e)                                                    \
     {                                                                       \
         if (!(v))                                                           \

src/p_inter.c

@@ -2386,16 +2386,16 @@ void P_DamageMobj(mobj_t *target, mobj_t *inflicter, mobj_t *source, int damage,
 
                 tplayer->damagereceived += stat;
                 stat_damagereceived = SafeAdd(stat_damagereceived, stat);
+                P_AnimateHealth(stat);
 
                 tplayer->health = 1;
                 target->health = 1;
-                P_AnimateHealth(stat);
             }
             else
             {
-                P_AnimateHealth(damage);
                 tplayer->damagereceived += damage;
                 stat_damagereceived = SafeAdd(stat_damagereceived, damage);
+                P_AnimateHealth(damage);
             }
         }
 

src/p_setup.c

@@ -3215,8 +3215,7 @@ void P_SetupLevel(int ep, int map)
 
     if (!(samelevel = (lumpnum == prevlumpnum)))
     {
-        viewplayer->cheats &= ~CF_ALLMAP;
-        viewplayer->cheats &= ~CF_ALLMAP_THINGS;
+        viewplayer->cheats &= ~(CF_ALLMAP | CF_ALLMAP_THINGS);
         viewplayer->deaths = 0;
         viewplayer->suicides = 0;
     }