diff options
| author | Simon Howard | 2014-10-01 23:58:25 -0400 |
|---|---|---|
| committer | Simon Howard | 2014-10-01 23:58:25 -0400 |
| commit | a43186b2beaab5fda826fe846d252fa6186d835a (patch) | |
| tree | f1f8f8407e5bab90c059a45992747d45e32df43e /src | |
| parent | 0ec3d826f0b0f2b25f8652287f2c1027c8229e34 (diff) | |
| parent | a0a4303a99c8dda72cbe3ff00f26157c2a639fcd (diff) | |
| download | chocolate-doom-a43186b2beaab5fda826fe846d252fa6186d835a.tar.gz chocolate-doom-a43186b2beaab5fda826fe846d252fa6186d835a.tar.bz2 chocolate-doom-a43186b2beaab5fda826fe846d252fa6186d835a.zip | |
Merge branch 'master' of github.com:chocolate-doom/chocolate-doom
Diffstat (limited to 'src')
| -rw-r--r-- | src/deh_io.c | 1 | ||||
| -rw-r--r-- | src/deh_main.c | 1 | ||||
| -rw-r--r-- | src/strife/p_floor.c | 3 | ||||
| -rw-r--r-- | src/strife/p_user.c | 8 |
4 files changed, 9 insertions, 4 deletions
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" 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; diff --git a/src/strife/p_user.c b/src/strife/p_user.c index e544dce8..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; } } @@ -776,7 +778,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 +820,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)); |