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

- floatified DoFlagRangeTest

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-04 18:39:13 +02:00
parent e8e69abdf7
commit 11ff044d87
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
source/games/sw/src/jweapon.cpp
View file

@ -1785,19 +1785,17 @@ void DoFlagScore(int16_t pal)
} }
} }
DSWActor* DoFlagRangeTest(DSWActor* actor, int range) DSWActor* DoFlagRangeTest(DSWActor* actor, double range)
{ {
unsigned int stat; unsigned int stat;
int dist, tx, ty;
int tmin;
for (stat = 0; stat < SIZ(StatDamageList); stat++) for (stat = 0; stat < SIZ(StatDamageList); stat++)
{ {
SWStatIterator it(StatDamageList[stat]); SWStatIterator it(StatDamageList[stat]);
while (auto itActor = it.Next()) while (auto itActor = it.Next())
{ {
DISTANCE(itActor->spr.pos, actor->spr.pos, dist, tx, ty, tmin); double dist = (itActor->spr.pos - actor->spr.pos).LengthSquared();
if (dist > range) if (dist > range * range)
continue; continue;
if (actor == itActor) if (actor == itActor)
@ -1812,10 +1810,6 @@ DSWActor* DoFlagRangeTest(DSWActor* actor, int range)
if (!FAFcansee(itActor->spr.pos, itActor->sector(), actor->spr.pos, actor->sector())) if (!FAFcansee(itActor->spr.pos, itActor->sector(), actor->spr.pos, actor->sector()))
continue; continue;
dist = FindDistance3D(actor->int_pos() - itActor->int_pos());
if (dist > range)
continue;
return itActor; return itActor;
} }
} }
@ -2046,7 +2040,7 @@ int SetCarryFlag(DSWActor* actor)
int DoFlag(DSWActor* actor) int DoFlag(DSWActor* actor)
{ {
auto hitActor = DoFlagRangeTest(actor, 1000); auto hitActor = DoFlagRangeTest(actor, 62.5);
if (hitActor) if (hitActor)
{ {