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

- a second large batch of KillSprite calls.

Browse source
This commit is contained in:
Christoph Oelckers 2021-10-30 23:00:37 +02:00
parent 3e1e5fb343
commit 5062dc6aa8
2 changed files with 67 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
source/games/sw/src/jweapon.cpp
View file

@ -396,7 +396,7 @@ DoBloodSpray(DSWActor* actor)
{ {
sp->z = fz; sp->z = fz;
SpawnFloorSplash(Weapon); SpawnFloorSplash(Weapon);
KillSprite((short) Weapon); KillActor(actor);
return true; return true;
} }
} }
@ -414,7 +414,7 @@ DoBloodSpray(DSWActor* actor)
switch (TEST(u->ret, HIT_MASK)) switch (TEST(u->ret, HIT_MASK))
{ {
case HIT_PLAX_WALL: case HIT_PLAX_WALL:
KillSprite(Weapon); KillActor(actor);
return true; return true;
case HIT_SPRITE: case HIT_SPRITE:
{ {
@ -435,7 +435,7 @@ DoBloodSpray(DSWActor* actor)
u->xchange = u->ychange = 0; u->xchange = u->ychange = 0;
SpawnMidSplash(Weapon); SpawnMidSplash(Weapon);
QueueWallBlood(Weapon, hsp->ang); QueueWallBlood(Weapon, hsp->ang);
KillSprite((short) Weapon); KillActor(actor);
return true; return true;
} }
@ -468,14 +468,14 @@ DoBloodSpray(DSWActor* actor)
if (wb < 0) if (wb < 0)
{ {
KillSprite(Weapon); KillActor(actor);
return 0; return 0;
} }
else else
{ {
if (FAF_Sector(sprite[wb].sectnum) || FAF_ConnectArea(sprite[wb].sectnum)) if (FAF_Sector(sprite[wb].sectnum) || FAF_ConnectArea(sprite[wb].sectnum))
{ {
KillSprite(Weapon); KillActor(actor);
return 0; return 0;
} }
@ -535,7 +535,7 @@ DoBloodSpray(DSWActor* actor)
{ {
u->xchange = u->ychange = 0; u->xchange = u->ychange = 0;
SpawnFloorSplash(Weapon); SpawnFloorSplash(Weapon);
KillSprite((short) Weapon); KillActor(actor);
return true; return true;
} }
} }
@ -625,7 +625,7 @@ DoPhosphorus(DSWActor* actor)
switch (TEST(u->ret, HIT_MASK)) switch (TEST(u->ret, HIT_MASK))
{ {
case HIT_PLAX_WALL: case HIT_PLAX_WALL:
KillSprite(Weapon); KillActor(actor);
return true; return true;
case HIT_SPRITE: case HIT_SPRITE:
{ {
@ -657,7 +657,7 @@ DoPhosphorus(DSWActor* actor)
DoFlamesDamageTest(Weapon); DoFlamesDamageTest(Weapon);
} }
u->xchange = u->ychange = 0; u->xchange = u->ychange = 0;
KillSprite((short) Weapon); KillActor(actor);
return true; return true;
} }
@ -720,7 +720,7 @@ DoPhosphorus(DSWActor* actor)
{ {
u->xchange = u->ychange = 0; u->xchange = u->ychange = 0;
SpawnFireballExp(Weapon); SpawnFireballExp(Weapon);
KillSprite((short) Weapon); KillActor(actor);
return true; return true;
} }
} }
@ -757,7 +757,7 @@ DoPhosphorus(DSWActor* actor)
{ {
u->xchange = u->ychange = 0; u->xchange = u->ychange = 0;
SpawnFireballExp(Weapon); SpawnFireballExp(Weapon);
KillSprite((short) Weapon); KillActor(actor);
return true; return true;
} }
} }
@ -850,7 +850,7 @@ DoChemBomb(DSWActor* actor)
switch (TEST(u->ret, HIT_MASK)) switch (TEST(u->ret, HIT_MASK))
{ {
case HIT_PLAX_WALL: case HIT_PLAX_WALL:
KillSprite(Weapon); KillActor(actor);
return true; return true;
case HIT_SPRITE: case HIT_SPRITE:
{ {
@ -882,7 +882,7 @@ DoChemBomb(DSWActor* actor)
u->xchange = u->ychange = 0; u->xchange = u->ychange = 0;
u->WaitTics -= (MISSILEMOVETICS * 2); u->WaitTics -= (MISSILEMOVETICS * 2);
if (u->WaitTics <= 0) if (u->WaitTics <= 0)
KillSprite((short) Weapon); KillActor(actor);
return true; return true;
} }
@ -958,7 +958,7 @@ DoChemBomb(DSWActor* actor)
u->xchange = u->ychange = 0; u->xchange = u->ychange = 0;
u->WaitTics -= (MISSILEMOVETICS * 2); u->WaitTics -= (MISSILEMOVETICS * 2);
if (u->WaitTics <= 0) if (u->WaitTics <= 0)
KillSprite((short) Weapon); KillActor(actor);
return true; return true;
} }
} }
@ -1007,7 +1007,7 @@ DoChemBomb(DSWActor* actor)
u->xchange = u->ychange = 0; u->xchange = u->ychange = 0;
u->WaitTics -= (MISSILEMOVETICS * 2); u->WaitTics -= (MISSILEMOVETICS * 2);
if (u->WaitTics <= 0) if (u->WaitTics <= 0)
KillSprite((short) Weapon); KillActor(actor);
return true; return true;
} }
} }
@ -1108,7 +1108,7 @@ DoCaltrops(DSWActor* actor)
switch (TEST(u->ret, HIT_MASK)) switch (TEST(u->ret, HIT_MASK))
{ {
case HIT_PLAX_WALL: case HIT_PLAX_WALL:
KillSprite(Weapon); KillActor(actor);
return true; return true;
case HIT_SPRITE: case HIT_SPRITE:
{ {

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

@ -7950,7 +7950,7 @@ DoStar(DSWActor* actor)
if (sp->z > u->loz) if (sp->z > u->loz)
{ {
KillSprite(Weapon); KillActor(actor);
return true; return true;
} }
} }
@ -8044,7 +8044,7 @@ DoStar(DSWActor* actor)
if (SectUser[hit_sect].Data() && FixedToInt(SectUser[hit_sect]->depth_fixed) > 0) if (SectUser[hit_sect].Data() && FixedToInt(SectUser[hit_sect]->depth_fixed) > 0)
{ {
SpawnSplash(Weapon); SpawnSplash(Weapon);
KillSprite(Weapon); KillActor(actor);
return true; return true;
// hit water - will be taken care of in WeaponMoveHit // hit water - will be taken care of in WeaponMoveHit
//break; //break;
@ -8136,7 +8136,7 @@ DoStar(DSWActor* actor)
if (WeaponMoveHit(Weapon)) if (WeaponMoveHit(Weapon))
{ {
KillSprite(Weapon); KillActor(actor);
return true; return true;
} }
} }
@ -8172,7 +8172,7 @@ DoCrossBolt(DSWActor* actor)
} }
} }
KillSprite(Weapon); KillActor(actor);
return true; return true;
} }
@ -8196,7 +8196,7 @@ DoPlasmaDone(DSWActor* actor)
if (sp->yrepeat < 6) if (sp->yrepeat < 6)
{ {
KillSprite(Weapon); KillActor(actor);
return 0; return 0;
} }
@ -8594,7 +8594,7 @@ DoPlasmaFountain(DSWActor* actor)
// if no owner then die // if no owner then die
if (u->Attach < 0) if (u->Attach < 0)
{ {
KillSprite(Weapon); KillActor(actor);
return 0; return 0;
} }
else else
@ -8628,7 +8628,7 @@ DoPlasmaFountain(DSWActor* actor)
//DoDamageTest(Weapon); // fountain not doing the damage an more //DoDamageTest(Weapon); // fountain not doing the damage an more
sp->cstat = bak_cstat; sp->cstat = bak_cstat;
KillSprite(Weapon); KillActor(actor);
} }
return 0; return 0;
} }
@ -8696,7 +8696,7 @@ DoPlasma(DSWActor* actor)
{ {
if (TEST(u->Flags, SPR_SUICIDE)) if (TEST(u->Flags, SPR_SUICIDE))
{ {
KillSprite(Weapon); KillActor(actor);
return true; return true;
} }
else else
@ -8920,7 +8920,7 @@ DoGrenade(DSWActor* actor)
switch (TEST(u->ret, HIT_MASK)) switch (TEST(u->ret, HIT_MASK))
{ {
case HIT_PLAX_WALL: case HIT_PLAX_WALL:
KillSprite(Weapon); KillActor(actor);
return true; return true;
case HIT_SPRITE: case HIT_SPRITE:
{ {
@ -8957,7 +8957,7 @@ DoGrenade(DSWActor* actor)
} }
} }
SpawnGrenadeExp(Weapon); SpawnGrenadeExp(Weapon);
KillSprite((short) Weapon); KillActor(actor);
return true; return true;
} }
@ -9029,7 +9029,7 @@ DoGrenade(DSWActor* actor)
} }
} }
SpawnGrenadeExp(Weapon); SpawnGrenadeExp(Weapon);
KillSprite((short) Weapon); KillActor(actor);
return true; return true;
} }
} }
@ -9073,7 +9073,7 @@ DoGrenade(DSWActor* actor)
} }
//WeaponMoveHit(Weapon); //WeaponMoveHit(Weapon);
SpawnGrenadeExp(Weapon); SpawnGrenadeExp(Weapon);
KillSprite((short) Weapon); KillActor(actor);
return true; return true;
} }
} }
@ -9093,7 +9093,7 @@ DoGrenade(DSWActor* actor)
if (u->bounce > 10) if (u->bounce > 10)
{ {
SpawnGrenadeExp(Weapon); SpawnGrenadeExp(Weapon);
KillSprite(Weapon); KillActor(actor);
return true; return true;
} }
@ -9149,7 +9149,7 @@ DoVulcanBoulder(DSWActor* actor)
if (vel < 30) if (vel < 30)
{ {
SpawnLittleExp(Weapon); SpawnLittleExp(Weapon);
KillSprite(Weapon); KillActor(actor);
return true; return true;
} }
@ -9158,7 +9158,7 @@ DoVulcanBoulder(DSWActor* actor)
switch (TEST(u->ret, HIT_MASK)) switch (TEST(u->ret, HIT_MASK))
{ {
case HIT_PLAX_WALL: case HIT_PLAX_WALL:
KillSprite(Weapon); KillActor(actor);
return true; return true;
case HIT_SPRITE: case HIT_SPRITE:
{ {
@ -9181,7 +9181,7 @@ DoVulcanBoulder(DSWActor* actor)
{ {
// hit an actor // hit an actor
SpawnLittleExp(Weapon); SpawnLittleExp(Weapon);
KillSprite((short) Weapon); KillActor(actor);
return true; return true;
} }
@ -9513,7 +9513,7 @@ DoMineStuck(DSWActor* actor)
{ {
PlaySound(DIGI_MINEBEEP, sp, v3df_dontpan); PlaySound(DIGI_MINEBEEP, sp, v3df_dontpan);
SpawnMineExp(Weapon); SpawnMineExp(Weapon);
KillSprite(Weapon); KillActor(actor);
return false; return false;
} }
break; break;
@ -9577,7 +9577,7 @@ DoMine(DSWActor* actor)
switch (TEST(u->ret, HIT_MASK)) switch (TEST(u->ret, HIT_MASK))
{ {
case HIT_PLAX_WALL: case HIT_PLAX_WALL:
KillSprite(Weapon); KillActor(actor);
return 0; return 0;
case HIT_SPRITE: case HIT_SPRITE:
{ {
@ -9638,7 +9638,7 @@ DoMine(DSWActor* actor)
else else
{ {
SpawnMineExp(Weapon); SpawnMineExp(Weapon);
KillSprite(Weapon); KillActor(actor);
return false; return false;
} }
} }
@ -9668,7 +9668,7 @@ DoMine(DSWActor* actor)
if (TEST(wall[hit_wall].extra, WALLFX_DONT_STICK)) if (TEST(wall[hit_wall].extra, WALLFX_DONT_STICK))
{ {
SpawnMineExp(Weapon); SpawnMineExp(Weapon);
KillSprite(Weapon); KillActor(actor);
return false; return false;
} }
@ -9691,7 +9691,7 @@ DoMine(DSWActor* actor)
if (TEST(sector[hit_sect].extra, SECTFX_SECTOR_OBJECT)) if (TEST(sector[hit_sect].extra, SECTFX_SECTOR_OBJECT))
{ {
SpawnMineExp(Weapon); SpawnMineExp(Weapon);
KillSprite(Weapon); KillActor(actor);
return false; return false;
} }
@ -9763,7 +9763,7 @@ DoBoltThinMan(DSWActor* actor)
if (WeaponMoveHit(Weapon)) if (WeaponMoveHit(Weapon))
{ {
SpawnBoltExp(Weapon); SpawnBoltExp(Weapon);
KillSprite(Weapon); KillActor(actor);
return true; return true;
} }
} }
@ -9790,7 +9790,7 @@ DoTracer(DSWActor* actor)
{ {
if (WeaponMoveHit(Weapon)) if (WeaponMoveHit(Weapon))
{ {
KillSprite(Weapon); KillActor(actor);
return true; return true;
} }
} }
@ -9830,7 +9830,7 @@ DoEMP(DSWActor* actor)
{ {
if (WeaponMoveHit(Weapon)) if (WeaponMoveHit(Weapon))
{ {
KillSprite(Weapon); KillActor(actor);
return true; return true;
} }
} }
@ -9889,7 +9889,7 @@ DoEMPBurst(DSWActor* actor)
{ {
//SpawnMineExp(Weapon); //SpawnMineExp(Weapon);
// Spawn a big radius burst of sparks here and check for final damage amount // Spawn a big radius burst of sparks here and check for final damage amount
KillSprite(Weapon); KillActor(actor);
return false; return false;
} }
@ -9915,7 +9915,7 @@ DoTankShell(DSWActor* actor)
{ {
SpawnTankShellExp(Weapon); SpawnTankShellExp(Weapon);
//SetExpQuake(exp); //SetExpQuake(exp);
KillSprite(Weapon); KillActor(actor);
return true; return true;
} }
} }
@ -9938,7 +9938,7 @@ DoTracerStart(DSWActor* actor)
{ {
if (WeaponMoveHit(Weapon)) if (WeaponMoveHit(Weapon))
{ {
KillSprite(Weapon); KillActor(actor);
return true; return true;
} }
} }
@ -9970,7 +9970,7 @@ DoLaser(DSWActor* actor)
if (WeaponMoveHit(Weapon)) if (WeaponMoveHit(Weapon))
{ {
SpawnBoltExp(Weapon); SpawnBoltExp(Weapon);
KillSprite((short) Weapon); KillActor(actor);
return true; return true;
} }
} }
@ -10013,7 +10013,7 @@ DoLaserStart(DSWActor* actor)
if (WeaponMoveHit(Weapon)) if (WeaponMoveHit(Weapon))
{ {
SpawnBoltExp(Weapon); SpawnBoltExp(Weapon);
KillSprite((short) Weapon); KillActor(actor);
return true; return true;
} }
} }
@ -10062,7 +10062,7 @@ DoRail(DSWActor* actor)
{ {
SpawnTracerExp(Weapon); SpawnTracerExp(Weapon);
SpawnShrapX(actor); SpawnShrapX(actor);
KillSprite((short) Weapon); KillActor(actor);
return true; return true;
} }
} }
@ -10070,7 +10070,7 @@ DoRail(DSWActor* actor)
{ {
SpawnTracerExp(Weapon); SpawnTracerExp(Weapon);
SpawnShrapX(actor); SpawnShrapX(actor);
KillSprite((short) Weapon); KillActor(actor);
return true; return true;
} }
} }
@ -10129,7 +10129,7 @@ DoRailStart(DSWActor* actor)
{ {
SpawnTracerExp(Weapon); SpawnTracerExp(Weapon);
SpawnShrapX(actor); SpawnShrapX(actor);
KillSprite((short) Weapon); KillActor(actor);
return true; return true;
} }
} }
@ -10186,7 +10186,7 @@ DoRocket(DSWActor* actor)
else else
SpawnBoltExp(Weapon); SpawnBoltExp(Weapon);
KillSprite((short) Weapon); KillActor(actor);
return true; return true;
} }
} }
@ -10244,7 +10244,7 @@ DoMicroMini(DSWActor* actor)
if (WeaponMoveHit(Weapon)) if (WeaponMoveHit(Weapon))
{ {
SpawnMicroExp(Weapon); SpawnMicroExp(Weapon);
KillSprite((short) Weapon); KillActor(actor);
return true; return true;
} }
} }
@ -10361,7 +10361,7 @@ DoMicro(DSWActor* actor)
if (WeaponMoveHit(Weapon)) if (WeaponMoveHit(Weapon))
{ {
SpawnMicroExp(Weapon); SpawnMicroExp(Weapon);
KillSprite(Weapon); KillActor(actor);
return true; return true;
} }
} }
@ -10427,13 +10427,13 @@ DoUziBullet(DSWActor* actor)
SET(wp->cstat, CSTAT_SPRITE_YCENTER); SET(wp->cstat, CSTAT_SPRITE_YCENTER);
} }
KillSprite(Weapon); KillActor(actor);
return true; return true;
} }
else if (u->Dist > 8000) else if (u->Dist > 8000)
{ {
KillSprite((short) Weapon); KillActor(actor);
return 0; return 0;
} }
} }
@ -10469,7 +10469,7 @@ DoBoltSeeker(DSWActor* actor)
if (WeaponMoveHit(Weapon)) if (WeaponMoveHit(Weapon))
{ {
SpawnBoltExp(Weapon); SpawnBoltExp(Weapon);
KillSprite((short) Weapon); KillActor(actor);
return true; return true;
} }
} }
@ -10540,7 +10540,7 @@ DoElectro(DSWActor* actor)
} }
//SpawnShrap(Weapon, -1); //SpawnShrap(Weapon, -1);
KillSprite(Weapon); KillActor(actor);
return true; return true;
} }
} }
@ -10570,7 +10570,7 @@ DoLavaBoulder(DSWActor* actor)
if (WeaponMoveHit(Weapon)) if (WeaponMoveHit(Weapon))
{ {
SpawnShrap(actor, nullptr); SpawnShrap(actor, nullptr);
KillSprite(Weapon); KillActor(actor);
return true; return true;
} }
} }
@ -10602,7 +10602,7 @@ DoSpear(DSWActor* actor)
if (WeaponMoveHit(Weapon)) if (WeaponMoveHit(Weapon))
{ {
//SpawnShrap(Weapon, -1); //SpawnShrap(Weapon, -1);
KillSprite(Weapon); KillActor(actor);
return true; return true;
} }
} }
@ -10815,7 +10815,7 @@ SpawnFireballFlames(int16_t SpriteNum, int16_t enemy)
{ {
if (TestDontStickSector(np->sectnum)) if (TestDontStickSector(np->sectnum))
{ {
KillSprite(New); KillActor(actorNew);
return -1; return -1;
} }
@ -11880,7 +11880,7 @@ DoFireball(DSWActor* actor)
if (sp->xrepeat <= 37) if (sp->xrepeat <= 37)
{ {
SpawnSmokePuff(actor); SpawnSmokePuff(actor);
KillSprite(Weapon); KillActor(actor);
return true; return true;
} }
} }
@ -11944,7 +11944,7 @@ DoFireball(DSWActor* actor)
SpawnFireballExp(Weapon); SpawnFireballExp(Weapon);
} }
KillSprite(Weapon); KillActor(actor);
return true; return true;
} }
@ -12092,7 +12092,7 @@ DoNapalm(DSWActor* actor)
if (sp->xrepeat <= 30) if (sp->xrepeat <= 30)
{ {
SpawnSmokePuff(actor); SpawnSmokePuff(actor);
KillSprite(Weapon); KillActor(actor);
return true; return true;
} }
} }
@ -12178,7 +12178,7 @@ DoNapalm(DSWActor* actor)
{ {
if (WeaponMoveHit(Weapon)) if (WeaponMoveHit(Weapon))
{ {
KillSprite((short) Weapon); KillActor(actor);
return true; return true;
} }
@ -12250,7 +12250,7 @@ DoBloodWorm(DSWActor* actor)
} }
SpawnZombie2(Weapon); SpawnZombie2(Weapon);
KillSprite(Weapon); KillActor(actor);
return true; return true;
} }
} }
@ -12338,7 +12338,7 @@ DoSerpMeteor(DSWActor* actor)
{ {
SpawnMeteorExp(Weapon); SpawnMeteorExp(Weapon);
KillSprite((short) Weapon); KillActor(actor);
return true; return true;
} }
@ -12371,7 +12371,7 @@ DoMirvMissile(DSWActor* actor)
{ {
SpawnMeteorExp(Weapon); SpawnMeteorExp(Weapon);
KillSprite((short) Weapon); KillActor(actor);
return true; return true;
} }
@ -12479,7 +12479,7 @@ DoMirv(DSWActor* actor)
{ {
SpawnMeteorExp(Weapon); SpawnMeteorExp(Weapon);
//SpawnBasicExp(Weapon); //SpawnBasicExp(Weapon);
KillSprite((short) Weapon); KillActor(actor);
return true; return true;
} }
@ -12598,7 +12598,7 @@ DoRing(DSWActor* actor)
if (sp->xrepeat <= 30) if (sp->xrepeat <= 30)
{ {
SpawnSmokePuff(actor); SpawnSmokePuff(actor);
KillSprite(Weapon); KillActor(actor);
return true; return true;
} }
} }
@ -12629,7 +12629,7 @@ DoRing(DSWActor* actor)
{ {
if (!User[sp->owner]->PlayerP) if (!User[sp->owner]->PlayerP)
User[sp->owner]->Counter--; User[sp->owner]->Counter--;
KillSprite(Weapon); KillActor(actor);
return 0; return 0;
} }
} }