zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-10 23:02:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: Unmorphing a monster did not clear its UNMORPHED flag.

Browse source
This commit is contained in:
Christoph Oelckers 2019-03-02 13:15:38 +01:00
parent 4cf90d70ae
commit 0febe20a08
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_mobj.cpp
View file

@ -7396,5 +7396,7 @@ void PrintMiscActorInfo(AActor *query)
Printf("FriendlySeeBlocks: %d\n", query->friendlyseeblocks); Printf("FriendlySeeBlocks: %d\n", query->friendlyseeblocks);
Printf("Target: %s\n", query->target ? query->target->GetClass()->TypeName.GetChars() : "-"); Printf("Target: %s\n", query->target ? query->target->GetClass()->TypeName.GetChars() : "-");
Printf("Last enemy: %s\n", query->lastenemy ? query->lastenemy->GetClass()->TypeName.GetChars() : "-"); Printf("Last enemy: %s\n", query->lastenemy ? query->lastenemy->GetClass()->TypeName.GetChars() : "-");
auto sn = FState::StaticGetStateName(query->state);
Printf("State:%s, Tics: %d", sn.GetChars(), query->tics);
} }
} }

1
wadsrc/static/zscript/actors/player/player_morph.zs
View file

@ -562,6 +562,7 @@ class MorphedMonster : Actor
unmorphed.args[3] = args[3]; unmorphed.args[3] = args[3];
unmorphed.args[4] = args[4]; unmorphed.args[4] = args[4];
unmorphed.CopyFriendliness (self, true); unmorphed.CopyFriendliness (self, true);
unmorphed.bUnmorphed = false;
UnmorphedMe = NULL; UnmorphedMe = NULL;
Substitute(unmorphed); Substitute(unmorphed);
Destroy (); Destroy ();