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

- get rid of vel wrappers for nnext conditions.

Browse source 
The fixed point conversion here is unavoidable, so make it explcit.
This commit is contained in:
Christoph Oelckers 2022-09-28 14:37:50 +02:00
parent 5dc2d467ee
commit 049220239c
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/blood/src/callback.cpp
View file

@ -368,7 +368,7 @@ void EnemyBubble(DBloodActor* actor, sectortype*) // 11
if (!actor) return; if (!actor) return;
double top, bottom; double top, bottom;
GetActorExtents(actor, &top, &bottom); GetActorExtents(actor, &top, &bottom);
for (int i = 0; i < (abs(actor->int_vel().Z) >> 18); i++) for (int i = 0; i < int(abs(actor->vel.Z) * 0.25); i++)
{ {
auto nAngle = RandomAngle(); auto nAngle = RandomAngle();
double nDist = (actor->spr.xrepeat * tileWidth(actor->spr.picnum)) * (REPEAT_SCALE / 2); double nDist = (actor->spr.xrepeat * tileWidth(actor->spr.picnum)) * (REPEAT_SCALE / 2);

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

@ -4601,18 +4601,18 @@ bool condCheckSprite(DBloodActor* aCond, int cmpOp, bool PUSH)
{ {
if (arg1 == 0) if (arg1 == 0)
{ {
if ((var = condCmp(objActor->int_vel().X, arg1, arg2, cmpOp)) == true) return var; if ((var = condCmp(FloatToFixed(objActor->vel.X), arg1, arg2, cmpOp)) == true) return var;
if ((var = condCmp(objActor->int_vel().Y, arg1, arg2, cmpOp)) == true) return var; if ((var = condCmp(FloatToFixed(objActor->vel.Y), arg1, arg2, cmpOp)) == true) return var;
if ((var = condCmp(objActor->int_vel().Z, arg1, arg2, cmpOp)) == true) return var; if ((var = condCmp(FloatToFixed(objActor->vel.Z), arg1, arg2, cmpOp)) == true) return var;
} }
else if (arg1 == 1) return condCmp(objActor->int_vel().X, arg1, arg2, cmpOp); else if (arg1 == 1) return condCmp(FloatToFixed(objActor->vel.X), arg1, arg2, cmpOp);
else if (arg1 == 2) return condCmp(objActor->int_vel().Y, arg1, arg2, cmpOp); else if (arg1 == 2) return condCmp(FloatToFixed(objActor->vel.Y), arg1, arg2, cmpOp);
else if (arg1 == 3) return condCmp(objActor->int_vel().Z, arg1, arg2, cmpOp); else if (arg1 == 3) return condCmp(FloatToFixed(objActor->vel.Z), arg1, arg2, cmpOp);
} }
else if (arg1 == 0) return (objActor->vel.X != 0 || objActor->vel.Y != 0 || objActor->int_vel().Z); else if (arg1 == 0) return (!objActor->vel.isZero());
else if (arg1 == 1) return (objActor->int_vel().X); else if (arg1 == 1) return (FloatToFixed(objActor->vel.X));
else if (arg1 == 2) return (objActor->int_vel().Y); else if (arg1 == 2) return (FloatToFixed(objActor->vel.Y));
else if (arg1 == 3) return (objActor->int_vel().Z); else if (arg1 == 3) return (FloatToFixed(objActor->vel.Z));
break; break;
case 30: case 30:
if (!spriteIsUnderwater(objActor) && !spriteIsUnderwater(objActor, true)) return false; if (!spriteIsUnderwater(objActor) && !spriteIsUnderwater(objActor, true)) return false;