This commit is contained in:
Thai Pangsakulyanont
2011-03-18 12:28:31 +07:00
3 changed files with 5 additions and 4 deletions
+2 -2
View File
@@ -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"
+2
View File
@@ -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 );
}
}
+1 -2
View File
@@ -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")