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

- trivial replacements in Exhumed.

Browse source
This commit is contained in:
Christoph Oelckers 2022-08-20 20:25:38 +02:00
parent 9314d4c774
commit 7152868077
8 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -241,7 +241,7 @@ void SnapSectors(sectortype* pSectorA, sectortype* pSectorB, int b)
} }
if (b) { if (b) {
pSectorB->set_int_ceilingz(pSectorA->int_floorz()); pSectorB->setceilingz(pSectorA->floorz);
} }
if (pSectorA->Flag & 0x1000) { if (pSectorA->Flag & 0x1000) {

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

@ -264,7 +264,7 @@ void AddFlash(sectortype* pSector, const DVector3& pos, int val)
if (wal.pal < 5) if (wal.pal < 5)
{ {
if (!pNextSector || pNextSector->int_floorz() < pSector->int_floorz()) if (!pNextSector || pNextSector->floorz < pSector->floorz)
{ {
int nFlash = GrabFlash(); int nFlash = GrabFlash();
if (nFlash < 0) { if (nFlash < 0) {

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

@ -888,7 +888,7 @@ void MoveSector(sectortype* pSector, int nAngle, int *nXVel, int *nYVel)
nZVal = pSector->int_floorz(); nZVal = pSector->int_floorz();
pos.Z = pNextSector->int_floorz() - 256; pos.Z = pNextSector->int_floorz() - 256;
pSector->set_int_floorz(pNextSector->int_floorz()); pSector->setfloorz(pNextSector->floorz);
} }
auto pSectorB = pSector; auto pSectorB = pSector;
@ -1377,7 +1377,7 @@ void AICreatureChunk::Tick(RunListEvent* ev)
auto nVal = movesprite(pActor, pActor->spr.xvel << 10, pActor->spr.yvel << 10, pActor->spr.zvel, 2560, -2560, CLIPMASK1); auto nVal = movesprite(pActor, pActor->spr.xvel << 10, pActor->spr.yvel << 10, pActor->spr.zvel, 2560, -2560, CLIPMASK1);
if (pActor->int_pos().Z >= pSector->int_floorz()) if (pActor->spr.pos.Z >= pSector->floorz)
{ {
// re-grab this variable as it may have changed in movesprite(). Note the check above is against the value *before* movesprite so don't change it. // re-grab this variable as it may have changed in movesprite(). Note the check above is against the value *before* movesprite so don't change it.
pSector = pActor->sector(); pSector = pActor->sector();

6
source/games/exhumed/src/object.cpp
View file

@ -1763,9 +1763,9 @@ void AIEnergyBlock::RadialDamage(RunListEvent* ev)
return; return;
} }
int nFloorZ = pSector->int_floorz(); double nFloorZ = pSector->floorz;
pSector->set_int_floorz(pActor->int_pos().Z); pSector->setfloorz(pActor->spr.pos.Z);
pActor->spr.pos.Z--; pActor->spr.pos.Z--;
ev->nDamage = runlist_CheckRadialDamage(pActor); ev->nDamage = runlist_CheckRadialDamage(pActor);
@ -1919,7 +1919,7 @@ void AIObject::Tick(RunListEvent* ev)
int var_18; int var_18;
// red branch // red branch
if ((nStat == kStatExplodeTarget) || (pActor->int_pos().Z < pActor->sector()->int_floorz())) if ((nStat == kStatExplodeTarget) || (pActor->spr.pos.Z < pActor->sector()->floorz))
{ {
var_18 = 36; var_18 = 36;
} }

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

@ -1215,7 +1215,7 @@ sectdone:
{ {
auto pTmpSect = pPlayerActor->sector(); auto pTmpSect = pPlayerActor->sector();
if (PlayerList[nPlayer].totalvel > 25 && pPlayerActor->int_pos().Z > pTmpSect->int_floorz()) if (PlayerList[nPlayer].totalvel > 25 && pPlayerActor->spr.pos.Z > pTmpSect->floorz)
{ {
if (pTmpSect->Depth && !pTmpSect->Speed && !pTmpSect->Damage) if (pTmpSect->Depth && !pTmpSect->Speed && !pTmpSect->Damage)
{ {
@ -2492,7 +2492,8 @@ sectdone:
case 16: case 16:
PlayerList[nPlayer].nSeqSize = SeqSize[var_AC] - 1; PlayerList[nPlayer].nSeqSize = SeqSize[var_AC] - 1;
if (pPlayerActor->int_pos().Z < pPlayerActor->sector()->int_floorz()) { if (pPlayerActor->spr.pos.Z < pPlayerActor->sector()->floorz)
{
pPlayerActor->spr.pos.Z++; pPlayerActor->spr.pos.Z++;
} }

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

@ -706,7 +706,7 @@ void runlist_ProcessSectorTag(sectortype* pSector, int nLotag, int nHitag)
runlist_AddRunRec(sRunChannels[nChannel].a,nSwitch.first, nSwitch.second); runlist_AddRunRec(sRunChannels[nChannel].a,nSwitch.first, nSwitch.second);
pSector->set_int_floorz(nextSectorP->int_floorz()); pSector->setfloorz(nextSectorP->floorz);
return; return;
} }

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

@ -404,9 +404,9 @@ void AISet::Tick(RunListEvent* ev)
if (pSector) if (pSector)
{ {
if ((pActor->int_pos().Z - pSector->int_floorz()) < 55000) if ((pActor->spr.pos.Z - pSector->floorz) < (55000/256.))
{ {
if (pActor->int_pos().Z > pSector->int_ceilingz()) if (pActor->spr.pos.Z > pSector->ceilingz)
{ {
pActor->nIndex = 1; pActor->nIndex = 1;
pActor->nAction = 7; pActor->nAction = 7;

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

@ -668,7 +668,7 @@ void CheckAmbience(sectortype* sect)
walltype* pWall = pSector2->firstWall(); walltype* pWall = pSector2->firstWall();
if (!soundEngine->IsSourcePlayingSomething(SOURCE_Ambient, &amb, 0)) if (!soundEngine->IsSourcePlayingSomething(SOURCE_Ambient, &amb, 0))
{ {
vec3_t v = { pWall->wall_int_pos().X, pWall->wall_int_pos().Y, pSector2->int_floorz() }; DVector3 v = { pWall->pos.X, pWall->pos.Y, pSector2->floorz };
amb = GetSoundPos(v); amb = GetSoundPos(v);
soundEngine->StartSound(SOURCE_Ambient, &amb, nullptr, CHAN_BODY, CHANF_TRANSIENT, sect->Sound + 1, 1.f, ATTN_NORM); soundEngine->StartSound(SOURCE_Ambient, &amb, nullptr, CHAN_BODY, CHANF_TRANSIENT, sect->Sound + 1, 1.f, ATTN_NORM);
return; return;
@ -683,7 +683,7 @@ void CheckAmbience(sectortype* sect)
} }
else else
{ {
vec3_t v = { pWall->wall_int_pos().X, pWall->wall_int_pos().Y, pSector2->int_floorz() }; DVector3 v = { pWall->pos.X, pWall->pos.Y, pSector2->floorz };
amb = GetSoundPos(v); amb = GetSoundPos(v);
} }
return 1; return 1;