OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- fixed: Morphing to a class without a face definition crashed.

Browse source 
- Converted all of Heretic's actors except the weapons to DECORATE.
- Added the option to define the ActorInfos for native classes in DECORATE.


SVN r1078 (trunk)
This commit is contained in:
Christoph Oelckers 2008-07-21 17:03:30 +00:00
commit a8c283dacd
29 changed files with 1580 additions and 2009 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/g_shared/a_morph.cpp
View file

@ -151,12 +151,15 @@ bool P_MorphPlayer (player_t *activator, player_t *p, const PClass *spawntype, i
// 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))
if (p == &players[consoleplayer])
{
StatusBar->SetFace(&skins[p->MorphedPlayerClass]);
}
const char *face = spawntype->Meta.GetMetaString (APMETA_Face);
if (face != NULL && strcmp(face, "None") != 0)
{
StatusBar->SetFace(&skins[p->MorphedPlayerClass]);
}
}
return true;
}