Re-enable fail pref. Possibly unstable.

Extra eyes would be beneficial here.
This commit is contained in:
Jason Felds
2011-07-06 22:44:53 -04:00
parent 6bb873c8ce
commit a35aaeb75f
2 changed files with 10 additions and 7 deletions
+5 -4
View File
@@ -125,16 +125,15 @@ XToString( CourseSortOrders );
StringToX( CourseSortOrders ); StringToX( CourseSortOrders );
LuaXType( CourseSortOrders ); LuaXType( CourseSortOrders );
// XXX: Fix fail bug? static const char *DefaultFailTypeNames[] = {
/* static const char *DefaultFailTypeNames[] = {
"Immediate", "Immediate",
"ImmediateContinue", "ImmediateContinue",
"EndOfSong", "AtEnd",
"Off", "Off",
}; };
XToString( DefaultFailType ); XToString( DefaultFailType );
StringToX( DefaultFailType ); StringToX( DefaultFailType );
LuaXType( DefaultFailType ); */ LuaXType( DefaultFailType );
bool g_bAutoRestart = false; bool g_bAutoRestart = false;
#ifdef DEBUG #ifdef DEBUG
@@ -191,6 +190,8 @@ PrefsManager::PrefsManager() :
m_fLifeDifficultyScale ( "LifeDifficultyScale", 1.0f ), m_fLifeDifficultyScale ( "LifeDifficultyScale", 1.0f ),
m_sDefaultFailType ("DefaultFailType", FAIL_IMMEDIATE),
m_iRegenComboAfterMiss ( "RegenComboAfterMiss", 5 ), m_iRegenComboAfterMiss ( "RegenComboAfterMiss", 5 ),
m_bMercifulDrain ( "MercifulDrain", true ), // negative life deltas are scaled by the players life percentage m_bMercifulDrain ( "MercifulDrain", true ), // negative life deltas are scaled by the players life percentage
+5 -3
View File
@@ -115,8 +115,8 @@ enum CourseSortOrders
enum DefaultFailType enum DefaultFailType
{ {
FAIL_IMMEDIATE, FAIL_IMMEDIATE,
FAIL_IMMEDIATECONTINUE, FAIL_IMMEDIATE_CONTINUE,
FAIL_ENDOFSONG, FAIL_AT_END,
FAIL_OFF, FAIL_OFF,
NUM_DefaultFailType, NUM_DefaultFailType,
DefaultFailType_Invalid DefaultFailType_Invalid
@@ -286,7 +286,9 @@ public:
/** @brief Enable some quirky behavior used by some older versions of StepMania. */ /** @brief Enable some quirky behavior used by some older versions of StepMania. */
Preference<bool> m_bQuirksMode; Preference<bool> m_bQuirksMode;
// Preference<RString> m_sDefaultFailType; // XXX: Fix fail bug?
/** @brief The specific failure type to use at the beginning. */
Preference<DefaultFailType> m_sDefaultFailType;
// Debug: // Debug:
Preference<bool> m_bLogToDisk; Preference<bool> m_bLogToDisk;