OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Removed the check for Heretic when playing *evillaugh when using the

Browse source 
Chaos Device. This sound is not defined by the other games so it won't
  play by default.
- Added MORPH_UNDOBYTOMEOFPOWER and MORPH_UNDOBYCHAOSDEVICE flags
  for the morph style so that the special behavior of these two items
  can be switched on and off. 

SVN r890 (trunk)
This commit is contained in:
Christoph Oelckers 2008-04-08 09:52:50 +00:00
commit 4dc1b9579e
7 changed files with 34 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/m_cheat.cpp
View file

@ -431,18 +431,23 @@ const char *cht_Morph (player_t *player, const PClass *morphclass, bool quickund
return "";
}
PClass *oldclass = player->mo->GetClass();
// Set the standard morph style for the current game
int style = MORPH_UNDOBYTOMEOFPOWER;
if (gameinfo.gametype == GAME_Hexen) style |= MORPH_UNDOBYCHAOSDEVICE;
if (player->morphTics)
{
if (P_UndoPlayerMorph (player))
{
if (!quickundo && oldclass != morphclass && P_MorphPlayer (player, morphclass))
if (!quickundo && oldclass != morphclass && P_MorphPlayer (player, morphclass, 0, style))
{
return "You feel even stranger.";
}
return "You feel like yourself again.";
}
}
else if (P_MorphPlayer (player, morphclass))
else if (P_MorphPlayer (player, morphclass, 0, style))
{
return "You feel strange...";
}