From 658c72c6ad189ea7f2b052efe7a5b5946cbdbe3e Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 10 Dec 2003 09:02:55 +0000
Subject: [PATCH] start phasing out BASE_PATH and SLASH

---
 stepmania/src/BannerCache.cpp       | 2 +-
 stepmania/src/PlayerAI.cpp          | 2 +-
 stepmania/src/Song.cpp              | 2 +-
 stepmania/src/SongCacheIndex.cpp    | 2 +-
 stepmania/src/StepMania.cpp         | 6 +++---
 stepmania/src/TitleSubstitution.cpp | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/stepmania/src/BannerCache.cpp b/stepmania/src/BannerCache.cpp
index 25c0e3a959..5c9c1316c8 100644
--- a/stepmania/src/BannerCache.cpp
+++ b/stepmania/src/BannerCache.cpp
@@ -23,7 +23,7 @@
 
 #include "Banner.h"
 
-#define CACHE_DIR BASE_PATH "Cache" SLASH
+#define CACHE_DIR "Cache/"
 
 /* Call CacheBanner to cache a banner by path.  If the banner is already
  * cached, it'll be recreated.  This is efficient if the banner hasn't changed,
diff --git a/stepmania/src/PlayerAI.cpp b/stepmania/src/PlayerAI.cpp
index 074ee4b683..d5a89e0bde 100644
--- a/stepmania/src/PlayerAI.cpp
+++ b/stepmania/src/PlayerAI.cpp
@@ -18,7 +18,7 @@
 #include <math.h>
 #include "arch/arch.h"
 
-#define AI_PATH BASE_PATH "Data" SLASH "AI.ini"
+#define AI_PATH "Data/AI.ini"
 
 struct TapScoreDistribution
 {
diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index 07876349ec..881c236952 100644
--- a/stepmania/src/Song.cpp
+++ b/stepmania/src/Song.cpp
@@ -47,7 +47,7 @@
 
 #include <set>
 
-#define CACHE_DIR BASE_PATH "Cache" SLASH
+#define CACHE_DIR "Cache/"
 
 const int FILE_CACHE_VERSION = 131;	// increment this when Song or Steps changes to invalidate cache
 
diff --git a/stepmania/src/SongCacheIndex.cpp b/stepmania/src/SongCacheIndex.cpp
index f211956f49..a0e0b55b86 100644
--- a/stepmania/src/SongCacheIndex.cpp
+++ b/stepmania/src/SongCacheIndex.cpp
@@ -9,7 +9,7 @@
 #include "song.h"
 #include "arch/arch.h"
 
-#define CACHE_DIR BASE_PATH "Cache" SLASH
+#define CACHE_DIR "Cache/"
 
 SongCacheIndex *SONGINDEX;
 
diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index 3c941f2344..62109b2061 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -672,8 +672,8 @@ static void RestoreAppPri()
 }
 
 
-#define GAMEPREFS_INI_PATH BASE_PATH "Data" SLASH "GamePrefs.ini"
-#define STATIC_INI_PATH BASE_PATH "Data" SLASH "Static.ini"
+#define GAMEPREFS_INI_PATH "Data/GamePrefs.ini"
+#define STATIC_INI_PATH "Data/Static.ini"
 
 void ChangeCurrentGame( Game g )
 {
@@ -773,7 +773,7 @@ static void MountTreeOfZips( const CString &dir )
 	}
 }
 
-#define UNLOCKS_PATH BASE_PATH "Data" SLASH "Unlocks.dat"
+#define UNLOCKS_PATH BASE_PATH "Data/Unlocks.dat"
 
 #ifdef _XBOX
 char *xboxargv[] = { "d:\\default.xbe" };
diff --git a/stepmania/src/TitleSubstitution.cpp b/stepmania/src/TitleSubstitution.cpp
index e5dd2ec549..9d9f967220 100644
--- a/stepmania/src/TitleSubstitution.cpp
+++ b/stepmania/src/TitleSubstitution.cpp
@@ -8,7 +8,7 @@
 
 #include "RageFile.h"
 
-#define TRANSLATION_PATH BASE_PATH "Data" SLASH "Translation.dat"
+#define TRANSLATION_PATH "Data/Translation.dat"
 
 struct TitleTrans
 {