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

- handle PlayerFacingRange

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-08 18:05:35 +02:00
parent 2fd918674d
commit 276960ac08
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1964,9 +1964,9 @@ inline bool SectorIsUnderwaterArea(sectortype* sect)
return sect ? sect->extra & (SECTFX_UNDERWATER | SECTFX_UNDERWATER2) : false; return sect ? sect->extra & (SECTFX_UNDERWATER | SECTFX_UNDERWATER2) : false;
} }
inline bool PlayerFacingRange(PLAYER* pp, DSWActor* a, int range) inline bool PlayerFacingRange(PLAYER* pp, DSWActor* a, DAngle range)
{ {
return (abs(getincangle(getangle(a->spr.pos - pp->pos), (pp)->angle.ang.Buildang())) < (range)); return absangle(VecToAngle(a->spr.pos - pp->pos), pp->angle.ang) < range;
} }
inline bool FacingRange(DSWActor* a1, DSWActor* a2, DAngle range) inline bool FacingRange(DSWActor* a1, DSWActor* a2, DAngle range)

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

@ -12265,7 +12265,8 @@ int InitSwordAttack(PLAYER* pp)
{ {
DSWActor* plActor = pp->actor; DSWActor* plActor = pp->actor;
unsigned stat; unsigned stat;
short reach, face; short reach;
DAngle face;
PlaySound(DIGI_SWORDSWOOSH, pp, v3df_dontpan | v3df_doppler); PlaySound(DIGI_SWORDSWOOSH, pp, v3df_dontpan | v3df_doppler);
@ -12313,7 +12314,7 @@ int InitSwordAttack(PLAYER* pp)
double dist = (pp->pos.XY() - itActor->spr.pos.XY()).Length(); double dist = (pp->pos.XY() - itActor->spr.pos.XY()).Length();
reach = 1000; // !JIM! was 800 reach = 1000; // !JIM! was 800
face = 200; face = DAngle::fromBuild(200);
if (dist < CloseRangeDist(itActor, plActor, reach) && PlayerFacingRange(pp, itActor, face)) if (dist < CloseRangeDist(itActor, plActor, reach) && PlayerFacingRange(pp, itActor, face))
{ {
@ -12432,7 +12433,8 @@ int InitFistAttack(PLAYER* pp)
{ {
DSWActor* plActor = pp->actor; DSWActor* plActor = pp->actor;
unsigned stat; unsigned stat;
short reach,face; short reach;
DAngle face;
PlaySound(DIGI_STAR, pp, v3df_dontpan|v3df_doppler); PlaySound(DIGI_STAR, pp, v3df_dontpan|v3df_doppler);
@ -12477,22 +12479,22 @@ int InitFistAttack(PLAYER* pp)
if (pp->InventoryActive[2]) // Shadow Bombs give you demon fist if (pp->InventoryActive[2]) // Shadow Bombs give you demon fist
{ {
face = 190; face = DAngle::fromBuild(190);
reach = 2300; reach = 2300;
} }
else else
{ {
reach = 1000; reach = 1000;
face = 200; face = DAngle::fromBuild(200);
} }
if (dist < CloseRangeDist(itActor, plActor, reach) && PlayerFacingRange(pp, itActor, face)) if (dist < CloseRangeDist(itActor, plActor, reach) && PlayerFacingRange(pp, itActor, face))
{ {
if (SpriteOverlapZ(pp->actor, itActor, 20) || face == 190) if (SpriteOverlapZ(pp->actor, itActor, 20) || reach == 2300)
{ {
if (FAFcansee(ActorVectOfMiddle(itActor), itActor->sector(), ActorVectOfMiddle(plActor), plActor->sector())) if (FAFcansee(ActorVectOfMiddle(itActor), itActor->sector(), ActorVectOfMiddle(plActor), plActor->sector()))
DoDamage(itActor, plActor); DoDamage(itActor, plActor);
if (face == 190) if (reach == 2300)
{ {
SpawnDemonFist(itActor); SpawnDemonFist(itActor);
} }