teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 17:01:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- 4x DISTANCE in skull.cpp

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-08 16:58:45 +02:00
parent f683f89580
commit 73998f556f
2 changed files with 9 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -212,11 +212,6 @@ inline int SQ(int val)
return val * val;
}
inline int DIST(int x1, int y1, int x2, int y2)
{
return ksqrt(SQ((x1)-(x2)) + SQ((y1)-(y2)));
}
// Distance macro - tx, ty, tmin are holding vars that must be declared in the routine
// that uses this macro
inline void DISTANCE(const DVector2& p1, const DVector2& p2, int& dist, int& tx, int& ty, int& tmin)

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

@ -381,12 +381,9 @@ int DoSkullJump(DSWActor* actor)
// jump/fall type
if(actor->vel.X != 0)
{
double dist = (actor->spr.pos.XY() - actor->user.targetActor->spr.pos.XY()).Length();
int dist,a,b,c;
DISTANCE(actor->spr.pos, actor->user.targetActor->spr.pos, dist, a, b, c);
if (dist < 1000 &&
if (dist < 62.5 &&
SpriteOverlapZ(actor, actor->user.targetActor, 32))
{
UpdateSinglePlayKills(actor);
@ -461,9 +458,7 @@ int DoSkullSpawnShrap(DSWActor* actor)
int DoSkullWait(DSWActor* actor)
{
int a,b,c,dist;
DISTANCE(actor->spr.pos, actor->user.targetActor->spr.pos, dist, a, b, c);
double dist = (actor->spr.pos.XY() - actor->user.targetActor->spr.pos.XY()).Length();
DoActorPickClosePlayer(actor);
@ -480,7 +475,7 @@ int DoSkullWait(DSWActor* actor)
if (actor->spr.pos.Z > actor->user.loz)
{
// look for closest player every once in a while
if (dist < 3500)
if (dist < 218.75)
{
actor->vel.X = 0;
actor->user.jump_speed = -600;
@ -495,7 +490,7 @@ int DoSkullWait(DSWActor* actor)
DoSkullBob(actor);
if (dist < 8000)
if (dist < 500)
{
actor->spr.angle = VecToAngle(actor->user.targetActor->spr.pos - actor->spr.pos);
actor->vel.X = 8 + RandomRangeF(16);
@ -791,11 +786,9 @@ int DoBettyJump(DSWActor* actor)
// jump/fall type
if(actor->vel.X != 0)
{
int dist,a,b,c;
double dist = (actor->spr.pos.XY() - actor->user.targetActor->spr.pos.XY()).Length();
DISTANCE(actor->spr.pos, actor->user.targetActor->spr.pos, dist, a, b, c);
if (dist < 1000 &&
if (dist < 62.5 &&
SpriteOverlapZ(actor, actor->user.targetActor, 32))
{
UpdateSinglePlayKills(actor);
@ -867,9 +860,7 @@ int DoBettySpawnShrap(DSWActor* actor)
int DoBettyWait(DSWActor* actor)
{
int a,b,c,dist;
DISTANCE(actor->spr.pos, actor->user.targetActor->spr.pos, dist, a, b, c);
double dist = (actor->spr.pos.XY(), actor->user.targetActor->spr.pos.XY()).Length();
DoActorPickClosePlayer(actor);
@ -883,7 +874,7 @@ int DoBettyWait(DSWActor* actor)
if (actor->spr.pos.Z > actor->user.loz)
{
// look for closest player every once in a while
if (dist < 3500)
if (dist < 218.75)
{
actor->vel.X = 0;
actor->user.jump_speed = -600;