From 8ab6e700f1c501a1125c25e80fe5a9525f1153cf Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Mon, 8 Apr 2019 06:26:08 +0000
Subject: [PATCH] SW: Remove very bad externs.

Patch from Striker.

git-svn-id: https://svn.eduke32.com/eduke32@7505 1a8010ca-5511-0410-912e-c29ae57300e0
---
 source/sw/src/border.cpp  | 1 -
 source/sw/src/break.cpp   | 1 -
 source/sw/src/colormap.h  | 7 +++++++
 source/sw/src/draw.cpp    | 8 ++------
 source/sw/src/inv.cpp     | 3 ---
 source/sw/src/menus.cpp   | 1 -
 source/sw/src/menus.h     | 1 -
 source/sw/src/network.cpp | 2 +-
 source/sw/src/player.cpp  | 6 ------
 source/sw/src/sector.cpp  | 1 -
 source/sw/src/weapon.cpp  | 4 +---
 source/sw/src/weapon.h    | 2 ++
 12 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/source/sw/src/border.cpp b/source/sw/src/border.cpp
index 33dbf8dec..2ad19a5d9 100644
--- a/source/sw/src/border.cpp
+++ b/source/sw/src/border.cpp
@@ -417,7 +417,6 @@ void DrawPanelBorderSides(PLAYERp pp, short x, short y, short x2, short y2, shor
 static
 void BorderSetView(PLAYERp UNUSED(pp), int *Xdim, int *Ydim, int *ScreenSize)
 {
-    void setview(int scrx1, int scry1, int scrx2, int scry2);
     int x, x2, y, y2;
     BORDER_INFO *b;
 
diff --git a/source/sw/src/break.cpp b/source/sw/src/break.cpp
index 549de5706..a47884025 100644
--- a/source/sw/src/break.cpp
+++ b/source/sw/src/break.cpp
@@ -955,7 +955,6 @@ int AutoBreakSprite(short BreakSprite, short type)
     SPRITEp bp = &sprite[BreakSprite];
     BREAK_INFOp break_info;
     extern void DoWallBreakMatch(short match);
-    int SpawnBreakFlames(int16_t SpriteNum);
 
     break_info = FindSpriteBreakInfo(bp->picnum);
 
diff --git a/source/sw/src/colormap.h b/source/sw/src/colormap.h
index 039d2bf47..5d3a98837 100644
--- a/source/sw/src/colormap.h
+++ b/source/sw/src/colormap.h
@@ -1,6 +1,13 @@
+#ifndef colormap_public_
+#define colormap_public_
+
+extern unsigned char DefaultPalette[];
+
 void MapColors(short num,COLOR_MAP cm,short create);
 void InitPalette(void);
 void SetPaletteToVESA(unsigned char *pal);
 void set_pal(unsigned char *pal);
 void GetPaletteFromVESA(unsigned char *pal);
 void InitPalette(void);
+
+#endif
diff --git a/source/sw/src/draw.cpp b/source/sw/src/draw.cpp
index 99b55e5c5..0ceed53e0 100644
--- a/source/sw/src/draw.cpp
+++ b/source/sw/src/draw.cpp
@@ -57,7 +57,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 static int OverlapDraw = FALSE;
 extern SWBOOL QuitFlag, LocationInfo, ConPanel, SpriteInfo, PauseKeySet;
 extern SWBOOL Voxel;
-extern char tempbuf[];
 extern char buffer[];
 SWBOOL DrawScreen;
 extern short f_c;
@@ -1388,8 +1387,8 @@ void PrintLocationInfo(PLAYERp pp)
         i = totalclock;
         if (i != frameval[framecnt])
         {
-            sprintf(tempbuf, "FPS: %d", ((120 * AVERAGEFRAMES) / (i - frameval[framecnt])) + f_c);
-            printext256(x, y, 1, -1, tempbuf, 1);
+            sprintf(buffer, "FPS: %d", ((120 * AVERAGEFRAMES) / (i - frameval[framecnt])) + f_c);
+            printext256(x, y, 1, -1, buffer, 1);
             frameval[framecnt] = i;
         }
 
@@ -1541,9 +1540,6 @@ void SpriteSortList2D(int tx, int ty)
 
 int COVERsetgamemode(int mode, int xdim, int ydim, int bpp)
 {
-    extern int ScreenHeight, ScreenWidth, ScreenMode, ScreenBPP;
-
-
     ScreenHeight = ydim;
     ScreenWidth  = xdim;
     ScreenMode   = mode;
diff --git a/source/sw/src/inv.cpp b/source/sw/src/inv.cpp
index 027d906e7..f496bd4a5 100644
--- a/source/sw/src/inv.cpp
+++ b/source/sw/src/inv.cpp
@@ -563,7 +563,6 @@ static char sectorfloorpals[MAXSECTORS], sectorceilingpals[MAXSECTORS], wallpals
 void
 DoPlayerNightVisionPalette(PLAYERp pp)
 {
-    extern char DefaultPalette[];
     short i;
 
     if (pp->InventoryActive[INVENTORY_NIGHT_VISION] && (pp - Player == screenpeek))
@@ -611,8 +610,6 @@ DoPlayerNightVisionPalette(PLAYERp pp)
 void
 DoPlayerNightVisionPalette(PLAYERp pp)
 {
-    extern char DefaultPalette[];
-
     if (pp != Player + screenpeek) return;
 
     if (pp->InventoryActive[INVENTORY_NIGHT_VISION])
diff --git a/source/sw/src/menus.cpp b/source/sw/src/menus.cpp
index 3a38ed046..101a700b7 100644
--- a/source/sw/src/menus.cpp
+++ b/source/sw/src/menus.cpp
@@ -122,7 +122,6 @@ short buttonsettings[btn_max];
 // EXTERNS ////////////////////////////
 #define XDIM    320
 #define YDIM    200
-extern char DefaultPalette[];
 extern SWBOOL QuitFlag;
 
 void TerminateGame(void);
diff --git a/source/sw/src/menus.h b/source/sw/src/menus.h
index 8ebf92416..cca4a995b 100644
--- a/source/sw/src/menus.h
+++ b/source/sw/src/menus.h
@@ -80,7 +80,6 @@ void ResetMenuInput(void);
     )
 
 extern SWBOOL BorderAdjust;
-extern int FXDevice,MusicDevice;
 extern SWBOOL MultiPlayQuitFlag;
 
 // Make memcpy an intrinsic function for an easy frame rate boost
diff --git a/source/sw/src/network.cpp b/source/sw/src/network.cpp
index c0e3ad012..a931169d8 100644
--- a/source/sw/src/network.cpp
+++ b/source/sw/src/network.cpp
@@ -62,7 +62,7 @@ SYNC BUG NOTES:
 
 //#undef MAXSYNCBYTES
 //#define MAXSYNCBYTES 16
-uint8_t tempbuf[576], packbuf[576];
+static uint8_t tempbuf[576], packbuf[576];
 int PlayClock;
 extern SWBOOL PauseKeySet;
 extern char CommPlayerName[32];
diff --git a/source/sw/src/player.cpp b/source/sw/src/player.cpp
index 30d9ce626..5f94817ea 100644
--- a/source/sw/src/player.cpp
+++ b/source/sw/src/player.cpp
@@ -138,7 +138,6 @@ char PlayerGravity = PLAYER_JUMP_GRAV;
 #endif
 
 int vel, svel, angvel;
-extern char tempbuf[];
 extern SWBOOL DebugOperate;
 
 //unsigned char synctics, lastsynctics;
@@ -5058,8 +5057,6 @@ DoPlayerWarpToSurface(PLAYERp pp)
 void
 DoPlayerDivePalette(PLAYERp pp)
 {
-    extern char DefaultPalette[];
-
     if (pp != Player + screenpeek) return;
 
     if ((pp->DeathType == PLAYER_DEATH_DROWN || TEST((Player+screenpeek)->Flags, PF_DIVING)) && !TEST(pp->Flags, PF_DIVING_IN_LAVA))
@@ -5220,7 +5217,6 @@ DoPlayerStopDive(PLAYERp pp)
 {
     USERp u = User[pp->PlayerSprite];
     SPRITEp sp = &sprite[pp->PlayerSprite];
-    extern char DefaultPalette[];
 
     if (Prediction)
         return;
@@ -6399,8 +6395,6 @@ char *KilledPlayerMessage(PLAYERp pp, PLAYERp killer)
     char *p1 = pp->PlayerName;
     char *p2 = killer->PlayerName;
 
-    extern char *DeathString(short SpriteNum);
-
     if (pp->HitBy == killer->PlayerSprite)
     {
         sprintf(ds,"%s was killed by %s.",p1,p2);
diff --git a/source/sw/src/sector.cpp b/source/sw/src/sector.cpp
index 6b1e723ac..0b5a37f4d 100644
--- a/source/sw/src/sector.cpp
+++ b/source/sw/src/sector.cpp
@@ -3155,7 +3155,6 @@ void initlava(void)
 #if 0
     int x, y, z, r;
     int i;
-    extern char tempbuf[];
 
 //char lavabakpic[(LAVASIZ + 2) * (LAVASIZ + 2)], lavainc[LAVASIZ];
 //int lavanumdrops, lavanumframes;
diff --git a/source/sw/src/weapon.cpp b/source/sw/src/weapon.cpp
index cf6ffc309..fb22b438d 100644
--- a/source/sw/src/weapon.cpp
+++ b/source/sw/src/weapon.cpp
@@ -10948,12 +10948,10 @@ SpawnFireballFlames(int16_t SpriteNum, int16_t enemy)
 
 
 int
-SpawnBreakFlames(int16_t SpriteNum, int16_t enemy)
+SpawnBreakFlames(int16_t SpriteNum)
 {
     SPRITEp sp = &sprite[SpriteNum];
     USERp u = User[SpriteNum];
-    SPRITEp ep = &sprite[enemy];
-    USERp eu = User[enemy];
     SPRITEp np;
     USERp nu;
     short New;
diff --git a/source/sw/src/weapon.h b/source/sw/src/weapon.h
index 0ebadeb28..a7f5a55e4 100644
--- a/source/sw/src/weapon.h
+++ b/source/sw/src/weapon.h
@@ -82,6 +82,8 @@ int DoShrapVelocity(int16_t SpriteNum);
 int ShrapKillSprite(short SpriteNum);
 SWBOOL MissileSetPos(short Weapon,ANIMATORp DoWeapon,int dist);
 int ActorPain(short SpriteNum);
+int SpawnBreakFlames(int16_t SpriteNum);
+const char *DeathString(short SpriteNum);
 
 //
 // Damage Amounts defined in damage.h