zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-12 11:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace "INT16_32768" macro with unsigned literal "32768u".

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6600 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2018-01-28 04:30:34 +00:00
parent 0bad11ee9d
commit b3fd642bf4
5 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/build/include/build.h
View file

@ -317,9 +317,6 @@ enum {
SPR_ALIGN_MASK = 32+16, SPR_ALIGN_MASK = 32+16,
}; };
// compatibility token for bitfield uses of the most significant bit of signed int16_t
#define INT16_32768 ((int16_t)32768)
#include "buildtypes.h" #include "buildtypes.h"
#define UNTRACKED_STRUCTS #define UNTRACKED_STRUCTS
#undef buildtypes_h__ #undef buildtypes_h__

2
source/duke3d/src/game.cpp
View file

@ -3120,7 +3120,7 @@ int A_Spawn(int spriteNum, int tileNum)
case SE_9_DOWN_OPEN_DOOR_LIGHTS: case SE_9_DOWN_OPEN_DOOR_LIGHTS:
if (sector[sectNum].lotag && if (sector[sectNum].lotag &&
labs(sector[sectNum].ceilingz-pSprite->z) > 1024) labs(sector[sectNum].ceilingz-pSprite->z) > 1024)
sector[sectNum].lotag |= INT16_32768; //If its open sector[sectNum].lotag |= 32768u; //If its open
fallthrough__; fallthrough__;
case SE_8_UP_OPEN_DOOR_LIGHTS: case SE_8_UP_OPEN_DOOR_LIGHTS:
//First, get the ceiling-floor shade //First, get the ceiling-floor shade

4
source/duke3d/src/gameexec.cpp
View file

@ -261,7 +261,7 @@ static int32_t VM_CheckSquished(void)
#endif #endif
if (vm.pSprite->pal == 1 ? if (vm.pSprite->pal == 1 ?
(floorZ - ceilZ >= ZOFFSET5 || (pSector->lotag & INT16_32768)) : (floorZ - ceilZ >= ZOFFSET5 || (pSector->lotag & 32768u)) :
(floorZ - ceilZ >= ZOFFSET4)) (floorZ - ceilZ >= ZOFFSET4))
return 0; return 0;
@ -3692,7 +3692,7 @@ nullquote:
if (foundSect >= 0 && isanearoperator(sector[foundSect].lotag)) if (foundSect >= 0 && isanearoperator(sector[foundSect].lotag))
if ((sector[foundSect].lotag&0xff) == ST_23_SWINGING_DOOR || sector[foundSect].floorz == sector[foundSect].ceilingz) if ((sector[foundSect].lotag&0xff) == ST_23_SWINGING_DOOR || sector[foundSect].floorz == sector[foundSect].ceilingz)
if ((sector[foundSect].lotag&(int16_t)(16384|INT16_32768)) == 0) if ((sector[foundSect].lotag&(16384u|32768u)) == 0)
{ {
int32_t j; int32_t j;

2
source/duke3d/src/premap.cpp
View file

@ -1046,7 +1046,7 @@ static void prelevel(char g)
case ST_20_CEILING_DOOR: case ST_20_CEILING_DOOR:
case ST_22_SPLITTING_DOOR: case ST_22_SPLITTING_DOOR:
if (sector[i].floorz > sector[i].ceilingz) if (sector[i].floorz > sector[i].ceilingz)
sector[i].lotag |= INT16_32768; sector[i].lotag |= 32768u;
continue; continue;
} }

2
source/duke3d/src/sector.cpp
View file

@ -818,7 +818,7 @@ REDODOOR:
if (j >= 0) j = sector[j].ceilingz; if (j >= 0) j = sector[j].ceilingz;
else else
{ {
pSector->lotag |= INT16_32768; pSector->lotag |= 32768u;
goto REDODOOR; goto REDODOOR;
} }
} }