OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge pull request #304 from MajorCooke/morphundoalways

Browse source 
- Added MORPH_UNDOALWAYS for morph powerups.
This commit is contained in:
coelckers 2015-04-30 09:05:41 +02:00
commit 691855e19b
4 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/g_shared/a_artifacts.cpp
View file

@ -1923,7 +1923,7 @@ void APowerMorph::EndEffect( )
if (!bNoCallUndoMorph)
{
int savedMorphTics = Player->morphTics;
P_UndoPlayerMorph (Player, Player);
P_UndoPlayerMorph (Player, Player, 0, !!(Player->MorphStyle & MORPH_UNDOALWAYS));
// Abort if unmorph failed; in that case,
// set the usual retry timer and return.