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

- floatified first part of TranslateSector calls.

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-16 18:40:39 +02:00
parent 0c43366a04
commit 8eb4296a56
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1443,18 +1443,20 @@ int StepRotateBusy(sectortype* pSector, unsigned int a2, DBloodActor* initiator)
XSECTOR* pXSector = &pSector->xs();
if (!pXSector->marker0) return 0;
auto marker0 = pXSector->marker0;
int vbp;
auto ang1 = mapangle(pXSector->data);
DAngle ang2;
if (pXSector->busy < a2)
{
vbp = pXSector->data + marker0->int_ang();
ang2 = ang1 + marker0->spr.angle;
int nWave = pXSector->busyWaveA;
TranslateSector(pSector, GetWaveValue(pXSector->busy, nWave), GetWaveValue(a2, nWave), marker0->int_pos().X, marker0->int_pos().Y, marker0->int_pos().X, marker0->int_pos().Y, pXSector->data, marker0->int_pos().X, marker0->int_pos().Y, vbp, true);
TranslateSector(pSector, GetWaveValue(pXSector->busy, nWave), GetWaveValue(a2, nWave), marker0->spr.pos, marker0->spr.pos, ang1, marker0->spr.pos, ang2, true);
}
else
{
vbp = pXSector->data - marker0->int_ang();
ang2 = ang1 - marker0->spr.angle;
int nWave = pXSector->busyWaveB;
TranslateSector(pSector, GetWaveValue(pXSector->busy, nWave), GetWaveValue(a2, nWave), marker0->int_pos().X, marker0->int_pos().Y, marker0->int_pos().X, marker0->int_pos().Y, vbp, marker0->int_pos().X, marker0->int_pos().Y, pXSector->data, true);
TranslateSector(pSector, GetWaveValue(pXSector->busy, nWave), GetWaveValue(a2, nWave), marker0->spr.pos, marker0->spr.pos, ang2, marker0->spr.pos, ang1, true);
}
pXSector->busy = a2;
if (pXSector->command == kCmdLink && pXSector->txID)
@ -1463,7 +1465,7 @@ int StepRotateBusy(sectortype* pSector, unsigned int a2, DBloodActor* initiator)
{
SetSectorState(pSector, FixedToInt(a2), initiator);
SectorEndSound(pSector, FixedToInt(a2));
pXSector->data = vbp & 2047;
pXSector->data = ang2.Normalized360().Buildang();
return 3;
}
return 0;