OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added full sound definitions for Heretic's ChickenPlayer and Hexen's

Browse source 
PigPlayer (submitted by NeuralStunner.)
- Added unmorph fix by Gez.


SVN r2056 (trunk)
This commit is contained in:
Christoph Oelckers 2009-12-28 22:41:14 +00:00
commit 9b5c2c81f1
5 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/g_shared/a_morph.cpp
View file

@ -192,7 +192,7 @@ bool P_UndoPlayerMorph (player_t *activator, player_t *player, int unmorphflag,
return false;
}
bool DeliberateUnmorphIsOkay = !!(player->MorphStyle & unmorphflag);
bool DeliberateUnmorphIsOkay = !!(MORPH_STANDARDUNDOING & unmorphflag);
if ((pmo->flags2 & MF2_INVULNERABLE) // If the player is invulnerable
&& ((player != activator) // and either did not decide to unmorph,