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

- Blood: floatified baseFloor and baseCeil.

Browse source
This commit is contained in:
Christoph Oelckers 2022-02-03 19:21:04 +01:00
parent 41ba829665
commit 403e1ad3b3
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/core/maptypes.h
View file

@ -307,8 +307,8 @@ struct sectortype
BLD_NS::XSECTOR* _xs;
TObjPtr<DCoreActor*> upperLink;
TObjPtr<DCoreActor*> lowerLink;
int baseFloor;
int baseCeil;
double baseFloor;
double baseCeil;
int velFloor;
int velCeil;
uint8_t slopewallofs; // This was originally the repurposed filler byte.

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

@ -1029,7 +1029,8 @@ void ZTranslateSector(sectortype* pSector, XSECTOR* pXSector, int a3, int a4)
if (dfz != 0)
{
int oldZ = pSector->int_floorz();
pSector->set_int_floorz((pSector->baseFloor = pXSector->offFloorZ + MulScale(dfz, GetWaveValue(a3, a4), 16)));
pSector->set_int_floorz((pXSector->offFloorZ + MulScale(dfz, GetWaveValue(a3, a4), 16)));
pSector->baseFloor = pSector->floorz;
pSector->velFloor += (pSector->int_floorz() - oldZ) << 8;
BloodSectIterator it(pSector);
@ -1076,7 +1077,8 @@ void ZTranslateSector(sectortype* pSector, XSECTOR* pXSector, int a3, int a4)
if (dcz != 0)
{
int oldZ = pSector->int_ceilingz();
pSector->set_int_ceilingz((pSector->baseCeil = pXSector->offCeilZ + MulScale(dcz, GetWaveValue(a3, a4), 16)));
pSector->set_int_ceilingz((pXSector->offCeilZ + MulScale(dcz, GetWaveValue(a3, a4), 16)));
pSector->baseCeil = pSector->ceilingz;
pSector->velCeil += (pSector->int_ceilingz() - oldZ) << 8;
BloodSectIterator it(pSector);
@ -2132,7 +2134,7 @@ void ProcessMotion(void)
{
int floorZ = pSector->int_floorz();
viewInterpolateSector(pSector);
pSector->set_int_floorz(pSector->baseFloor + vdi);
pSector->setfloorz(pSector->baseFloor + vdi * zinttoworld);
BloodSectIterator itr(pSector);
while (auto actor = itr.Next())
@ -2155,7 +2157,7 @@ void ProcessMotion(void)
{
int ceilZ = pSector->int_ceilingz();
viewInterpolateSector(pSector);
pSector->set_int_ceilingz(pSector->baseCeil + vdi);
pSector->setceilingz(pSector->baseCeil + vdi * zinttoworld);
BloodSectIterator itr(pSector);
while (auto actor = itr.Next())
@ -2323,8 +2325,8 @@ void trInit(TArray<DBloodActor*>& actors)
for (auto& sect : sector)
{
sectortype* pSector = &sect;
pSector->baseFloor = pSector->int_floorz();
pSector->baseCeil = pSector->int_ceilingz();
pSector->baseFloor = pSector->floorz;
pSector->baseCeil = pSector->ceilingz;
if (pSector->hasX())
{
XSECTOR* pXSector = &pSector->xs();