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

- simple add_int_z stuff in nnexts.cpp

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-16 18:21:49 +02:00
parent 305bca68c0
commit 25bc068032
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1060,10 +1060,10 @@ static void windGenDoVerticalWind(int factor, sectortype* pSector)
}
val = -MulScale(factor * 64, 0x10000, 16);
if (actor->int_vel().Z >= 0) actor->add_int_bvel_z(val);
if (actor->vel.Z >= 0) actor->add_int_bvel_z(val);
else actor->set_int_bvel_z(val);
actor->add_int_z(actor->int_vel().Z >> 12);
actor->spr.pos.Z += actor->vel.Z / 16.;
}
@ -1713,8 +1713,7 @@ void debrisMove(int listIndex)
if (pSector->hasX())
uwater = pSector->xs().Underwater;
if (actor->int_vel().Z)
actor->add_int_z(actor->int_vel().Z >> 8);
actor->spr.pos.Z += actor->vel.Z;
int ceilZ, floorZ;
Collision ceilColl, floorColl;
@ -9272,14 +9271,14 @@ void callbackGenDudeUpdate(DBloodActor* actor, sectortype*) // 24
void clampSprite(DBloodActor* actor, int which)
{
int zTop, zBot;
double zTop, zBot;
if (actor->insector())
{
GetActorExtents(actor, &zTop, &zBot);
if (which & 0x01)
actor->add_int_z(ClipHigh(getflorzofslopeptr(actor->sector(), actor->spr.pos) - zBot, 0));
actor->spr.pos.Z += min(getflorzofslopeptrf(actor->sector(), actor->spr.pos) - zBot, 0.);
if (which & 0x02)
actor->add_int_z(ClipLow(getceilzofslopeptr(actor->sector(), actor->spr.pos) - zTop, 0));
actor->spr.pos.Z += max(getceilzofslopeptrf(actor->sector(), actor->spr.pos) - zTop, 0.);
}