zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- more macros in weapons.cpp converted into functions.

Browse source
This commit is contained in:
Christoph Oelckers 2021-12-24 19:10:11 +01:00
parent 39640a4870
commit b488361639
3 changed files with 25 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2071,7 +2071,10 @@ inline int PlayerFacingRange(PLAYERp pp, DSWActor* a, int range)
return (abs(getincangle(getangle(a->spr.pos.X - (pp)->pos.X, a->spr.pos.Y - (pp)->pos.Y), (pp)->angle.ang.asbuild())) < (range)); return (abs(getincangle(getangle(a->spr.pos.X - (pp)->pos.X, a->spr.pos.Y - (pp)->pos.Y), (pp)->angle.ang.asbuild())) < (range));
} }
#define FACING_RANGE(sp1,sp2,range) (abs(getincangle(getangle((sp1)->pos.X - (sp2)->pos.X, (sp1)->pos.Y - (sp2)->pos.Y), (sp2)->ang)) < (range)) inline int FacingRange(DSWActor* a1, DSWActor* a2, int range)
{
return (abs(getincangle(getangle(a1->spr.pos.X - a2->spr.pos.X, a1->spr.pos.Y - a2->spr.pos.Y), a2->spr.ang)) < (range));
}
inline void SET_BOOL1(spritetype* sp) { sp->extra |= SPRX_BOOL1; } inline void SET_BOOL1(spritetype* sp) { sp->extra |= SPRX_BOOL1; }
inline void SET_BOOL2(spritetype* sp) { sp->extra |= SPRX_BOOL2; } inline void SET_BOOL2(spritetype* sp) { sp->extra |= SPRX_BOOL2; }

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

