From c939d40ae5a588048747bfabefb79d0cdaec7759 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sat, 19 Apr 2003 17:59:26 +0000
Subject: [PATCH] Move *.ini.

---
 stepmania/src/InputMapper.cpp  | 4 ++--
 stepmania/src/PrefsManager.cpp | 8 ++++----
 stepmania/stepmania.nsi        | 7 ++++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp
index d7e244c87d..1626e27091 100644
--- a/stepmania/src/InputMapper.cpp
+++ b/stepmania/src/InputMapper.cpp
@@ -70,7 +70,7 @@ void InputMapper::ReadMappingsFromDisk()
 	ClearAllMappings();
 
 	IniFile ini;
-	ini.SetPath( "Keymaps.ini" );
+	ini.SetPath( "data/Keymaps.ini" );
 	if( !ini.ReadFile() )
 		LOG->Warn( "could not input mapping file \"Keymaps.ini\"." );
 
@@ -107,7 +107,7 @@ void InputMapper::ReadMappingsFromDisk()
 void InputMapper::SaveMappingsToDisk()
 {
 	IniFile ini;
-	ini.SetPath( "Keymaps.ini" );
+	ini.SetPath( "data/Keymaps.ini" );
 	ini.ReadFile();
 	
 	// erase the key so that we overwrite everything for this game
diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp
index f77c2ddb18..940de7b99c 100644
--- a/stepmania/src/PrefsManager.cpp
+++ b/stepmania/src/PrefsManager.cpp
@@ -124,7 +124,7 @@ PrefsManager::~PrefsManager()
 void PrefsManager::ReadGlobalPrefsFromDisk( bool bSwitchToLastPlayedGame )
 {
 	IniFile ini;
-	ini.SetPath( "StepMania.ini" );
+	ini.SetPath( "data/StepMania.ini" );
 	if( !ini.ReadFile() )
 		return;		// could not read config file, load nothing
 
@@ -208,7 +208,7 @@ void PrefsManager::ReadGlobalPrefsFromDisk( bool bSwitchToLastPlayedGame )
 void PrefsManager::SaveGlobalPrefsToDisk()
 {
 	IniFile ini;
-	ini.SetPath( "StepMania.ini" );
+	ini.SetPath( "data/StepMania.ini" );
 
 	ini.SetValueB( "Options", "Windowed",					m_bWindowed );
 	ini.SetValueI( "Options", "DisplayWidth",				m_iDisplayWidth );
@@ -295,7 +295,7 @@ void PrefsManager::ReadGamePrefsFromDisk()
 
 	CString sGameName = GAMESTATE->GetCurrentGameDef()->m_szName;
 	IniFile ini;
-	ini.SetPath( "GamePrefs.ini" );
+	ini.SetPath( "data/GamePrefs.ini" );
 	ini.ReadFile();	// it's OK if this fails
 
 	CString sAnnouncer = sGameName, sTheme = sGameName, sNoteSkin = sGameName;
@@ -324,7 +324,7 @@ void PrefsManager::SaveGamePrefsToDisk()
 
 	CString sGameName = GAMESTATE->GetCurrentGameDef()->m_szName;
 	IniFile ini;
-	ini.SetPath( "GamePrefs.ini" );
+	ini.SetPath( "data/GamePrefs.ini" );
 	ini.ReadFile();	// it's OK if this fails
 
 	ini.SetValue( sGameName, "Announcer",		ANNOUNCER->GetCurAnnouncerName() );
diff --git a/stepmania/stepmania.nsi b/stepmania/stepmania.nsi
index cd0ed17083..83c45aa7de 100644
--- a/stepmania/stepmania.nsi
+++ b/stepmania/stepmania.nsi
@@ -296,7 +296,11 @@ RMDir "$INSTDIR\Themes"
 Delete "$INSTDIR\Visualizations\instructions.txt"
 RMDir "$INSTDIR\Visualizations"
 
+; Don't delete high scores.
 Delete "$INSTDIR\Data\Translation.dat"
+Delete "$INSTDIR\Data\stepmania.ini"
+Delete "$INSTDIR\Data\Keymaps.ini"
+Delete "$INSTDIR\Data\GamePrefs.ini"
 RMDir "$INSTDIR\Data"
 
 Delete "$INSTDIR\msvcr70.dll"
@@ -308,9 +312,6 @@ Delete "$INSTDIR\COPYING.txt"
 Delete "$INSTDIR\README-FIRST.html"
 Delete "$INSTDIR\NEWS"
 Delete "$INSTDIR\stepmania.exe"
-Delete "$INSTDIR\stepmania.ini"
-Delete "$INSTDIR\Keymaps.ini"
-Delete "$INSTDIR\GamePrefs.ini"
 Delete "$INSTDIR\smpackage.exe"
 Delete "$INSTDIR\StepMania.vdi"
 Delete "$INSTDIR\log.txt"