diff --git a/source/games/sw/src/cache.cpp b/source/games/sw/src/cache.cpp
index 10cec872d..0f290f9f1 100644
--- a/source/games/sw/src/cache.cpp
+++ b/source/games/sw/src/cache.cpp
@@ -48,488 +48,444 @@ BEGIN_SW_NS
 // It will save out the tile and sound number every time one caches.
 //
 // sw -map $bullet -cacheprint > foofile
-extern bool PreCaching;
 
-void PreCacheTable(short table[], int num);
-void PreCacheGhost(void);
-
-void
-SetupPreCache(void)
+void PreCacheRange(int start_pic, int end_pic, int pal = 0)
 {
-    if (PreCaching)
-    {
-        precache();
-
-       
-        // actors cache ranges are called from SpriteSetup
-        // only caches the actor if its on the level
-
-        // weapons
-        PreCacheRange(2000, 2227);
-        PreCacheRange(4090, 4093);
-        // Explosions
-        PreCacheRange(3072, 3225);
-        // ninja player character
-        PreCacheRange(1024, 1175);
-        // console
-        PreCacheRange(2380, 2409);
-        PreCacheRange(3600, 3645);
-        PreCacheRange(2434, 2435);
-        // common
-        PreCacheRange(204, 208);
-        // message font
-        PreCacheRange(4608, 4701);
-        // gibs
-        PreCacheRange(1150,1568);
-        PreCacheRange(1685,1690);
-        PreCacheRange(900,944);
-        PreCacheRange(1670,1681);
-        // blood
-        PreCacheRange(1710,1715);
-        PreCacheRange(2410,2425);
-        PreCacheRange(389,389); // blood puddle by itself in art file
-        PreCacheRange(2500,2503);
-        // shrap
-        PreCacheRange(3840,3911);
-        PreCacheRange(3924,3947);
-        PreCacheRange(1397,1398);
-        // water *** animated tiles, can be deleted now ***
-        // PreCacheRange(780,794);
-        // switches
-        PreCacheRange(561,584);
-        PreCacheRange(551,552);
-        PreCacheRange(1846,1847);
-        PreCacheRange(1850,1859);
-        // bullet smoke
-        PreCacheRange(1748,1753);
-        // small blue font
-        PreCacheRange(2930,3023);
-        // gas can
-        PreCacheRange(3038,3042);
-        // lava *** animated tiles, can be deleted now ***
-        // PreCacheRange(175,182);
-        // gas clouds & teleport effect
-        PreCacheRange(3240,3277);
-        // nuke mushroom cloud
-        PreCacheRange(3280,3300);
-        // blood drops
-        PreCacheRange(1718,1721);
-        // smoke
-        PreCacheRange(3948,3968);
-        // footprints
-        PreCacheRange(2490,2492);
-        // player fists
-        PreCacheRange(4070,4077);
-        PreCacheRange(4050,4051);
-        PreCacheRange(4090,4093);
-        // fish actor
-        PreCacheRange(3760,3771);
-        PreCacheRange(3780,3795);
-        // coins
-        PreCacheRange(2531,2533);
-        // respawn markers & console keys
-        PreCacheRange(2440,2467);
-        // light/torch sprites
-        PreCacheRange(537,548);
-        PreCacheRange(521,528);
-        PreCacheRange(512,515);
-        PreCacheRange(396,399);
-        PreCacheRange(443,446);
-        // bubbles
-        PreCacheRange(716,720);
-        // bullet splashes
-        PreCacheRange(772,776);
-    }
-}
-
-void PreCacheRipper(void)
-{
-    PreCacheRange(1580, 1644);
-}
-
-void PreCacheRipper2(void)
-{
-    PreCacheRange(4320, 4427);
-}
-
-void PreCacheCoolie(void)
-{
-    PreCacheGhost();
-    PreCacheRange(1400, 1440);
-    PreCacheRange(4260, 4276); // coolie explode
-}
-
-void PreCacheGhost(void)
-{
-    PreCacheRange(4277, 4312);
-}
-
-void PreCacheSerpent(void)
-{
-    PreCacheRange(960, 1016);
-    PreCacheRange(1300, 1314);
-}
-
-void PreCacheGuardian(void)
-{
-    PreCacheRange(1469,1497);
-}
-
-void PreCacheNinja(void)
-{
-    PreCacheRange(4096, 4239);
-}
-
-void PreCacheNinjaGirl(void)
-{
-    PreCacheRange(5162, 5260);
-}
-
-void PreCacheSumo(void)
-{
-    PreCacheRange(4490, 4544);
-}
-
-void PreCacheZilla(void)
-{
-    PreCacheRange(4490, 4544);
-}
-
-void PreCacheEel(void)
-{
-    PreCacheRange(4430, 4479);
-}
-
-void PreCacheToiletGirl(void)
-{
-    PreCacheRange(5023, 5027);
-}
-
-void PreCacheWashGirl(void)
-{
-    PreCacheRange(5032, 5035);
-}
-
-void PreCacheCarGirl(void)
-{
-    PreCacheRange(4594,4597);
-}
-
-void PreCacheMechanicGirl(void)
-{
-    PreCacheRange(4590,4593);
-}
-
-void PreCacheSailorGirl(void)
-{
-    PreCacheRange(4600,4602);
-}
-
-void PreCachePruneGirl(void)
-{
-    PreCacheRange(4604,4604);
-}
-
-void PreCacheTrash(void)
-{
-    PreCacheRange(2540, 2546);
-}
-
-void PreCacheBunny(void)
-{
-    PreCacheRange(4550, 4584);
-}
-
-void PreCacheSkel(void)
-{
-    PreCacheRange(1320, 1396);
-}
-
-void PreCacheHornet(void)
-{
-    PreCacheRange(800, 811);
-}
-
-void PreCacheSkull(void)
-{
-    PreCacheRange(820, 854);
-}
-
-void PreCacheBetty(void)
-{
-    PreCacheRange(817, 819);
-}
-
-void PreCachePachinko(void)
-{
-    PreCacheRange(618,623);
-    PreCacheRange(618,623);
-    PreCacheRange(4768,4790);
-    PreCacheRange(4792,4814);
-    PreCacheRange(4816,4838);
-    PreCacheRange(4840,4863);
-}
-
-void
-PreCacheTable(short table[], int num)
-{
-    short j;
-
-    for (j = 0; j < num; j++)
-    {
-        SET(gotpic[table[j]>>3], 1<<(table[j]&7));
-    }
-}
-
-void
-PreCacheRange(short start_pic, short end_pic)
-{
-    short j;
-
-    for (j = start_pic; j <= end_pic; j++)
-    {
-        SET(gotpic[j>>3], 1<<(j&7));
-    }
+	for (int j = start_pic; j <= end_pic; j++)
+	{
+		markTileForPrecache(j, pal);
+	}
 }
 
 void PreCacheOverride(void)
 {
-    int i;
+	int i;
+	StatIterator it(STAT_CEILING_FLOOR_PIC_OVERRIDE);
+	while ((i = it.NextIndex()) >= 0)
+	{
+		int j = SPRITE_TAG2(i);
+		if(j >= 0 && j <= MAXTILES)
+			markTileForPrecache(j, 0);
+	}
+}
 
