From d95cbcfa2bd3479dfdbfad536d888ac828727a68 Mon Sep 17 00:00:00 2001
From: Fabian Greffrath
Date: Mon, 15 Sep 2014 07:55:01 +0200
Subject: deh_main.c: fix "warning: implicit declaration of function ‘I_Error’"

---
 src/deh_io.c   | 1 -
 src/deh_main.c | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/deh_io.c b/src/deh_io.c
index 4b264370..526d8e46 100644
--- a/src/deh_io.c
+++ b/src/deh_io.c
@@ -21,7 +21,6 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "i_system.h"
 #include "m_misc.h"
 #include "w_wad.h"
 #include "z_zone.h"
diff --git a/src/deh_main.c b/src/deh_main.c
index ff4500aa..b3dc609a 100644
--- a/src/deh_main.c
+++ b/src/deh_main.c
@@ -21,6 +21,7 @@
 #include <ctype.h>
 
 #include "doomtype.h"
+#include "i_system.h"
 #include "d_iwad.h"
 #include "m_argv.h"
 #include "w_wad.h"
-- 
cgit v1.2.3


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')

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 6f8bed05ab5bb9c403ce4d60ce3f85869fca8c49 Mon Sep 17 00:00:00 2001
From: James Haley
Date: Fri, 19 Sep 2014 22:37:17 -0500
Subject: Upstream fixes to stair building issues

First sector moved instantly for buildDown16 stairs due to neglect of
using direction instead of constant 1. Also found that Strife clears the
tag of the first stair sector.
---
 src/strife/p_floor.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/strife/p_floor.c b/src/strife/p_floor.c
index 75f9cbd9..9b89168e 100644
--- a/src/strife/p_floor.c
+++ b/src/strife/p_floor.c
@@ -522,9 +522,10 @@ EV_BuildStairs
         rtn = 1;
         floor = Z_Malloc (sizeof(*floor), PU_LEVSPEC, 0);
         P_AddThinker (&floor->thinker);
+        sec->tag = 0; // haleyjd 20140919: [STRIFE] clears tag of first stair sector
         sec->specialdata = floor;
         floor->thinker.function.acp1 = (actionf_p1) T_MoveFloor;
-        floor->direction = 1;
+        floor->direction = direction; // haleyjd 20140919: bug fix: direction, not "1"
         floor->sector = sec;
         floor->speed = speed;
         height = sec->floorheight + stairsize;
-- 
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')

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