From 70479fd0c454fcc6bbacc4ade1e81a57fe73f990 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 6 Feb 2006 18:23:30 +0000 Subject: [PATCH] tab cleanup no need to fall back to opengl on xbox --- stepmania/src/PrefsManager.cpp | 260 +++++++++++++------------- stepmania/src/ScreenOptionsMaster.cpp | 2 + stepmania/src/StepMania.cpp | 8 +- 3 files changed, 136 insertions(+), 134 deletions(-) diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index 7f95f5b001..96ea056754 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -145,175 +145,175 @@ void TimeMeterSecondsChangeInit( size_t /*ScoreEvent*/ i, RString &sNameOut, flo PrefsManager::PrefsManager() : - m_sCurrentGame ( "CurrentGame", "" ), + m_sCurrentGame ( "CurrentGame", "" ), - m_sAnnouncer ( "Announcer", "" ), - m_sTheme ( "Theme", "" ), - m_sDefaultModifiers ( "DefaultModifiers", "" ), + m_sAnnouncer ( "Announcer", "" ), + m_sTheme ( "Theme", "" ), + m_sDefaultModifiers ( "DefaultModifiers", "" ), - m_bWindowed ( "Windowed", TRUE_IF_DEBUG ), - m_iDisplayWidth ( "DisplayWidth", 640 ), - m_iDisplayHeight ( "DisplayHeight", 480 ), + m_bWindowed ( "Windowed", TRUE_IF_DEBUG ), + m_iDisplayWidth ( "DisplayWidth", 640 ), + m_iDisplayHeight ( "DisplayHeight", 480 ), m_iDisplayColorDepth ( "DisplayColorDepth", 16 ), m_iTextureColorDepth ( "TextureColorDepth", 16 ), - m_iMovieColorDepth ( "MovieColorDepth", 16 ), + m_iMovieColorDepth ( "MovieColorDepth", 16 ), m_iMaxTextureResolution ( "MaxTextureResolution", 2048 ), - m_iRefreshRate ( "RefreshRate", REFRESH_DEFAULT ), + m_iRefreshRate ( "RefreshRate", REFRESH_DEFAULT ), m_bAllowMultitexture ( "AllowMultitexture", true ), - m_bShowStats ( "ShowStats", TRUE_IF_DEBUG), - m_bShowBanners ( "ShowBanners", true ), + m_bShowStats ( "ShowStats", TRUE_IF_DEBUG), + m_bShowBanners ( "ShowBanners", true ), - m_bSongBackgrounds ( "SongBackgrounds", true ), + m_bSongBackgrounds ( "SongBackgrounds", true ), m_RandomBackgroundMode ( "RandomBackgroundMode", BGMODE_ANIMATIONS ), - m_iNumBackgrounds ( "NumBackgrounds", 8 ), - m_fBGBrightness ( "BGBrightness", 0.8f ), - m_bHiddenSongs ( "HiddenSongs", false ), - m_bVsync ( "Vsync", true ), - m_bInterlaced ( "Interlaced", false ), - m_bPAL ( "PAL", false ), + m_iNumBackgrounds ( "NumBackgrounds", 8 ), + m_fBGBrightness ( "BGBrightness", 0.8f ), + m_bHiddenSongs ( "HiddenSongs", false ), + m_bVsync ( "Vsync", true ), + m_bInterlaced ( "Interlaced", false ), + m_bPAL ( "PAL", false ), m_bDelayedTextureDelete ( "DelayedTextureDelete", true ), m_bDelayedModelDelete ( "DelayedModelDelete", false ), - m_BannerCache ( "BannerCache", BNCACHE_LOW_RES_PRELOAD ), + m_BannerCache ( "BannerCache", BNCACHE_LOW_RES_PRELOAD ), m_bPalettedBannerCache ( "PalettedBannerCache", false ), - m_bFastLoad ( "FastLoad", false ), + m_bFastLoad ( "FastLoad", false ), m_bOnlyDedicatedMenuButtons ( "OnlyDedicatedMenuButtons", false ), - m_bMenuTimer ( "MenuTimer", true ), - m_bShowDanger ( "ShowDanger", true ), + m_bMenuTimer ( "MenuTimer", true ), + m_bShowDanger ( "ShowDanger", true ), - m_fTimingWindowScale ( "TimingWindowScale", 1.0f ), - m_fTimingWindowAdd ( "TimingWindowAdd", 0 ), - m_fTimingWindowSeconds( TimingWindowSecondsInit, NUM_TimingWindow ), + m_fTimingWindowScale ( "TimingWindowScale", 1.0f ), + m_fTimingWindowAdd ( "TimingWindowAdd", 0 ), + m_fTimingWindowSeconds ( TimingWindowSecondsInit, NUM_TimingWindow ), - m_fLifeDifficultyScale ( "LifeDifficultyScale", 1.0f ), + m_fLifeDifficultyScale ( "LifeDifficultyScale", 1.0f ), - m_iRegenComboAfterFail ( "RegenComboAfterFail", 10 ), - m_iRegenComboAfterMiss ( "RegenComboAfterMiss", 5 ), - m_iMaxRegenComboAfterFail ( "MaxRegenComboAfterFail", 10 ), - m_iMaxRegenComboAfterMiss ( "MaxRegenComboAfterMiss", 10 ), - m_bTwoPlayerRecovery ( "TwoPlayerRecovery", true ), - m_bMercifulDrain ( "MercifulDrain", true ), // negative life deltas are scaled by the players life percentage - m_bMinimum1FullSongInCourses ( "Minimum1FullSongInCourses", false ), // FEoS for 1st song, FailImmediate thereafter - m_bFailOffInBeginner ( "FailOffInBeginner", false ), - m_bFailOffForFirstStageEasy ( "FailOffForFirstStageEasy", false ), - m_bMercifulBeginner ( "MercifulBeginner", false ), + m_iRegenComboAfterFail ( "RegenComboAfterFail", 10 ), + m_iRegenComboAfterMiss ( "RegenComboAfterMiss", 5 ), + m_iMaxRegenComboAfterFail ( "MaxRegenComboAfterFail", 10 ), + m_iMaxRegenComboAfterMiss ( "MaxRegenComboAfterMiss", 10 ), + m_bTwoPlayerRecovery ( "TwoPlayerRecovery", true ), + m_bMercifulDrain ( "MercifulDrain", true ), // negative life deltas are scaled by the players life percentage + m_bMinimum1FullSongInCourses ( "Minimum1FullSongInCourses", false ), // FEoS for 1st song, FailImmediate thereafter + m_bFailOffInBeginner ( "FailOffInBeginner", false ), + m_bFailOffForFirstStageEasy ( "FailOffForFirstStageEasy", false ), + m_bMercifulBeginner ( "MercifulBeginner", false ), - m_iPercentScoreWeight ( PercentScoreWeightInit, NUM_ScoreEvent ), + m_iPercentScoreWeight ( PercentScoreWeightInit, NUM_ScoreEvent ), - m_iGradeWeight ( GradeWeightInit, NUM_ScoreEvent ), + m_iGradeWeight ( GradeWeightInit, NUM_ScoreEvent ), m_fSuperMeterPercentChange ( SuperMeterPercentChangeInit, NUM_ScoreEvent ), - m_bMercifulSuperMeter ( "MercifulSuperMeter", true ), + m_bMercifulSuperMeter ( "MercifulSuperMeter", true ), - m_fTimeMeterSecondsChange ( TimeMeterSecondsChangeInit, NUM_ScoreEvent ), + m_fTimeMeterSecondsChange ( TimeMeterSecondsChangeInit, NUM_ScoreEvent ), - m_AutoPlay ( "AutoPlay", PC_HUMAN ), - m_bDelayedBack ( "DelayedBack", true ), - m_bShowInstructions ( "ShowInstructions", true ), - m_bShowSelectGroup ( "ShowSelectGroup", true ), - m_bShowCaution ( "ShowCaution", true ), - m_bShowNativeLanguage ( "ShowNativeLanguage", true ), + m_AutoPlay ( "AutoPlay", PC_HUMAN ), + m_bDelayedBack ( "DelayedBack", true ), + m_bShowInstructions ( "ShowInstructions", true ), + m_bShowSelectGroup ( "ShowSelectGroup", true ), + m_bShowCaution ( "ShowCaution", true ), + m_bShowNativeLanguage ( "ShowNativeLanguage", true ), m_bArcadeOptionsNavigation ( "ArcadeOptionsNavigation", false ), - m_MusicWheelUsesSections ( "MusicWheelUsesSections", ALWAYS ), - m_iMusicWheelSwitchSpeed ( "MusicWheelSwitchSpeed", 10 ), - m_bEasterEggs ( "EasterEggs", true ), + m_MusicWheelUsesSections ( "MusicWheelUsesSections", ALWAYS ), + m_iMusicWheelSwitchSpeed ( "MusicWheelSwitchSpeed", 10 ), + m_bEasterEggs ( "EasterEggs", true ), m_AllowW1 ( "AllowW1", ALLOW_W1_EVERYWHERE ), - m_bEventMode ( "EventMode", false ), - m_iCoinsPerCredit ( "CoinsPerCredit", 1 ), - m_iSongsPerPlay ( "SongsPerPlay", 3 ), + m_bEventMode ( "EventMode", false ), + m_iCoinsPerCredit ( "CoinsPerCredit", 1 ), + m_iSongsPerPlay ( "SongsPerPlay", 3 ), - m_CoinMode ( "CoinMode", COIN_MODE_HOME ), - m_Premium ( "Premium", PREMIUM_NONE ), - m_bDelayedCreditsReconcile ( "DelayedCreditsReconcile", false ), - m_bPickExtraStage ( "PickExtraStage", false ), + m_CoinMode ( "CoinMode", COIN_MODE_HOME ), + m_Premium ( "Premium", PREMIUM_NONE ), + m_bDelayedCreditsReconcile ( "DelayedCreditsReconcile", false ), + m_bPickExtraStage ( "PickExtraStage", false ), m_bComboContinuesBetweenSongs ( "ComboContinuesBetweenSongs", false ), - m_fLongVerSongSeconds ( "LongVerSongSeconds", 60*2.5f ), // Dynamite Rave is 2:55 - m_fMarathonVerSongSeconds ( "MarathonVerSongSeconds", 60*5.f ), - m_ShowSongOptions ( "ShowSongOptions", YES ), - m_bCenter1Player ( "Center1Player", false ), - m_bDancePointsForOni ( "DancePointsForOni", false ), - m_bPercentageScoring ( "PercentageScoring", false ), + m_fLongVerSongSeconds ( "LongVerSongSeconds", 60*2.5f ), // Dynamite Rave is 2:55 + m_fMarathonVerSongSeconds ( "MarathonVerSongSeconds", 60*5.f ), + m_ShowSongOptions ( "ShowSongOptions", YES ), + m_bCenter1Player ( "Center1Player", false ), + m_bDancePointsForOni ( "DancePointsForOni", false ), + m_bPercentageScoring ( "PercentageScoring", false ), m_fMinPercentageForMachineSongHighScore ( "MinPercentageForMachineSongHighScore", 0.5f ), m_fMinPercentageForMachineCourseHighScore ( "MinPercentageForMachineCourseHighScore", 0.0001f ), // don't save course scores with 0 percentage - m_bDisqualification ( "Disqualification", false ), - m_bShowLyrics ( "ShowLyrics", true ), - m_bAutogenSteps ( "AutogenSteps", true ), - m_bAutogenGroupCourses ( "AutogenGroupCourses", true ), - m_bBreakComboToGetItem ( "BreakComboToGetItem", false ), - m_bLockCourseDifficulties ( "LockCourseDifficulties", true ), - m_ShowDancingCharacters ( "ShowDancingCharacters", SDC_Random ), - m_bUseUnlockSystem ( "UseUnlockSystem", false ), - m_fGlobalOffsetSeconds ( "GlobalOffsetSeconds", 0 ), - m_iProgressiveLifebar ( "ProgressiveLifebar", 0 ), - m_iProgressiveStageLifebar ( "ProgressiveStageLifebar", 0 ), - m_iProgressiveNonstopLifebar ( "ProgressiveNonstopLifebar", 0 ), - m_bShowBeginnerHelper ( "ShowBeginnerHelper", false ), - m_bDisableScreenSaver ( "DisableScreenSaver", true ), - m_sLanguage ( "Language", "" ), // ThemeManager will deal with this invalid language - m_sMemoryCardProfileSubdir ( "MemoryCardProfileSubdir", PRODUCT_NAME ), - m_iProductID ( "ProductID", 1 ), - m_bMemoryCards ( "MemoryCards", true ), - m_iCenterImageTranslateX ( "CenterImageTranslateX", 0 ), - m_iCenterImageTranslateY ( "CenterImageTranslateY", 0 ), - m_fCenterImageAddWidth ( "CenterImageAddWidth", 0 ), - m_fCenterImageAddHeight ( "CenterImageAddHeight", 0 ), - m_fBrightnessAdd ( "BrightnessAdd", 0 ), - m_AttractSoundFrequency ( "AttractSoundFrequency", ASF_EVERY_TIME ), - m_bAllowExtraStage ( "AllowExtraStage", true ), - m_bHideDefaultNoteSkin ( "HideDefaultNoteSkin", false ), - m_iMaxHighScoresPerListForMachine ( "MaxHighScoresPerListForMachine", 10 ), - m_iMaxHighScoresPerListForPlayer ( "MaxHighScoresPerListForPlayer", 3 ), - m_iMaxRecentScoresForMachine ( "MaxRecentScoresForMachine", 100 ), - m_iMaxRecentScoresForPlayer ( "MaxRecentScoresForPlayer", 20 ), + m_bDisqualification ( "Disqualification", false ), + m_bShowLyrics ( "ShowLyrics", true ), + m_bAutogenSteps ( "AutogenSteps", true ), + m_bAutogenGroupCourses ( "AutogenGroupCourses", true ), + m_bBreakComboToGetItem ( "BreakComboToGetItem", false ), + m_bLockCourseDifficulties ( "LockCourseDifficulties", true ), + m_ShowDancingCharacters ( "ShowDancingCharacters", SDC_Random ), + m_bUseUnlockSystem ( "UseUnlockSystem", false ), + m_fGlobalOffsetSeconds ( "GlobalOffsetSeconds", 0 ), + m_iProgressiveLifebar ( "ProgressiveLifebar", 0 ), + m_iProgressiveStageLifebar ( "ProgressiveStageLifebar", 0 ), + m_iProgressiveNonstopLifebar ( "ProgressiveNonstopLifebar", 0 ), + m_bShowBeginnerHelper ( "ShowBeginnerHelper", false ), + m_bDisableScreenSaver ( "DisableScreenSaver", true ), + m_sLanguage ( "Language", "" ), // ThemeManager will deal with this invalid language + m_sMemoryCardProfileSubdir ( "MemoryCardProfileSubdir", PRODUCT_NAME ), + m_iProductID ( "ProductID", 1 ), + m_bMemoryCards ( "MemoryCards", true ), + m_iCenterImageTranslateX ( "CenterImageTranslateX", 0 ), + m_iCenterImageTranslateY ( "CenterImageTranslateY", 0 ), + m_fCenterImageAddWidth ( "CenterImageAddWidth", 0 ), + m_fCenterImageAddHeight ( "CenterImageAddHeight", 0 ), + m_fBrightnessAdd ( "BrightnessAdd", 0 ), + m_AttractSoundFrequency ( "AttractSoundFrequency", ASF_EVERY_TIME ), + m_bAllowExtraStage ( "AllowExtraStage", true ), + m_bHideDefaultNoteSkin ( "HideDefaultNoteSkin", false ), + m_iMaxHighScoresPerListForMachine ( "MaxHighScoresPerListForMachine", 10 ), + m_iMaxHighScoresPerListForPlayer ( "MaxHighScoresPerListForPlayer", 3 ), + m_iMaxRecentScoresForMachine ( "MaxRecentScoresForMachine", 100 ), + m_iMaxRecentScoresForPlayer ( "MaxRecentScoresForPlayer", 20 ), m_bAllowMultipleHighScoreWithSameName ( "AllowMultipleHighScoreWithSameName", true ), - m_bCelShadeModels ( "CelShadeModels", false ), // Work-In-Progress.. disable by default. - m_bPreferredSortUsesGroups ( "PreferredSortUsesGroups", true ), + m_bCelShadeModels ( "CelShadeModels", false ), // Work-In-Progress.. disable by default. + m_bPreferredSortUsesGroups ( "PreferredSortUsesGroups", true ), - m_fPadStickSeconds ( "PadStickSeconds", 0 ), - m_bForceMipMaps ( "ForceMipMaps", 0 ), - m_bTrilinearFiltering ( "TrilinearFiltering", 0 ), - m_bAnisotropicFiltering ( "AnisotropicFiltering", 0 ), + m_fPadStickSeconds ( "PadStickSeconds", 0 ), + m_bForceMipMaps ( "ForceMipMaps", 0 ), + m_bTrilinearFiltering ( "TrilinearFiltering", 0 ), + m_bAnisotropicFiltering ( "AnisotropicFiltering", 0 ), - m_bSignProfileData ( "SignProfileData", false ), - m_CourseSortOrder ( "CourseSortOrder", COURSE_SORT_SONGS ), - m_bMoveRandomToEnd ( "MoveRandomToEnd", false ), - m_bSubSortByNumSteps ( "SubSortByNumSteps", false ), - m_GetRankingName ( "GetRankingName", RANKING_ON ), - m_ScoringType ( "ScoringType", SCORING_NEW ), - m_sAdditionalSongFolders ( "AdditionalSongFolders", "" ), - m_sAdditionalFolders ( "AdditionalFolders", "" ), - m_sLastSeenVideoDriver ( "LastSeenVideoDriver", "" ), - m_sVideoRenderers ( "VideoRenderers", "" ), // StepMania.cpp sets these on first run: - m_bSmoothLines ( "SmoothLines", false ), - m_fSoundVolume ( "SoundVolume", 1.0f ), - m_iSoundWriteAhead ( "SoundWriteAhead", 0 ), - m_iSoundDevice ( "SoundDevice", "" ), - m_iSoundPreferredSampleRate ( "SoundPreferredSampleRate", 44100 ), - m_sLightsStepsDifficulty ( "LightsStepsDifficulty", "medium" ), + m_bSignProfileData ( "SignProfileData", false ), + m_CourseSortOrder ( "CourseSortOrder", COURSE_SORT_SONGS ), + m_bMoveRandomToEnd ( "MoveRandomToEnd", false ), + m_bSubSortByNumSteps ( "SubSortByNumSteps", false ), + m_GetRankingName ( "GetRankingName", RANKING_ON ), + m_ScoringType ( "ScoringType", SCORING_NEW ), + m_sAdditionalSongFolders ( "AdditionalSongFolders", "" ), + m_sAdditionalFolders ( "AdditionalFolders", "" ), + m_sLastSeenVideoDriver ( "LastSeenVideoDriver", "" ), + m_sVideoRenderers ( "VideoRenderers", "" ), // StepMania.cpp sets these on first run: + m_bSmoothLines ( "SmoothLines", false ), + m_fSoundVolume ( "SoundVolume", 1.0f ), + m_iSoundWriteAhead ( "SoundWriteAhead", 0 ), + m_iSoundDevice ( "SoundDevice", "" ), + m_iSoundPreferredSampleRate ( "SoundPreferredSampleRate", 44100 ), + m_sLightsStepsDifficulty ( "LightsStepsDifficulty", "medium" ), m_bBlinkGameplayButtonLightsOnNote ( "BlinkGameplayButtonLightsOnNote",false ), - m_bAllowUnacceleratedRenderer ( "AllowUnacceleratedRenderer", false ), - m_bThreadedInput ( "ThreadedInput", true ), - m_bThreadedMovieDecode ( "ThreadedMovieDecode", true ), - m_bScreenTestMode ( "ScreenTestMode", false ), - m_bDebugLights ( "DebugLights", false ), - m_bMonkeyInput ( "MonkeyInput", false ), - m_sMachineName ( "MachineName", "" ), - m_sCoursesToShowRanking ( "CoursesToShowRanking", "" ), + m_bAllowUnacceleratedRenderer ( "AllowUnacceleratedRenderer", false ), + m_bThreadedInput ( "ThreadedInput", true ), + m_bThreadedMovieDecode ( "ThreadedMovieDecode", true ), + m_bScreenTestMode ( "ScreenTestMode", false ), + m_bDebugLights ( "DebugLights", false ), + m_bMonkeyInput ( "MonkeyInput", false ), + m_sMachineName ( "MachineName", "" ), + m_sCoursesToShowRanking ( "CoursesToShowRanking", "" ), /* Debug: */ - m_bLogToDisk ( "LogToDisk", true ), - m_bForceLogFlush ( "ForceLogFlush", false ), - m_bShowLogOutput ( "ShowLogOutput", false ), - m_bLogSkips ( "LogSkips", false ), - m_bLogCheckpoints ( "LogCheckpoints", false ), - m_bShowLoadingWindow ( "ShowLoadingWindow", true ), - m_bPseudoLocalize ( "PseudoLocalize", false ) + m_bLogToDisk ( "LogToDisk", true ), + m_bForceLogFlush ( "ForceLogFlush", false ), + m_bShowLogOutput ( "ShowLogOutput", false ), + m_bLogSkips ( "LogSkips", false ), + m_bLogCheckpoints ( "LogCheckpoints", false ), + m_bShowLoadingWindow ( "ShowLoadingWindow", true ), + m_bPseudoLocalize ( "PseudoLocalize", false ) #if !defined(WITHOUT_NETWORKING) , - m_bEnableScoreboard ( "EnableScoreboard", true ) + m_bEnableScoreboard ( "EnableScoreboard", true ) #endif { diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp index 68d8dbbaad..5d4164256d 100644 --- a/stepmania/src/ScreenOptionsMaster.cpp +++ b/stepmania/src/ScreenOptionsMaster.cpp @@ -122,7 +122,9 @@ void ScreenOptionsMaster::HandleScreenMessage( const ScreenMessage SM ) if( (m_iChangeMask & OPT_APPLY_THEME) || (m_iChangeMask & OPT_APPLY_GRAPHICS) || (m_iChangeMask & OPT_APPLY_ASPECT_RATIO) ) + { StepMania::ApplyGraphicOptions(); + } if( m_iChangeMask & OPT_SAVE_PREFERENCES ) { diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index 97ff8f7a4b..0486e73dc0 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -393,7 +393,7 @@ struct VideoCardDefaults { VideoCardDefaults( "Xbox", - "d3d,opengl", + "d3d", 600,400, 32,32,32, 2048, @@ -641,10 +641,10 @@ found_defaults: } static LocalizedString ERROR_INITIALIZING_CARD ( "StepMania", "There was an error while initializing your video card." ); -static LocalizedString ERROR_DONT_FILE_BUG ( "StepMania", "Please do not file this error as a bug! Use the web page below to troubleshoot this problem." ); -static LocalizedString ERROR_VIDEO_DRIVER ( "StepMania", "Video Driver: %s" ); +static LocalizedString ERROR_DONT_FILE_BUG ( "StepMania", "Please do not file this error as a bug! Use the web page below to troubleshoot this problem." ); +static LocalizedString ERROR_VIDEO_DRIVER ( "StepMania", "Video Driver: %s" ); static LocalizedString ERROR_NO_VIDEO_RENDERERS ( "StepMania", "No video renderers attempted." ); -static LocalizedString ERROR_INITIALIZING ( "StepMania", "Initializing %s..." ); +static LocalizedString ERROR_INITIALIZING ( "StepMania", "Initializing %s..." ); static LocalizedString ERROR_UNKNOWN_VIDEO_RENDERER ( "StepMania", "Unknown video renderer value: %s" ); RageDisplay *CreateDisplay()