From 12732a1501d7690ba011270b4473dc8556ddf5e8 Mon Sep 17 00:00:00 2001
From: James Haley
Date: Thu, 18 Sep 2014 01:22:41 -0500
Subject: Upstream bug fix to teleport beacon allegiance

Was not propagating properly from player to beacon to rebels due to
mistranslated assembly code; access to wrong structure.
---
 src/strife/p_user.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/strife')

diff --git a/src/strife/p_user.c b/src/strife/p_user.c
index e544dce8..78b8df03 100644
--- a/src/strife/p_user.c
+++ b/src/strife/p_user.c
@@ -776,7 +776,9 @@ boolean P_TossDegninOre(player_t* player)
 
 //
 // P_SpawnTeleportBeacon
+//
 // villsa [STRIFE] new function
+// haleyjd 20140918: bug fixed to propagate allegiance properly.
 //
 boolean P_SpawnTeleportBeacon(player_t* player)
 {
@@ -816,7 +818,7 @@ boolean P_SpawnTeleportBeacon(player_t* player)
     if(P_CheckPosition(beacon, x, y))
     {
         beacon->target = mo;
-        beacon->miscdata = mo->miscdata;
+        beacon->miscdata = (byte)(player->allegiance);
         beacon->angle = (angle << ANGLETOFINESHIFT);
         beacon->momx = FixedMul(finecosine[angle], (5*FRACUNIT));
         beacon->momy = FixedMul(finesine[angle], (5*FRACUNIT));
-- 
cgit v1.2.3