From 1c9f10be4217b9591b7b4c4b419f6fdbcd9602b9 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Thu, 29 Sep 2005 06:30:09 +0000
Subject: [PATCH] default DancingCharacters to random, not off

---
 stepmania/src/GameState.cpp             | 2 +-
 stepmania/src/Preference.cpp            | 2 +-
 stepmania/src/PrefsManager.cpp          | 2 +-
 stepmania/src/PrefsManager.h            | 4 ++--
 stepmania/src/ScreenSelectCharacter.cpp | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index 9d88c0903f..ca3ee250b5 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -247,7 +247,7 @@ void GameState::Reset()
 
 	FOREACH_PlayerNumber(p)
 	{
-		if( PREFSMAN->m_ShowDancingCharacters == PrefsManager::CO_RANDOM )
+		if( PREFSMAN->m_ShowDancingCharacters == PrefsManager::SDC_Random )
 			m_pCurCharacters[p] = CHARMAN->GetRandomCharacter();
 		else
 			m_pCurCharacters[p] = CHARMAN->GetDefaultCharacter();
diff --git a/stepmania/src/Preference.cpp b/stepmania/src/Preference.cpp
index 6717f7fb33..1b4dcc6158 100644
--- a/stepmania/src/Preference.cpp
+++ b/stepmania/src/Preference.cpp
@@ -63,7 +63,7 @@ READFROM_AND_WRITETO( PrefsManager::MarvelousTiming, int& )
 READFROM_AND_WRITETO( CoinMode, int& )
 READFROM_AND_WRITETO( Premium, int& )
 READFROM_AND_WRITETO( PrefsManager::Maybe, int& )
-READFROM_AND_WRITETO( PrefsManager::CharacterOption, int& )
+READFROM_AND_WRITETO( PrefsManager::ShowDancingCharacters, int& )
 READFROM_AND_WRITETO( PrefsManager::CourseSortOrders, int& )
 READFROM_AND_WRITETO( PrefsManager::GetRankingName, int& )
 READFROM_AND_WRITETO( PrefsManager::ScoringTypes, int& )
diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp
index d35b0e0964..1096b30e42 100644
--- a/stepmania/src/PrefsManager.cpp
+++ b/stepmania/src/PrefsManager.cpp
@@ -210,7 +210,7 @@ PrefsManager::PrefsManager() :
 	m_bAutogenGroupCourses			( "AutogenGroupCourses",		true ),
 	m_bBreakComboToGetItem			( "BreakComboToGetItem",		false ),
 	m_bLockCourseDifficulties		( "LockCourseDifficulties",		true ),
-	m_ShowDancingCharacters			( "ShowDancingCharacters",		CO_OFF ),
+	m_ShowDancingCharacters			( "ShowDancingCharacters",		SDC_Random ),
 	m_bUseUnlockSystem				( "UseUnlockSystem",			false ),
 	m_bAutoMapOnJoyChange			( "AutoMapOnJoyChange",			true ),
 	m_fGlobalOffsetSeconds			( "GlobalOffsetSeconds",		0 ),
diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h
index ceccf8d2c7..f6d00a672d 100644
--- a/stepmania/src/PrefsManager.h
+++ b/stepmania/src/PrefsManager.h
@@ -190,8 +190,8 @@ public:
 	Preference<bool>	m_bAutogenGroupCourses;
 	Preference<bool>	m_bBreakComboToGetItem;
 	Preference<bool>	m_bLockCourseDifficulties;
-	enum CharacterOption { CO_OFF = 0, CO_RANDOM = 1, CO_SELECT = 2};
-	Preference<CharacterOption>		m_ShowDancingCharacters;
+	enum ShowDancingCharacters { SDC_Off = 0, SDC_Random = 1, SDC_Select = 2};
+	Preference<ShowDancingCharacters>		m_ShowDancingCharacters;
 	Preference<bool>	m_bUseUnlockSystem;
 	Preference<bool>	m_bAutoMapOnJoyChange;
 	Preference<float>	m_fGlobalOffsetSeconds;
diff --git a/stepmania/src/ScreenSelectCharacter.cpp b/stepmania/src/ScreenSelectCharacter.cpp
index 7f7cf646f4..8827c1485c 100644
--- a/stepmania/src/ScreenSelectCharacter.cpp
+++ b/stepmania/src/ScreenSelectCharacter.cpp
@@ -76,7 +76,7 @@ void ScreenSelectCharacter::Init()
 
 	default:
 		/* Non Rave/Battle mode, just skip this screen if disabled. */
-		if(	PREFSMAN->m_ShowDancingCharacters != PrefsManager::CO_SELECT )
+		if(	PREFSMAN->m_ShowDancingCharacters != PrefsManager::SDC_Select )
 		{
 			this->PostScreenMessage( SM_GoToNextScreen, 0 );
 			return;