From a026a7d9f62c39cc649f9dba36de6df9da0eb1a9 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 23 Jun 2003 08:39:34 +0000 Subject: [PATCH] remove m_bUseBGIfNoBanner and m_BannerCacheType --- stepmania/Themes/default/metrics.ini | 2 -- stepmania/src/Banner.cpp | 1 - stepmania/src/MusicBannerWheel.cpp | 4 ---- stepmania/src/MusicWheel.cpp | 16 ---------------- stepmania/src/PrefsManager.cpp | 6 ------ stepmania/src/PrefsManager.h | 4 ---- stepmania/src/ScreenGameplayOptions.cpp | 4 ---- stepmania/src/ScreenGraphicOptions.cpp | 4 ---- 8 files changed, 41 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 2f2425cd6b..50aecc1b62 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -1839,11 +1839,9 @@ RefreshRate=Controls how many times per second the screen will refresh.::This se MovieDecode=When a movie texture is being used, StepMania will spend this much time::between each frame to decode the next frame of the movie. If your frame rate::is high but movie texures skip, then increase this value. WaitForVsync=Wait for the monitor's vertical retrace before displaying::the next frame. This option only has an effect when the::Display Mode is set to &oq;full screen&cq;. Turning this option off will not::cap your frame rate to the refresh rate, but may result in &oq;tearing&cq;. KeepTexturesInMemory=Set to ON hold textures in memory instead of::freeing them. This will eliminate the time needed to load::the texture next from disk next time this is needed. Do not set to ON::unless you have 128MB of memory or more. -BannerLoading=ON DEMAND loads banners when they're displayed, for fast loads.::ALL loads all banners in advance.::GROUP loads banners when opening song groups. [ScreenGameplayOptions] HelpText=&UP; &DOWN; to change line &LEFT; &RIGHT; to select between options::START to accept changes BACK to discard changes -BGForBanner=Instead of displaying the banner image in menus, display::the song background instead. Backgrounds can look better::than banners because they are higher resolution, but they::will take longer to load and may result in some &oq;skipping&cq;. EasterEggs=Enable or disable some special easter eggs. MarvelousTiming=Enable or disable marvelous judgement. HiddenSongs=Some songs are only playable during Oni courses and::with roulette. Leave this &oq;OFF&cq; to always display all songs. diff --git a/stepmania/src/Banner.cpp b/stepmania/src/Banner.cpp index d9224e012e..21cef3738d 100644 --- a/stepmania/src/Banner.cpp +++ b/stepmania/src/Banner.cpp @@ -85,7 +85,6 @@ void Banner::LoadFromSong( Song* pSong ) // NULL means no song if( pSong == NULL ) LoadFallback(); else if( pSong->HasBanner() ) Load( pSong->GetBannerPath() ); - else if( PREFSMAN->m_bUseBGIfNoBanner && pSong->HasBackground() ) Load( pSong->GetBackgroundPath() ); else LoadFallback(); m_bScrolling = false; diff --git a/stepmania/src/MusicBannerWheel.cpp b/stepmania/src/MusicBannerWheel.cpp index 27acbdd835..d89db030b2 100644 --- a/stepmania/src/MusicBannerWheel.cpp +++ b/stepmania/src/MusicBannerWheel.cpp @@ -139,7 +139,6 @@ void MusicBannerWheel::InsertNewBanner(int direction) if( pSong == NULL ) sGraphicPath = (THEME->GetPathToG("Common fallback banner")); else if (pSong->HasBanner()) sGraphicPath = (pSong->GetBannerPath()); - else if (PREFSMAN->m_bUseBGIfNoBanner && pSong->HasBackground() ) sGraphicPath = (pSong->GetBackgroundPath()); else sGraphicPath = (THEME->GetPathToG("Common fallback banner")); elementtoreplace = scrlistPos - 2; @@ -166,7 +165,6 @@ void MusicBannerWheel::InsertNewBanner(int direction) if( pSong == NULL ) sGraphicPath = (THEME->GetPathToG("Common fallback banner")); else if (pSong->HasBanner()) sGraphicPath = (pSong->GetBannerPath()); - else if (PREFSMAN->m_bUseBGIfNoBanner && pSong->HasBackground() ) sGraphicPath = (pSong->GetBackgroundPath()); else sGraphicPath = (THEME->GetPathToG("Common fallback banner")); elementtoreplace = scrlistPos + 2; @@ -218,7 +216,6 @@ void MusicBannerWheel::LoadSongData() if( pSong == NULL ) asGraphicPaths.push_back(THEME->GetPathToG("Common fallback banner")); else if (pSong->HasBanner()) asGraphicPaths.push_back(pSong->GetBannerPath()); - else if (PREFSMAN->m_bUseBGIfNoBanner && pSong->HasBackground() ) asGraphicPaths.push_back(pSong->GetBackgroundPath()); else asGraphicPaths.push_back(THEME->GetPathToG("Common fallback banner")); } } @@ -270,7 +267,6 @@ void MusicBannerWheel::LoadSongData() if( pSong == NULL ) asGraphicPaths.push_back(THEME->GetPathToG("Common fallback banner")); else if (pSong->HasBanner()) asGraphicPaths.push_back(pSong->GetBannerPath()); - else if (PREFSMAN->m_bUseBGIfNoBanner && pSong->HasBackground() ) asGraphicPaths.push_back(pSong->GetBackgroundPath()); else asGraphicPaths.push_back(THEME->GetPathToG("Common fallback banner")); } } diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp index ff848e6fc7..34fcbc6b34 100644 --- a/stepmania/src/MusicWheel.cpp +++ b/stepmania/src/MusicWheel.cpp @@ -531,16 +531,6 @@ void MusicWheel::BuildWheelItemDatas( vector &arrayWheelItemDatas ASSERT(0); // invalid PlayMode } - if(PREFSMAN->m_BannerCacheType == PREFSMAN->preload_all) - { - for( i=0; iCacheTexture( Banner::BannerTex(WID.GetBanner()) ); - } - } - // init music status icons for( i=0; im_BannerCacheType == PREFSMAN->preload_group) -// TEXTUREMAN->CacheTexture( Banner::BannerTex(from[i].GetBanner()) ); } diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index 11a685da99..dcc8661a8c 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -66,7 +66,6 @@ PrefsManager::PrefsManager() m_fJudgeWindowOKSeconds = 0.250f; // allow enough time to take foot off and put back on m_fLifeDifficultyScale = 1.0f; m_iMovieDecodeMS = 2; - m_bUseBGIfNoBanner = false; m_bDelayedEscape = true; m_bInstructions = true; m_bShowDontDie = true; @@ -94,7 +93,6 @@ PrefsManager::PrefsManager() m_bAutogenGroupCourses = true; m_bBreakComboToGetItem = false; m_bShowDancingCharacters = false; - m_BannerCacheType = preload_none; m_fDancePointsAccumulated = 0; m_bUseUnlockSystem = false; m_bFirstRun = true; @@ -170,7 +168,6 @@ void PrefsManager::ReadGlobalPrefsFromDisk( bool bSwitchToLastPlayedGame ) ini.GetValueF( "Options", "JudgeWindowOKSeconds", m_fJudgeWindowOKSeconds ); ini.GetValueF( "Options", "LifeDifficultyScale", m_fLifeDifficultyScale ); ini.GetValueI( "Options", "MovieDecodeMS", m_iMovieDecodeMS ); - ini.GetValueB( "Options", "UseBGIfNoBanner", m_bUseBGIfNoBanner ); ini.GetValueB( "Options", "DelayedEscape", m_bDelayedEscape ); ini.GetValueB( "Options", "HiddenSongs", m_bHiddenSongs ); ini.GetValueB( "Options", "Vsync", m_bVsync ); @@ -208,7 +205,6 @@ void PrefsManager::ReadGlobalPrefsFromDisk( bool bSwitchToLastPlayedGame ) ini.GetValue ( "Options", "DefaultModifiers", m_sDefaultModifiers ); ini.GetValueB( "Options", "BreakComboToGetItem", m_bBreakComboToGetItem ); ini.GetValueB( "Options", "ShowDancingCharacters", m_bShowDancingCharacters ); -// ini.GetValueI( "Options", "BannerCacheType", (int&)m_BannerCacheType ); /* XXX: This belongs in the memcard code, not prefs. */ ini.GetValueF( "Options", "DancePointsAccumulated", m_fDancePointsAccumulated ); ini.GetValueB( "Options", "UseUnlockSystem", m_bUseUnlockSystem ); @@ -267,7 +263,6 @@ void PrefsManager::SaveGlobalPrefsToDisk() ini.SetValueF( "Options", "JudgeWindowOKSeconds", m_fJudgeWindowOKSeconds ); ini.SetValueF( "Options", "LifeDifficultyScale", m_fLifeDifficultyScale ); ini.SetValueI( "Options", "MovieDecodeMS", m_iMovieDecodeMS ); - ini.SetValueB( "Options", "UseBGIfNoBanner", m_bUseBGIfNoBanner ); ini.SetValueB( "Options", "DelayedEscape", m_bDelayedEscape ); ini.SetValueB( "Options", "HiddenSongs", m_bHiddenSongs ); ini.SetValueB( "Options", "Vsync", m_bVsync ); @@ -303,7 +298,6 @@ void PrefsManager::SaveGlobalPrefsToDisk() ini.SetValue ( "Options", "DefaultModifiers", m_sDefaultModifiers ); ini.SetValueB( "Options", "BreakComboToGetItem", m_bBreakComboToGetItem ); ini.SetValueB( "Options", "ShowDancingCharacters", m_bShowDancingCharacters ); -// ini.SetValueI( "Options", "BannerCacheType", m_BannerCacheType ); ini.SetValueF( "Options", "DancePointsAccumulated", m_fDancePointsAccumulated ); ini.SetValueB( "Options", "UseUnlockSystem", m_bUseUnlockSystem ); ini.SetValueB( "Options", "FirstRun", m_bFirstRun ); diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h index 74109d55a8..d1cff6c442 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -31,7 +31,6 @@ public: int m_iNumBackgrounds; float m_fBGBrightness; int m_iMovieDecodeMS; - bool m_bUseBGIfNoBanner; bool m_bHiddenSongs; bool m_bVsync; bool m_bDelayedTextureDelete; @@ -100,9 +99,6 @@ public: bool m_bSoundPreloadAll; bool m_bAllowUnacceleratedRenderer; - enum BannerCacheType { preload_none, preload_all, preload_group }; - BannerCacheType m_BannerCacheType; - /* Game-specific prefs: */ CString m_sDefaultNoteSkin; diff --git a/stepmania/src/ScreenGameplayOptions.cpp b/stepmania/src/ScreenGameplayOptions.cpp index e2e3b2f9df..87198d0a1b 100644 --- a/stepmania/src/ScreenGameplayOptions.cpp +++ b/stepmania/src/ScreenGameplayOptions.cpp @@ -24,7 +24,6 @@ enum { - GO_BGIFNOBANNER, GO_SOLO_SINGLE, GO_HIDDEN_SONGS, GO_EASTER_EGGS, @@ -35,7 +34,6 @@ enum { }; OptionRow g_GameplayOptionsLines[NUM_GAMEPLAY_OPTIONS_LINES] = { - OptionRow( "BG For\nBanner", "NO", "YES (slow)" ), OptionRow( "Solo\nSingles", "OFF","ON" ), OptionRow( "Hidden\nSongs", "OFF","ON" ), OptionRow( "Easter\nEggs", "OFF","ON" ), @@ -61,7 +59,6 @@ ScreenGameplayOptions::ScreenGameplayOptions() : void ScreenGameplayOptions::ImportOptions() { - m_iSelectedOption[0][GO_BGIFNOBANNER] = PREFSMAN->m_bUseBGIfNoBanner ? 1:0; m_iSelectedOption[0][GO_SOLO_SINGLE] = PREFSMAN->m_bSoloSingle ? 1:0; m_iSelectedOption[0][GO_HIDDEN_SONGS] = PREFSMAN->m_bHiddenSongs ? 1:0; m_iSelectedOption[0][GO_EASTER_EGGS] = PREFSMAN->m_bEasterEggs ? 1:0; @@ -72,7 +69,6 @@ void ScreenGameplayOptions::ImportOptions() void ScreenGameplayOptions::ExportOptions() { - PREFSMAN->m_bUseBGIfNoBanner = m_iSelectedOption[0][GO_BGIFNOBANNER] == 1; PREFSMAN->m_bSoloSingle = m_iSelectedOption[0][GO_SOLO_SINGLE] == 1; PREFSMAN->m_bHiddenSongs = m_iSelectedOption[0][GO_HIDDEN_SONGS] == 1; PREFSMAN->m_bEasterEggs = m_iSelectedOption[0][GO_EASTER_EGGS] == 1; diff --git a/stepmania/src/ScreenGraphicOptions.cpp b/stepmania/src/ScreenGraphicOptions.cpp index 0471d6bc37..baa666b68a 100644 --- a/stepmania/src/ScreenGraphicOptions.cpp +++ b/stepmania/src/ScreenGraphicOptions.cpp @@ -32,7 +32,6 @@ enum { GO_REFRESH_RATE, GO_MOVIEDECODEMS, GO_VSYNC, -// GO_PRELOAD_BANNERS, NUM_GRAPHIC_OPTIONS_LINES }; OptionRow g_GraphicOptionsLines[NUM_GRAPHIC_OPTIONS_LINES] = { @@ -45,7 +44,6 @@ OptionRow g_GraphicOptionsLines[NUM_GRAPHIC_OPTIONS_LINES] = { OptionRow( "Refresh\nRate", "DEFAULT","60","70","72","75","80","85","90","100","120","150" ), OptionRow( "Movie\nDecode", "1ms","2ms","3ms","4ms" ), OptionRow( "Wait For\nVsync", "NO", "YES" ), -// OptionRow( "Banner\nLoading", "ON DEMAND", "ALL", "GROUP" ), }; static const int HorizRes[] = { @@ -124,7 +122,6 @@ void ScreenGraphicOptions::ImportOptions() m_iSelectedOption[0][GO_MOVIEDECODEMS] = PREFSMAN->m_iMovieDecodeMS-1; m_iSelectedOption[0][GO_VSYNC] = PREFSMAN->m_bVsync ? 1:0; -// m_iSelectedOption[0][GO_PRELOAD_BANNERS] = PREFSMAN->m_BannerCacheType; } void ScreenGraphicOptions::ExportOptions() @@ -167,7 +164,6 @@ void ScreenGraphicOptions::ExportOptions() PREFSMAN->m_iMovieDecodeMS = m_iSelectedOption[0][GO_MOVIEDECODEMS]+1; PREFSMAN->m_bVsync = m_iSelectedOption[0][GO_VSYNC] == 1; -// PREFSMAN->m_BannerCacheType = (PrefsManager::BannerCacheType) m_iSelectedOption[0][GO_PRELOAD_BANNERS]; } void ScreenGraphicOptions::GoToPrevState()