-    StatIterator it(STAT_CEILING_FLOOR_PIC_OVERRIDE);
-    while ((i = it.NextIndex()) >= 0)
-    {
-        ASSERT(SPRITE_TAG2(i) >= 0 && SPRITE_TAG2(i) <= MAXTILES);
-        SET_GOTPIC(SPRITE_TAG2(i));
-    }
+void precacheMap(void)
+{
+	int i;
+	int j;
+	SECTORp sectp;
+	WALLp wp;
+	SPRITEp sp;
+
+	for (sectp = sector; sectp < &sector[numsectors]; sectp++)
+	{
+		j = sectp->ceilingpicnum;
+		markTileForPrecache(j, sectp->ceilingpal);
+
+		if (TEST(picanm[j].sf, PICANM_ANIMTYPE_MASK) >> PICANM_ANIMTYPE_SHIFT)
+		{
+			for (i = 1; i <= picanm[j].num; i++)
+			{
+				markTileForPrecache(j + i, sectp->ceilingpal);
+			}
+		}
+
+		j = sectp->floorpicnum;
+
+		markTileForPrecache(j, sectp->floorpal);
+
+		if (TEST(picanm[j].sf, PICANM_ANIMTYPE_MASK) >> PICANM_ANIMTYPE_SHIFT)
+		{
+			for (i = 1; i <= picanm[j].num; i++)
+			{
+				markTileForPrecache(j + i, sectp->floorpal);
+			}
+		}
+
+	}
+
+	for (wp = wall; wp < &wall[numwalls]; wp++)
+	{
+		j = wp->picnum;
+
+		markTileForPrecache(j, wp->pal);
+
+		if (TEST(picanm[j].sf, PICANM_ANIMTYPE_MASK) >> PICANM_ANIMTYPE_SHIFT)
+		{
+			for (i = 1; i <= picanm[j].num; i++)
+			{
+				markTileForPrecache(j + i, wp->pal);
+			}
+		}
+
+		if (wp->overpicnum > 0 && wp->overpicnum < MAXTILES)
+		{
+			j = wp->overpicnum;
+			markTileForPrecache(j, wp->pal);
+
+			if (TEST(picanm[j].sf, PICANM_ANIMTYPE_MASK) >> PICANM_ANIMTYPE_SHIFT)
+			{
+				for (i = 1; i <= picanm[j].num; i++)
+				{
+					markTileForPrecache(j + i, wp->pal);
+				}
+			}
+		}
+	}
+}
+
+void SetupPreCache(void)
+{
+	precacheMap();
+
+	   
+	// actors cache ranges are called from SpriteSetup
+	// only caches the actor if its on the level
+
+	// weapons
+	PreCacheRange(2000, 2227);
+	PreCacheRange(4090, 4093);
+	// Explosions
+	PreCacheRange(3072, 3225);
+	// ninja player character
+	PreCacheRange(1024, 1175);
+	// console
+	PreCacheRange(2380, 2409);
+	PreCacheRange(3600, 3645);
+	PreCacheRange(2434, 2435);
+	// common
+	PreCacheRange(204, 208);
+	// message font
+	PreCacheRange(4608, 4701);
+	// gibs
+	PreCacheRange(1150,1568);
+	PreCacheRange(1685,1690);
+	PreCacheRange(900,944);
+	PreCacheRange(1670,1681);
+	// blood
+	PreCacheRange(1710,1715);
+	PreCacheRange(2410,2425);
+	PreCacheRange(389,389); // blood puddle by itself in art file
+	PreCacheRange(2500,2503);
+	// shrap
+	PreCacheRange(3840,3911);
+	PreCacheRange(3924,3947);
+	PreCacheRange(1397,1398);
+	// water *** animated tiles, can be deleted now ***
+	// PreCacheRange(780,794);
+	// switches
+	PreCacheRange(561,584);
+	PreCacheRange(551,552);
+	PreCacheRange(1846,1847);
+	PreCacheRange(1850,1859);
+	// bullet smoke
+	PreCacheRange(1748,1753);
+	// gas can
+	PreCacheRange(3038,3042);
+	// lava *** animated tiles, can be deleted now ***
+	// PreCacheRange(175,182);
+	// gas clouds & teleport effect
+	PreCacheRange(3240,3277);
+	// nuke mushroom cloud
+	PreCacheRange(3280,3300);
+	// blood drops
+	PreCacheRange(1718,1721);
+	// smoke
+	PreCacheRange(3948,3968);
+	// footprints
+	PreCacheRange(2490,2492);
+	// player fists
+	PreCacheRange(4070,4077);
+	PreCacheRange(4050,4051);
+	PreCacheRange(4090,4093);
+	// fish actor
+	PreCacheRange(3760,3771);
+	PreCacheRange(3780,3795);
+	// coins
+	PreCacheRange(2531,2533);
+	// respawn markers & console keys
+	PreCacheRange(2440,2467);
+	// light/torch sprites
+	PreCacheRange(537,548);
+	PreCacheRange(521,528);
+	PreCacheRange(512,515);
+	PreCacheRange(396,399);
+	PreCacheRange(443,446);
+	// bubbles
+	PreCacheRange(716,720);
+	// bullet splashes
+	PreCacheRange(772,776);
+}
+
+void PreCacheRipper(int pal)
+{
+	PreCacheRange(1580, 1644, pal);
+}
+
+void PreCacheRipper2(int pal)
+{
+	PreCacheRange(4320, 4427, pal);
+}
+
+void PreCacheGhost(int pal)
+{
+	PreCacheRange(4277, 4312, pal);
+}
+
+void PreCacheCoolie(int pal)
+{
+	PreCacheGhost(pal);
+	PreCacheRange(1400, 1440, pal);
+	PreCacheRange(4260, 4276, pal); // coolie explode
+}
+
+void PreCacheSerpent(int pal)
+{
+	PreCacheRange(960, 1016, pal);
+	PreCacheRange(1300, 1314, pal);
+}
+
+void PreCacheGuardian(int pal)
+{
+	PreCacheRange(1469,1497, pal);
+}
+
+void PreCacheNinja(int pal)
+{
+	PreCacheRange(4096, 4239, pal);
+}
+
+void PreCacheNinjaGirl(int pal)
+{
+	PreCacheRange(5162, 5260, pal);
+}
+
+void PreCacheSumo(int pal)
+{
+	PreCacheRange(4490, 4544, pal);
+}
+
+void PreCacheZilla(int pal)
+{
+	PreCacheRange(4490, 4544, pal);
+}
+
+void PreCacheEel(int pal)
+{
+	PreCacheRange(4430, 4479, pal);
+}
+
+void PreCacheToiletGirl(int pal)
+{
+	PreCacheRange(5023, 5027, pal);
+}
+
+void PreCacheWashGirl(int pal)
+{
+	PreCacheRange(5032, 5035, pal);
+}
+
+void PreCacheCarGirl(int pal)
+{
+	PreCacheRange(4594,4597, pal);
+}
+
+void PreCacheMechanicGirl(int pal)
+{
+	PreCacheRange(4590,4593, pal);
+}
+
+void PreCacheSailorGirl(int pal)
+{
+	PreCacheRange(4600,4602, pal);
+}
+
+void PreCachePruneGirl(int pal)
+{
+	PreCacheRange(4604,4604, pal);
+}
+
+void PreCacheTrash(int pal)
+{
+	PreCacheRange(2540, 2546, pal);
+}
+
+void PreCacheBunny(int pal)
+{
+	PreCacheRange(4550, 4584, pal);
+}
+
+void PreCacheSkel(int pal)
+{
+	PreCacheRange(1320, 1396, pal);
+}
+
+void PreCacheHornet(int pal)
+{
+	PreCacheRange(800, 811, pal);
+}
+
+void PreCacheSkull(int pal)
+{
+	PreCacheRange(820, 854, pal);
+}
+
+void PreCacheBetty(int pal)
+{
+	PreCacheRange(817, 819, pal);
+}
+
+void PreCachePachinko(int pal)
+{
+	PreCacheRange(618,623, pal);
+	PreCacheRange(618,623, pal);
+	PreCacheRange(4768,4790, pal);
+	PreCacheRange(4792,4814, pal);
+	PreCacheRange(4816,4838, pal);
+	PreCacheRange(4840,4863, pal);
 }
 
 void
 PreCacheActor(void)
 {
-    int i;
-    short pic;
+	int i;
+	int pic;
 
-    for (i=0; i < MAXSPRITES; i++)
-    {
-        if (sprite[i].statnum >= MAXSTATUS)
-            continue;
+	for (i=0; i < MAXSPRITES; i++)
+	{
+		if (sprite[i].statnum >= MAXSTATUS)
+			continue;
 
-        if (User[i])
-            pic = User[i]->ID;
-        else
-            pic = sprite[i].picnum;
+		if (User[i])
+			pic = User[i]->ID;
+		else
+			pic = sprite[i].picnum;
 
-        switch (pic)
-        {
-        case COOLIE_RUN_R0:
-            PreCacheCoolie();
-            break;
+		switch (pic)
+		{
+		case COOLIE_RUN_R0:
+			PreCacheCoolie(sprite[i].pal);
+			break;
 
-        case NINJA_RUN_R0:
-        case NINJA_CRAWL_R0:
-            PreCacheNinja();
-            break;
+		case NINJA_RUN_R0:
+		case NINJA_CRAWL_R0:
+			PreCacheNinja(sprite[i].pal);
+			break;
 
-        case GORO_RUN_R0:
-            PreCacheGuardian();
-            break;
+		case GORO_RUN_R0:
+			PreCacheGuardian(sprite[i].pal);
+			break;
 
-        case 1441:
-        case COOLG_RUN_R0:
-            PreCacheGhost();
-            break;
+		case 1441:
+		case COOLG_RUN_R0:
+			PreCacheGhost(sprite[i].pal);
+			break;
 
-        case EEL_RUN_R0:
-            PreCacheEel();
-            break;
+		case EEL_RUN_R0:
+			PreCacheEel(sprite[i].pal);
+			break;
 
-        case SUMO_RUN_R0:
-            PreCacheZilla();
-            break;
+		case SUMO_RUN_R0:
+			PreCacheZilla(sprite[i].pal);
+			break;
 
-        case ZILLA_RUN_R0:
-            PreCacheSumo();
-            break;
+		case ZILLA_RUN_R0:
+			PreCacheSumo(sprite[i].pal);
+			break;
 
-        case TOILETGIRL_R0:
-            PreCacheToiletGirl();
-            break;
+		case TOILETGIRL_R0:
+			PreCacheToiletGirl(sprite[i].pal);
+			break;
 
-        case WASHGIRL_R0:
-            PreCacheWashGirl();
-            break;
+		case WASHGIRL_R0:
+			PreCacheWashGirl(sprite[i].pal);
+			break;
 
-        case CARGIRL_R0:
-            PreCacheCarGirl();
-            break;
+		case CARGIRL_R0:
+			PreCacheCarGirl(sprite[i].pal);
+			break;
 
-        case MECHANICGIRL_R0:
-            PreCacheMechanicGirl();
-            break;
+		case MECHANICGIRL_R0:
+			PreCacheMechanicGirl(sprite[i].pal);
+			break;
 
-        case SAILORGIRL_R0:
-            PreCacheSailorGirl();
-            break;
+		case SAILORGIRL_R0:
+			PreCacheSailorGirl(sprite[i].pal);
+			break;
 
-        case PRUNEGIRL_R0:
-            PreCachePruneGirl();
-            break;
+		case PRUNEGIRL_R0:
+			PreCachePruneGirl(sprite[i].pal);
+			break;
 
-        case TRASHCAN:
-            PreCacheTrash();
-            break;
+		case TRASHCAN:
+			PreCacheTrash(sprite[i].pal);
+			break;
 
-        case BUNNY_RUN_R0:
-            PreCacheBunny();
-            break;
+		case BUNNY_RUN_R0:
+			PreCacheBunny(sprite[i].pal);
+			break;
 
-        case RIPPER_RUN_R0:
-            PreCacheRipper();
-            break;
+		case RIPPER_RUN_R0:
+			PreCacheRipper(sprite[i].pal);
+			break;
 
-        case RIPPER2_RUN_R0:
-            PreCacheRipper2();
-            break;
+		case RIPPER2_RUN_R0:
+			PreCacheRipper2(sprite[i].pal);
+			break;
 
-        case SERP_RUN_R0:
-            PreCacheSerpent();
-            break;
+		case SERP_RUN_R0:
+			PreCacheSerpent(sprite[i].pal);
+			break;
 
-        case LAVA_RUN_R0:
-            break;
+		case LAVA_RUN_R0:
+			break;
 
-        case SKEL_RUN_R0:
-            PreCacheSkel();
-            break;
+		case SKEL_RUN_R0:
+			PreCacheSkel(sprite[i].pal);
+			break;
 
-        case HORNET_RUN_R0:
-            PreCacheHornet();
-            break;
+		case HORNET_RUN_R0:
+			PreCacheHornet(sprite[i].pal);
+			break;
 
-        case SKULL_R0:
-            PreCacheSkull();
-            break;
+		case SKULL_R0:
+			PreCacheSkull(sprite[i].pal);
+			break;
 
-        case BETTY_R0:
-            PreCacheBetty();
-            break;
+		case BETTY_R0:
+			PreCacheBetty(sprite[i].pal);
+			break;
 
-        case GIRLNINJA_RUN_R0:
-            PreCacheNinjaGirl();
-            break;
+		case GIRLNINJA_RUN_R0:
+			PreCacheNinjaGirl(sprite[i].pal);
+			break;
 
-        case 623:   // Pachinko win light
-        case PACHINKO1:
-        case PACHINKO2:
-        case PACHINKO3:
-        case PACHINKO4:
-            PreCachePachinko();
-            break;
-        }
-    }
+		case 623:   // Pachinko win light
+		case PACHINKO1:
+		case PACHINKO2:
+		case PACHINKO3:
+		case PACHINKO4:
+			PreCachePachinko(sprite[i].pal);
+			break;
+
+		default:
+			markTileForPrecache(pic, sprite[i].pal);
+		}
+	}
 }
 
 
 void DoTheCache(void)
 {
-    int i, cnt=0;
-
-    PreCacheActor();
-    PreCacheOverride();
-
-    for (i = 0; i < MAXTILES; i++)
-    {
-        if ((TEST(gotpic[i>>3], 1<<(i&7))) && (!tilePtr(i)))
-        {
-            // Without palettes this is rather useless...
-            if (r_precache) PrecacheHardwareTextures(i);
-            cnt++;
-        }
-    }
-
-    memset(gotpic,0,sizeof(gotpic));
+	if (r_precache)
+	{
+		SetupPreCache();
+		PreCacheActor();
+		PreCacheOverride();
+		precacheMarkedTiles();
+	}
 }
 
