From 23cc4c0e4561c9cd9b3b9293358398873a4740bc Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Mon, 21 Feb 2011 12:15:25 -0600 Subject: [PATCH] [Common] Added OperatorMenuScreen metric. --- Docs/Changelog_sm-ssc.txt | 1 + .../Scripts/03 ThemeAndGamePrefs.lua | 1 - Themes/_fallback/metrics.ini | 22 ++++++++++++++----- src/CommonMetrics.cpp | 2 +- src/CommonMetrics.h | 2 +- src/StepMania.cpp | 2 +- 6 files changed, 20 insertions(+), 10 deletions(-) diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt index 52a743c94c..908b7fc7f5 100644 --- a/Docs/Changelog_sm-ssc.txt +++ b/Docs/Changelog_sm-ssc.txt @@ -19,6 +19,7 @@ sm-ssc v1.2.3 | 201102?? Please re-adjust your speed mods accordingly. [AJ] * [OptionRow] Added GetLayoutType() and GetSelectType() Lua bindings. [AJ] * Fix .sm-style edits not being loaded. [AJ] +* [Common] Added OperatorMenuScreen metric. [AJ] ================================================================================ sm-ssc v1.2.2 | 20110220 diff --git a/Themes/_fallback/Scripts/03 ThemeAndGamePrefs.lua b/Themes/_fallback/Scripts/03 ThemeAndGamePrefs.lua index 74fc02a2a4..7d20bef84f 100644 --- a/Themes/_fallback/Scripts/03 ThemeAndGamePrefs.lua +++ b/Themes/_fallback/Scripts/03 ThemeAndGamePrefs.lua @@ -6,7 +6,6 @@ function InitGamePrefs() { "NotePosition", true }, { "ComboOnRolls", false }, { "ComboUnderField", true }, - { "AdjustSpeed", false }, }; for idx,pref in ipairs(Prefs) do diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 7a48d01b9f..578e87a703 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -22,14 +22,16 @@ IsBaseTheme=1 # for 480p, it would be enlarged for bigger screens! ScreenWidth=1 ScreenHeight=480 + # Allows you to pick all available game modes for your gametype: for example, # inserting enough coins for 1p would let you choose between solo, single # and double before each game -# AutoSetStyle=true AutoSetStyle=GetGamePrefB("AutoSetStyle") + # Default modifiers and noteskin. DefaultModifiers="default;1.5x;" DefaultNoteSkinName="default" + # Difficulties to show. Useful for custom games where you want to hide these. DifficultiesToShow="beginner,easy,medium,hard,challenge" # Same as above, but for courses. @@ -37,19 +39,27 @@ CourseDifficultiesToShow="easy,medium,hard" # Things to hide. You couldn't play cabinet anyways. StepsTypesToHide="lights-cabinet" #~ StepsTypesToHide="dance-couple,dance-solo,pump-halfdouble,lights-cabinet" -# Useless? + +# The number of entries before "Various" is shown on the BPMDisplay, etc. MaxCourseEntriesBeforeShowVarious=10 -# Legacy metric: The first screen that shows up when you take forever to press -# start. + +# The screen that appears when pressing the operator button. +OperatorMenuScreen="ScreenOptionsService" + +# The first screen in the attract cycle. FirstAttractScreen="ScreenDemonstration" + # First screen that pops up when you start the game. ScreenInit in particular # shows the theme information before going to the title screen. InitialScreen="ScreenInit" + # Music selection screen used after downloading files. SelectMusicScreen="ScreenSelectMusic" -# Screens that show over everything else. you shouldn't worry bout this, since -# it wont matter much. + +# Screens that show over everything else. +# Only mess with this if you know what you're doing. OverlayScreens="ScreenSystemLayer,ScreenSyncOverlay,ScreenStatsOverlay,ScreenDebugOverlay,ScreenConsoleOverlay,ScreenInstallOverlay" + # Legacy metric: Percentage Scoring shows this many decimals ( 00.00% ). PercentScoreDecimalPlaces=2 diff --git a/src/CommonMetrics.cpp b/src/CommonMetrics.cpp index b981ae8d27..02629cb1eb 100644 --- a/src/CommonMetrics.cpp +++ b/src/CommonMetrics.cpp @@ -8,7 +8,7 @@ #include "ProductInfo.h" #include "LuaManager.h" -//ThemeMetric CommonMetrics::OPERATOR_MENU_SCREEN ("Common","OperatorMenuScreen"); +ThemeMetric CommonMetrics::OPERATOR_MENU_SCREEN ("Common","OperatorMenuScreen"); ThemeMetric CommonMetrics::FIRST_ATTRACT_SCREEN ("Common","FirstAttractScreen"); ThemeMetric CommonMetrics::DEFAULT_MODIFIERS ("Common","DefaultModifiers" ); LocalizedString CommonMetrics::WINDOW_TITLE ("Common","WindowTitle"); diff --git a/src/CommonMetrics.h b/src/CommonMetrics.h index ca175ae449..f0ca41c1cb 100644 --- a/src/CommonMetrics.h +++ b/src/CommonMetrics.h @@ -48,7 +48,7 @@ namespace CommonMetrics /** @brief The first screen in the attract loop. */ extern ThemeMetric FIRST_ATTRACT_SCREEN; /** @brief The screen that appears when pressing the operator button. */ - //extern ThemeMetric OPERATOR_MENU_SCREEN; + extern ThemeMetric OPERATOR_MENU_SCREEN; /** @brief The default modifiers to apply. */ extern ThemeMetric DEFAULT_MODIFIERS; /** @brief The caption on the title bar. */ diff --git a/src/StepMania.cpp b/src/StepMania.cpp index 2e8ee2af5c..34f6d6d5eb 100644 --- a/src/StepMania.cpp +++ b/src/StepMania.cpp @@ -1291,7 +1291,7 @@ bool HandleGlobalInputs( const InputEventPlus &input ) SCREENMAN->SystemMessage( SERVICE_SWITCH_PRESSED ); SCREENMAN->PopAllScreens(); GAMESTATE->Reset(); - SCREENMAN->SetNewScreen( "ScreenOptionsService" ); + SCREENMAN->SetNewScreen( CommonMetrics::OPERATOR_MENU_SCREEN ); } return true;