teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-04-08 00:31:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- mostly deal with hitinfo.hitsect.

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-24 23:50:02 +01:00
parent f495097663
commit bcc61470a2
3 changed files with 33 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2212,9 +2212,9 @@ inline bool SpriteInUnderwaterArea(SPRITEp sp)
return (TEST(sp->sector()->extra, SECTFX_UNDERWATER | SECTFX_UNDERWATER2) ? true : false);
}
inline bool SectorIsDiveArea(int sect)
inline bool SectorIsDiveArea(sectortype* sect)
{
return (TEST(sector[sect].extra, SECTFX_DIVE_AREA) ? true : false);
return (TEST(sect->extra, SECTFX_DIVE_AREA) ? true : false);
}
inline bool SectorIsUnderwaterArea(sectortype* sect)

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

@ -98,8 +98,8 @@ ANIMATOR DoShrapJumpFall;
ANIMATOR DoFastShrapJumpFall;
int SpawnSmokePuff(DSWActor* actor);
bool WarpToUnderwater(int *sectnum, int *x, int *y, int *z);
bool WarpToSurface(int *sectnum, int *x, int *y, int *z);
bool WarpToUnderwater(sectortype** sectnum, int *x, int *y, int *z);
bool WarpToSurface(sectortype** sectnum, int *x, int *y, int *z);
int InitElectroJump(SPRITEp wp, SPRITEp sp);
bool TestDontStickSector(short hit_sect);
ANIMATOR SpawnShrapX;
@ -115,7 +115,7 @@ void SpawnTankShellExp(DSWActor*);
void SpawnMicroExp(DSWActor*);
void SpawnExpZadjust(DSWActor* actor, DSWActor* expActor, int upper_zsize, int lower_zsize);
int BulletHitSprite(DSWActor* actor, DSWActor* hitActor, int hit_x, int hit_y, int hit_z, short ID);
int SpawnSplashXY(int hit_x,int hit_y,int hit_z,int);
int SpawnSplashXY(int hit_x,int hit_y,int hit_z,sectortype*);
DSWActor* SpawnBoatSparks(PLAYERp pp, sectortype* hit_sect, walltype* hit_wall, int hit_x, int hit_y, int hit_z, short hit_ang);
short StatDamageList[STAT_DAMAGE_LIST_SIZE] =
@ -13499,12 +13499,12 @@ void InitHeartAttack(PLAYERp pp)
u->WaitTics = 0;
}
int ContinueHitscan(PLAYERp pp, short sectnum, int x, int y, int z, short ang, int xvect, int yvect, int zvect)
int ContinueHitscan(PLAYERp pp, sectortype* sect, int x, int y, int z, short ang, int xvect, int yvect, int zvect)
{
HITINFO hitinfo;
USERp u = pp->Actor()->u();
FAFhitscan(x, y, z, sectnum,
FAFhitscan(x, y, z, sectnum(sect),
xvect, yvect, zvect,
&hitinfo, CLIPMASK_MISSILE);
@ -13659,8 +13659,8 @@ int InitShotgun(PLAYERp pp)
if (SectorIsUnderwaterArea(hitinfo.sector()))
{
WarpToSurface(&hitinfo.hitsect, &hitinfo.pos.x, &hitinfo.pos.y, &hitinfo.pos.z);
ContinueHitscan(pp, hitinfo.hitsect, hitinfo.pos.x, hitinfo.pos.y, hitinfo.pos.z, ndaang, xvect, yvect, zvect);
WarpToSurface(&hitinfo.hitSector, &hitinfo.pos.x, &hitinfo.pos.y, &hitinfo.pos.z);
ContinueHitscan(pp, hitinfo.sector(), hitinfo.pos.x, hitinfo.pos.y, hitinfo.pos.z, ndaang, xvect, yvect, zvect);
continue;
}
}
@ -13668,12 +13668,12 @@ int InitShotgun(PLAYERp pp)
{
if (TEST(hitinfo.sector()->extra, SECTFX_LIQUID_MASK) != SECTFX_LIQUID_NONE)
{
SpawnSplashXY(hitinfo.pos.x,hitinfo.pos.y,hitinfo.pos.z,hitinfo.hitsect);
SpawnSplashXY(hitinfo.pos.x,hitinfo.pos.y,hitinfo.pos.z,hitinfo.sector());
if (SectorIsDiveArea(hitinfo.hitsect))
if (SectorIsDiveArea(hitinfo.sector()))
{
WarpToUnderwater(&hitinfo.hitsect, &hitinfo.pos.x, &hitinfo.pos.y, &hitinfo.pos.z);
ContinueHitscan(pp, hitinfo.hitsect, hitinfo.pos.x, hitinfo.pos.y, hitinfo.pos.z, ndaang, xvect, yvect, zvect);
WarpToUnderwater(&hitinfo.hitSector, &hitinfo.pos.x, &hitinfo.pos.y, &hitinfo.pos.z);
ContinueHitscan(pp, hitinfo.sector(), hitinfo.pos.x, hitinfo.pos.y, hitinfo.pos.z, ndaang, xvect, yvect, zvect);
}
continue;
@ -16221,8 +16221,8 @@ int InitUzi(PLAYERp pp)
if (SectorIsUnderwaterArea(hitinfo.sector()))
{
WarpToSurface(&hitinfo.hitsect, &hitinfo.pos.x, &hitinfo.pos.y, &hitinfo.pos.z);
ContinueHitscan(pp, hitinfo.hitsect, hitinfo.pos.x, hitinfo.pos.y, hitinfo.pos.z, daang, xvect, yvect, zvect);
WarpToSurface(&hitinfo.hitSector, &hitinfo.pos.x, &hitinfo.pos.y, &hitinfo.pos.z);
ContinueHitscan(pp, hitinfo.sector(), hitinfo.pos.x, hitinfo.pos.y, hitinfo.pos.z, daang, xvect, yvect, zvect);
return 0;
}
}
@ -16230,12 +16230,12 @@ int InitUzi(PLAYERp pp)
{
if (TEST(hitinfo.sector()->extra, SECTFX_LIQUID_MASK) != SECTFX_LIQUID_NONE)
{
SpawnSplashXY(hitinfo.pos.x,hitinfo.pos.y,hitinfo.pos.z,hitinfo.hitsect);
SpawnSplashXY(hitinfo.pos.x,hitinfo.pos.y,hitinfo.pos.z,hitinfo.sector());
if (SectorIsDiveArea(hitinfo.hitsect))
if (SectorIsDiveArea(hitinfo.sector()))
{
WarpToUnderwater(&hitinfo.hitsect, &hitinfo.pos.x, &hitinfo.pos.y, &hitinfo.pos.z);
ContinueHitscan(pp, hitinfo.hitsect, hitinfo.pos.x, hitinfo.pos.y, hitinfo.pos.z, daang, xvect, yvect, zvect);
WarpToUnderwater(&hitinfo.hitSector, &hitinfo.pos.x, &hitinfo.pos.y, &hitinfo.pos.z);
ContinueHitscan(pp, hitinfo.sector(), hitinfo.pos.x, hitinfo.pos.y, hitinfo.pos.z, daang, xvect, yvect, zvect);
return 0;
}
@ -16768,7 +16768,7 @@ int InitSobjMachineGun(DSWActor* actor, PLAYERp pp)
{
if (TEST(hitinfo.sector()->extra, SECTFX_LIQUID_MASK) != SECTFX_LIQUID_NONE)
{
SpawnSplashXY(hitinfo.pos.x,hitinfo.pos.y,hitinfo.pos.z,hitinfo.hitsect);
SpawnSplashXY(hitinfo.pos.x,hitinfo.pos.y,hitinfo.pos.z,hitinfo.sector());
return 0;
}
}
@ -17175,7 +17175,7 @@ int InitTurretMgun(SECTOR_OBJECTp sop)
{
if (TEST(hitinfo.sector()->extra, SECTFX_LIQUID_MASK) != SECTFX_LIQUID_NONE)
{
SpawnSplashXY(hitinfo.pos.x,hitinfo.pos.y,hitinfo.pos.z,hitinfo.hitsect);
SpawnSplashXY(hitinfo.pos.x,hitinfo.pos.y,hitinfo.pos.z,hitinfo.sector());
continue;
}
}
@ -17871,13 +17871,12 @@ int InitEnemyFireball(DSWActor* actor)
// for hitscans or other uses
///////////////////////////////////////////////////////////////////////////////
bool WarpToUnderwater(int *sectnum, int *x, int *y, int *z)
bool WarpToUnderwater(sectortype** psectu, int *x, int *y, int *z)
{
int i;
auto sectu = &sector[*sectnum];
auto sectu = *psectu;
SPRITEp under_sp = nullptr, over_sp = nullptr;
bool Found = false;
short over, under;
int sx, sy;
// 0 not valid for water match tags
@ -17927,16 +17926,16 @@ bool WarpToUnderwater(int *sectnum, int *x, int *y, int *z)
*x = under_sp->x - sx;
*y = under_sp->y - sy;
over = over_sp->sectnum;
under = under_sp->sectnum;
auto over = over_sp->sector();
auto under = under_sp->sector();
if (GetOverlapSector(*x, *y, &over, &under) == 2)
{
*sectnum = under;
*psectu = under;
}
else
{
*sectnum = under;
*psectu = under;
}
*z = under_sp->sector()->ceilingz + Z(1);
@ -17944,11 +17943,10 @@ bool WarpToUnderwater(int *sectnum, int *x, int *y, int *z)
return true;
}
bool WarpToSurface(int *sectnum, int *x, int *y, int *z)
bool WarpToSurface(sectortype** psectu, int *x, int *y, int *z)
{
int i;
auto sectu = &sector[*sectnum];
short over, under;
auto sectu = *psectu;
int sx, sy;
SPRITEp under_sp = nullptr, over_sp = nullptr;
@ -18001,12 +17999,12 @@ bool WarpToSurface(int *sectnum, int *x, int *y, int *z)
*x = over_sp->x - sx;
*y = over_sp->y - sy;
over = over_sp->sectnum;
under = under_sp->sectnum;
auto over = over_sp->sector();
auto under = under_sp->sector();
if (GetOverlapSector(*x, *y, &over, &under))
{
*sectnum = over;
*psectu = over;
}
*z = over_sp->sector()->floorz - Z(2);
@ -18209,17 +18207,14 @@ int SpawnSplash(DSWActor* actor)
return 0;
}
int SpawnSplashXY(int hit_x, int hit_y, int hit_z, int sectnum)
int SpawnSplashXY(int hit_x, int hit_y, int hit_z, sectortype* sectp)
{
USERp wu;
SPRITEp wp;
SECTORp sectp;
if (Prediction)
return 0;
sectp = &sector[sectnum];
if (sectp->hasU() && (TEST(sectp->extra, SECTFX_LIQUID_MASK) == SECTFX_LIQUID_NONE))
return 0;

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

@ -170,16 +170,6 @@ bool SpriteOverlap(short, short);
DSWActor* SpawnShotgunSparks(PLAYERp pp, sectortype* hit_sect, walltype* hit_wall, int hit_x, int hit_y, int hit_z, short hit_ang);
int DoActorBeginSlide(DSWActor* actor, int ang, int vel, int dec);
int GetOverlapSector(int x, int y, sectortype** over, sectortype** under);
[[deprecated]]
inline int GetOverlapSector(int x, int y, short* over, short* under)
{
auto o = &sector[*over];
auto u = &sector[*under];
int res = GetOverlapSector(x, y, &o, &u);
*over = sectnum(o);
*under = sectnum(u);
return res;
}
bool MissileHitDiveArea(DSWActor*);