From 4bab061bd07ca751f999f3f4f2af2dc24f8de373 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Mon, 3 Aug 2020 20:53:00 +0200
Subject: [PATCH] - removed some dead code from SW.

---
 source/sw/src/cache.cpp | 56 -----------------------------------------
 source/sw/src/cache.h   |  6 -----
 source/sw/src/config.h  | 28 ---------------------
 3 files changed, 90 deletions(-)

diff --git a/source/sw/src/cache.cpp b/source/sw/src/cache.cpp
index 2186bf52b..53bfd2748 100644
--- a/source/sw/src/cache.cpp
+++ b/source/sw/src/cache.cpp
@@ -405,15 +405,6 @@ void PreCachePachinko(void)
 
 void PreCacheSoundList(short table[], int num)
 {
-    short j;
-
-#if 0
-    for (j = 0; j < num; j++)
-    {
-        CacheSound(table[j], CACHE_SOUND_PRECACHE);
-        AnimateCacheCursor();
-    }
-#endif
 }
 
 void
@@ -438,24 +429,6 @@ PreCacheRange(short start_pic, short end_pic)
     }
 }
 
-void PreCacheAmbient(void)
-{
-    int i,nexti;
-    int num;
-    SPRITEp sp;
-    extern AMB_INFO ambarray[];
-
-    TRAVERSE_SPRITE_STAT(headspritestat[STAT_AMBIENT], i, nexti)
-    {
-        sp = &sprite[i];
-
-        num = sp->lotag;
-        num = ambarray[num].diginame;
-
-        CacheSound(num, CACHE_SOUND_PRECACHE);
-    }
-}
-
 void PreCacheOverride(void)
 {
     int i,nexti;
@@ -467,33 +440,6 @@ void PreCacheOverride(void)
     }
 }
 
-
-void PreCacheSoundSpot(void)
-{
-    int i,nexti;
-    int num;
-    SPRITEp sp;
-
-    TRAVERSE_SPRITE_STAT(headspritestat[STAT_SOUND_SPOT], i, nexti)
-    {
-        sp = &sprite[i];
-
-        num = SP_TAG13(sp); // tag4 is copied to tag13
-        if (num > 0 && num < DIGI_MAX)
-            CacheSound(num, CACHE_SOUND_PRECACHE);
-
-        num = SP_TAG5(sp);
-        if (num > 0 && num < DIGI_MAX)
-            CacheSound(num, CACHE_SOUND_PRECACHE);
-
-        num = SP_TAG6(sp);
-        if (num > 0 && num < DIGI_MAX)
-            CacheSound(num, CACHE_SOUND_PRECACHE);
-
-        CacheSound(num, CACHE_SOUND_PRECACHE);
-    }
-}
-
 void
 PreCacheActor(void)
 {
@@ -626,8 +572,6 @@ void DoTheCache(void)
     extern char CacheLastLevel[32],LevelName[20];
     int i, cnt=0;
 
-    PreCacheAmbient();
-    PreCacheSoundSpot();
     PreCacheActor();
     PreCacheOverride();
 
diff --git a/source/sw/src/cache.h b/source/sw/src/cache.h
index 6c66bfb89..f533acbe0 100644
--- a/source/sw/src/cache.h
+++ b/source/sw/src/cache.h
@@ -26,12 +26,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 
 BEGIN_SW_NS
 
-#define CACHE_NONE          0       // don't use this - this is for ken
-#define CACHE_LOCK_MAX      255
-#define CACHE_LOCK_START    200
-#define CACHE_UNLOCK_START  1
-#define CACHE_UNLOCK_MAX    199
-
 #define CACHE_SOUND_PRECACHE 0
 #define CACHE_SOUND_PLAY     1
 
diff --git a/source/sw/src/config.h b/source/sw/src/config.h
index 89f91ac51..6d5326fb4 100644
--- a/source/sw/src/config.h
+++ b/source/sw/src/config.h
@@ -39,34 +39,6 @@ BEGIN_SW_NS
 extern int32_t ScreenBufferMode;
 extern int32_t VesaBufferMode;
 
-
-#if 0
-// comm externs
-extern int32_t ComPort;
-extern int32_t IrqNumber;
-extern int32_t UartAddress;
-extern int32_t PortSpeed;
-
-
-extern int32_t ToneDial;
-extern char  ModemName[MAXMODEMSTRING];
-extern char  InitString[MAXMODEMSTRING];
-extern char  HangupString[MAXMODEMSTRING];
-extern char  DialoutString[MAXMODEMSTRING];
-extern int32_t SocketNumber;
-extern char  PhoneNames[MAXPHONEENTRIES][PHONENAMELENGTH];
-extern char  PhoneNumbers[MAXPHONEENTRIES][PHONENUMBERLENGTH];
-extern char  PhoneNumber[PHONENUMBERLENGTH];
-extern int32_t NumberPlayers;
-extern int32_t ConnectType;
-extern char  PlayerName[MAXPLAYERNAMELENGTH];
-extern char  UserLevel[MAXUSERLEVELNAMELENGTH];
-extern char  RTSPath[MAXRTSPATHLENGTH];
-extern char  UserPath[MAXUSERLEVELPATHLENGTH];
-
-#endif
-// controller externs
-
 extern int32_t EnableRudder;
 
 extern char setupfilename[BMAX_PATH];