teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-20 08:00:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

- added wrapper function for these variables.

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-27 20:24:21 +02:00
parent 6dbb5a0b8c
commit 4114f21323
3 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/games/blood/src/mapstructs.h
View file

@ -194,6 +194,12 @@ struct XSECTOR {
int32_t _onCeilZ;
int32_t _offFloorZ;
int32_t _onFloorZ;
int int_offCeilZ() const { return _offCeilZ; }
int int_onCeilZ() const { return _onCeilZ; }
int int_offFloorZ() const { return _offFloorZ; }
int int_onFloorZ() const { return _onFloorZ; }
uint32_t windVel; // Wind vel (changed from 10 bit to use higher velocity values)
uint16_t data; // Data

8
source/games/blood/src/nnexts.cpp
View file

@ -4232,13 +4232,13 @@ bool condCheckSector(DBloodActor* aCond, int cmpOp, bool PUSH)
case kSectorSlide:
if (cond == 55)// 60)
{
h = ClipLow(abs(pXSect->_onFloorZ - pXSect->_offFloorZ), 1);
curH = abs(pSect->int_floorz() - pXSect->_offFloorZ);
h = ClipLow(abs(pXSect->int_onFloorZ() - pXSect->int_offFloorZ()), 1);
curH = abs(pSect->int_floorz() - pXSect->int_offFloorZ());
}
else
{
h = ClipLow(abs(pXSect->_onCeilZ - pXSect->_offCeilZ), 1);
curH = abs(pSect->int_ceilingz() - pXSect->_offCeilZ);
h = ClipLow(abs(pXSect->int_onCeilZ() - pXSect->int_offCeilZ()), 1);
curH = abs(pSect->int_ceilingz() - pXSect->int_offCeilZ());
}
return condCmp((kPercFull * curH) / h, arg1, arg2, cmpOp);
default:

24
source/games/blood/src/triggers.cpp
View file

@ -1001,8 +1001,8 @@ void ZTranslateSector(sectortype* pSector, XSECTOR* pXSector, int a3, int a4)
{
viewInterpolateSector(pSector);
int dfz = pXSector->_onFloorZ - pXSector->_offFloorZ;
int dcz = pXSector->_onCeilZ - pXSector->_offCeilZ;
int dfz = pXSector->int_onFloorZ() - pXSector->int_offFloorZ();
int dcz = pXSector->int_onCeilZ() - pXSector->int_offCeilZ();
#ifdef NOONE_EXTENSIONS
// get pointer to sprites near outside walls before translation
@ -1013,7 +1013,7 @@ void ZTranslateSector(sectortype* pSector, XSECTOR* pXSector, int a3, int a4)
if (dfz != 0)
{
double old_Z = pSector->floorz;
pSector->set_int_floorz((pXSector->_offFloorZ + MulScale(dfz, GetWaveValue(a3, a4), 16)));
pSector->set_int_floorz((pXSector->int_offFloorZ() + MulScale(dfz, GetWaveValue(a3, a4), 16)));
pSector->baseFloor = pSector->floorz;
pSector->velFloor += (pSector->floorz - old_Z);
@ -1061,7 +1061,7 @@ void ZTranslateSector(sectortype* pSector, XSECTOR* pXSector, int a3, int a4)
if (dcz != 0)
{
double old_Z = pSector->ceilingz;
pSector->set_int_ceilingz((pXSector->_offCeilZ + MulScale(dcz, GetWaveValue(a3, a4), 16)));
pSector->set_int_ceilingz((pXSector->int_offCeilZ() + MulScale(dcz, GetWaveValue(a3, a4), 16)));
pSector->baseCeil = pSector->ceilingz;
pSector->velCeil += pSector->ceilingz - old_Z;
@ -1174,12 +1174,12 @@ int VCrushBusy(sectortype* pSector, unsigned int a2, DBloodActor* initiator)
nWave = pXSector->busyWaveA;
else
nWave = pXSector->busyWaveB;
int dz1 = pXSector->_onCeilZ - pXSector->_offCeilZ;
int vc = pXSector->_offCeilZ;
int dz1 = pXSector->int_onCeilZ() - pXSector->int_offCeilZ();
int vc = pXSector->int_offCeilZ();
if (dz1 != 0)
vc += MulScale(dz1, GetWaveValue(a2, nWave), 16);
int dz2 = pXSector->_onFloorZ - pXSector->_offFloorZ;
int v10 = pXSector->_offFloorZ;
int dz2 = pXSector->int_onFloorZ() - pXSector->int_offFloorZ();
int v10 = pXSector->int_offFloorZ();
if (dz2 != 0)
v10 += MulScale(dz2, GetWaveValue(a2, nWave), 16);
int v18;
@ -1217,7 +1217,7 @@ int VSpriteBusy(sectortype* pSector, unsigned int a2, DBloodActor* initiator)
nWave = pXSector->busyWaveA;
else
nWave = pXSector->busyWaveB;
int dz1 = pXSector->_onFloorZ - pXSector->_offFloorZ;
int dz1 = pXSector->int_onFloorZ() - pXSector->int_offFloorZ();
if (dz1 != 0)
{
BloodSectIterator it(pSector);
@ -1230,7 +1230,7 @@ int VSpriteBusy(sectortype* pSector, unsigned int a2, DBloodActor* initiator)
}
}
}
int dz2 = pXSector->_onCeilZ - pXSector->_offCeilZ;
int dz2 = pXSector->int_onCeilZ() - pXSector->int_offCeilZ();
if (dz2 != 0)
{
BloodSectIterator it(pSector);
@ -1275,7 +1275,7 @@ int VDoorBusy(sectortype* pSector, unsigned int a2, DBloodActor* initiator)
if (actor && a2 > pXSector->busy)
{
assert(actor->hasX());
if (pXSector->_onCeilZ > pXSector->_offCeilZ || pXSector->_onFloorZ < pXSector->_offFloorZ)
if (pXSector->int_onCeilZ() > pXSector->int_offCeilZ() || pXSector->int_onFloorZ() < pXSector->int_offFloorZ())
{
if (pXSector->interruptable)
{
@ -1307,7 +1307,7 @@ int VDoorBusy(sectortype* pSector, unsigned int a2, DBloodActor* initiator)
else if (actor && a2 < pXSector->busy)
{
assert(actor->hasX());
if (pXSector->_offCeilZ > pXSector->_onCeilZ || pXSector->_offFloorZ < pXSector->_onFloorZ)
if (pXSector->int_offCeilZ() > pXSector->int_onCeilZ() || pXSector->int_offFloorZ() < pXSector->int_onFloorZ())
{
if (pXSector->interruptable)
{