zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-03-13 20:42:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

- got rid of the tempsector... arrays in Duke's polymost interface.

Browse source 
Instead use some of the free parts in sectortype thats needed for the other games.
This commit is contained in:
Christoph Oelckers 2021-11-21 01:05:39 +01:00
parent c5e45f1021
commit 4e30ba339b
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
source/games/duke/src/_polymost.cpp
View file

@ -13,9 +13,6 @@ void SE40_Draw(int tag, spritetype *spr, int x, int y, int z, binangle a, fixedh
tileDelete(FOF);
if (!testgotpic(FOF, true)) return;
TArray<int> tempsectorz(numsectors, true);
TArray<int> tempsectorpicnum(numsectors, true);
floor1 = spr;
if (spr->lotag == tag + 2) fofmode = tag + 0;
@ -72,19 +69,21 @@ void SE40_Draw(int tag, spritetype *spr, int x, int y, int z, binangle a, fixedh
spr->hitag == floor1->hitag
)
{
auto sect = spr->sector();
// repurpose otherwise unused fields in sectortype as temporary storage.
if (k == tag + 0)
{
tempsectorz[spr->sectnum] = spr->sector()->floorz;
spr->sector()->floorz += (((z - spr->sector()->floorz) / 32768) + 1) * 32768;
tempsectorpicnum[spr->sectnum] = spr->sector()->floorpicnum;
spr->sector()->floorpicnum = 13;
sect->Above = sect->floorz;
sect->floorz += (((z - sect->floorz) / 32768) + 1) * 32768;
sect->Below = sect->floorpicnum;
sect->floorpicnum = 13;
}
if (k == tag + 1)
{
tempsectorz[spr->sectnum] = spr->sector()->ceilingz;
spr->sector()->ceilingz += (((z - spr->sector()->ceilingz) / 32768) - 1) * 32768;
tempsectorpicnum[spr->sectnum] = spr->sector()->ceilingpicnum;
spr->sector()->ceilingpicnum = 13;
sect->Above = sect->ceilingz;
sect->ceilingz += (((z - sect->ceilingz) / 32768) - 1) * 32768;
sect->Below = sect->ceilingpicnum;
sect->ceilingpicnum = 13;
}
}
}
@ -105,15 +104,16 @@ void SE40_Draw(int tag, spritetype *spr, int x, int y, int z, binangle a, fixedh
spr->hitag == floor1->hitag
)
{
auto sect = spr->sector();
if (k == tag + 0)
{
spr->sector()->floorz = tempsectorz[spr->sectnum];
spr->sector()->floorpicnum = tempsectorpicnum[spr->sectnum];
sect->floorz = sect->Above;
sect->floorpicnum = sect->Below;
}
if (k == tag + 1)
{
spr->sector()->ceilingz = tempsectorz[spr->sectnum];
spr->sector()->ceilingpicnum = tempsectorpicnum[spr->sectnum];
sect->ceilingz = sect->Above;
sect->ceilingpicnum = sect->Below;
}
}// end if
}// end for