@ -12491,7 +12491,7 @@ int InitSwordAttack(PLAYERp pp)
reach = 1000; // !JIM! was 800 reach = 1000; // !JIM! was 800
face = 200; face = 200;
if (dist < CLOSE_RANGE_DIST_FUDGE(itActor, plActor, reach) && PlayerFacingRange(pp, itActor, face)) if (dist < CloseRangeDist(itActor, plActor, reach) && PlayerFacingRange(pp, itActor, face))
{ {
if (SpriteOverlapZ(pp->Actor(), itActor, Z(20))) if (SpriteOverlapZ(pp->Actor(), itActor, Z(20)))
{ {
@ -12674,7 +12674,7 @@ int InitFistAttack(PLAYERp pp)
face = 200; face = 200;
} }
if (dist < CLOSE_RANGE_DIST_FUDGE(itActor, plActor, reach) && PlayerFacingRange(pp, itActor, face)) if (dist < CloseRangeDist(itActor, plActor, reach) && PlayerFacingRange(pp, itActor, face))
{ {
if (SpriteOverlapZ(pp->Actor(), itActor, Z(20)) || face == 190) if (SpriteOverlapZ(pp->Actor(), itActor, Z(20)) || face == 190)
{ {
@ -12977,7 +12977,7 @@ int InitSumoStompAttack(DSWActor* actor)
reach = 16384; reach = 16384;
if (dist < CLOSE_RANGE_DIST_FUDGE(tsp, sp, reach)) if (dist < CloseRangeDist(itActor, actor, reach))
{ {
if (FAFcansee(tsp->pos.X,tsp->pos.Y,GetSpriteZOfMiddle(tsp),tsp->sector(),actor->spr.pos.X,actor->spr.pos.Y,ActorZOfMiddle(actor),actor->spr.sector())) if (FAFcansee(tsp->pos.X,tsp->pos.Y,GetSpriteZOfMiddle(tsp),tsp->sector(),actor->spr.pos.X,actor->spr.pos.Y,ActorZOfMiddle(actor),actor->spr.sector()))
DoDamage(itActor, actor); DoDamage(itActor, actor);
@ -12996,31 +12996,31 @@ int InitMiniSumoClap(DSWActor* actor)
int dist; int dist;
short reach; short reach;
auto targetActor = u->targetActor;
if (!u->targetActor) return 0; if (!targetActor) return 0;
auto tsp = &u->targetActor->s(); auto tsp = &targetActor->s();
dist = Distance(actor->spr.pos.X, actor->spr.pos.Y, tsp->pos.X, tsp->pos.Y); dist = Distance(actor->spr.pos.X, actor->spr.pos.Y, tsp->pos.X, tsp->pos.Y);
reach = 10000; reach = 10000;
if (dist < CLOSE_RANGE_DIST_FUDGE(tsp, sp, 1000)) if (dist < CloseRangeDist(targetActor, actor, 1000))
{ {
if (SpriteOverlapZ(actor, u->targetActor, Z(20))) if (SpriteOverlapZ(actor, targetActor, Z(20)))
{ {
if (FAFcansee(tsp->pos.X, tsp->pos.Y, ActorMid(u->targetActor), tsp->sector(), actor->spr.pos.X, actor->spr.pos.Y, ActorZOfMiddle(actor), actor->spr.sector())) if (FAFcansee(tsp->pos.X, tsp->pos.Y, ActorMid(targetActor), tsp->sector(), actor->spr.pos.X, actor->spr.pos.Y, ActorZOfMiddle(actor), actor->spr.sector()))
{ {
PlaySound(DIGI_CGTHIGHBONE, actor, v3df_follow | v3df_dontpan); PlaySound(DIGI_CGTHIGHBONE, actor, v3df_follow | v3df_dontpan);
DoDamage(u->targetActor, actor); DoDamage(targetActor, actor);
} }
} }
} }
else if (dist < CLOSE_RANGE_DIST_FUDGE(tsp, sp, reach)) else if (dist < CloseRangeDist(targetActor, actor, reach))
{ {
if (FAFcansee(tsp->pos.X, tsp->pos.Y, ActorMid(u->targetActor), tsp->sector(), actor->spr.pos.X, actor->spr.pos.Y, ActorZOfMiddle(actor), actor->spr.sector())) if (FAFcansee(tsp->pos.X, tsp->pos.Y, ActorMid(targetActor), tsp->sector(), actor->spr.pos.X, actor->spr.pos.Y, ActorZOfMiddle(actor), actor->spr.sector()))
{ {
PlaySound(DIGI_30MMEXPLODE, actor, v3df_none); PlaySound(DIGI_30MMEXPLODE, actor, v3df_none);
SpawnFireballFlames(actor, u->targetActor); SpawnFireballFlames(actor, targetActor);
} }
} }
@ -14566,7 +14566,7 @@ int InitRipperSlash(DSWActor* actor)
DISTANCE(hp->pos.X, hp->pos.Y, actor->spr.pos.X, actor->spr.pos.Y, dist, a, b, c); DISTANCE(hp->pos.X, hp->pos.Y, actor->spr.pos.X, actor->spr.pos.Y, dist, a, b, c);
if (dist < CLOSE_RANGE_DIST_FUDGE(sp, hp, 600) && FACING_RANGE(hp, sp, 150)) if (dist < CloseRangeDist(actor, itActor, 600) && FacingRange(itActor, actor,150))
{ {
DoDamage(itActor, actor); DoDamage(itActor, actor);
} }
@ -14599,7 +14599,7 @@ int InitBunnySlash(DSWActor* actor)
DISTANCE(hp->pos.X, hp->pos.Y, actor->spr.pos.X, actor->spr.pos.Y, dist, a, b, c); DISTANCE(hp->pos.X, hp->pos.Y, actor->spr.pos.X, actor->spr.pos.Y, dist, a, b, c);
if (dist < CLOSE_RANGE_DIST_FUDGE(sp, hp, 600) && FACING_RANGE(hp, sp, 150)) if (dist < CloseRangeDist(actor, itActor, 600) && FacingRange(itActor, actor,150))
{ {
DoDamage(itActor, actor); DoDamage(itActor, actor);
} }
@ -14633,7 +14633,7 @@ int InitSerpSlash(DSWActor* actor)
DISTANCE(hp->pos.X, hp->pos.Y, actor->spr.pos.X, actor->spr.pos.Y, dist, a, b, c); DISTANCE(hp->pos.X, hp->pos.Y, actor->spr.pos.X, actor->spr.pos.Y, dist, a, b, c);
if (dist < CLOSE_RANGE_DIST_FUDGE(sp, hp, 800) && FACING_RANGE(hp, sp, 150)) if (dist < CloseRangeDist(actor, itActor, 800) && FacingRange(itActor, actor,150))
{ {
DoDamage(itActor, actor); DoDamage(itActor, actor);
} }
@ -14792,7 +14792,7 @@ int InitCoolgBash(DSWActor* actor)
DISTANCE(hp->pos.X, hp->pos.Y, actor->spr.pos.X, actor->spr.pos.Y, dist, a, b, c); DISTANCE(hp->pos.X, hp->pos.Y, actor->spr.pos.X, actor->spr.pos.Y, dist, a, b, c);
if (dist < CLOSE_RANGE_DIST_FUDGE(sp, hp, 600) && FACING_RANGE(hp, sp, 150)) if (dist < CloseRangeDist(actor, itActor, 600) && FacingRange(itActor, actor,150))
{ {
DoDamage(itActor, actor); DoDamage(itActor, actor);
} }
@ -14825,7 +14825,7 @@ int InitSkelSlash(DSWActor* actor)
DISTANCE(hp->pos.X, hp->pos.Y, actor->spr.pos.X, actor->spr.pos.Y, dist, a, b, c); DISTANCE(hp->pos.X, hp->pos.Y, actor->spr.pos.X, actor->spr.pos.Y, dist, a, b, c);
if (dist < CLOSE_RANGE_DIST_FUDGE(sp, hp, 600) && FACING_RANGE(hp, sp, 150)) if (dist < CloseRangeDist(actor, itActor, 600) && FacingRange(itActor, actor,150))
{ {
DoDamage(itActor, actor); DoDamage(itActor, actor);
} }
@ -14858,7 +14858,7 @@ int InitGoroChop(DSWActor* actor)
DISTANCE(hp->pos.X, hp->pos.Y, actor->spr.pos.X, actor->spr.pos.Y, dist, a, b, c); DISTANCE(hp->pos.X, hp->pos.Y, actor->spr.pos.X, actor->spr.pos.Y, dist, a, b, c);
if (dist < CLOSE_RANGE_DIST_FUDGE(sp, hp, 700) && FACING_RANGE(hp, sp, 150)) if (dist < CloseRangeDist(actor, itActor, 700) && FacingRange(itActor, actor,150))
{ {
PlaySound(DIGI_GRDAXEHIT, actor, v3df_none); PlaySound(DIGI_GRDAXEHIT, actor, v3df_none);
DoDamage(itActor, actor); DoDamage(itActor, actor);
@ -15646,7 +15646,7 @@ int InitEelFire(DSWActor* actor)
DISTANCE(hp->pos.X, hp->pos.Y, actor->spr.pos.X, actor->spr.pos.Y, dist, a, b, c); DISTANCE(hp->pos.X, hp->pos.Y, actor->spr.pos.X, actor->spr.pos.Y, dist, a, b, c);
if (dist < CLOSE_RANGE_DIST_FUDGE(sp, hp, 600) && FACING_RANGE(hp, sp, 150)) if (dist < CloseRangeDist(actor, itActor, 600) && FacingRange(itActor, actor,150))
{ {
PlaySound(DIGI_GIBS1, actor, v3df_none); PlaySound(DIGI_GIBS1, actor, v3df_none);
DoDamage(itActor, actor); DoDamage(itActor, actor);

12
source/games/sw/src/weapon.h
View file

@ -160,21 +160,11 @@ extern int WeaponIsAmmo;
#define MISSILEMOVETICS 6 #define MISSILEMOVETICS 6
inline int CLOSE_RANGE_DIST_FUDGE(SPRITEp sp1, SPRITEp sp2, int fudge) inline int CloseRangeDist(DSWActor* a1, DSWActor* a2, int fudge)
{
return (((int)sp1->clipdist << 2) + ((int)sp2->clipdist << 2) + fudge);
}
inline int CLOSE_RANGE_DIST_FUDGE(DSWActor* a1, DSWActor* a2, int fudge)
{ {
return (((int)a1->spr.clipdist << 2) + ((int)a2->spr.clipdist << 2) + fudge); return (((int)a1->spr.clipdist << 2) + ((int)a2->spr.clipdist << 2) + fudge);
} }
inline int CLOSE_RANGE_DIST(SPRITEp sp1, SPRITEp sp2)
{
return CLOSE_RANGE_DIST_FUDGE(sp1, sp2, 400);
}
extern short target_ang; extern short target_ang;