foxygit / doom Log in
commit 3e3342a35a390e1496e8a68b1f297f5111700713
Author:     James Haley <haleyjd@hotmail.com>
AuthorDate: Fri Oct 24 00:53:40 2014 -0500
Commit:     James Haley <haleyjd@hotmail.com>
CommitDate: Fri Oct 24 00:53:40 2014 -0500

    Upstream fix 3

    Propagation of allegiance from teleport beacons to rebels missing;
    verfied positioning of missing assignment against disassembly.
---
 src/strife/p_enemy.c | 4 ++++
 1 file changed, 4 insertions(+)

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