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

- floatified move_scan's return position

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-04 00:58:05 +02:00
parent 1a9e255265
commit 312bc369ef
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
source/games/sw/src/ai.cpp
View file

@ -1284,7 +1284,7 @@ int DoActorMoveJump(DSWActor* actor)
} }
Collision move_scan(DSWActor* actor, int ang, int dist, int *stopx, int *stopy, int *stopz) Collision move_scan(DSWActor* actor, int ang, int dist, DVector3& stop)
{ {
uint32_t cliptype = CLIPMASK_ACTOR; uint32_t cliptype = CLIPMASK_ACTOR;
@ -1316,9 +1316,7 @@ Collision move_scan(DSWActor* actor, int ang, int dist, int *stopx, int *stopy,
// should I look down with a FAFgetzrange to see where I am? // should I look down with a FAFgetzrange to see where I am?
// remember where it stopped // remember where it stopped
*stopx = actor->int_pos().X; stop = actor->spr.pos;
*stopy = actor->int_pos().Y;
*stopz = actor->int_pos().Z;
// reset position information // reset position information
actor->spr.pos = pos; actor->spr.pos = pos;
@ -1364,9 +1362,6 @@ int FindNewAngle(DSWActor* actor, int dir, int DistToMove)
int new_ang, oang; int new_ang, oang;
int save_ang = -1; int save_ang = -1;
int set; int set;
int dist, stopx, stopy, stopz;
// start out with mininum distance that will be accepted as a move
int save_dist = 500; int save_dist = 500;
// if on fire, run shorter distances // if on fire, run shorter distances
@ -1417,19 +1412,22 @@ int FindNewAngle(DSWActor* actor, int dir, int DistToMove)
} }
#endif #endif
DVector3 stop;
// start out with mininum distance that will be accepted as a move
// check to see how far we can move // check to see how far we can move
auto ret = move_scan(actor, new_ang, DistToMove, &stopx, &stopy, &stopz); auto ret = move_scan(actor, new_ang, DistToMove, stop);
int dist = (actor->spr.pos.XY() - stop.XY()).Length() * worldtoint;
if (ret.type == kHitNone) if (ret.type == kHitNone)
{ {
// cleanly moved in new direction without hitting something // cleanly moved in new direction without hitting something
actor->user.TargetDist = Distance(actor->int_pos().X, actor->int_pos().Y, stopx, stopy); actor->user.TargetDist = dist;
return new_ang; return new_ang;
} }
else else
{ {
// hit something // hit something
dist = Distance(actor->int_pos().X, actor->int_pos().Y, stopx, stopy);
if (dist > save_dist) if (dist > save_dist)
{ {