lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into sdl2

This commit is contained in:
Alam Ed Arias 2014-05-02 21:32:31 -04:00
parent 0f8269fe6f d859b70b25
commit d597856c8f
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/hardware/hw_main.c
View File

@ -2857,9 +2857,10 @@ static void HWR_Subsector(size_t num)
#ifdef DOPLANES #ifdef DOPLANES
// -------------------- WATER IN DEV. TEST ------------------------ // -------------------- WATER IN DEV. TEST ------------------------
//dck hack : use abs(tag) for waterheight //dck hack : use abs(tag) for waterheight
if (gr_frontsector->tag < 0) //ilag : Since we changed to UINT16 for sector tags, simulate INT16
if (gr_frontsector->tag > 32767)
{ {
wh = ((-gr_frontsector->tag) <<FRACBITS) + (FRACUNIT/2); wh = ((65535-gr_frontsector->tag) <<FRACBITS) + (FRACUNIT/2);
if (wh > gr_frontsector->floorheight && if (wh > gr_frontsector->floorheight &&
wh < gr_frontsector->ceilingheight) wh < gr_frontsector->ceilingheight)
{ {

4
src/p_mobj.c
View File

@ -3670,7 +3670,7 @@ static void P_Boss3Thinker(mobj_t *mobj)
// Move Boss4's sectors by delta. // Move Boss4's sectors by delta.
static boolean P_Boss4MoveCage(fixed_t delta) static boolean P_Boss4MoveCage(fixed_t delta)
{ {
const INT16 tag = -2; const UINT16 tag = 65534;
INT32 snum; INT32 snum;
sector_t *sector; sector_t *sector;
for (snum = sectors[tag%numsectors].firsttag; snum != -1; snum = sector->nexttag) for (snum = sectors[tag%numsectors].firsttag; snum != -1; snum = sector->nexttag)
@ -3719,7 +3719,7 @@ static void P_Boss4PinchSpikeballs(mobj_t *mobj, angle_t angle, fixed_t fz)
// Destroy cage FOFs. // Destroy cage FOFs.
static void P_Boss4DestroyCage(void) static void P_Boss4DestroyCage(void)
{ {
const INT16 tag = -2; const UINT16 tag = 65534;
INT32 snum, next; INT32 snum, next;
size_t a; size_t a;
sector_t *sector, *rsec; sector_t *sector, *rsec;

2
src/r_defs.h
View File

@ -242,7 +242,7 @@ typedef struct sector_s
INT32 ceilingpic; INT32 ceilingpic;
INT16 lightlevel; INT16 lightlevel;
INT16 special; INT16 special;
INT16 tag; UINT16 tag;
INT32 nexttag, firsttag; // for fast tag searches INT32 nexttag, firsttag; // for fast tag searches
// origin for any sounds played by the sector // origin for any sounds played by the sector