-void
-precache(void)
-{
-    int i;
-    short j;
-    SECTORp sectp;
-    WALLp wp;
-    SPRITEp sp;
-
-    memset(gotpic,0,sizeof(gotpic));
-
-    for (sectp = sector; sectp < &sector[numsectors]; sectp++)
-    {
-        j = sectp->ceilingpicnum;
-
-        SET(gotpic[j>>3], 1<<(j&7));
-
-        if (TEST(picanm[j].sf, PICANM_ANIMTYPE_MASK) >> PICANM_ANIMTYPE_SHIFT)
-        {
-            for (i = 1; i <= picanm[j].num; i++)
-            {
-                SET(gotpic[(j+i)>>3], 1<<((j+i)&7));
-            }
-        }
-
-        j = sectp->floorpicnum;
-
-        SET(gotpic[j>>3], 1<<(j&7));
-
-        if (TEST(picanm[j].sf, PICANM_ANIMTYPE_MASK) >> PICANM_ANIMTYPE_SHIFT)
-        {
-            for (i = 1; i <= picanm[j].num; i++)
-            {
-                SET(gotpic[(j+i)>>3], 1<<((j+i)&7));
-            }
-        }
-
-    }
-
-    for (wp = wall; wp < &wall[numwalls]; wp++)
-    {
-        j = wp->picnum;
-
-        SET(gotpic[j>>3], 1<<(j&7));
-
-        if (TEST(picanm[j].sf, PICANM_ANIMTYPE_MASK) >> PICANM_ANIMTYPE_SHIFT)
-        {
-            for (i = 1; i <= picanm[j].num; i++)
-            {
-                SET(gotpic[(j+i)>>3], 1<<((j+i)&7));
-            }
-        }
-
-        if (wp->overpicnum > 0 && wp->overpicnum < MAXTILES)
-        {
-            j = wp->overpicnum;
-            SET(gotpic[j>>3], 1<<(j&7));
-
-            if (TEST(picanm[j].sf, PICANM_ANIMTYPE_MASK) >> PICANM_ANIMTYPE_SHIFT)
-            {
-                for (i = 1; i <= picanm[j].num; i++)
-                {
-                    SET(gotpic[(j+i)>>3], 1<<((j+i)&7));
-                }
-            }
-
-        }
-    }
-
-    for (sp = sprite; sp < &sprite[MAXSPRITES]; sp++)
-    {
-        if (sp->statnum < MAXSTATUS)
-        {
-            j = sp->picnum;
-
-            SET(gotpic[j>>3], 1<<(j&7));
-        }
-    }
-}
 
 
 END_SW_NS
