shithub: choc

Download patch

ref: 3e3342a35a390e1496e8a68b1f297f5111700713
parent: ee236f29242c8463daf85b155338eef12bf222b4
author: James Haley <haleyjd@hotmail.com>
date: Thu Oct 23 20:53:40 EDT 2014

Upstream fix 3

Propagation of allegiance from teleport beacons to rebels missing;
verfied positioning of missing assignment against disassembly.

--- a/src/strife/p_enemy.c
+++ b/src/strife/p_enemy.c
@@ -3163,6 +3163,10 @@
 
     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