diff --git a/stepmania/TODO.chris b/stepmania/TODO.chris
index b23bcc5ff8..c26a77100a 100644
--- a/stepmania/TODO.chris
+++ b/stepmania/TODO.chris
@@ -19,8 +19,6 @@ get rid of lines between tiles
red life glow in sync with beat
-kpt web site - NOW!
-
No no, I know about chaning group colors but when in ABC sort they're all red
on Ez2, the Ranking doesn't save (AAA, AA, A, B e.t.c.)
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 5867b833d6..01b154dd7e 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -1,7 +1,7 @@
// Possible NextScreen Codes:
// - ScreenCaution
// - ScreenEz2SelectPlayer
-// - ScreenEz2SelectStyle
+// - ScreenSelectMode
// - ScreenHowToPlay
// - ScreenSelectCourse
// - ScreenSelectDifficulty
@@ -76,7 +76,7 @@ HelpText=Use ! " to select, then press START
TimerSeconds=40
NextScreen=ScreenSelectDifficulty
-[ScreenEz2SelectStyle]
+[ScreenSelectMode]
CursorP1X=120
CursorP1Y=335
CursorP2X=520
@@ -91,6 +91,7 @@ NextScreen=ScreenSelectGroup
ScrollingListX=320
ScrollingListY=250
UseSelectionBGAnimations=0
+SelectionSpecificBGAnimations=0
[ScreenSelectDifficulty]
MorePage1X=580
diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp
index 8cfde12db6..35d75cb1a9 100644
--- a/stepmania/src/PrefsManager.cpp
+++ b/stepmania/src/PrefsManager.cpp
@@ -169,15 +169,15 @@ void PrefsManager::ReadGamePrefsFromDisk()
CString sGameName = GAMESTATE->GetCurrentGameDef()->m_szName;
IniFile ini;
- ini.SetPath( sGameName + "Prefs.ini" );
+ ini.SetPath( "StepMania.ini" );
ini.ReadFile(); // it's OK if this fails
CString sAnnouncer = sGameName, sTheme = sGameName, sNoteSkin = sGameName;
// if these calls fail, the three strings will keep the initial values set above.
- ini.GetValue( "Options", "Announcer", sAnnouncer );
- ini.GetValue( "Options", "Theme", sTheme );
- ini.GetValue( "Options", "NoteSkin", sNoteSkin );
+ ini.GetValue( sGameName, "Announcer", sAnnouncer );
+ ini.GetValue( sGameName, "Theme", sTheme );
+ ini.GetValue( sGameName, "NoteSkin", sNoteSkin );
// it's OK to call these functions with names that don't exist.
ANNOUNCER->SwitchAnnouncer( sAnnouncer );
@@ -192,11 +192,12 @@ void PrefsManager::SaveGamePrefsToDisk()
CString sGameName = GAMESTATE->GetCurrentGameDef()->m_szName;
IniFile ini;
- ini.SetPath( sGameName + "Prefs.ini" );
+ ini.SetPath( "StepMania.ini" );
+ ini.ReadFile(); // it's OK if this fails
- ini.SetValue( "Options", "Announcer", ANNOUNCER->GetCurAnnouncerName() );
- ini.SetValue( "Options", "Theme", THEME->GetCurThemeName() );
- ini.SetValue( "Options", "NoteSkin", GAMEMAN->GetCurNoteSkin() );
+ ini.SetValue( sGameName, "Announcer", ANNOUNCER->GetCurAnnouncerName() );
+ ini.SetValue( sGameName, "Theme", THEME->GetCurThemeName() );
+ ini.SetValue( sGameName, "NoteSkin", GAMEMAN->GetCurNoteSkin() );
ini.WriteFile();
}
diff --git a/stepmania/src/ScreenAppearanceOptions.cpp b/stepmania/src/ScreenAppearanceOptions.cpp
index 3d3aed0a47..1035c81af5 100644
--- a/stepmania/src/ScreenAppearanceOptions.cpp
+++ b/stepmania/src/ScreenAppearanceOptions.cpp
@@ -153,6 +153,9 @@ void ScreenAppearanceOptions::ImportOptions()
void ScreenAppearanceOptions::ExportOptions()
{
+ PREFSMAN->SaveGamePrefsToDisk();
+ PREFSMAN->SaveGlobalPrefsToDisk();
+
int iSelectedAnnouncer = m_iSelectedOption[0][AO_ANNOUNCER];
CString sNewAnnouncer = m_OptionRowData[AO_ANNOUNCER].szOptionsText[iSelectedAnnouncer];
if( iSelectedAnnouncer == 0 )
diff --git a/stepmania/src/ScreenEz2SelectPlayer.cpp b/stepmania/src/ScreenEz2SelectPlayer.cpp
index 1c43be4511..c3b8ec7cce 100644
--- a/stepmania/src/ScreenEz2SelectPlayer.cpp
+++ b/stepmania/src/ScreenEz2SelectPlayer.cpp
@@ -91,7 +91,7 @@ ScreenEz2SelectPlayer::ScreenEz2SelectPlayer()
}
/************************************
-~ScreenEz2SelectStyle (Destructor)
+~ScreenSelectMode (Destructor)
Desc: Writes line to log when screen
is terminated.
************************************/
diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp
index 7d995b4370..fda40023e0 100644
--- a/stepmania/src/ScreenManager.cpp
+++ b/stepmania/src/ScreenManager.cpp
@@ -160,7 +160,7 @@ void ScreenManager::Input( const DeviceInput& DeviceI, const InputEventType type
#include "ScreenEditMenu.h"
#include "ScreenEvaluation.h"
#include "ScreenEz2SelectPlayer.h"
-#include "ScreenEz2SelectStyle.h"
+#include "ScreenSelectMode.h"
#include "ScreenGameOver.h"
#include "ScreenGameplay.h"
#include "ScreenGraphicOptions.h"
@@ -197,7 +197,7 @@ Screen* ScreenManager::MakeNewScreen( CString sClassName )
else if( 0==stricmp(sClassName, "ScreenEvaluation") ) return new ScreenEvaluation;
else if( 0==stricmp(sClassName, "ScreenFinalEvaluation") ) return new ScreenFinalEvaluation;
else if( 0==stricmp(sClassName, "ScreenEz2SelectPlayer") ) return new ScreenEz2SelectPlayer;
- else if( 0==stricmp(sClassName, "ScreenEz2SelectStyle") ) return new ScreenEz2SelectStyle;
+ else if( 0==stricmp(sClassName, "ScreenSelectMode") ) return new ScreenSelectMode;
else if( 0==stricmp(sClassName, "ScreenGameOver") ) return new ScreenGameOver;
else if( 0==stricmp(sClassName, "ScreenGameplay") ) return new ScreenGameplay;
else if( 0==stricmp(sClassName, "ScreenGraphicOptions") ) return new ScreenGraphicOptions;
diff --git a/stepmania/src/ScreenTitleMenu.cpp b/stepmania/src/ScreenTitleMenu.cpp
index e484862f53..1ba7f9660e 100644
--- a/stepmania/src/ScreenTitleMenu.cpp
+++ b/stepmania/src/ScreenTitleMenu.cpp
@@ -84,15 +84,9 @@ ScreenTitleMenu::ScreenTitleMenu()
{
CString sGameName = GAMESTATE->GetCurrentGameDef()->m_szName;
if( THEME->DoesThemeExist( sGameName ) )
- {
THEME->SwitchTheme( sGameName );
- }
else
- {
- CStringArray asThemeNames;
- THEME->GetThemeNamesForCurGame( asThemeNames );
- THEME->SwitchTheme( asThemeNames[0] );
- }
+ THEME->SwitchTheme( "default" );
}
diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj
index 2ca14cdc6a..a3c3777382 100644
--- a/stepmania/src/StepMania.vcproj
+++ b/stepmania/src/StepMania.vcproj
@@ -213,12 +213,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
-
-
-
-
@@ -324,6 +318,12 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
+
+
+
+
diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp
index 91aca80bfd..413a27900c 100644
--- a/stepmania/src/ThemeManager.cpp
+++ b/stepmania/src/ThemeManager.cpp
@@ -86,9 +86,7 @@ bool ThemeManager::DoesThemeExist( CString sThemeName )
void ThemeManager::SwitchTheme( CString sThemeName )
{
- if( 0==stricmp(BASE_THEME_NAME, sThemeName) )
- m_sCurThemeName = ""; // can't select the base theme
- else if( !DoesThemeExist(sThemeName) )
+ if( !DoesThemeExist(sThemeName) )
m_sCurThemeName = BASE_THEME_NAME;
else
m_sCurThemeName = sThemeName;