actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cache OPTION_ORDER

Browse Source
This commit is contained in:
Chris Danford
2005-02-06 05:15:57 +00:00
parent 7a21e95ede
commit d93d2d1681
4 changed files with 46 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameConstantsAndTypes.cpp
+12
View File
@@ -237,6 +237,18 @@ static const CString StyleTypeNames[NUM_STYLE_TYPES] = {
XToString( StyleType );
StringToX( StyleType );
static const CString MenuDirNames[NUM_MENU_DIRS] = {
"Up",
"Down",
"Left",
"Right",
"Auto",
};
XToString( MenuDir );
StringToX( MenuDir );
#include "LuaFunctions.h"
LuaFunction_NoArgs( CoinMode, CoinModeToString(PREFSMAN->m_CoinMode) )
LuaFunction_NoArgs( Premium, PremiumToString(PREFSMAN->m_Premium) )
stepmania/src/GameConstantsAndTypes.h
+13 -1
View File
@@ -35,7 +35,6 @@ const CString& RadarCategoryToString( RadarCategory cat );
const CString& RadarCategoryToThemedString( RadarCategory cat );
enum StepsType
{
STEPS_TYPE_DANCE_SINGLE = 0,
@@ -343,6 +342,19 @@ const CString& StyleTypeToString( StyleType s );
StyleType StringToStyleType( const CString& s );
enum MenuDir
{
MENU_DIR_UP,
MENU_DIR_DOWN,
MENU_DIR_LEFT,
MENU_DIR_RIGHT,
MENU_DIR_AUTO, // when players join and the selection becomes invalid
NUM_MENU_DIRS
};
#define FOREACH_MenuDir( md ) FOREACH_ENUM( MenuDir, NUM_MENU_DIRS, md )
const CString& MenuDirToString( MenuDir md );
#endif
/*
stepmania/src/ScreenSelectMaster.cpp
+18 -23
View File
@@ -14,18 +14,13 @@
#include "Foreach.h"
#include "RageSoundManager.h"
#define OPTION_ORDER( dir ) THEME->GetMetric (m_sName,"OptionOrder"+CString(dir))
/* OptionOrderLeft=0:1,1:2,2:3,3:4 */
const char *ScreenSelectMaster::dirs[NUM_DIRS] =
{
"Up", "Down", "Left", "Right", "Auto"
};
const ScreenMessage SM_PlayPostSwitchPage = (ScreenMessage)(SM_User+1);
CString CURSOR_OFFSET_X_FROM_ICON_NAME( size_t p, size_t part ) { return ssprintf("CursorPart%dP%dOffsetXFromIcon",part+1,p+1); }
CString CURSOR_OFFSET_Y_FROM_ICON_NAME( size_t p, size_t part ) { return ssprintf("CursorPart%dP%dOffsetYFromIcon",part+1,p+1); }
/* e.g. "OptionOrderLeft=0:1,1:2,2:3,3:4" */
CString OPTION_ORDER_NAME( size_t dir ) { return "OptionOrder"+MenuDirToString((MenuDir)dir); }
REGISTER_SCREEN_CLASS( ScreenSelectMaster );
ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sClassName ),
@@ -39,6 +34,7 @@ ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sCl
PRE_SWITCH_PAGE_SECONDS(m_sName,"PreSwitchPageSeconds"),
POST_SWITCH_PAGE_SECONDS(m_sName,"PostSwitchPageSeconds"),
EXTRA_SLEEP_AFTER_TWEEN_OFF_SECONDS(m_sName,"ExtraSleepAfterTweenOffSeconds"),
OPTION_ORDER(m_sName,OPTION_ORDER_NAME,NUM_MENU_DIRS),
WRAP_CURSOR(m_sName,"WrapCursor"),
SHOW_SCROLLER(m_sName,"ShowScroller"),
SCROLLER_SECONDS_PER_ITEM(m_sName,"ScrollerSecondsPerItem"),
@@ -202,7 +198,7 @@ ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sCl
m_soundStart.Load( THEME->GetPathS(m_sName,"start") );
// init m_Next order info
for( int dir = 0; dir < NUM_DIRS; ++dir )
FOREACH_MenuDir( dir )
{
/* Reasonable defaults: */
for( unsigned c = 0; c < m_aGameCommands.size(); ++c )
@@ -210,21 +206,20 @@ ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sCl
int add;
switch( dir )
{
case DIR_UP:
case DIR_LEFT: add = -1; break;
default: add = +1; break;
case MENU_DIR_UP:
case MENU_DIR_LEFT: add = -1; break;
default: add = +1; break;
}
m_Next[dir][c] = c + add;
/* Always wrap around DIR_AUTO. */
if( dir == DIR_AUTO || (bool)WRAP_CURSOR )
/* Always wrap around MENU_DIR_AUTO. */
if( dir == MENU_DIR_AUTO || (bool)WRAP_CURSOR )
wrap( m_Next[dir][c], m_aGameCommands.size() );
else
m_Next[dir][c] = clamp( m_Next[dir][c], 0, (int)m_aGameCommands.size()-1 );
}
const CString dirname = dirs[dir];
const CString order = OPTION_ORDER( dirname );
const CString order = OPTION_ORDER.GetValue( dir );
vector<CString> parts;
split( order, ",", parts, true );
@@ -236,7 +231,7 @@ ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sCl
unsigned from, to;
if( sscanf( parts[part], "%u:%u", &from, &to ) != 2 )
{
LOG->Warn( "%s::OptionOrder%s parse error", m_sName.c_str(), dirname.c_str() );
LOG->Warn( "%s::OptionOrder%s parse error", m_sName.c_str(), MenuDirToString(dir).c_str() );
continue;
}
@@ -246,7 +241,7 @@ ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sCl
if( from >= m_aGameCommands.size() ||
to >= m_aGameCommands.size() )
{
LOG->Warn( "%s::OptionOrder%s out of range", m_sName.c_str(), dirname.c_str() );
LOG->Warn( "%s::OptionOrder%s out of range", m_sName.c_str(), MenuDirToString(dir).c_str() );
continue;
}
@@ -339,12 +334,12 @@ void ScreenSelectMaster::UpdateSelectableChoices()
FOREACH_HumanPlayer( p )
{
if( !m_aGameCommands[m_iChoice[p]].IsPlayable() )
Move( p, DIR_AUTO );
Move( p, MENU_DIR_AUTO );
ASSERT( m_aGameCommands[m_iChoice[p]].IsPlayable() );
}
}
bool ScreenSelectMaster::Move( PlayerNumber pn, Dirs dir )
bool ScreenSelectMaster::Move( PlayerNumber pn, MenuDir dir )
{
int iSwitchToIndex = m_iChoice[pn];
set<int> seen;
@@ -366,7 +361,7 @@ void ScreenSelectMaster::MenuLeft( PlayerNumber pn )
{
if( m_fLockInputSecs > 0 || m_bChosen[pn] )
return;
if( Move(pn, DIR_LEFT) )
if( Move(pn, MENU_DIR_LEFT) )
m_soundChange.Play();
}
@@ -374,7 +369,7 @@ void ScreenSelectMaster::MenuRight( PlayerNumber pn )
{
if( m_fLockInputSecs > 0 || m_bChosen[pn] )
return;
if( Move(pn, DIR_RIGHT) )
if( Move(pn, MENU_DIR_RIGHT) )
m_soundChange.Play();
}
@@ -382,7 +377,7 @@ void ScreenSelectMaster::MenuUp( PlayerNumber pn )
{
if( m_fLockInputSecs > 0 || m_bChosen[pn] )
return;
if( Move(pn, DIR_UP) )
if( Move(pn, MENU_DIR_UP) )
m_soundChange.Play();
}
@@ -390,7 +385,7 @@ void ScreenSelectMaster::MenuDown( PlayerNumber pn )
{
if( m_fLockInputSecs > 0 || m_bChosen[pn] )
return;
if( Move(pn, DIR_DOWN) )
if( Move(pn, MENU_DIR_DOWN) )
m_soundChange.Play();
}
stepmania/src/ScreenSelectMaster.h
+3 -13
View File
@@ -46,7 +46,7 @@ protected:
ThemeMetric<float> PRE_SWITCH_PAGE_SECONDS;
ThemeMetric<float> POST_SWITCH_PAGE_SECONDS;
ThemeMetric<float> EXTRA_SLEEP_AFTER_TWEEN_OFF_SECONDS;
//OPTION_ORDER( dir ) THEME->GetMetric (m_sName,"OptionOrder"+CString(dir))
ThemeMetric1D<CString,NUM_MENU_DIRS> OPTION_ORDER;
ThemeMetric<bool> WRAP_CURSOR;
ThemeMetric<bool> SHOW_SCROLLER;
ThemeMetric<float> SCROLLER_SECONDS_PER_ITEM;
@@ -55,22 +55,12 @@ protected:
ThemeMetric<float> SCROLLER_SPACING_Y;
ThemeMetric<CString> DEFAULT_CHOICE;
enum Dirs
{
DIR_UP,
DIR_DOWN,
DIR_LEFT,
DIR_RIGHT,
DIR_AUTO, // when players join and the selection becomes invalid
NUM_DIRS
};
static const char *dirs[NUM_DIRS];
int m_Next[NUM_DIRS][MAX_CHOICES];
int m_Next[NUM_MENU_DIRS][MAX_CHOICES];
virtual int GetSelectionIndex( PlayerNumber pn );
virtual void UpdateSelectableChoices();
bool Move( PlayerNumber pn, Dirs dir );
bool Move( PlayerNumber pn, MenuDir dir );
bool ChangePage( int iNewChoice );
bool ChangeSelection( PlayerNumber pn, int iNewChoice );
float DoMenuStart( PlayerNumber pn );