From f305b2f70c318224f331a0401852757d5ea47225 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Tue, 24 Nov 2009 02:26:01 +0000
Subject: [PATCH] - Fixed: FWadCollection::AddFile() did not call
 FixPathSeperator(), so   savegames would hold the full file path for wads
 that had been specified   with backslash characters, because GetWadName()
 would not trim off the   path.

SVN r1994 (trunk)
---
 docs/rh-log.txt | 6 ++++++
 src/w_wad.cpp   | 3 ++-
 src/w_wad.h     | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 9a04d901d..36a23017c 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,9 @@
+November 23, 2009
+- Fixed: FWadCollection::AddFile() did not call FixPathSeperator(), so
+  savegames would hold the full file path for wads that had been specified
+  with backslash characters, because GetWadName() would not trim off the
+  path.
+
 November 22, 2009  (Changes by Graf Zahl)
 - extended Doom map format linedef translator so that it also handles the flags.
 
diff --git a/src/w_wad.cpp b/src/w_wad.cpp
index 3594c8b3f..9c5b525ca 100644
--- a/src/w_wad.cpp
+++ b/src/w_wad.cpp
@@ -222,7 +222,7 @@ int FWadCollection::AddExternalFile(const char *filename)
 // [RH] Removed reload hack
 //==========================================================================
 
-void FWadCollection::AddFile (const char *filename, FileReader *wadinfo)
+void FWadCollection::AddFile (char *filename, FileReader *wadinfo)
 {
 	int startlump;
 	bool isdir = false;
@@ -252,6 +252,7 @@ void FWadCollection::AddFile (const char *filename, FileReader *wadinfo)
 				return;
 			}
 		}
+		FixPathSeperator(filename);
 	}
 
 	Printf (" adding %s", filename);
diff --git a/src/w_wad.h b/src/w_wad.h
index 293a328f5..7adea8ab7 100644
--- a/src/w_wad.h
+++ b/src/w_wad.h
@@ -154,7 +154,7 @@ public:
 	enum { IWAD_FILENUM = 1 };
 
 	void InitMultipleFiles (wadlist_t **filenames);
-	void AddFile (const char *filename, FileReader *wadinfo = NULL);
+	void AddFile (char *filename, FileReader *wadinfo = NULL);
 	int CheckIfWadLoaded (const char *name);
 
 	const char *GetWadName (int wadnum) const;