summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Haley2014-10-24 00:53:40 -0500
committerJames Haley2014-10-24 00:53:40 -0500
commit3e3342a35a390e1496e8a68b1f297f5111700713 (patch)
treec847d5eda87795e1ed6bce2b9b24f5d8fb3f4d70
parentee236f29242c8463daf85b155338eef12bf222b4 (diff)
downloadchocolate-doom-3e3342a35a390e1496e8a68b1f297f5111700713.tar.gz
chocolate-doom-3e3342a35a390e1496e8a68b1f297f5111700713.tar.bz2
chocolate-doom-3e3342a35a390e1496e8a68b1f297f5111700713.zip
Upstream fix 3
Propagation of allegiance from teleport beacons to rebels missing; verfied positioning of missing assignment against disassembly.
-rw-r--r--src/strife/p_enemy.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/strife/p_enemy.c b/src/strife/p_enemy.c
index e3757ac7..6e128679 100644
--- a/src/strife/p_enemy.c
+++ b/src/strife/p_enemy.c
@@ -3163,6 +3163,10 @@ void A_TeleportBeacon(mobj_t* actor)
mobj = P_SpawnMobj(actor->x, actor->y, ONFLOORZ, MT_REBEL1);
+ // haleyjd 20141024: missing code from disassembly; transfer allegiance
+ // originally from master player to the rebel.
+ mobj->miscdata = actor->miscdata;
+
if(!P_TryMove(mobj, mobj->x, mobj->y))
{
// Rebel is probably stuck in something.. too bad