[ScreenOptions] Renamed "ScreenOptions LineHighlight" to "ScreenOptions LineHighlight P#", making it load per-player.

This commit is contained in:
AJ Kelly
2011-04-30 03:45:16 -05:00
parent 1e2404918b
commit 3869c69098
5 changed files with 30 additions and 13 deletions
+6 -1
View File
@@ -10,9 +10,14 @@ supported but exist anyways.)
_____________________________________________________________________________ _____________________________________________________________________________
================================================================================ ================================================================================
sm-ssc v1.2.5 | 201104?? sm-ssc v1.2.5 | 20110???
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
20110430
--------
* [ScreenOptions] Renamed "ScreenOptions LineHighlight" to "ScreenOptions
LineHighlight P#", making it load per-player. [AJ]
20110428 20110428
-------- --------
* [BeginnerHelper] Various changes: [AJ] * [BeginnerHelper] Various changes: [AJ]
@@ -0,0 +1 @@
_blank
+20 -9
View File
@@ -2082,9 +2082,12 @@ PageOnCommand=
ContainerOnCommand= ContainerOnCommand=
ContainerOffCommand= ContainerOffCommand=
CursorOnCommand= CursorOnCommand=
LineHighlightOnCommand= LineHighlightP1OnCommand=
LineHighlightChangeCommand= LineHighlightP1ChangeCommand=
LineHighlightChangeToExitCommand= LineHighlightP1ChangeToExitCommand=
LineHighlightP2OnCommand=
LineHighlightP2ChangeCommand=
LineHighlightP2ChangeToExitCommand=
ShowScrollBar=false ShowScrollBar=false
ScrollBarHeight=0 ScrollBarHeight=0
ScrollBarTime=0 ScrollBarTime=0
@@ -2472,9 +2475,13 @@ Fallback="ScreenOptionsSimple"
OptionRowNormalMetricsGroup="OptionRowService" OptionRowNormalMetricsGroup="OptionRowService"
LineHighlightOnCommand=visible,false LineHighlightP1OnCommand=visible,false
LineHighlightChangeCommand= LineHighlightP1ChangeCommand=
LineHighlightChangeToExitCommand= LineHighlightP1ChangeToExitCommand=
LineHighlightP2OnCommand=visible,false
LineHighlightP2ChangeCommand=
LineHighlightP2ChangeToExitCommand=
CursorOnCommand=visible,false CursorOnCommand=visible,false
@@ -2531,9 +2538,13 @@ PrevScreen="ScreenOptionsService"
NextScreen="ScreenOptionsService" NextScreen="ScreenOptionsService"
HelpText=Screen.String("HelpTextOptionsAndBack") HelpText=Screen.String("HelpTextOptionsAndBack")
LineHighlightOnCommand=visible,false LineHighlightP1OnCommand=visible,false
LineHighlightChangeCommand= LineHighlightP1ChangeCommand=
LineHighlightChangeToExitCommand= LineHighlightP1ChangeToExitCommand=
LineHighlightP2OnCommand=visible,false
LineHighlightP2ChangeCommand=
LineHighlightP2ChangeToExitCommand=
# #
ExplanationTogetherX=SCREEN_CENTER_X ExplanationTogetherX=SCREEN_CENTER_X
ExplanationTogetherY=SCREEN_CENTER_Y+174 ExplanationTogetherY=SCREEN_CENTER_Y+174
+3 -3
View File
@@ -131,11 +131,11 @@ void ScreenOptions::Init()
LOAD_ALL_COMMANDS_AND_SET_XY( m_sprPage ); LOAD_ALL_COMMANDS_AND_SET_XY( m_sprPage );
m_frameContainer.AddChild( m_sprPage ); m_frameContainer.AddChild( m_sprPage );
// init line line highlights // init line highlights
FOREACH_PlayerNumber( p ) FOREACH_PlayerNumber( p )
{ {
m_sprLineHighlight[p].Load( THEME->GetPathG(m_sName,"LineHighlight") ); m_sprLineHighlight[p].Load( THEME->GetPathG(m_sName, ssprintf("LineHighlight P%d",p+1)) );
m_sprLineHighlight[p]->SetName( "LineHighlight" ); m_sprLineHighlight[p]->SetName( ssprintf("LineHighlightP%d",p+1) );
m_sprLineHighlight[p]->SetX( LINE_HIGHLIGHT_X ); m_sprLineHighlight[p]->SetX( LINE_HIGHLIGHT_X );
LOAD_ALL_COMMANDS( m_sprLineHighlight[p] ); LOAD_ALL_COMMANDS( m_sprLineHighlight[p] );
m_frameContainer.AddChild( m_sprLineHighlight[p] ); m_frameContainer.AddChild( m_sprLineHighlight[p] );