Cleanup. Make everything line up nicely with 4 space tabstops.
This commit is contained in:
@@ -50,15 +50,14 @@ IPreference *PrefsManager::GetPreferenceByName( const CString &sName )
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool g_bAutoRestart = false;
|
bool g_bAutoRestart = false;
|
||||||
|
#ifdef DEBUG
|
||||||
|
# define TRUE_IF_DEBUG true
|
||||||
|
#else
|
||||||
|
# define TRUE_IF_DEBUG false
|
||||||
|
#endif
|
||||||
|
|
||||||
PrefsManager::PrefsManager() :
|
PrefsManager::PrefsManager() :
|
||||||
m_bWindowed ( "Windowed",
|
m_bWindowed ( "Windowed", TRUE_IF_DEBUG),
|
||||||
#ifdef DEBUG
|
|
||||||
true
|
|
||||||
#else
|
|
||||||
false
|
|
||||||
#endif
|
|
||||||
),
|
|
||||||
m_iDisplayWidth ( "DisplayWidth", 640 ),
|
m_iDisplayWidth ( "DisplayWidth", 640 ),
|
||||||
m_iDisplayHeight ( "DisplayHeight", 480 ),
|
m_iDisplayHeight ( "DisplayHeight", 480 ),
|
||||||
m_iDisplayColorDepth ( "DisplayColorDepth", 16 ),
|
m_iDisplayColorDepth ( "DisplayColorDepth", 16 ),
|
||||||
@@ -67,19 +66,15 @@ PrefsManager::PrefsManager() :
|
|||||||
m_iMaxTextureResolution ( "MaxTextureResolution", 2048 ),
|
m_iMaxTextureResolution ( "MaxTextureResolution", 2048 ),
|
||||||
m_iRefreshRate ( "RefreshRate", REFRESH_DEFAULT ),
|
m_iRefreshRate ( "RefreshRate", REFRESH_DEFAULT ),
|
||||||
m_fDisplayAspectRatio ( "DisplayAspectRatio", 4/3.0f ),
|
m_fDisplayAspectRatio ( "DisplayAspectRatio", 4/3.0f ),
|
||||||
m_bShowStats ( "ShowStats",
|
m_bShowStats ( "ShowStats", TRUE_IF_DEBUG),
|
||||||
#ifdef DEBUG
|
|
||||||
true
|
|
||||||
#else
|
|
||||||
false
|
|
||||||
#endif
|
|
||||||
),
|
|
||||||
m_bShowBanners ( "ShowBanners", true ),
|
m_bShowBanners ( "ShowBanners", true ),
|
||||||
|
|
||||||
m_BackgroundMode ( "BackgroundMode", BGMODE_ANIMATIONS ),
|
m_BackgroundMode ( "BackgroundMode", BGMODE_ANIMATIONS ),
|
||||||
m_iNumBackgrounds ( "NumBackgrounds", 8 ),
|
m_iNumBackgrounds ( "NumBackgrounds", 8 ),
|
||||||
m_fBGBrightness ( "BGBrightness", 0.8f ),
|
m_fBGBrightness ( "BGBrightness", 0.8f ),
|
||||||
m_bHiddenSongs ( "HiddenSongs", false ), /* I'd rather get occasional people asking for support for this even though it's already here than lots of people asking why songs aren't being displayed. */
|
/* I'd rather get occasional people asking for support for this even though
|
||||||
|
* it's already here than lots of people asking why songs aren't being displayed. */
|
||||||
|
m_bHiddenSongs ( "HiddenSongs", false ),
|
||||||
m_bVsync ( "Vsync", true ),
|
m_bVsync ( "Vsync", true ),
|
||||||
m_bInterlaced ( "Interlaced", false ),
|
m_bInterlaced ( "Interlaced", false ),
|
||||||
/* XXX: Set these defaults for individual consoles using VideoCardDefaults.ini. */
|
/* XXX: Set these defaults for individual consoles using VideoCardDefaults.ini. */
|
||||||
@@ -201,7 +196,7 @@ PrefsManager::PrefsManager() :
|
|||||||
m_bDelayedCreditsReconcile ( "DelayedCreditsReconcile", false ),
|
m_bDelayedCreditsReconcile ( "DelayedCreditsReconcile", false ),
|
||||||
m_bPickExtraStage ( "PickExtraStage", false ),
|
m_bPickExtraStage ( "PickExtraStage", false ),
|
||||||
|
|
||||||
m_bComboContinuesBetweenSongs ( "ComboContinuesBetweenSongs",false ),
|
m_bComboContinuesBetweenSongs ( "ComboContinuesBetweenSongs", false ),
|
||||||
m_fLongVerSongSeconds ( "LongVerSongSeconds", 60*2.5f ), // Dynamite Rave is 2:55
|
m_fLongVerSongSeconds ( "LongVerSongSeconds", 60*2.5f ), // Dynamite Rave is 2:55
|
||||||
m_fMarathonVerSongSeconds ( "MarathonVerSongSeconds", 60*5.f ),
|
m_fMarathonVerSongSeconds ( "MarathonVerSongSeconds", 60*5.f ),
|
||||||
m_ShowSongOptions ( "ShowSongOptions", YES ),
|
m_ShowSongOptions ( "ShowSongOptions", YES ),
|
||||||
@@ -225,7 +220,7 @@ PrefsManager::PrefsManager() :
|
|||||||
m_iProgressiveNonstopLifebar ( "ProgressiveNonstopLifebar", 0 ),
|
m_iProgressiveNonstopLifebar ( "ProgressiveNonstopLifebar", 0 ),
|
||||||
m_bShowBeginnerHelper ( "ShowBeginnerHelper", false ),
|
m_bShowBeginnerHelper ( "ShowBeginnerHelper", false ),
|
||||||
m_bEndlessBreakEnabled ( "EndlessBreakEnabled", true ),
|
m_bEndlessBreakEnabled ( "EndlessBreakEnabled", true ),
|
||||||
m_iEndlessNumStagesUntilBreak ( "EndlessNumStagesUntilBreak",5 ),
|
m_iEndlessNumStagesUntilBreak ( "EndlessNumStagesUntilBreak", 5 ),
|
||||||
m_iEndlessBreakLength ( "EndlessBreakLength", 5 ),
|
m_iEndlessBreakLength ( "EndlessBreakLength", 5 ),
|
||||||
m_bDisableScreenSaver ( "DisableScreenSaver", true ),
|
m_bDisableScreenSaver ( "DisableScreenSaver", true ),
|
||||||
m_sLanguage ( "Language", "" ), // ThemeManager will deal with this invalid language
|
m_sLanguage ( "Language", "" ), // ThemeManager will deal with this invalid language
|
||||||
@@ -257,7 +252,7 @@ PrefsManager::PrefsManager() :
|
|||||||
m_bCelShadeModels ( "CelShadeModels", false ), // Work-In-Progress.. disable by default.
|
m_bCelShadeModels ( "CelShadeModels", false ), // Work-In-Progress.. disable by default.
|
||||||
m_bPreferredSortUsesGroups ( "PreferredSortUsesGroups", true ),
|
m_bPreferredSortUsesGroups ( "PreferredSortUsesGroups", true ),
|
||||||
|
|
||||||
m_fConstantUpdateDeltaSeconds ( "ConstantUpdateDeltaSeconds",0 ),
|
m_fConstantUpdateDeltaSeconds ( "ConstantUpdateDeltaSeconds", 0 ),
|
||||||
m_fPadStickSeconds ( "PadStickSeconds", 0 ),
|
m_fPadStickSeconds ( "PadStickSeconds", 0 ),
|
||||||
m_bForceMipMaps ( "ForceMipMaps", 0 ),
|
m_bForceMipMaps ( "ForceMipMaps", 0 ),
|
||||||
m_bTrilinearFiltering ( "TrilinearFiltering", 0 ),
|
m_bTrilinearFiltering ( "TrilinearFiltering", 0 ),
|
||||||
@@ -290,7 +285,7 @@ PrefsManager::PrefsManager() :
|
|||||||
m_sLightsDriver ( "LightsDriver", "" ),
|
m_sLightsDriver ( "LightsDriver", "" ),
|
||||||
m_sLightsStepsDifficulty ( "LightsStepsDifficulty", "medium" ),
|
m_sLightsStepsDifficulty ( "LightsStepsDifficulty", "medium" ),
|
||||||
m_bBlinkGameplayButtonLightsOnNote ( "BlinkGameplayButtonLightsOnNote",false ),
|
m_bBlinkGameplayButtonLightsOnNote ( "BlinkGameplayButtonLightsOnNote",false ),
|
||||||
m_bAllowUnacceleratedRenderer ( "AllowUnacceleratedRenderer",false ),
|
m_bAllowUnacceleratedRenderer ( "AllowUnacceleratedRenderer", false ),
|
||||||
m_bThreadedInput ( "ThreadedInput", true ),
|
m_bThreadedInput ( "ThreadedInput", true ),
|
||||||
m_bThreadedMovieDecode ( "ThreadedMovieDecode", true ),
|
m_bThreadedMovieDecode ( "ThreadedMovieDecode", true ),
|
||||||
m_bScreenTestMode ( "ScreenTestMode", false ),
|
m_bScreenTestMode ( "ScreenTestMode", false ),
|
||||||
@@ -324,6 +319,7 @@ PrefsManager::PrefsManager() :
|
|||||||
Init();
|
Init();
|
||||||
ReadGlobalPrefsFromDisk();
|
ReadGlobalPrefsFromDisk();
|
||||||
}
|
}
|
||||||
|
#undef TRUE_IF_DEBUG
|
||||||
|
|
||||||
void PrefsManager::Init()
|
void PrefsManager::Init()
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user