teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-20 08:00:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

- magic carpet fixes for SW's $woods.map

Browse source 
* the track point code needs to retain the original distance function because in this case the difference can be critical as it interprets map data.
* two cases of bad vertical distance calculation due to unclear original code.
This commit is contained in:
Christoph Oelckers 2022-10-19 17:41:50 +02:00
parent 6e11a4317e
commit 1553ec812d
2 changed files with 29 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/games/sw/src/sector.cpp
View file

@ -2803,6 +2803,7 @@ int AnimSet(int animtype, int animindex, DSWActor* animactor, double thegoal, in
Anim[j].animactor = animactor; Anim[j].animactor = animactor;
Anim[j].goal = thegoal; Anim[j].goal = thegoal;
Anim[j].vel = thevel; Anim[j].vel = thevel;
if (animtype != ANIM_SUdepth) Anim[j].vel /= 256.;
Anim[j].vel_adj = 0; Anim[j].vel_adj = 0;
Anim[j].callback = nullptr; Anim[j].callback = nullptr;
Anim[j].callbackdata = nullptr; Anim[j].callbackdata = nullptr;

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

@ -51,6 +51,25 @@ ANIMATOR NinjaJumpActionFunc;
#define ACTOR_STD_JUMP (-384) #define ACTOR_STD_JUMP (-384)
DAngle GlobSpeedSO; DAngle GlobSpeedSO;
double Distance(DVector2 p1, DVector2 p2)
{
double min;
if ((p2.X = p2.X - p1.X) < 0)
p2.X = -p2.X;
if ((p2.Y = p2.Y - p1.Y) < 0)
p2.Y = -p2.Y;
if (p2.X > p2.Y)
min = p2.Y;
else
min = p2.X;
return p2.X + p2.Y - (min * 0.5);
}
// determine if moving down the track will get you closer to the player // determine if moving down the track will get you closer to the player
short TrackTowardPlayer(DSWActor* actor, TRACK* t, TRACK_POINT* start_point) short TrackTowardPlayer(DSWActor* actor, TRACK* t, TRACK_POINT* start_point)
{ {
@ -66,8 +85,8 @@ short TrackTowardPlayer(DSWActor* actor, TRACK* t, TRACK_POINT* start_point)
end_point = t->TrackPoint; end_point = t->TrackPoint;
} }
auto end_dist = (end_point->pos.XY() - actor->spr.pos.XY()).Length(); auto end_dist = Distance(end_point->pos.XY(), actor->spr.pos.XY());
auto start_dist = (start_point->pos.XY() - actor->spr.pos.XY()).Length(); auto start_dist = Distance(start_point->pos.XY(), actor->spr.pos.XY());
return (end_dist < start_dist); return (end_dist < start_dist);
} }
@ -86,8 +105,8 @@ short TrackStartCloserThanEnd(DSWActor* actor, TRACK* t, TRACK_POINT* start_poin
end_point = t->TrackPoint; end_point = t->TrackPoint;
} }
auto end_dist = (end_point->pos.XY() - actor->spr.pos.XY()).Length(); auto end_dist = Distance(end_point->pos.XY(), actor->spr.pos.XY());
auto start_dist = (start_point->pos.XY() - actor->spr.pos.XY()).Length(); auto start_dist = Distance(start_point->pos.XY(), actor->spr.pos.XY());
return (start_dist < end_dist); return (start_dist < end_dist);
} }
@ -183,7 +202,7 @@ short ActorFindTrack(DSWActor* actor, int8_t player_dir, int track_type, int* tr
{ {
tp = t->TrackPoint + end_point[i]; tp = t->TrackPoint + end_point[i];
double dist = (tp->pos.XY() - actor->spr.pos.XY()).Length(); double dist = Distance(tp->pos.XY(), actor->spr.pos.XY());
if (dist < threshold && dist < near_dist) if (dist < threshold && dist < near_dist)
{ {
@ -583,7 +602,7 @@ void TrackSetup(void)
it.Reset(STAT_TRACK + ndx); it.Reset(STAT_TRACK + ndx);
while (auto actor = it.Next()) while (auto actor = it.Next())
{ {
dist = ((tp + t->NumPoints - 1)->pos - actor->spr.pos).Length(); dist = Distance((tp + t->NumPoints - 1)->pos, actor->spr.pos);
if (dist < low_dist) if (dist < low_dist)
{ {
@ -1360,7 +1379,7 @@ void PlaceSectorObjectsOnTracks(void)
{ {
tpoint = Track[sop->track].TrackPoint; tpoint = Track[sop->track].TrackPoint;
dist = ((tpoint + j)->pos - sop->pmid).Length(); dist = Distance((tpoint + j)->pos, sop->pmid);
if (dist < low_dist) if (dist < low_dist)
{ {
@ -1423,7 +1442,7 @@ void PlaceActorsOnTracks(void)
{ {
tpoint = Track[actor->user.track].TrackPoint; tpoint = Track[actor->user.track].TrackPoint;
dist = ((tpoint + j)->pos - actor->spr.pos).Length(); dist = Distance((tpoint + j)->pos, actor->spr.pos);
if (dist < low_dist) if (dist < low_dist)
{ {
@ -2445,7 +2464,7 @@ DVector2 DoTrack(SECTOR_OBJECT* sop, short locktics)
// (velocity * difference between the target and the object) // (velocity * difference between the target and the object)
// take absolute value // take absolute value
sop->z_rate = (int)abs((sop->vel * zmaptoworld * (sop->pmid.Z - pos.Z)) / dist); sop->z_rate = (int)abs((sop->vel * maptoworld * (sop->pmid.Z - pos.Z)) / dist);
if ((sop->flags & SOBJ_SPRITE_OBJ)) if ((sop->flags & SOBJ_SPRITE_OBJ))
{ {