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

- the last sector[]

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-23 00:55:46 +01:00
parent 6e786fcf1e
commit 2027c6ebaf
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/games/exhumed/src/player.cpp
View file

@ -853,7 +853,7 @@ void AIPlayer::Tick(RunListEvent* ev)
}
// loc_1A4E6
int nSector =pPlayerSprite->sectnum;
auto pSector = pPlayerSprite->sector();
int nSectFlag = PlayerList[nPlayer].pPlayerViewSect->Flag;
int playerX = pPlayerSprite->x;
@ -2234,11 +2234,11 @@ sectdone:
}
}
if (nSector != pPlayerSprite->sectnum)
if (pSector != pPlayerSprite->sector())
{
if (sector[nSector].lotag > 0)
if (pSector->lotag > 0)
{
runlist_SignalRun(sector[nSector].lotag - 1, nPlayer, &ExhumedAI::EnterSector);
runlist_SignalRun(pSector->lotag - 1, nPlayer, &ExhumedAI::EnterSector);
}
if (pPlayerSprite->sector()->lotag > 0)

12
source/games/exhumed/src/queen.cpp
View file

@ -435,11 +435,11 @@ void BuildQueenEgg(int nQueen, int nVal)
int x = pSprite->x;
int y = pSprite->y;
int nSector =pSprite->sectnum;
int nFloorZ = sector[nSector].floorz;
auto pSector =pSprite->sector();
int nFloorZ = pSector->floorz;
int nAngle = pSprite->ang;
auto pActor2 = insertActor(nSector, 121);
auto pActor2 = insertActor(pSector, 121);
auto pSprite2 = &pActor2->s();
pSprite2->x = x;
@ -696,10 +696,10 @@ void BuildQueenHead(int nQueen)
int x = pSprite->x;
int y = pSprite->y;
int nAngle = pSprite->ang;
int nSector =pSprite->sectnum;
int z = sector[nSector].floorz;
auto pSector = pSprite->sector();
int z = pSector->floorz;
auto pActor2 = insertActor(nSector, 121);
auto pActor2 = insertActor(pSector, 121);
auto pSprite2 = &pActor2->s();
pSprite2->x = x;

4
source/games/exhumed/src/sequence.cpp
View file

@ -608,8 +608,8 @@ int seq_PlotSequence(int nSprite, int16_t edx, int16_t nFrame, int16_t ecx)
}
else
{
int nSector =pTSprite->sectnum;
int nFloorZ = sector[nSector].floorz;
auto pSector =pTSprite->sector();
int nFloorZ = pSector->floorz;
if (nFloorZ <= PlayerList[nLocalPlayer].eyelevel + initz) {
pTSprite->owner = -1;

2
source/games/exhumed/src/set.cpp
View file

@ -121,7 +121,7 @@ void BuildSoul(DExhumedActor* pSet)
pSprite->y = pSetSprite->y;
int nSector =pSprite->sectnum;
pSprite->z = (RandomSize(8) << 8) + 8192 + sector[nSector].ceilingz - GetActorHeight(pActor);
pSprite->z = (RandomSize(8) << 8) + 8192 + pSprite->sector()->ceilingz - GetActorHeight(pActor);
//pSprite->hitag = nSet;
pActor->pTarget = pSet;