standard metric for "forceallplayers"

This commit is contained in:
Glenn Maynard
2006-01-15 22:35:25 +00:00
parent 64a633ac9f
commit 2517ced11c
2 changed files with 14 additions and 13 deletions
+6 -7
View File
@@ -2169,7 +2169,8 @@ NextScreen=ScreenJukebox
PrevScreen=@ScreenTitleBranch()
StyleIcon=0
TimerSeconds=0
OptionMenuFlags=together;forceallplayers
OptionMenuFlags=together
ForceAllPlayers=1
LineNames=1,2,3,4
Line1=list,Styles
Line2=list,Groups
@@ -3656,7 +3657,8 @@ TitleX=SCREEN_CENTER_X-180
TitleOnCommand=zoom,0.5;horizalign,left;ShadowLength,0
TitleGainFocusCommand=diffuseshift;EffectColor1,1.3,1.3,1.3,1;EffectColor2,0.3,0.3,0.3,1
TitleLoseFocusCommand=stopeffect
OptionMenuFlags=together;forceallplayers;smnavigation
OptionMenuFlags=together;smnavigation
ForceAllPlayers=1
[ScreenOptionsService]
Class=ScreenOptionsMaster
@@ -3668,9 +3670,6 @@ PrevScreen=@ScreenTitleBranch()
# "Together" forces the vertical cursor to move together for both
# players.
#
# "ForceAllPlayers" enables all players when the screen loads.
# This should be enabled for menus used outside of gameplay.
#
# "SMNavigation" forces the START button to end the screen. This is needed
# when using entries that change the screen; otherwise, the only way to
# exit the screen when in regular mode is "exit".
@@ -3707,7 +3706,8 @@ TimerOnCommand=hidden,1
StyleIcon=0
TimerSeconds=0
AllowOperatorMenuButton=0
OptionMenuFlags=together;forceallplayers;smnavigation
OptionMenuFlags=together;smnavigation
ForceAllPlayers=1
PrevScreen=ScreenOptionsService
NextScreen=ScreenOptionsService
@@ -3718,7 +3718,6 @@ PrevScreen=ScreenOptionsService
LineNames=1
Line1=lua,OptionsRowTest()
HelpText=
OptionMenuFlags=forceallplayers
[TextBanner]
TitleX=-90
+8 -6
View File
@@ -19,6 +19,7 @@
#define LINE_NAMES THEME->GetMetric (m_sName,"LineNames")
#define OPTION_MENU_FLAGS THEME->GetMetric (m_sName,"OptionMenuFlags")
#define LINE(sLineName) THEME->GetMetric (m_sName,ssprintf("Line%s",sLineName.c_str()))
#define FORCE_ALL_PLAYERS THEME->GetMetricB(m_sName,"ForceAllPlayers")
REGISTER_SCREEN_CLASS( ScreenOptionsMaster );
@@ -35,6 +36,13 @@ void ScreenOptionsMaster::Init()
split( OPTION_MENU_FLAGS, ";", Flags, true );
InputMode im = INPUTMODE_INDIVIDUAL;
if( FORCE_ALL_PLAYERS )
{
FOREACH_PlayerNumber( pn )
GAMESTATE->m_bSideIsJoined[pn] = true;
GAMESTATE->m_MasterPlayerNumber = PLAYER_1;
}
for( unsigned i = 0; i < Flags.size(); ++i )
{
CString sFlag = Flags[i];
@@ -42,12 +50,6 @@ void ScreenOptionsMaster::Init()
if( sFlag == "together" )
im = INPUTMODE_SHARE_CURSOR;
else if( sFlag == "forceallplayers" )
{
FOREACH_PlayerNumber( pn )
GAMESTATE->m_bSideIsJoined[pn] = true;
GAMESTATE->m_MasterPlayerNumber = PLAYER_1;
}
else if( sFlag == "smnavigation" )
SetNavigation( NAV_THREE_KEY_MENU );
else if( sFlag == "toggle" )