From ad9b9479ec424aeb59c7d22a17b085e51b0539af Mon Sep 17 00:00:00 2001 From: Edoardo Prezioso Date: Wed, 20 Apr 2016 22:59:57 +0200 Subject: [PATCH] - Fixed erroneous P_UndoPlayerMorph calls. In some places, P_UndoPlayerMorph was called with the 'force' argument placed in the 'unmorphflag' parameter, so that 'forced' unmorphs would be not completely forceful. I hope no mod relied on this weirdness... --- src/g_shared/a_morph.cpp | 2 +- src/p_acs.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/g_shared/a_morph.cpp b/src/g_shared/a_morph.cpp index 3b3741a43..d0e807c3e 100644 --- a/src/g_shared/a_morph.cpp +++ b/src/g_shared/a_morph.cpp @@ -514,7 +514,7 @@ bool P_MorphedDeath(AActor *actor, AActor **morphed, int *morphedstyle, int *mor AActor *realme = actor->player->mo->tracer; int realstyle = actor->player->MorphStyle; int realhealth = actor->health; - if (P_UndoPlayerMorph(actor->player, actor->player, !!(actor->player->MorphStyle & MORPH_UNDOBYDEATHFORCED))) + if (P_UndoPlayerMorph(actor->player, actor->player, 0, !!(actor->player->MorphStyle & MORPH_UNDOBYDEATHFORCED))) { *morphed = realme; *morphedstyle = realstyle; diff --git a/src/p_acs.cpp b/src/p_acs.cpp index 83ef42b9a..e56aeb596 100644 --- a/src/p_acs.cpp +++ b/src/p_acs.cpp @@ -9455,7 +9455,7 @@ scriptwait: { if (activator->player) { - if (P_UndoPlayerMorph(activator->player, activator->player, force)) + if (P_UndoPlayerMorph(activator->player, activator->player, 0, force)) { changes++; } @@ -9481,7 +9481,7 @@ scriptwait: { if (actor->player) { - if (P_UndoPlayerMorph(activator->player, actor->player, force)) + if (P_UndoPlayerMorph(activator->player, actor->player, 0, force)) { changes++; }