zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-06-01 09:42:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

- replaced all remaining read access to __int_floorz and __int_ceilingz with wrappers.

Browse source
This commit is contained in:
Christoph Oelckers 2022-08-27 10:13:15 +02:00
parent 47a594a96c
commit 044929ad06
7 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
source/core/automap.cpp
View file

@ -389,10 +389,10 @@ bool ShowRedLine(int j, int i)
} }
if (automapMode == am_full) if (automapMode == am_full)
{ {
if (sector[i].__int_floorz != sector[i].__int_ceilingz) if (sector[i].int_floorz() != sector[i].int_ceilingz())
if (wal->nextSector()->int_floorz() != wal->nextSector()->int_ceilingz()) if (wal->nextSector()->int_floorz() != wal->nextSector()->int_ceilingz())
if (((wal->cstat | wal->nextWall()->cstat) & (CSTAT_WALL_MASKED | CSTAT_WALL_1WAY)) == 0) if (((wal->cstat | wal->nextWall()->cstat) & (CSTAT_WALL_MASKED | CSTAT_WALL_1WAY)) == 0)
if (sector[i].__int_floorz == wal->nextSector()->int_floorz()) if (sector[i].int_floorz() == wal->nextSector()->int_floorz())
return false; return false;
if (sector[i].floorpicnum != wal->nextSector()->floorpicnum) if (sector[i].floorpicnum != wal->nextSector()->floorpicnum)
return false; return false;
@ -420,8 +420,8 @@ void drawredlines(int cposx, int cposy, int czoom, int cang)
{ {
if (!gFullMap && !show2dsector[i]) continue; if (!gFullMap && !show2dsector[i]) continue;
int z1 = sector[i].__int_ceilingz; int z1 = sector[i].int_ceilingz();
int z2 = sector[i].__int_floorz; int z2 = sector[i].int_floorz();
for (auto& wal : wallsofsector(i)) for (auto& wal : wallsofsector(i))
{ {

4
source/core/interpolate.cpp
View file

@ -41,8 +41,8 @@ double Get(int index, DCoreActor* actor, int type)
{ {
switch(type) switch(type)
{ {
case Interp_Sect_Floorz: return sector[index].__int_floorz; case Interp_Sect_Floorz: return sector[index].int_floorz();
case Interp_Sect_Ceilingz: return sector[index].__int_ceilingz; case Interp_Sect_Ceilingz: return sector[index].int_ceilingz();
case Interp_Sect_Floorheinum: return sector[index].floorheinum; case Interp_Sect_Floorheinum: return sector[index].floorheinum;
case Interp_Sect_Ceilingheinum: return sector[index].ceilingheinum; case Interp_Sect_Ceilingheinum: return sector[index].ceilingheinum;
case Interp_Sect_FloorPanX: return sector[index].floorxpan_; case Interp_Sect_FloorPanX: return sector[index].floorxpan_;

8
source/core/vmexports.cpp
View file

@ -107,25 +107,25 @@ DEFINE_GLOBAL(sector)
double sector_floorz(sectortype* sect) double sector_floorz(sectortype* sect)
{ {
if (!sect) ThrowAbortException(X_READ_NIL, nullptr); if (!sect) ThrowAbortException(X_READ_NIL, nullptr);
return sect->__int_floorz * zinttoworld; return sect->int_floorz() * zinttoworld;
} }
DEFINE_ACTION_FUNCTION_NATIVE(_sectortype, floorz, sector_floorz) DEFINE_ACTION_FUNCTION_NATIVE(_sectortype, floorz, sector_floorz)
{ {
PARAM_SELF_STRUCT_PROLOGUE(sectortype); PARAM_SELF_STRUCT_PROLOGUE(sectortype);
ACTION_RETURN_FLOAT(self->__int_floorz * zinttoworld); ACTION_RETURN_FLOAT(sector_floorz(self));
} }
double sector_ceilingz(sectortype* sect) double sector_ceilingz(sectortype* sect)
{ {
if (!sect) ThrowAbortException(X_READ_NIL, nullptr); if (!sect) ThrowAbortException(X_READ_NIL, nullptr);
return sect->__int_ceilingz * zinttoworld; return sect->int_ceilingz() * zinttoworld;
} }
DEFINE_ACTION_FUNCTION_NATIVE(_sectortype, ceilingz, sector_ceilingz) DEFINE_ACTION_FUNCTION_NATIVE(_sectortype, ceilingz, sector_ceilingz)
{ {
PARAM_SELF_STRUCT_PROLOGUE(sectortype); PARAM_SELF_STRUCT_PROLOGUE(sectortype);
ACTION_RETURN_FLOAT(self->__int_ceilingz * zinttoworld); ACTION_RETURN_FLOAT(sector_ceilingz(self));
} }
void sector_setfloorz(sectortype* sect, double val) void sector_setfloorz(sectortype* sect, double val)

4
source/games/blood/src/triggers.cpp
View file

@ -1064,7 +1064,7 @@ void ZTranslateSector(sectortype* pSector, XSECTOR* pXSector, int a3, int a4)
if (ac && (ac->spr.cstat & CSTAT_SPRITE_MOVE_FORWARD)) if (ac && (ac->spr.cstat & CSTAT_SPRITE_MOVE_FORWARD))
{ {
viewBackupSpriteLoc(ac); viewBackupSpriteLoc(ac);
ac->add_int_z(pSector->__int_floorz - oldZ); ac->add_int_z(pSector->int_floorz() - oldZ);
} }
} }
} }
@ -1102,7 +1102,7 @@ void ZTranslateSector(sectortype* pSector, XSECTOR* pXSector, int a3, int a4)
if (ac && (ac->spr.cstat & CSTAT_SPRITE_MOVE_REVERSE)) if (ac && (ac->spr.cstat & CSTAT_SPRITE_MOVE_REVERSE))
{ {
viewBackupSpriteLoc(ac); viewBackupSpriteLoc(ac);
ac->add_int_z(pSector->__int_ceilingz - oldZ); ac->add_int_z(pSector->int_ceilingz() - oldZ);
} }
} }
} }

4
source/games/duke/src/sectors.cpp
View file

@ -282,9 +282,9 @@ double getanimatevalue(int type, int index)
switch (type) switch (type)
{ {
case anim_floorz: case anim_floorz:
return sector[index].__int_floorz; return sector[index].int_floorz();
case anim_ceilingz: case anim_ceilingz:
return sector[index].__int_ceilingz; return sector[index].int_ceilingz();
case anim_vertexx: case anim_vertexx:
return wall[index].wall_int_pos().X; return wall[index].wall_int_pos().X;
case anim_vertexy: case anim_vertexy:

2
source/games/sw/src/game.h
View file

@ -2113,7 +2113,7 @@ struct ANIM
switch (animtype) switch (animtype)
{ {
case ANIM_Floorz: case ANIM_Floorz:
return sector[animindex].__int_floorz; return sector[animindex].int_floorz();
case ANIM_SopZ: case ANIM_SopZ:
return SectorObject[animindex].pmid.Z; return SectorObject[animindex].pmid.Z;
case ANIM_Spritez: case ANIM_Spritez:

4
source/games/sw/src/interpso.cpp
View file

@ -99,9 +99,9 @@ static double getvalue(so_interp::interp_data& element)
case soi_wally: case soi_wally:
return wall[index].pos.Y; return wall[index].pos.Y;
case soi_ceil: case soi_ceil:
return sector[index].__int_ceilingz; return sector[index].int_ceilingz();
case soi_floor: case soi_floor:
return sector[index].__int_floorz; return sector[index].int_floorz();
case soi_sox: case soi_sox:
return SectorObject[index].pmid.X; return SectorObject[index].pmid.X;
case soi_soy: case soi_soy: