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

- pass position pointers to DISTANCE.

Browse source
This commit is contained in:
Christoph Oelckers 2022-08-21 16:03:46 +02:00
parent bd497a7e68
commit 98b06697f7
11 changed files with 45 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -324,7 +324,7 @@ int DoActorPickClosePlayer(DSWActor* actor)
// continue;
}
DISTANCE(actor->int_pos().X, actor->int_pos().Y, pp->int_ppos().X, pp->int_ppos().Y, dist, a, b, c);
DISTANCE(actor->spr.pos, pp->pos, dist, a, b, c);
if (dist < near_dist)
{
@ -350,7 +350,7 @@ int DoActorPickClosePlayer(DSWActor* actor)
continue;
}
DISTANCE(actor->int_pos().X, actor->int_pos().Y, pp->int_ppos().X, pp->int_ppos().Y, dist, a, b, c);
DISTANCE(actor->spr.pos, pp->pos, dist, a, b, c);
DSWActor* plActor = pp->actor;
if (dist < near_dist && FAFcansee(actor->int_pos().X, actor->int_pos().Y, look_height, actor->sector(), plActor->int_pos().X, plActor->int_pos().Y, int_ActorUpperZ(plActor), plActor->sector()))
@ -377,7 +377,7 @@ TARGETACTOR:
if ((itActor->user.Flags & (SPR_SUICIDE | SPR_DEAD)))
continue;
DISTANCE(actor->int_pos().X, actor->int_pos().Y, itActor->int_pos().X, itActor->int_pos().Y, dist, a, b, c);
DISTANCE(actor->spr.pos, itActor->spr.pos, dist, a, b, c);
if (dist < near_dist && FAFcansee(actor->int_pos().X, actor->int_pos().Y, look_height, actor->sector(), itActor->int_pos().X, itActor->int_pos().Y, int_ActorUpperZ(itActor), itActor->sector()))
{
@ -1169,7 +1169,7 @@ int DoActorAttack(DSWActor* actor)
DoActorNoise(ChooseAction(actor->user.Personality->Broadcast),actor);
DISTANCE(actor->int_pos().X, actor->int_pos().Y, actor->user.targetActor->int_pos().X, actor->user.targetActor->int_pos().Y, dist, a, b, c);
DISTANCE(actor->spr.pos, actor->user.targetActor->spr.pos, dist, a, b, c);
auto pActor = GetPlayerSpriteNum(actor);
if ((actor->user.ActorActionSet->CloseAttack[0] && dist < CloseRangeDist(actor, actor->user.targetActor)) ||

2
source/games/sw/src/bunny.cpp
View file

@ -903,7 +903,7 @@ void DoPickCloseBunny(DSWActor* actor)
if (itActor->user.ID != BUNNY_RUN_R0) continue;
DISTANCE(itActor->int_pos().X, itActor->int_pos().Y, actor->int_pos().X, actor->int_pos().Y, dist, a, b, c);
DISTANCE(itActor->spr.pos, actor->spr.pos, dist, a, b, c);
if (dist > near_dist) continue;

4
source/games/sw/src/eel.cpp
View file

@ -459,7 +459,7 @@ int DoEelMatchPlayerZ(DSWActor* actor)
double bound;
if (actor->user.lowActor && actor->user.targetActor == actor->user.highActor) // this doesn't look right...
{
DISTANCE(actor->int_pos().X, actor->int_pos().Y, actor->user.lowActor->int_pos().X, actor->user.lowActor->int_pos().Y, dist, a, b, c);
DISTANCE(actor->spr.pos, actor->user.lowActor->spr.pos, dist, a, b, c);
if (dist <= 300)
bound = actor->user.pos.Z;
else
@ -476,7 +476,7 @@ int DoEelMatchPlayerZ(DSWActor* actor)
// upper bound
if (actor->user.highActor && actor->user.targetActor == actor->user.highActor)
{
DISTANCE(actor->int_pos().X, actor->int_pos().Y, actor->user.highActor->int_pos().X, actor->user.highActor->int_pos().Y, dist, a, b, c);
DISTANCE(actor->spr.pos, actor->user.highActor->spr.pos, dist, a, b, c);
if (dist <= 300)
bound = actor->user.pos.Z;
else

10
source/games/sw/src/game.h
View file

@ -209,12 +209,12 @@ inline int DIST(int x1, int y1, int x2, int y2)
// Distance macro - tx, ty, tmin are holding vars that must be declared in the routine
// that uses this macro
inline void DISTANCE(int x1, int y1, int x2, int y2, int& dist, int& tx, int& ty, int& tmin)
inline void DISTANCE(const DVector2& p1, const DVector2& p2, int& dist, int& tx, int& ty, int& tmin)
{
tx = abs(x2 - x1);
ty = abs(y2 - y1);
tmin = min(tx, ty);
dist = tx + ty - (tmin >> 1);
tx = int(abs(p2.X - p1.X) * worldtoint);
ty = int(abs(p2.Y - p1.Y) * worldtoint);
tmin = min(tx, ty);
dist = tx + ty - (tmin >> 1);
}
inline int GetSpriteSizeY(const spritetypebase* sp)

4
source/games/sw/src/hornet.cpp
View file

@ -539,7 +539,7 @@ int DoCheckSwarm(DSWActor* actor)
if (actor->user.targetActor->user.PlayerP)
{
pp = actor->user.targetActor->user.PlayerP;
DISTANCE(actor->int_pos().X, actor->int_pos().Y, pp->int_ppos().X, pp->int_ppos().Y, pdist, a, b, c);
DISTANCE(actor->spr.pos, pp->pos, pdist, a, b, c);
}
else
return 0;
@ -552,7 +552,7 @@ int DoCheckSwarm(DSWActor* actor)
if (itActor->spr.hitag != TAG_SWARMSPOT || itActor->spr.lotag != 2) continue;
DISTANCE(actor->int_pos().X, actor->int_pos().Y, itActor->int_pos().X, itActor->int_pos().Y, dist, a, b, c);
DISTANCE(actor->spr.pos, itActor->spr.pos, dist, a, b, c);
if (dist < pdist && actor->user.ID == itActor->user.ID) // Only flock to your own kind
{

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

@ -1425,7 +1425,7 @@ int PlayerInitFlashBomb(PLAYER* pp)
if (itActor == pp->actor)
break;
DISTANCE(itActor->int_pos().X, itActor->int_pos().Y, actor->int_pos().X, actor->int_pos().Y, dist, tx, ty, tmin);
DISTANCE(itActor->spr.pos, actor->spr.pos, dist, tx, ty, tmin);
if (dist > 16384) // Flash radius
continue;
@ -1484,7 +1484,7 @@ int InitFlashBomb(DSWActor* actor)
SWStatIterator it(StatDamageList[stat]);
while (auto itActor = it.Next())
{
DISTANCE(itActor->int_pos().X, itActor->int_pos().Y, actor->int_pos().X, actor->int_pos().Y, dist, tx, ty, tmin);
DISTANCE(itActor->spr.pos, actor->spr.pos, dist, tx, ty, tmin);
if (dist > 16384) // Flash radius
continue;
@ -1880,7 +1880,7 @@ DSWActor* DoFlagRangeTest(DSWActor* actor, int range)
SWStatIterator it(StatDamageList[stat]);
while (auto itActor = it.Next())
{
DISTANCE(itActor->int_pos().X, itActor->int_pos().Y, actor->int_pos().X, actor->int_pos().Y, dist, tx, ty, tmin);
DISTANCE(itActor->spr.pos, actor->spr.pos, dist, tx, ty, tmin);
if (dist > range)
continue;

2
source/games/sw/src/player.cpp
View file

@ -5779,7 +5779,7 @@ void DoPlayerDeathCheckKick(PLAYER* pp)
if (!(itActor->spr.extra & SPRX_PLAYER_OR_ENEMY))
continue;
DISTANCE(itActor->int_pos().X, itActor->int_pos().Y, plActor->int_pos().X, plActor->int_pos().Y, dist, a, b, c);
DISTANCE(itActor->spr.pos, plActor->spr.pos, dist, a, b, c);
if (unsigned(dist) < itActor->user.Radius + 100)
{

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

@ -2670,7 +2670,7 @@ void DoSector(void)
}
else
{
DISTANCE(pp->int_ppos().X, pp->int_ppos().Y, sop->int_pmid().X, sop->int_pmid().Y, dist, a, b, c);
DISTANCE(pp->pos, sop->pmid, dist, a, b, c);
if (dist < min_dist)
min_dist = dist;
}

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

@ -363,7 +363,7 @@ int DoSkullJump(DSWActor* actor)
int dist,a,b,c;
DISTANCE(actor->int_pos().X, actor->int_pos().Y, actor->user.targetActor->int_pos().X, actor->user.targetActor->int_pos().Y, dist, a, b, c);
DISTANCE(actor->spr.pos, actor->user.targetActor->spr.pos, dist, a, b, c);
if (dist < 1000 &&
SpriteOverlapZ(actor, actor->user.targetActor, Z(32)))
@ -424,7 +424,7 @@ int DoSkullWait(DSWActor* actor)
{
int a,b,c,dist;
DISTANCE(actor->int_pos().X, actor->int_pos().Y, actor->user.targetActor->int_pos().X, actor->user.targetActor->int_pos().Y, dist, a, b, c);
DISTANCE(actor->spr.pos, actor->user.targetActor->spr.pos, dist, a, b, c);
DoActorPickClosePlayer(actor);
@ -740,7 +740,7 @@ int DoBettyJump(DSWActor* actor)
{
int dist,a,b,c;
DISTANCE(actor->int_pos().X, actor->int_pos().Y, actor->user.targetActor->int_pos().X, actor->user.targetActor->int_pos().Y, dist, a, b, c);
DISTANCE(actor->spr.pos, actor->user.targetActor->spr.pos, dist, a, b, c);
if (dist < 1000 &&
SpriteOverlapZ(actor, actor->user.targetActor, Z(32)))
@ -798,7 +798,7 @@ int DoBettyWait(DSWActor* actor)
{
int a,b,c,dist;
DISTANCE(actor->int_pos().X, actor->int_pos().Y, actor->user.targetActor->int_pos().X, actor->user.targetActor->int_pos().Y, dist, a, b, c);
DISTANCE(actor->spr.pos, actor->user.targetActor->spr.pos, dist, a, b, c);
DoActorPickClosePlayer(actor);

4
source/games/sw/src/sprite.cpp
View file

@ -5021,7 +5021,7 @@ int DoGet(DSWActor* actor)
if (pp->Flags & (PF_DEAD))
continue;
DISTANCE(pp->int_ppos().X, pp->int_ppos().Y, actor->int_pos().X, actor->int_pos().Y, dist, a,b,c);
DISTANCE(pp->pos, actor->spr.pos, dist, a,b,c);
if ((unsigned)dist > (plActor->user.Radius + actor->user.Radius))
{
continue;
@ -6056,7 +6056,7 @@ void SpriteControl(void)
pp = &Player[pnum];
// Only update the ones closest
DISTANCE(pp->int_ppos().X, pp->int_ppos().Y, actor->int_pos().X, actor->int_pos().Y, dist, tx, ty, tmin);
DISTANCE(pp->pos, actor->spr.pos, dist, tx, ty, tmin);
AdjustActiveRange(pp, actor, dist);

40
source/games/sw/src/weapon.cpp
View file

@ -5292,7 +5292,7 @@ int GetDamage(DSWActor* actor, DSWActor* weapActor, int DamageNdx)
int damage_per_pixel, damage_force, damage_amt;
DISTANCE(weapActor->int_pos().X,weapActor->int_pos().Y,actor->int_pos().X,actor->int_pos().Y,dist,a,b,c);
DISTANCE(weapActor->spr.pos, actor->spr.pos,dist,a,b,c);
// take off the box around the player or else you'll never get
// the max_damage;
@ -7028,7 +7028,7 @@ int DoDamageTest(DSWActor* actor)
SWStatIterator it(StatDamageList[stat]);
while (auto itActor = it.Next())
{
DISTANCE(itActor->int_pos().X, itActor->int_pos().Y, actor->int_pos().X, actor->int_pos().Y, dist, tx, ty, tmin);
DISTANCE(itActor->spr.pos, actor->spr.pos, dist, tx, ty, tmin);
if ((unsigned)dist > actor->user.Radius + itActor->user.Radius)
continue;
@ -7099,7 +7099,7 @@ int DoFlamesDamageTest(DSWActor* actor)
continue;
}
DISTANCE(itActor->int_pos().X, itActor->int_pos().Y, actor->int_pos().X, actor->int_pos().Y, dist, tx, ty, tmin);
DISTANCE(itActor->spr.pos, actor->spr.pos, dist, tx, ty, tmin);
if ((unsigned)dist > actor->user.Radius + itActor->user.Radius)
continue;
@ -7236,7 +7236,7 @@ int DoExpDamageTest(DSWActor* actor)
SWStatIterator it(StatDamageList[stat]);
while (auto itActor = it.Next())
{
DISTANCE(itActor->int_pos().X, itActor->int_pos().Y, actor->int_pos().X, actor->int_pos().Y, dist, tx, ty, tmin);
DISTANCE(itActor->spr.pos, actor->spr.pos, dist, tx, ty, tmin);
if ((unsigned)dist > actor->user.Radius + itActor->user.Radius)
continue;
@ -7281,7 +7281,7 @@ int DoExpDamageTest(DSWActor* actor)
SWStatIterator it(StatBreakList[stat]);
while (auto itActor = it.Next())
{
DISTANCE(itActor->int_pos().X, itActor->int_pos().Y, actor->int_pos().X, actor->int_pos().Y, dist, tx, ty, tmin);
DISTANCE(itActor->spr.pos, actor->spr.pos, dist, tx, ty, tmin);
if ((unsigned)dist > actor->user.Radius)
continue;
@ -7309,7 +7309,7 @@ int DoExpDamageTest(DSWActor* actor)
SWStatIterator it(STAT_WALL_MOVE);
while (auto itActor = it.Next())
{
DISTANCE(itActor->int_pos().X, itActor->int_pos().Y, actor->int_pos().X, actor->int_pos().Y, dist, tx, ty, tmin);
DISTANCE(itActor->spr.pos, actor->spr.pos, dist, tx, ty, tmin);
if ((unsigned)dist > actor->user.Radius/4)
continue;
@ -7355,7 +7355,7 @@ int DoMineExpMine(DSWActor* actor)
SWStatIterator it(STAT_MINE_STUCK);
while (auto itActor = it.Next())
{
DISTANCE(itActor->int_pos().X, itActor->int_pos().Y, actor->int_pos().X, actor->int_pos().Y, dist, tx, ty, tmin);
DISTANCE(itActor->spr.pos, actor->spr.pos, dist, tx, ty, tmin);
if ((unsigned)dist > actor->user.Radius + itActor->user.Radius)
continue;
@ -8583,7 +8583,7 @@ int DoMineRangeTest(DSWActor* actor, int range)
SWStatIterator it(StatDamageList[stat]);
while (auto itActor = it.Next())
{
DISTANCE(itActor->int_pos().X, itActor->int_pos().Y, actor->int_pos().X, actor->int_pos().Y, dist, tx, ty, tmin);
DISTANCE(itActor->spr.pos, actor->spr.pos, dist, tx, ty, tmin);
if (dist > range)
continue;
@ -9296,7 +9296,7 @@ int DoRocket(DSWActor* actor)
if ((actor->user.FlagOwner -= ACTORMOVETICS)<=0 && actor->user.spal == 20)
{
DISTANCE(actor->int_pos().X, actor->int_pos().Y, actor->user.targetActor->int_pos().X, actor->user.targetActor->int_pos().Y, dist, a, b, c);
DISTANCE(actor->spr.pos, actor->user.targetActor->spr.pos, dist, a, b, c);
actor->user.FlagOwner = dist>>6;
// Special warn sound attached to each seeker spawned
PlaySound(DIGI_MINEBEEP, actor, v3df_follow);
@ -11336,7 +11336,7 @@ int DoSerpRing(DSWActor* actor)
!(tActor->user.PlayerP->Flags & PF_DEAD))
{
actor->user.targetActor = own->user.targetActor;
DISTANCE(actor->int_pos().X, actor->int_pos().Y, actor->user.targetActor->int_pos().X, actor->user.targetActor->int_pos().Y, dist, a,b,c);
DISTANCE(actor->spr.pos, actor->user.targetActor->spr.pos, dist, a,b,c);
// if ((dist ok and random ok) OR very few skulls left)
if ((dist < 18000 && (RANDOM_P2(2048<<5)>>5) < 16) || own->user.Counter < 4)
@ -13768,7 +13768,7 @@ int InitRipperSlash(DSWActor* actor)
if ((unsigned)FindDistance3D(actor->int_pos() - itActor->int_pos()) > itActor->user.Radius + actor->user.Radius)
continue;
DISTANCE(itActor->int_pos().X, itActor->int_pos().Y, actor->int_pos().X, actor->int_pos().Y, dist, a, b, c);
DISTANCE(itActor->spr.pos, actor->spr.pos, dist, a, b, c);
if (dist < CloseRangeDist(actor, itActor, 600) && FacingRange(itActor, actor,150))
{
@ -13796,7 +13796,7 @@ int InitBunnySlash(DSWActor* actor)
if (itActor == actor)
break;
DISTANCE(itActor->int_pos().X, itActor->int_pos().Y, actor->int_pos().X, actor->int_pos().Y, dist, a, b, c);
DISTANCE(itActor->spr.pos, actor->spr.pos, dist, a, b, c);
if (dist < CloseRangeDist(actor, itActor, 600) && FacingRange(itActor, actor,150))
{
@ -13825,7 +13825,7 @@ int InitSerpSlash(DSWActor* actor)
if (itActor == actor)
break;
DISTANCE(itActor->int_pos().X, itActor->int_pos().Y, actor->int_pos().X, actor->int_pos().Y, dist, a, b, c);
DISTANCE(itActor->spr.pos, actor->spr.pos, dist, a, b, c);
if (dist < CloseRangeDist(actor, itActor, 800) && FacingRange(itActor, actor,150))
{
@ -13862,7 +13862,7 @@ int DoBladeDamage(DSWActor* actor)
if (!(itActor->spr.extra & SPRX_PLAYER_OR_ENEMY))
continue;
DISTANCE(itActor->int_pos().X, itActor->int_pos().Y, actor->int_pos().X, actor->int_pos().Y, dist, a, b, c);
DISTANCE(itActor->spr.pos, actor->spr.pos, dist, a, b, c);
if (dist > 2000)
continue;
@ -13899,7 +13899,7 @@ int DoStaticFlamesDamage(DSWActor* actor)
if (!(itActor->spr.extra & SPRX_PLAYER_OR_ENEMY))
continue;
DISTANCE(itActor->int_pos().X, itActor->int_pos().Y, actor->int_pos().X, actor->int_pos().Y, dist, a, b, c);
DISTANCE(itActor->spr.pos, actor->spr.pos, dist, a, b, c);
if (dist > 2000)
continue;
@ -13942,7 +13942,7 @@ int InitCoolgBash(DSWActor* actor)
if (!(itActor->spr.extra & SPRX_PLAYER_OR_ENEMY))
continue;
DISTANCE(itActor->int_pos().X, itActor->int_pos().Y, actor->int_pos().X, actor->int_pos().Y, dist, a, b, c);
DISTANCE(itActor->spr.pos, actor->spr.pos, dist, a, b, c);
if (dist < CloseRangeDist(actor, itActor, 600) && FacingRange(itActor, actor,150))
{
@ -13970,7 +13970,7 @@ int InitSkelSlash(DSWActor* actor)
if (itActor == actor)
break;
DISTANCE(itActor->int_pos().X, itActor->int_pos().Y, actor->int_pos().X, actor->int_pos().Y, dist, a, b, c);
DISTANCE(itActor->spr.pos, actor->spr.pos, dist, a, b, c);
if (dist < CloseRangeDist(actor, itActor, 600) && FacingRange(itActor, actor,150))
{
@ -13998,7 +13998,7 @@ int InitGoroChop(DSWActor* actor)
if (itActor == actor)
break;
DISTANCE(itActor->int_pos().X, itActor->int_pos().Y, actor->int_pos().X, actor->int_pos().Y, dist, a, b, c);
DISTANCE(itActor->spr.pos, actor->spr.pos, dist, a, b, c);
if (dist < CloseRangeDist(actor, itActor, 700) && FacingRange(itActor, actor,150))
{
@ -14696,7 +14696,7 @@ int InitEelFire(DSWActor* actor)
if ((unsigned)FindDistance3D(actor->int_pos() - itActor->int_pos()) > itActor->user.Radius + actor->user.Radius)
continue;
DISTANCE(itActor->int_pos().X, itActor->int_pos().Y, actor->int_pos().X, actor->int_pos().Y, dist, a, b, c);
DISTANCE(itActor->spr.pos, actor->spr.pos, dist, a, b, c);
if (dist < CloseRangeDist(actor, itActor, 600) && FacingRange(itActor, actor,150))
{
@ -17755,7 +17755,7 @@ int DoFloorBlood(DSWActor* actor)
{
pp = &Player[pnum];
DISTANCE(actor->int_pos().X, actor->int_pos().Y, pp->int_ppos().X, pp->int_ppos().Y, dist, a, b, c);
DISTANCE(actor->spr.pos, pp->pos, dist, a, b, c);
if (dist < near_dist)
{