From ff09079502d0b2ea1c5a68fd80ca73867ed57aec Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 25 Dec 2021 21:10:55 +0100 Subject: [PATCH] - deleted u in goro.cpp --- source/games/sw/src/goro.cpp | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/source/games/sw/src/goro.cpp b/source/games/sw/src/goro.cpp index 49873c7b8..c57b74cc7 100644 --- a/source/games/sw/src/goro.cpp +++ b/source/games/sw/src/goro.cpp @@ -483,17 +483,11 @@ ACTOR_ACTION_SET GoroActionSet = int SetupGoro(DSWActor* actor) { - USERp u; ANIMATOR DoActorDecide; - if (TEST(actor->spr.cstat, CSTAT_SPRITE_RESTORE)) + if (!TEST(actor->spr.cstat, CSTAT_SPRITE_RESTORE)) { - u = actor->u(); - ASSERT(u); - } - else - { - u = SpawnUser(actor, GORO_RUN_R0,s_GoroRun[0]); + SpawnUser(actor, GORO_RUN_R0,s_GoroRun[0]); actor->user.Health = HEALTH_GORO; } @@ -513,8 +507,6 @@ int SetupGoro(DSWActor* actor) int NullGoro(DSWActor* actor) { - USER* u = actor->u(); - if (TEST(actor->user.Flags,SPR_SLIDING)) DoActorSlide(actor); @@ -526,8 +518,6 @@ int NullGoro(DSWActor* actor) int DoGoroPain(DSWActor* actor) { - USER* u = actor->u(); - NullGoro(actor); if ((actor->user.WaitTics -= ACTORMOVETICS) <= 0) @@ -537,8 +527,6 @@ int DoGoroPain(DSWActor* actor) int DoGoroMove(DSWActor* actor) { - USER* u = actor->u(); - if (TEST(actor->user.Flags,SPR_SLIDING)) DoActorSlide(actor);