zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Fixed the morphed player actor friendliness. 

It wasn't inherited from the original player actor object.
This commit is contained in:
Edoardo Prezioso 2016-04-18 15:28:45 +02:00 committed by Christoph Oelckers
parent a30eb4d709
commit 8dee0be9ab
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/g_shared/a_morph.cpp
View File

@ -91,6 +91,8 @@ bool P_MorphPlayer (player_t *activator, player_t *p, PClassPlayerPawn *spawntyp
morphed->Angles.Yaw = actor->Angles.Yaw; morphed->Angles.Yaw = actor->Angles.Yaw;
morphed->target = actor->target; morphed->target = actor->target;
morphed->tracer = actor; morphed->tracer = actor;
morphed->FriendPlayer = actor->FriendPlayer;
morphed->DesignatedTeam = actor->DesignatedTeam;
morphed->Score = actor->Score; morphed->Score = actor->Score;
p->PremorphWeapon = p->ReadyWeapon; p->PremorphWeapon = p->ReadyWeapon;
morphed->special2 = actor->flags & ~MF_JUSTHIT; morphed->special2 = actor->flags & ~MF_JUSTHIT;