zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-04-26 09:40:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

- the ones I missed.

Browse source
This commit is contained in:
Christoph Oelckers 2021-12-24 18:44:50 +01:00
parent a8d0e29a3b
commit 17810bc6cd
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12610,9 +12610,9 @@ int InitSwordAttack(PLAYERp pp)
int InitFistAttack(PLAYERp pp) int InitFistAttack(PLAYERp pp)
{ {
USERp u = pp->Actor()->u(),tu; auto plActor = pp->actor;
auto psp = &pp->Actor()->s(); USERp u = plActor->u(),tu;
SPRITEp sp = nullptr; auto psp = &plActor->s();
unsigned stat; unsigned stat;
int dist; int dist;
short reach,face; short reach,face;
@ -12656,15 +12656,13 @@ int InitFistAttack(PLAYERp pp)
SWStatIterator it(StatDamageList[stat]); SWStatIterator it(StatDamageList[stat]);
while (auto itActor = it.Next()) while (auto itActor = it.Next())
{ {
sp = &itActor->s();
if (itActor->user.PlayerP == pp) if (itActor->user.PlayerP == pp)
break; break;
if (!TEST(sp->extra, SPRX_PLAYER_OR_ENEMY)) if (!TEST(itActor->spr.extra, SPRX_PLAYER_OR_ENEMY))
continue; continue;
dist = Distance(pp->pos.X, pp->pos.Y, sp->pos.X, sp->pos.Y); dist = Distance(pp->pos.X, pp->pos.Y, itActor->spr.pos.X, itActor->spr.pos.Y);
if (pp->InventoryActive[2]) // Shadow Bombs give you demon fist if (pp->InventoryActive[2]) // Shadow Bombs give you demon fist
{ {
@ -12677,12 +12675,12 @@ int InitFistAttack(PLAYERp pp)
face = 200; face = 200;
} }
if (dist < CLOSE_RANGE_DIST_FUDGE(sp, psp, reach) && PlayerFacingRange(pp, itActor, face)) if (dist < CLOSE_RANGE_DIST_FUDGE(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)
{ {
if (FAFcansee(sp->pos.X,sp->pos.Y,GetSpriteZOfMiddle(sp),sp->sector(),psp->pos.X,psp->pos.Y,GetSpriteZOfMiddle(psp),psp->sector())) if (FAFcansee(itActor->spr.pos.X, itActor->spr.pos.Y, ActorZOfMiddle(itActor), itActor->spr.sector(), psp->pos.X, psp->pos.Y, GetSpriteZOfMiddle(psp), psp->sector()))
DoDamage(itActor, pp->Actor()); DoDamage(itActor, plActor);
if (face == 190) if (face == 190)
{ {
SpawnDemonFist(itActor); SpawnDemonFist(itActor);
@ -17373,8 +17371,9 @@ int InitEnemyUzi(DSWActor* actor)
int InitGrenade(PLAYERp pp) int InitGrenade(PLAYERp pp)
{ {
USERp u = pp->Actor()->u(); DSWActor* actor = pp->actor;
auto sp = &pp->Actor()->s(); USERp u = actor->u();
auto sp = &actor->s();
USERp wu; USERp wu;
SPRITEp wp; SPRITEp wp;
int nx, ny, nz; int nx, ny, nz;
@ -18595,7 +18594,6 @@ void QueueHole(sectortype* hit_sect, walltype* hit_wall, int hit_x, int hit_y, i
HoleQueueHead = (HoleQueueHead+1) & (MAX_HOLE_QUEUE-1); HoleQueueHead = (HoleQueueHead+1) & (MAX_HOLE_QUEUE-1);
sp = &spawnedActor->s();
spawnedActor->spr.xrepeat = spawnedActor->spr.yrepeat = 16; spawnedActor->spr.xrepeat = spawnedActor->spr.yrepeat = 16;
spawnedActor->spr.cstat = 0; spawnedActor->spr.cstat = 0;
spawnedActor->spr.pal = 0; spawnedActor->spr.pal = 0;