zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- gave Blood's and SW's mirror/ROR tiles proper names.

Browse source
This commit is contained in:
Christoph Oelckers 2022-12-06 11:20:01 +01:00
parent 63c1630cda
commit ffa265ae1d
6 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/games/blood/src/mirrors.cpp
View file

@ -43,7 +43,6 @@ MIRROR mirror[16]; // only needed by Polymost.
void InitMirrors(void) void InitMirrors(void)
{ {
auto mirrortile = tileGetTextureID(504);
mirrorcnt = 0; mirrorcnt = 0;
portalClear(); portalClear();

1
source/games/blood/src/misc.h
View file

@ -95,6 +95,7 @@ extern int8_t tileShade[MAXTILES];
extern short voxelIndex[MAXTILES]; extern short voxelIndex[MAXTILES];
extern int nPrecacheCount; extern int nPrecacheCount;
inline FTextureID mirrortile;
void tilePrecacheTile(int nTile, int nType, int palette); void tilePrecacheTile(int nTile, int nType, int palette);

2
source/games/blood/src/namelist.h
View file

@ -191,3 +191,5 @@ x(SBarWaponNum0, 2246)
x(SBarWaponNum0, 2247) x(SBarWaponNum0, 2247)
x(SBarWaponNum0, 2248) x(SBarWaponNum0, 2248)
x(SBarWaponNum0, 2249) x(SBarWaponNum0, 2249)
x(MIRRORTILE, 504)

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

@ -105,6 +105,7 @@ void GameInterface::SetupSpecialTextures()
TileFiles.tileCreate(4079, 128, 128); TileFiles.tileCreate(4079, 128, 128);
TileFiles.tileMakeWritable(2342); TileFiles.tileMakeWritable(2342);
TileFiles.lock(); // from this point on the tile<->texture associations may not change anymore. TileFiles.lock(); // from this point on the tile<->texture associations may not change anymore.
mirrortile = tileGetTextureID(504);
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@ -144,6 +145,9 @@ void GameInterface::SetTileProps(int tile, int surf, int vox, int shade)
if (surf != INT_MAX) surfType[tile] = surf; if (surf != INT_MAX) surfType[tile] = surf;
if (vox != INT_MAX) voxelIndex[tile] = vox; if (vox != INT_MAX) voxelIndex[tile] = vox;
if (shade != INT_MAX) tileShade[tile] = shade; if (shade != INT_MAX) tileShade[tile] = shade;
mirrortile = tileGetTextureID(504);
} }
END_BLD_NS END_BLD_NS

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

@ -298,3 +298,5 @@ x(COMPASS_WEST2, 2389)
x(COMPASS_MID_TIC, 2390) x(COMPASS_MID_TIC, 2390)
x(COMPASS_MID_TIC2, 2391) x(COMPASS_MID_TIC2, 2391)
x(FAF_PORTAL, 341)
x(FAF_PORTAL2, 342)

3
source/games/sw/src/sector.cpp
View file

@ -191,11 +191,12 @@ void WallSetup(void)
for (auto& wal : wall) for (auto& wal : wall)
{ {
/*
if (wal.walltexture() == FAFPlaceMirrorPic[0]) if (wal.walltexture() == FAFPlaceMirrorPic[0])
wal.setwalltexture(FAFMirrorPic[0]); wal.setwalltexture(FAFMirrorPic[0]);
if (wal.walltexture() == FAFPlaceMirrorPic[1]) if (wal.walltexture() == FAFPlaceMirrorPic[1])
wal.setwalltexture(FAFMirrorPic[1]); wal.setwalltexture(FAFMirrorPic[1]);*/
// this overwrites the lotag so it needs to be called LAST - its down there // this overwrites the lotag so it needs to be called LAST - its down there
// SetupWallForBreak(wp); // SetupWallForBreak(wp);