teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 00:41:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

- renamed global 'wall' and 'sector' arrays to 'walls' and 'sectors' for ZScript.

Browse source 
This avoids problems with name hiding.
This commit is contained in:
Christoph Oelckers 2022-11-15 20:08:31 +01:00
parent f7fafabba0
commit dc9451d584
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/core/vmexports.cpp
View file

@ -102,8 +102,8 @@ DEFINE_FIELD_X(tspritetype, tspritetype, yoffset)
DEFINE_FIELD_X(tspritetype, tspritetype, ownerActor)
DEFINE_FIELD_X(tspritetype, tspritetype, time)
DEFINE_GLOBAL(wall)
DEFINE_GLOBAL(sector)
DEFINE_GLOBAL_NAMED(wall, walls)
DEFINE_GLOBAL_NAMED(sector, sectors)
void sector_setfloorz(sectortype* sect, double val)
{

12
wadsrc/static/zscript/level_compatibility.zs
View file

@ -19,7 +19,7 @@ class LevelCompatibility : LevelPostProcessor
case '24c7b1434070dbe01fa83c6a48926ed9': // RR E1L1.map
SplitSector(47, 367, 375); // sector bleeds into another area.
wall[4592].dragpoint((1615., -2715.)); // fix overlapping sectors
walls[4592].dragpoint((1615., -2715.)); // fix overlapping sectors
break;
case 'd7bf49213531cd2607e0459b950ac454': // RR E2L7.map
@ -28,7 +28,7 @@ class LevelCompatibility : LevelPostProcessor
break;
case '491a04a732cd5aa253703216ff2feff4': // RR E1L2.map
wall[3312].cstat |= CSTAT_WALL_BOTTOM_SWAP; // missing lower texture .
walls[3312].cstat |= CSTAT_WALL_BOTTOM_SWAP; // missing lower texture .
break;
case '4f2233ed8fb32f6a3deebc7803dbed69': // SW $plax.map
@ -44,14 +44,14 @@ class LevelCompatibility : LevelPostProcessor
break;
case '25d4164814f10cd71d26d52d494c4fb8': // WT $auto.map
sector[152].exflags |= SECTOREX_DONTCLIP; // workaround for sector object overlapping with an outer wall.
sectors[152].exflags |= SECTOREX_DONTCLIP; // workaround for sector object overlapping with an outer wall.
break;
case '2bac4971499306ee6c86462e6a03dae8': // WT $volcano.map (original version)
case '67207fb90130ad561479301c0970c7ba': // WT $volcano.map (fixed version)
sector[118].ceilingstat &= ~CSTAT_SECTOR_SKY;
sector[57].ceilingstat &= ~CSTAT_SECTOR_SKY;
sector[281].ceilingstat &= ~CSTAT_SECTOR_SKY;
sectors[118].ceilingstat &= ~CSTAT_SECTOR_SKY;
sectors[57].ceilingstat &= ~CSTAT_SECTOR_SKY;
sectors[281].ceilingstat &= ~CSTAT_SECTOR_SKY;
break;
case '745182e393945e0d308e8e0a5ee80c3c': // SW Last Warrior level 4.

4
wadsrc/static/zscript/razebase.zs
View file

@ -72,8 +72,8 @@ extend struct _
native readonly int automapMode;
native readonly int PlayClock;
native Array<@sectortype> Sector;
native Array<@walltype> Wall;
native Array<@sectortype> Sectors;
native Array<@walltype> Walls;
}