shithub: choc

Info  •  Files  •  Log  •  Branches

Merge branch 'master' of github.com:chocolate-doom/chocolate-doom

--- 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"

--- 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"

--- a/src/strife/p_floor.c

+++ b/src/strife/p_floor.c

@@ -522,9 +522,10 @@

         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;

--- a/src/strife/p_user.c

+++ b/src/strife/p_user.c

@@ -457,7 +457,9 @@

         {

             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;

             }

         }

@@ -776,7 +778,9 @@

 //

 // P_SpawnTeleportBeacon

+//

 // villsa [STRIFE] new function

+// haleyjd 20140918: bug fixed to propagate allegiance properly.

 //

 boolean P_SpawnTeleportBeacon(player_t* player)

 {

@@ -816,7 +820,7 @@

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