From 47ebbdbd26dee37b8ea80743bdb4b9b3e4993849 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Thu, 17 Mar 2011 15:40:35 -0400 Subject: [PATCH 1/3] Metrics for the future. ;) --- Themes/_fallback/metrics.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index a0f3f4306c..b37ce668a6 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -1664,11 +1664,11 @@ Choice8="screen,ScreenTest;text,Sandbox" Choice9="screen,ScreenQuickSetupOverview;text,Setup" # Aliases for the future. ChoiceSetup="screen,ScreenQuickSetupOverview;text,Setup" -ChoiceGameStart="applydefaultoptions;screen,ScreenSelectProfile;text,Game Start" +ChoiceGameStart="applydefaultoptions;text,Game Start;screen,"..Branch.StartGame() ChoiceOnline="screen,ScreenNetworkOptions;text,Play Online" ChoiceGameSelect="screen,ScreenSelectGame;text,Select Game" ChoiceOptions="screen,ScreenOptionsSystemDirection;text,Options" -ChoiceEdit="screen,ScreenOptionsEdit;text,Edit/Share" +ChoiceEdit="text,Edit/Share;screen,"..Branch.OptionsEdit() ChoiceJukebox="screen,ScreenJukeboxMenu;text,Jukebox" ChoiceSandbox="screen,ScreenTest;text,Sandbox" ChoiceSetup="screen,ScreenQuickSetupOverview;text,Setup" From 661a1b89108b2737867eb84bd7cc0dface71f895 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Thu, 17 Mar 2011 15:05:15 -0500 Subject: [PATCH 2/3] fix PaneDisplay --- src/PaneDisplay.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/PaneDisplay.cpp b/src/PaneDisplay.cpp index f3e37b9e60..e812156cd3 100644 --- a/src/PaneDisplay.cpp +++ b/src/PaneDisplay.cpp @@ -51,6 +51,7 @@ static const Content_t g_Contents[NUM_PaneCategory] = { NEED_NOTES, "count" }, // Mines { NEED_NOTES, "count" }, // Hands { NEED_NOTES, "count" }, // Lifts + { NEED_NOTES, "count" }, // Fakes { NEED_NOTES, "score" }, // MachineHighScore { NEED_NOTES, "name" }, // MachineHighName { NEED_NOTES|NEED_PROFILE, "score" }, // ProfileHighScore @@ -247,6 +248,7 @@ void PaneDisplay::SetContent( PaneCategory c ) case PaneCategory_Mines: case PaneCategory_Hands: case PaneCategory_Lifts: + case PaneCategory_Fakes: str = ssprintf( COUNT_FORMAT.GetValue(), val ); } } From 8892ad30780fffc7b2885f1e8472218b3e0238d9 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Thu, 17 Mar 2011 18:22:31 -0500 Subject: [PATCH 3/3] fix a crash on themes which use the detail lines on ScreenEvaluation --- src/ScreenEvaluation.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ScreenEvaluation.cpp b/src/ScreenEvaluation.cpp index 395c8b257b..b474d8b8cb 100644 --- a/src/ScreenEvaluation.cpp +++ b/src/ScreenEvaluation.cpp @@ -30,7 +30,6 @@ #include "ScoreKeeperNormal.h" #include "InputEventPlus.h" - // metrics that are common to all ScreenEvaluation classes #define BANNER_WIDTH THEME->GetMetricF(m_sName,"BannerWidth") #define BANNER_HEIGHT THEME->GetMetricF(m_sName,"BannerHeight") @@ -45,7 +44,7 @@ LuaFunction( JudgmentLineToLocalizedString, JudgmentLineToLocalizedString(Enum:: static const char *DetailLineNames[NUM_DetailLine] = { - "NumSteps","Jumps", "Holds", "Mines", "Hands", "Rolls", + "NumSteps","Jumps", "Holds", "Mines", "Hands", "Rolls", "Lifts", "Fakes" }; XToString( DetailLine ); #define DETAILLINE_FORMAT THEME->GetMetric (m_sName,"DetailLineFormat")