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

- deal with the last remaining bits of integer math in track.cpp.

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-08 16:42:55 +02:00
parent e4b0be9f1d
commit da664b9964
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/games/sw/src/track.cpp
View file

@ -2634,7 +2634,7 @@ void DoTornadoObject(SECTOR_OBJECT* sop)
auto vect = ang.ToVector() * sop->vel; // vel is still in Build coordinates.
int xvect = vect.X * 16384;
int yvect = vect.Y * 16384;
clipmove(pos, &cursect, xvect, yvect, (int)sop->clipdist, Z(0), int(floor_dist * zworldtoint), CLIPMASK_ACTOR, coll);
clipmove(pos, &cursect, xvect, yvect, (int)sop->clipdist, 0., floor_dist, CLIPMASK_ACTOR, coll);
if (coll.type != kHitNone)
{
@ -3022,7 +3022,7 @@ bool ActorTrackDecide(TRACK_POINT* tpoint, DSWActor* actor)
{
neartag(DVector3(actor->spr.pos.XY(), zz), actor->sector(), actor->spr.angle, near, 1024, NTAG_SEARCH_LO_HI);
if (near.actor() != nullptr && near.int_hitpos().X < 1024)
if (near.actor() != nullptr && near.hitpos.X < 64)
{
if (OperateSprite(near.actor(), false))
{
@ -3036,7 +3036,7 @@ bool ActorTrackDecide(TRACK_POINT* tpoint, DSWActor* actor)
}
}
if (near.hitSector != nullptr && near.int_hitpos().X < 1024)
if (near.hitSector != nullptr && near.hitpos.X < 64)
{
if (OperateSector(near.hitSector, false))
{
@ -3278,7 +3278,7 @@ bool ActorTrackDecide(TRACK_POINT* tpoint, DSWActor* actor)
actor->user.Flags |= (SPR_CLIMBING);
NewStateGroup(actor, actor->user.ActorActionSet->Climb);
actor->set_int_zvel(-Z(1));
actor->vel.Z -= 1;
}
break;