diff --git a/source/games/sw/src/game.cpp b/source/games/sw/src/game.cpp
index 50583459a..064cfc44f 100644
--- a/source/games/sw/src/game.cpp
+++ b/source/games/sw/src/game.cpp
@@ -106,7 +106,6 @@ bool NewGame = false;
 bool FinishedLevel = false;
 short screenpeek = 0;
 
-bool PreCaching = true;
 int GodMode = false;
 short Skill = 2;
 short TotalKillable;
@@ -363,8 +362,6 @@ void InitLevel(MapRecord *maprec)
     STAT_NewLevel(currentLevel->fileName);
     Player[0].angle.ang = buildang(ang);
 
-    SetupPreCache();
-
     if (sector[0].extra != -1)
     {
         NormalVisibility = g_visibility = sector[0].extra;
diff --git a/source/games/sw/src/misc.h b/source/games/sw/src/misc.h
index 6a8052575..00d518286 100644
--- a/source/games/sw/src/misc.h
+++ b/source/games/sw/src/misc.h
@@ -11,10 +11,7 @@ enum
 	CACHE_SOUND_PLAY =1
 };
 
-void SetupPreCache(void);
-void PreCacheRange(short start_pic, short end_pic);
 void DoTheCache(void);
-void precache(void);
 
 void InitCheats();
 
diff --git a/source/games/sw/src/save.cpp b/source/games/sw/src/save.cpp
index 39f4d62e4..6feeff775 100644
--- a/source/games/sw/src/save.cpp
+++ b/source/games/sw/src/save.cpp
@@ -990,7 +990,6 @@ bool GameInterface::LoadGame()
     }
 #endif
 
-    SetupPreCache();
     DoTheCache();
 
     // this is ok - just duplicating sector list with pointers
diff --git a/source/games/sw/src/sprite.cpp b/source/games/sw/src/sprite.cpp
index 4a6002369..3eb4309e3 100644
--- a/source/games/sw/src/sprite.cpp
+++ b/source/games/sw/src/sprite.cpp
@@ -1187,9 +1187,6 @@ ActorSpawn(SPRITEp sp)
     case 1441:
     case COOLG_RUN_R0:
     {
-
-        //PreCacheGhost();
-
         if (!ActorTestSpawn(sp))
         {
             KillSprite(SpriteNum);