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

- QueueHole

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-24 21:57:07 +01:00
parent e3ad05d4d7
commit 5cafd7b591
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6717,7 +6717,7 @@ pDisplaySprites(PLAYERp pp, double smoothratio)
{
sectortype* sectp = nullptr;
int16_t floorshade = 0;
if (pp->cursectnum >= 0)
if (pp->insector())
{
sectp = pp->cursector();
pal = sectp->floorpal;

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

@ -13543,7 +13543,7 @@ int ContinueHitscan(PLAYERp pp, short sectnum, int x, int y, int z, short ang, i
return 0;
}
QueueHole(hitinfo.hitsect,hitinfo.hitwall,hitinfo.pos.x,hitinfo.pos.y,hitinfo.pos.z);
QueueHole(hitinfo.sector(), hitinfo.wall(), hitinfo.pos.x, hitinfo.pos.y, hitinfo.pos.z);
}
// hit a sprite?
@ -13700,7 +13700,7 @@ int InitShotgun(PLAYERp pp)
continue;
}
QueueHole(hitinfo.hitsect,hitinfo.hitwall,hitinfo.pos.x,hitinfo.pos.y,hitinfo.pos.z);
QueueHole(hitinfo.sector(), hitinfo.wall(), hitinfo.pos.x, hitinfo.pos.y, hitinfo.pos.z);
}
// hit a sprite?
@ -16264,7 +16264,7 @@ int InitUzi(PLAYERp pp)
return 0;
}
QueueHole(hitinfo.hitsect,hitinfo.hitwall,hitinfo.pos.x,hitinfo.pos.y,hitinfo.pos.z);
QueueHole(hitinfo.sector(), hitinfo.wall(), hitinfo.pos.x, hitinfo.pos.y, hitinfo.pos.z);
}
// hit a sprite?
@ -17201,7 +17201,7 @@ int InitTurretMgun(SECTOR_OBJECTp sop)
continue;
}
QueueHole(hitinfo.hitsect,hitinfo.hitwall,hitinfo.pos.x,hitinfo.pos.y,hitinfo.pos.z);
QueueHole(hitinfo.sector(), hitinfo.wall(), hitinfo.pos.x, hitinfo.pos.y, hitinfo.pos.z);
}
// hit a sprite?
@ -17337,7 +17337,7 @@ int InitEnemyUzi(DSWActor* actor)
return 0;
}
QueueHole(hitinfo.hitsect,hitinfo.hitwall,hitinfo.pos.x,hitinfo.pos.y,hitinfo.pos.z);
QueueHole(hitinfo.sector(), hitinfo.wall(), hitinfo.pos.x, hitinfo.pos.y, hitinfo.pos.z);
}
if (hitinfo.hitactor != nullptr)
@ -18546,19 +18546,19 @@ void QueueReset(void)
LoWangsQueue[i] = nullptr;
}
bool TestDontStick(DSWActor* actor, short hit_wall)
bool TestDontStick(DSWActor* actor, walltype* hit_wall)
{
WALLp wp;
if (hit_wall < 0)
if (hit_wall == nullptr)
{
ASSERT(actor != nullptr);
USERp u = actor->u();
if (u->coll.type != kHitWall) return true; // ain't got a wall here.
hit_wall = u->coll.index;
hit_wall = u->coll.wall();
}
wp = &wall[hit_wall];
wp = hit_wall;
if (TEST(wp->extra, WALLFX_DONT_STICK))
return true;
@ -18583,7 +18583,7 @@ int QueueStar(DSWActor* actor)
SPRITEp sp = &actor->s();
SPRITEp osp;
if (TestDontStick(actor, -1))
if (TestDontStick(actor, nullptr))
{
KillActor(actor);
return -1;
@ -18612,7 +18612,7 @@ int QueueStar(DSWActor* actor)
return 0;
}
void QueueHole(short hit_sect, short hit_wall, int hit_x, int hit_y, int hit_z)
void QueueHole(sectortype* hit_sect, walltype* hit_wall, int hit_x, int hit_y, int hit_z)
{
short w,nw,wall_ang;
DSWActor* spawnedActor;
@ -18651,7 +18651,7 @@ void QueueHole(short hit_sect, short hit_wall, int hit_x, int hit_y, int hit_z)
SET(sp->cstat, CSTAT_SPRITE_ONE_SIDED);
RESET(sp->cstat, CSTAT_SPRITE_BLOCK|CSTAT_SPRITE_BLOCK_HITSCAN);
wall_ang = NORM_ANGLE(getangle(wall[hit_wall].delta())+512);
wall_ang = NORM_ANGLE(getangle(hit_wall->delta())+512);
sp->ang = wall_ang;
// move it back some
@ -18927,7 +18927,7 @@ DSWActor* QueueWallBlood(DSWActor* actor, short ang)
if (hitinfo.hitwall >= 0) // Don't check if blood didn't hit a wall, otherwise the ASSERT fails!
{
if (TestDontStick(nullptr, hitinfo.hitwall))
if (TestDontStick(nullptr, hitinfo.wall()))
return nullptr;
}
else

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

@ -76,7 +76,7 @@ void DoPlayerBeginRecoil(PLAYERp pp, short pix_amt);
SECTOR_OBJECTp DetectSectorObject(SECTORp);
SECTOR_OBJECTp DetectSectorObjectByWall(WALLp);
void ScaleSpriteVector(DSWActor* actor, int scale);
void QueueHole(short hit_sect, short hit_wall, int hit_x, int hit_y, int hit_z);
void QueueHole(sectortype* hit_sect, walltype* hit_wall, int hit_x, int hit_y, int hit_z);
DSWActor* QueueWallBlood(DSWActor* hit, short ang);
bool SlopeBounce(DSWActor*, bool *hit_wall);
int SpawnSwordSparks(PLAYERp pp, short hit_sect, short hit_wall, int hit_x, int hit_y, int hit_z, short hit_ang);