Minor tweaks

releasenotes.md

@@ -13,7 +13,7 @@
 * Monsters now only become non-solid at the end of their death sequence rather than at the start.
 * Shadows cast by monsters are now slightly lighter while they attack and the `r_shadows` CVAR is `on`.
 * The player’s crosshair now displays correctly when the `crosshair` CVAR is `cross` and the `r_hud_translucency` CVAR is `off`.
-* Specifying `-dog`, or `-dogs 1` to `-dogs 8`, on the command-line will now spawn one or more [*MBF*](https://doomwiki.org/wiki/MBF) helper dogs at the start of the game.
+* Specifying `-dog`, or `-dogs 1` to `-dogs 8`, on the command-line now spawns one or more [*MBF* helper dogs](https://doomwiki.org/wiki/Helper_dog) at the start of the game.
 
 ![](https://github.com/bradharding/www.doomretro.com/raw/master/wiki/bigdivider.png)
 

src/d_main.c

@@ -2540,8 +2540,8 @@ static void D_DoomMainSetup(void)
     {
         const int   dogs = strtol(myargv[p + 1], NULL, 10);
 
-        if (dogs > 0 && dogs <= MAXFRIENDS)
-            P_InitHelperDogs(dogs);
+        if (dogs >= 1)
+            P_InitHelperDogs(MIN(dogs, MAXFRIENDS));
     }
     else if (M_CheckParm("-dogs"))
         P_InitHelperDogs(MAXFRIENDS);

src/p_mobj.c

@@ -1164,7 +1164,9 @@ static void P_SpawnFriend(const mapthing_t *mthing)
         M_StringCopy(mobj->name, friendname[playerstart - 2], sizeof(mobj->name));
         mobj->health = friendhealth[playerstart - 2];
 
-        if (*mobj->name)
+        if (gamemap == 1)
+            C_Warning(0, "A friendly %s entered this map with %s!", mobjinfo[mobj->type].name1, playername);
+        else if (*mobj->name)
             C_Warning(0, "%s followed %s into this map!", mobj->name, playername);
         else
             C_Warning(0, "A friendly %s followed %s into this map!", mobjinfo[mobj->type].name1, playername);