- Externalized all default episode definitions. Added an 'optional' keyword

to handle M4 and 5 in Doom and Heretic.
- Added P_CheckMapData functions and replaced all calls to P_OpenMapData that
  only checked for a map's presence with it.
- Added Martin Howe's player statusbar face submission.
- Added an 'adddefaultmap' option for MAPINFO. This is the same as 'defaultmap'
  but keeps all existing information in the default and just adds to it. This
  is needed because Hexen and Strife set some information in their base
  MAPINFO and using 'defaultmap' in a PWAD would override that.
- Fixed: Using MAPINFO's f1 option could cause memory leaks.
- Added option to load lumps by full name to several places:
  * Finale texts loaded from a text lump
  * Demos
  * Local SNDINFOs
  * Local SNDSEQs
  * Image names in FONTDEFS
  * intermission script names
- Changed the STCFN121 handling. The character is not an 'I' but a '|' so
  instead of discarding it it should be inserted at position 124.
- Renamed indexfont.fon to indexfont so that I could remove a special case
  from V_GetFont that was just added for this one font.
- Added a 'dumpspawnedthings' CVAR that enables a listing of all things in 
  the map and the actor type they spawned.


SVN r882 (trunk)

src/g_shared/a_morph.cpp

@@ -8,6 +8,7 @@
 #include "s_sound.h"
 #include "m_random.h"
 #include "a_sharedglobal.h"
+#include "sbar.h"
 
 #define MORPHTICS (40*TICRATE)
 
@@ -56,6 +57,10 @@ bool P_MorphPlayer (player_t *p, const PClass *spawntype)
 	{
 		return false;
 	}
+	if (spawntype == p->mo->GetClass())
+	{
+		return false;
+	}
 
 	morphed = static_cast<APlayerPawn *>(Spawn (spawntype, actor->x, actor->y, actor->z, NO_REPLACE));
 	DObject::StaticPointerSubstitution (actor, morphed);
@@ -78,6 +83,18 @@ bool P_MorphPlayer (player_t *p, const PClass *spawntype)
 	actor->flags |= MF_UNMORPHED;
 	actor->renderflags |= RF_INVISIBLE;
 	p->morphTics = MORPHTICS;
+
+	// [MH] Used by SBARINFO to speed up face drawing
+	p->MorphedPlayerClass = 0;
+	for (unsigned int i = 1; i < PlayerClasses.Size (); i++)
+	{
+		if (PlayerClasses[i].Type == spawntype)
+		{
+			p->MorphedPlayerClass = i;
+			break;
+		}
+	}
+	
 	p->health = morphed->health;
 	p->mo = morphed;
 	p->momx = p->momy = 0;
@@ -116,6 +133,18 @@ bool P_MorphPlayer (player_t *p, const PClass *spawntype)
 		p->camera = morphed;
 	}
 	morphed->ScoreIcon = actor->ScoreIcon;	// [GRB]
+
+	// [MH]
+	// If the player that was morphed is the one
+	// taking events, set up the face, if any;
+	// this is only needed for old-skool skins
+	// and for the original DOOM status bar.
+	if ((p == &players[consoleplayer]) && 
+		(strcmp(spawntype->Meta.GetMetaString (APMETA_Face), "None") != 0))
+	{
+		StatusBar->SetFace(&skins[p->MorphedPlayerClass]);
+	}
+
 	return true;
 }
 
@@ -182,6 +211,39 @@ bool P_UndoPlayerMorph (player_t *player, bool force)
 	{
 		player->camera = mo;
 	}
+
+	// [MH]
+	// If the player that was morphed is the one
+	// taking events, reset up the face, if any;
+	// this is only needed for old-skool skins
+	// and for the original DOOM status bar.
+	if ((player == &players[consoleplayer]) && 
+		(strcmp(pmo->GetClass()->Meta.GetMetaString (APMETA_Face), "None") != 0))
+	{
+		// Assume root-level base skin to begin with
+		size_t skinindex = 0;
+		// If a custom skin was in use, then reload it
+		// or else the base skin for the player class.
+		if ((unsigned int)player->userinfo.skin >= PlayerClasses.Size () &&
+			(size_t)player->userinfo.skin < numskins)
+		{
+			skinindex = player->userinfo.skin;
+		}
+		else if (PlayerClasses.Size () > 1)
+		{
+			const PClass *whatami = player->mo->GetClass();
+			for (unsigned int i = 0; i < PlayerClasses.Size (); ++i)
+			{
+				if (PlayerClasses[i].Type == whatami)
+				{
+					skinindex = i;
+					break;
+				}
+			}
+		}
+		StatusBar->SetFace(&skins[skinindex]);
+	}
+
 	angle = mo->angle >> ANGLETOFINESHIFT;
 	Spawn<ATeleportFog> (pmo->x + 20*finecosine[angle],
 		pmo->y + 20*finesine[angle], pmo->z + TELEFOGHEIGHT, ALLOW_REPLACE);