From bb3365a904e8f6051d62ea479a2a31b152dea00e Mon Sep 17 00:00:00 2001
From: Nevur <apophycens@gmail.com>
Date: Tue, 8 Aug 2017 10:39:25 +0200
Subject: [PATCH] We use srb2.pk3 instead.

---
 src/d_main.c       | 4 ----
 src/d_netfil.c     | 3 +--
 src/sdl/i_system.c | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/d_main.c b/src/d_main.c
index 98411f28f..26abcbde3 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -849,9 +849,6 @@ static void IdentifyVersion(void)
 	// Add the players
 	D_AddFile(va(pandf,srb2waddir, "player.dta"));
 
-	// Add the weapons
-	D_AddFile(va(pandf,srb2waddir,"rings.dta"));
-
 #ifdef USE_PATCH_DTA
 	// Add our crappy patches to fix our bugs
 	D_AddFile(va(pandf,srb2waddir,"patch.dta"));
@@ -1158,7 +1155,6 @@ void D_SRB2Main(void)
 	//W_VerifyFileMD5(0, ASSET_HASH_SRB2_SRB); // srb2.srb/srb2.wad
 	//W_VerifyFileMD5(1, ASSET_HASH_ZONES_DTA); // zones.dta
 	//W_VerifyFileMD5(2, ASSET_HASH_PLAYER_DTA); // player.dta
-	//W_VerifyFileMD5(3, ASSET_HASH_RINGS_DTA); // rings.dta
 #ifdef USE_PATCH_DTA
 	W_VerifyFileMD5(4, ASSET_HASH_PATCH_DTA); // patch.dta
 #endif
diff --git a/src/d_netfil.c b/src/d_netfil.c
index 172624ad2..db0bf8055 100644
--- a/src/d_netfil.c
+++ b/src/d_netfil.c
@@ -793,11 +793,10 @@ void Got_Filetxpak(void)
 	char *filename = file->filename;
 	static INT32 filetime = 0;
 
-	if (!(strcmp(filename, "srb2.srb")
+	if (!(strcmp(filename, "srb2.pk3")
 		&& strcmp(filename, "srb2.wad")
 		&& strcmp(filename, "zones.dta")
 		&& strcmp(filename, "player.dta")
-		&& strcmp(filename, "rings.dta")
 		&& strcmp(filename, "patch.dta")
 		&& strcmp(filename, "music.dta")
 		))
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index f72a9857d..fdf96bae7 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -224,7 +224,7 @@ void __set_fpscr(long); // in libgcc / kernel's startup.s?
 
 /**	\brief WAD file to look for
 */
-#define WADKEYWORD1 "srb2.srb"
+#define WADKEYWORD1 "srb2.pk3"
 #define WADKEYWORD2 "srb2.wad"
 /**	\brief holds wad path
 */