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/p_user.c')

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


From a0a4303a99c8dda72cbe3ff00f26157c2a639fcd Mon Sep 17 00:00:00 2001
From: James Haley
Date: Wed, 24 Sep 2014 20:22:57 -0500
Subject: Upstream fix to torpedo weapon changing

Use of the wrong enum value as an index into weaponinfo left the
torpedo's selectability accidentally relying on you having 30 or more
rockets instead of cells. Verified against binary as a choco error.
---
 src/strife/p_user.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/strife/p_user.c')

diff --git a/src/strife/p_user.c b/src/strife/p_user.c
index 78b8df03..bf082e99 100644
--- a/src/strife/p_user.c
+++ b/src/strife/p_user.c
@@ -457,7 +457,9 @@ void P_PlayerThink (player_t* player)
         {
             if(player->weaponowned[wp_torpedo] && player->readyweapon == wp_mauler)
             {
-                if(player->ammo[weaponinfo[am_cell].ammo] >= 30)
+                // haleyjd 20140924: bug fix - using wrong enum value am_cell
+                // caused this to check the missile launcher for rocket ammo
+                if(player->ammo[weaponinfo[wp_torpedo].ammo] >= 30)
                     newweapon = wp_torpedo;
             }
         }
-- 
cgit v1.2.3