zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-13 07:58:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix all "truncation of constant value" warnings in MSVC due to restoring hitag/lotag to signedness.

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

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

@ -4790,8 +4790,8 @@ DETONATEB:
case SECTOREFFECTOR__STATIC: case SECTOREFFECTOR__STATIC:
if (sprite[j].lotag == 1) if (sprite[j].lotag == 1)
{ {
sprite[j].lotag = 65535; sprite[j].lotag = 65535u;
sprite[j].hitag = 65535; sprite[j].hitag = 65535u;
} }
break; break;
case REACTOR__STATIC: case REACTOR__STATIC:

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

@ -588,7 +588,7 @@ void G_DoCheats(void)
if ((lotag & 0x7fff) > 2) if ((lotag & 0x7fff) > 2)
{ {
if (lotag&(0xffff-16384)) if (lotag&(0xffff-16384))
sector[i].lotag &= (0xffff-16384); sector[i].lotag &= (uint16_t)~16384u;
G_OperateSectors(i, pPlayer->i); G_OperateSectors(i, pPlayer->i);
} }
} }

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

@ -569,13 +569,13 @@ void G_OperateSectors(int sectNum, int spriteNum)
if (GetAnimationGoal(&pSector->ceilingz) == -1) //if the door has stopped if (GetAnimationGoal(&pSector->ceilingz) == -1) //if the door has stopped
{ {
g_haltSoundHack = 1; g_haltSoundHack = 1;
pSector->lotag &= 0xff00; pSector->lotag &= 0xFF00u;
pSector->lotag |= ST_22_SPLITTING_DOOR; pSector->lotag |= ST_22_SPLITTING_DOOR;
G_OperateSectors(sectNum,spriteNum); G_OperateSectors(sectNum,spriteNum);
pSector->lotag &= 0xff00; pSector->lotag &= 0xFF00u;
pSector->lotag |= ST_9_SLIDING_ST_DOOR; pSector->lotag |= ST_9_SLIDING_ST_DOOR;
G_OperateSectors(sectNum,spriteNum); G_OperateSectors(sectNum,spriteNum);
pSector->lotag &= 0xff00; pSector->lotag &= 0xFF00u;
pSector->lotag |= ST_26_SPLITTING_ST_DOOR; pSector->lotag |= ST_26_SPLITTING_ST_DOOR;
} }
return; return;
@ -767,7 +767,7 @@ void G_OperateSectors(int sectNum, int spriteNum)
A_CallSound(sectNum, spriteNum); A_CallSound(sectNum, spriteNum);
pSector->lotag ^= 0x8000; pSector->lotag ^= 0x8000u;
if (pSector->lotag&0x8000) if (pSector->lotag&0x8000)
{ {
@ -823,7 +823,7 @@ REDODOOR:
} }
} }
pSector->lotag ^= 0x8000; pSector->lotag ^= 0x8000u;
SetAnimation(sectNum,&pSector->ceilingz,j,pSector->extra); SetAnimation(sectNum,&pSector->ceilingz,j,pSector->extra);
A_CallSound(sectNum,spriteNum); A_CallSound(sectNum,spriteNum);
@ -844,7 +844,7 @@ REDODOOR:
j = sector[nextsectorneighborz(sectNum,pSector->ceilingz,1,1)].floorz; j = sector[nextsectorneighborz(sectNum,pSector->ceilingz,1,1)].floorz;
else j = pSector->ceilingz; else j = pSector->ceilingz;
pSector->lotag ^= 0x8000; pSector->lotag ^= 0x8000u;
if (SetAnimation(sectNum,&pSector->floorz,j,pSector->extra) >= 0) if (SetAnimation(sectNum,&pSector->floorz,j,pSector->extra) >= 0)
A_CallSound(sectNum,spriteNum); A_CallSound(sectNum,spriteNum);
@ -874,11 +874,11 @@ REDODOOR:
{ {
OSD_Printf("WARNING: ST_22_SPLITTING_DOOR: null sector: floor neighbor=%d, ceiling neighbor=%d!\n", OSD_Printf("WARNING: ST_22_SPLITTING_DOOR: null sector: floor neighbor=%d, ceiling neighbor=%d!\n",
floorNeighbor, ceilingNeighbor); floorNeighbor, ceilingNeighbor);
pSector->lotag ^= 0x8000; pSector->lotag ^= 0x8000u;
} }
} }
pSector->lotag ^= 0x8000; pSector->lotag ^= 0x8000u;
A_CallSound(sectNum,spriteNum); A_CallSound(sectNum,spriteNum);
@ -909,7 +909,7 @@ REDODOOR:
if (tag == (sector[SECT(i)].lotag&0x8000) && SLT(i) == SE_11_SWINGING_DOOR && sprite[j].hitag == SHT(i) && !T5(i)) if (tag == (sector[SECT(i)].lotag&0x8000) && SLT(i) == SE_11_SWINGING_DOOR && sprite[j].hitag == SHT(i) && !T5(i))
{ {
if (sector[SECT(i)].lotag&0x8000) sector[SECT(i)].lotag &= 0x7fff; if (sector[SECT(i)].lotag&0x8000) sector[SECT(i)].lotag &= 0x7fff;
else sector[SECT(i)].lotag |= 0x8000; else sector[SECT(i)].lotag |= 0x8000u;
T5(i) = 1; T5(i) = 1;
T4(i) = -T4(i); T4(i) = -T4(i);
@ -939,7 +939,7 @@ REDODOOR:
{ {
if (SLT(i) == SE_15_SLIDING_DOOR) if (SLT(i) == SE_15_SLIDING_DOOR)
{ {
sector[SECT(i)].lotag ^= 0x8000; // Toggle the open or close sector[SECT(i)].lotag ^= 0x8000u; // Toggle the open or close
SA(i) += 1024; SA(i) += 1024;
if (T5(i)) if (T5(i))
@ -957,7 +957,7 @@ REDODOOR:
for (SPRITES_OF(STAT_EFFECTOR, j)) for (SPRITES_OF(STAT_EFFECTOR, j))
if ((sprite[j].lotag&0xff)==SE_20_STRETCH_BRIDGE && sprite[j].sectnum == sectNum) //Bridge if ((sprite[j].lotag&0xff)==SE_20_STRETCH_BRIDGE && sprite[j].sectnum == sectNum) //Bridge
{ {
sector[sectNum].lotag ^= 0x8000; sector[sectNum].lotag ^= 0x8000u;
// Highest bit now set means we're opening. // Highest bit now set means we're opening.
actor[j].t_data[0] = (sector[sectNum].lotag&0x8000) ? 1 : 2; actor[j].t_data[0] = (sector[sectNum].lotag&0x8000) ? 1 : 2;