From b97760db29ed1707daad2911f1312ce9063973c4 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 6 Nov 2021 12:39:51 +0100 Subject: [PATCH] - forgotten cleanup. --- source/games/sw/src/quake.cpp | 8 ++------ source/games/sw/src/sprite.cpp | 1 - 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/source/games/sw/src/quake.cpp b/source/games/sw/src/quake.cpp index 3b856e077..d03d0d300 100644 --- a/source/games/sw/src/quake.cpp +++ b/source/games/sw/src/quake.cpp @@ -52,7 +52,7 @@ BEGIN_SW_NS // only for timed quakes #define QUAKE_WaitForTrigger(sp) (TEST_BOOL3(sp)) -short CopyQuakeSpotToOn(SPRITEp sp) +void CopyQuakeSpotToOn(SPRITEp sp) { auto actorNew = InsertActor(sp->sectnum, STAT_QUAKE_SPOT); auto np = &actorNew->s(); @@ -68,8 +68,6 @@ short CopyQuakeSpotToOn(SPRITEp sp) change_actor_stat(actorNew, STAT_QUAKE_ON); QUAKE_Duration(np) *= 120; - - return actorNew->GetSpriteIndex(); } @@ -236,7 +234,7 @@ void QuakeViewChange(PLAYERp pp, int *z_diff, int *x_diff, int *y_diff, short *a } } -int SpawnQuake(short sectnum, int x, int y, int z, +void SpawnQuake(short sectnum, int x, int y, int z, short tics, short amt, int radius) { @@ -257,8 +255,6 @@ int SpawnQuake(short sectnum, int x, int y, int z, QUAKE_PosAmt(sp) = 0; PlaySound(DIGI_ERUPTION, actorNew, v3df_follow|v3df_dontpan); - - return actorNew->GetSpriteIndex(); } bool diff --git a/source/games/sw/src/sprite.cpp b/source/games/sw/src/sprite.cpp index 496c53e96..9f54ab260 100644 --- a/source/games/sw/src/sprite.cpp +++ b/source/games/sw/src/sprite.cpp @@ -4008,7 +4008,6 @@ int SpawnItemsMatch(short match) SWStatIterator it(STAT_SPAWN_ITEMS); while (auto itActor = it.Next()) { - int si = itActor->GetSpriteIndex(); sip = &itActor->s(); if (SP_TAG2(sip) != match)