teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-02-22 19:51:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

- handle most of move.cpp.

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-10 16:09:32 +02:00
parent dd152f6406
commit 55d01509fa
2 changed files with 11 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -520,18 +520,15 @@ Collision MoveCreatureWithCaution(DExhumedActor* pActor)
auto oldv = pActor->spr.pos; auto oldv = pActor->spr.pos;
auto pSectorPre = pActor->sector(); auto pSectorPre = pActor->sector();
auto ecx = MoveCreature(pActor); auto result = MoveCreature(pActor);
auto pSector =pActor->sector(); auto pSector =pActor->sector();
if (pSector != pSectorPre) if (pSector != pSectorPre)
{ {
int zDiff = pSectorPre->int_floorz() - pSector->int_floorz(); double zDiff = abs(pSectorPre->floorz - pSector->floorz);
if (zDiff < 0) {
zDiff = -zDiff;
}
if (zDiff > 15360 || (pSector->Flag & kSectUnderwater) || (pSector->pBelow != nullptr && pSector->pBelow->Flag) || pSector->Damage) if (zDiff > 60 || (pSector->Flag & kSectUnderwater) || (pSector->pBelow != nullptr && pSector->pBelow->Flag) || pSector->Damage)
{ {
pActor->spr.pos = oldv; pActor->spr.pos = oldv;
@ -545,7 +542,7 @@ Collision MoveCreatureWithCaution(DExhumedActor* pActor)
} }
} }
return ecx; return result;
} }
int GetAngleToSprite(DExhumedActor* a1, DExhumedActor* a2) int GetAngleToSprite(DExhumedActor* a1, DExhumedActor* a2)
@ -882,28 +879,15 @@ void SetQuake(DExhumedActor* pActor, int nVal)
for (int i = 0; i < nTotalPlayers; i++) for (int i = 0; i < nTotalPlayers; i++)
{ {
auto nSqrt = ((PlayerList[i].pActor->spr.pos.XY() - pActor->spr.pos.XY()) * (1. / 16.)).Length(); auto nSqrt = ((PlayerList[i].pActor->spr.pos.XY() - pActor->spr.pos.XY()) * (1. / 16.)).Length();
double eax = nVal;
if (nSqrt) if (nSqrt)
{ {
eax = eax / nSqrt; nVal = clamp(int(nVal / nSqrt), 0, 15);
if (eax >= 1)
{
if (eax > 15)
{
eax = 15;
}
}
else
{
eax = 0;
}
} }
if (eax > nQuake[i]) if (nVal > nQuake[i])
{ {
nQuake[i] = eax; nQuake[i] = nVal;
} }
} }
} }
@ -979,11 +963,10 @@ DVector3 WheresMyMouth(int nPlayer, sectortype **sectnum)
*sectnum = pActor->sector(); *sectnum = pActor->sector();
auto pos = pActor->spr.pos.plusZ(-height); auto pos = pActor->spr.pos.plusZ(-height);
auto vect = pActor->spr.angle.ToVector() * 8;
Collision scratch; Collision scratch;
clipmove(pos, sectnum, clipmove(pos, sectnum, FloatToFixed<18>(vect.X), FloatToFixed<18>(vect.Y), 5120, 1280, 1280, CLIPMASK1, scratch);
bcos(pActor->int_ang(), 7),
bsin(pActor->int_ang(), 7),
5120, 1280, 1280, CLIPMASK1, scratch);
return pos; return pos;
} }

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

@ -1511,7 +1511,7 @@ DExhumedActor* BuildEnergyBlock(sectortype* pSector)
pActor->spr.pos.Z = pSector->firstWall()->nextSector()->floorz; pActor->spr.pos.Z = pSector->firstWall()->nextSector()->floorz;
// CHECKME - name of this variable? // CHECKME - name of this variable?
int nRepeat = (pActor->int_pos().Z - pSector->int_floorz()) >> 8; int nRepeat = int(pActor->spr.pos.Z - pSector->floorz);
if (nRepeat > 255) { if (nRepeat > 255) {
nRepeat = 255; nRepeat = 255;
} }