From b73ea76c1808ac7a54cb7e885e619e2ccb6d82e6 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sun, 28 Nov 2021 08:40:41 +0100
Subject: [PATCH] - cleaned out Bunny_Count declarations.

One is enough.
---
 source/games/sw/src/bunny.cpp  | 10 +---------
 source/games/sw/src/game.h     |  2 +-
 source/games/sw/src/save.cpp   |  1 -
 source/games/sw/src/weapon.cpp |  1 -
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/source/games/sw/src/bunny.cpp b/source/games/sw/src/bunny.cpp
index f8e1cee01..fe6a205c5 100644
--- a/source/games/sw/src/bunny.cpp
+++ b/source/games/sw/src/bunny.cpp
@@ -38,7 +38,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 
 BEGIN_SW_NS
 
-short Bunny_Count = 0;
+int Bunny_Count = 0;
 ANIMATOR DoActorMoveJump;
 ANIMATOR DoBunnyMoveJump;
 ANIMATOR DoBunnyQuickJump;
@@ -740,18 +740,10 @@ int SetupBunny(DSWActor* actor)
     }
 
     Bunny_Count++;
-    //if(Bunny_Count > 20)
-    //    {
-    //    KillActor(actor);
-    //    Bunny_Count--;
-    //    return(0);
-    //    }
 
     ChangeState(actor, s_BunnyRun[0]);
     u->StateEnd = s_BunnyDie;
     u->Rot = sg_BunnyRun;
-    //sp->xrepeat = 64;
-    //sp->yrepeat = 64;
     u->ShellNum = 0; // Not Pregnant right now
     u->FlagOwner = 0;
 
diff --git a/source/games/sw/src/game.h b/source/games/sw/src/game.h
index e9ee642ae..fc0ebdb0b 100644
--- a/source/games/sw/src/game.h
+++ b/source/games/sw/src/game.h
@@ -2145,7 +2145,7 @@ extern bool left_foot;
 extern bool bosswasseen[3];
 extern DSWActor* BossSpriteNum[3];
 extern int ChopTics;
-extern short Bunny_Count;
+extern int Bunny_Count;
 
 
 #define ANIM_SERP 1
diff --git a/source/games/sw/src/save.cpp b/source/games/sw/src/save.cpp
index 528d37c48..1f8f5add4 100644
--- a/source/games/sw/src/save.cpp
+++ b/source/games/sw/src/save.cpp
@@ -69,7 +69,6 @@ TO DO
 void InitLevelGlobals(void);
 
 extern int lastUpdate;
-extern short Bunny_Count;
 extern bool NewGame;
 extern int GodMode;
 extern int FinishTimer;
diff --git a/source/games/sw/src/weapon.cpp b/source/games/sw/src/weapon.cpp
index fd9dbbb1d..c2e0d357e 100644
--- a/source/games/sw/src/weapon.cpp
+++ b/source/games/sw/src/weapon.cpp
@@ -4856,7 +4856,6 @@ int ActorChooseDeath(DSWActor* actor, DSWActor* weapActor)
         break;
     case BUNNY_RUN_R0:
     {
-        extern short Bunny_Count;
         Bunny_Count--;  // Bunny died, decrease the population
     }
     break;