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

FOREACH_ENUM2 -> FOREACH_ENUM

Browse Source
This commit is contained in:
Glenn Maynard
2006-10-07 08:56:58 +00:00
parent 30fd6d77b4
commit 617e8b5335
39 changed files with 64 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/CodeDetector.h
+1 -1
View File
@@ -47,7 +47,7 @@ enum Code {
CODE_BACK_IN_EVENT_MODE,
NUM_Code // leave this at the end
};
#define FOREACH_Code( c ) FOREACH_ENUM2( Code, c )
#define FOREACH_Code( c ) FOREACH_ENUM( Code, c )
struct CodeItem
{
stepmania/src/ControllerStateDisplay.cpp
+2 -2
View File
@@ -58,7 +58,7 @@ void ControllerStateDisplay::LoadInternal( MultiPlayer mp, GameController gc )
this->AddChild( m_sprFrame );
m_mp = mp;
FOREACH_ENUM2( ControllerStateButton, b )
FOREACH_ENUM( ControllerStateButton, b )
{
Button &button = m_Buttons[ b ];
@@ -74,7 +74,7 @@ void ControllerStateDisplay::Update( float fDelta )
{
ActorFrame::Update( fDelta );
FOREACH_ENUM2( ControllerStateButton, b )
FOREACH_ENUM( ControllerStateButton, b )
{
Button &button = m_Buttons[ b ];
stepmania/src/Course.h
+2 -2
View File
@@ -26,7 +26,7 @@ enum CourseType
NUM_CourseType,
CourseType_Invalid
};
#define FOREACH_CourseType( i ) FOREACH_ENUM2( CourseType, i )
#define FOREACH_CourseType( i ) FOREACH_ENUM( CourseType, i )
const RString& CourseTypeToString( CourseType i );
const RString& CourseTypeToLocalizedString( CourseType i );
LuaDeclareType( CourseType );
@@ -44,7 +44,7 @@ enum SongSort
SongSort_LowestGrades,
NUM_SongSort,
};
#define FOREACH_SongSort( i ) FOREACH_ENUM2( SongSort, i )
#define FOREACH_SongSort( i ) FOREACH_ENUM( SongSort, i )
const RString& SongSortToString( SongSort ss );
const RString& SongSortToLocalizedString( SongSort ss );
stepmania/src/Difficulty.h
+1 -1
View File
@@ -17,7 +17,7 @@ enum Difficulty
NUM_Difficulty,
Difficulty_Invalid
};
#define FOREACH_Difficulty( dc ) FOREACH_ENUM2( Difficulty, dc )
#define FOREACH_Difficulty( dc ) FOREACH_ENUM( Difficulty, dc )
const RString& DifficultyToString( Difficulty dc );
const RString& DifficultyToLocalizedString( Difficulty dc );
Difficulty StringToDifficulty( const RString& sDC );
stepmania/src/EditMenu.h
+2 -2
View File
@@ -23,7 +23,7 @@ enum EditMenuRow
ROW_ACTION,
NUM_EditMenuRow
};
#define FOREACH_EditMenuRow( r ) FOREACH_ENUM2( EditMenuRow, r )
#define FOREACH_EditMenuRow( r ) FOREACH_ENUM( EditMenuRow, r )
const RString& EditMenuRowToString( EditMenuRow r );
const RString& EditMenuRowToLocalizedString( EditMenuRow r );
@@ -36,7 +36,7 @@ enum EditMenuAction
NUM_EditMenuAction,
EditMenuAction_Invalid
};
#define FOREACH_EditMenuAction( ema ) FOREACH_ENUM2( EditMenuAction, ema )
#define FOREACH_EditMenuAction( ema ) FOREACH_ENUM( EditMenuAction, ema )
const RString& EditMenuActionToString( EditMenuAction ema );
const RString& EditMenuActionToLocalizedString( EditMenuAction ema );
stepmania/src/EnumHelper.h
+2 -3
View File
@@ -11,7 +11,6 @@ extern "C"
#define FOREACH_ENUM_N( e, max, var ) for( e var=(e)0; var<max; enum_add<e>( var, +1 ) )
#define FOREACH_ENUM( e, var ) for( e var=(e)0; var<NUM_##e; enum_add<e>( var, +1 ) )
#define FOREACH_ENUM2 FOREACH_ENUM
int CheckEnum( lua_State *L, LuaReference &table, int iPos, int iInvalid, const char *szType );
@@ -100,7 +99,7 @@ static void Lua##X(lua_State* L) \
{ \
/* Create the EnumToString table: { "UnlockEntry_ArcadePoints", "UnlockEntry_DancePoints" } */ \
lua_newtable( L ); \
FOREACH_ENUM2( X, i ) \
FOREACH_ENUM( X, i ) \
{ \
RString s = X##ToString( i ); \
lua_pushstring( L, (#X "_")+s ); \
@@ -111,7 +110,7 @@ static void Lua##X(lua_State* L) \
lua_setglobal( L, #X ); \
/* Create the StringToEnum table: { "UnlockEntry_ArcadePoints" = 0, "UnlockEntry_DancePoints" = 1 } */ \
lua_newtable( L ); \
FOREACH_ENUM2( X, i ) \
FOREACH_ENUM( X, i ) \
{ \
RString s = X##ToString( i ); \
lua_pushstring( L, (#X "_")+s ); \
stepmania/src/GameConstantsAndTypes.h
+14 -14
View File
@@ -32,7 +32,7 @@ enum RadarCategory
NUM_RadarCategory, // leave this at the end
RadarCategory_Invalid
};
#define FOREACH_RadarCategory( rc ) FOREACH_ENUM2( RadarCategory, rc )
#define FOREACH_RadarCategory( rc ) FOREACH_ENUM( RadarCategory, rc )
const RString& RadarCategoryToString( RadarCategory cat );
const RString& RadarCategoryToLocalizedString( RadarCategory cat );
LuaDeclareType( RadarCategory );
@@ -72,7 +72,7 @@ enum StepsType
NUM_StepsType, // leave this at the end
StepsType_Invalid,
};
#define FOREACH_StepsType( st ) FOREACH_ENUM2( StepsType, st )
#define FOREACH_StepsType( st ) FOREACH_ENUM( StepsType, st )
LuaDeclareType( StepsType );
//
@@ -89,7 +89,7 @@ enum PlayMode
NUM_PlayMode,
PlayMode_Invalid
};
#define FOREACH_PlayMode( pm ) FOREACH_ENUM2( PlayMode, pm )
#define FOREACH_PlayMode( pm ) FOREACH_ENUM( PlayMode, pm )
const RString& PlayModeToString( PlayMode pm );
const RString& PlayModeToLocalizedString( PlayMode pm );
PlayMode StringToPlayMode( const RString& s );
@@ -122,7 +122,7 @@ enum SortOrder
SortOrder_Invalid
};
const SortOrder MAX_SELECTABLE_SORT = (SortOrder)(SORT_ROULETTE-1);
#define FOREACH_SortOrder( so ) FOREACH_ENUM2( SortOrder, so )
#define FOREACH_SortOrder( so ) FOREACH_ENUM( SortOrder, so )
const RString& SortOrderToString( SortOrder so );
SortOrder StringToSortOrder( const RString& str );
LuaDeclareType( SortOrder );
@@ -146,7 +146,7 @@ enum TapNoteScore {
NUM_TapNoteScore,
TapNoteScore_Invalid,
};
#define FOREACH_TapNoteScore( tns ) FOREACH_ENUM2( TapNoteScore, tns )
#define FOREACH_TapNoteScore( tns ) FOREACH_ENUM( TapNoteScore, tns )
const RString& TapNoteScoreToString( TapNoteScore tns );
const RString& TapNoteScoreToLocalizedString( TapNoteScore tns );
TapNoteScore StringToTapNoteScore( const RString& str );
@@ -161,7 +161,7 @@ enum HoldNoteScore
NUM_HoldNoteScore,
HoldNoteScore_Invalid,
};
#define FOREACH_HoldNoteScore( hns ) FOREACH_ENUM2( HoldNoteScore, hns )
#define FOREACH_HoldNoteScore( hns ) FOREACH_ENUM( HoldNoteScore, hns )
const RString& HoldNoteScoreToString( HoldNoteScore hns );
const RString& HoldNoteScoreToLocalizedString( HoldNoteScore hns );
HoldNoteScore StringToHoldNoteScore( const RString& str );
@@ -210,7 +210,7 @@ enum ProfileSlot
NUM_ProfileSlot,
ProfileSlot_Invalid
};
#define FOREACH_ProfileSlot( slot ) FOREACH_ENUM2( ProfileSlot, slot )
#define FOREACH_ProfileSlot( slot ) FOREACH_ENUM( ProfileSlot, slot )
enum MemoryCardState
@@ -240,7 +240,7 @@ enum RankingCategory
NUM_RankingCategory,
RankingCategory_Invalid
};
#define FOREACH_RankingCategory( rc ) FOREACH_ENUM2( RankingCategory, rc )
#define FOREACH_RankingCategory( rc ) FOREACH_ENUM( RankingCategory, rc )
const RString& RankingCategoryToString( RankingCategory rc );
RankingCategory StringToRankingCategory( const RString& rc );
@@ -308,7 +308,7 @@ enum CoinMode
NUM_CoinMode,
CoinMode_Invalid
};
#define FOREACH_CoinMode( i ) FOREACH_ENUM2( CoinMode, i )
#define FOREACH_CoinMode( i ) FOREACH_ENUM( CoinMode, i )
const RString& CoinModeToString( CoinMode cm );
LuaDeclareType( CoinMode );
@@ -324,7 +324,7 @@ enum Premium
NUM_Premium,
Premium_Invalid
};
#define FOREACH_Premium( i ) FOREACH_ENUM2( Premium, i )
#define FOREACH_Premium( i ) FOREACH_ENUM( Premium, i )
const RString& PremiumToString( Premium p );
LuaDeclareType( Premium );
@@ -348,7 +348,7 @@ enum PerDifficultyAward
NUM_PerDifficultyAward,
PerDifficultyAward_Invalid,
};
#define FOREACH_PerDifficultyAward( pma ) FOREACH_ENUM2( PerDifficultyAward, pma )
#define FOREACH_PerDifficultyAward( pma ) FOREACH_ENUM( PerDifficultyAward, pma )
const RString& PerDifficultyAwardToString( PerDifficultyAward pma );
const RString& PerDifficultyAwardToLocalizedString( PerDifficultyAward pma );
PerDifficultyAward StringToPerDifficultyAward( const RString& pma );
@@ -370,7 +370,7 @@ enum PeakComboAward
NUM_PeakComboAward,
PeakComboAward_Invalid,
};
#define FOREACH_PeakComboAward( pca ) FOREACH_ENUM2( PeakComboAward, pca )
#define FOREACH_PeakComboAward( pca ) FOREACH_ENUM( PeakComboAward, pca )
const RString& PeakComboAwardToString( PeakComboAward pma );
const RString& PeakComboAwardToLocalizedString( PeakComboAward pma );
PeakComboAward StringToPeakComboAward( const RString& pma );
@@ -409,7 +409,7 @@ enum GoalType
NUM_GoalType,
GoalType_Invalid,
};
#define FOREACH_GoalType( gt ) FOREACH_ENUM2( GoalType, gt )
#define FOREACH_GoalType( gt ) FOREACH_ENUM( GoalType, gt )
const RString& GoalTypeToString( GoalType gt );
GoalType StringToGoalType( const RString& s );
LuaDeclareType( GoalType );
@@ -447,7 +447,7 @@ enum Stage
NUM_Stage,
Stage_Invalid,
};
#define FOREACH_Stage( s ) FOREACH_ENUM2( Stage, s )
#define FOREACH_Stage( s ) FOREACH_ENUM( Stage, s )
const RString& StageToString( Stage s );
LuaDeclareType( Stage );
stepmania/src/GameInput.h
+2 -2
View File
@@ -14,7 +14,7 @@ enum GameController
NUM_GameController, // leave this at the end
GameController_Invalid,
};
#define FOREACH_GameController( gc ) FOREACH_ENUM2( GameController, gc )
#define FOREACH_GameController( gc ) FOREACH_ENUM( GameController, gc )
typedef int GameButton;
RString GameButtonToString( const InputScheme* pInputs, GameButton i );
@@ -23,7 +23,7 @@ GameButton StringToGameButton( const InputScheme* pInputs, const RString& s );
const GameButton NUM_GameButton = 20;
const GameButton GameButton_Invalid = NUM_GameButton+1;
#define FOREACH_GameButton( gb ) FOREACH_ENUM2( GameButton, gb )
#define FOREACH_GameButton( gb ) FOREACH_ENUM( GameButton, gb )
enum // DanceButtons
{
stepmania/src/Grade.h
+1 -1
View File
@@ -53,7 +53,7 @@ RString GradeToOldString( Grade g ); // "AAA", "B", etc for backward compatibili
RString GradeToLocalizedString( Grade g );
Grade StringToGrade( const RString &s );
LuaDeclareType( Grade );
#define FOREACH_Grade( g ) FOREACH_ENUM2( Grade, g )
#define FOREACH_Grade( g ) FOREACH_ENUM( Grade, g )
#define FOREACH_UsedGrade( g ) FOREACH_ENUM_N( Grade, THEME->GetMetricI("PlayerStageStats","NumGradeTiersUsed"), g )
#endif
stepmania/src/LightsManager.h
+1 -1
View File
@@ -24,7 +24,7 @@ enum CabinetLight
NUM_CabinetLight,
CabinetLight_Invalid
};
#define FOREACH_CabinetLight( i ) FOREACH_ENUM2( CabinetLight, i )
#define FOREACH_CabinetLight( i ) FOREACH_ENUM( CabinetLight, i )
const RString& CabinetLightToString( CabinetLight cl );
CabinetLight StringToCabinetLight( const RString& s);
stepmania/src/MenuInput.h
+1 -1
View File
@@ -17,7 +17,7 @@ enum MenuButton
NUM_MenuButton, // leave this at the end
MenuButton_Invalid
};
#define FOREACH_MenuButton( m ) FOREACH_ENUM2( MenuButton, m )
#define FOREACH_MenuButton( m ) FOREACH_ENUM( MenuButton, m )
const RString &MenuButtonToString( MenuButton mb );
const RString &MenuButtonToLocalizedString( MenuButton mb );
stepmania/src/MusicWheel.cpp
+1 -1
View File
@@ -589,7 +589,7 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData *> &arrayWheelItemDat
vct.push_back( COURSE_TYPE_ENDLESS );
break;
case SORT_ALL_COURSES:
FOREACH_ENUM2( CourseType, i )
FOREACH_ENUM( CourseType, i )
vct.push_back( i );
break;
default: ASSERT(0); break;
stepmania/src/NetworkSyncManager.h
+1 -1
View File
@@ -53,7 +53,7 @@ enum NSScoreBoardColumn
NUM_NSScoreBoardColumn,
NSScoreBoardColumn_Invalid
};
#define FOREACH_NSScoreBoardColumn( sc ) FOREACH_ENUM2( NSScoreBoardColumn, sc )
#define FOREACH_NSScoreBoardColumn( sc ) FOREACH_ENUM( NSScoreBoardColumn, sc )
struct NetServerInfo
{
stepmania/src/NoteDisplay.cpp
+1 -1
View File
@@ -13,7 +13,7 @@
#include "LuaBinding.h"
const RString& NoteNotePartToString( NotePart i );
#define FOREACH_NotePart( i ) FOREACH_ENUM2( NotePart, i )
#define FOREACH_NotePart( i ) FOREACH_ENUM( NotePart, i )
static const char *NotePartNames[] = {
"TapNote",
stepmania/src/NoteDisplay.h
+2 -2
View File
@@ -52,7 +52,7 @@ enum HoldType
NUM_HoldType,
HoldType_Invalid
};
#define FOREACH_HoldType( i ) FOREACH_ENUM2( HoldType, i )
#define FOREACH_HoldType( i ) FOREACH_ENUM( HoldType, i )
const RString &HoldTypeToString( HoldType ht );
enum ActiveType
@@ -62,7 +62,7 @@ enum ActiveType
NUM_ActiveType,
ActiveType_Invalid
};
#define FOREACH_ActiveType( i ) FOREACH_ENUM2( ActiveType, i )
#define FOREACH_ActiveType( i ) FOREACH_ENUM( ActiveType, i )
const RString &ActiveTypeToString( ActiveType at );
stepmania/src/PaneDisplay.h
+1 -1
View File
@@ -45,7 +45,7 @@ enum PaneContents
COURSE_ROLLS,
NUM_PANE_CONTENTS
};
#define FOREACH_PaneContents( p ) FOREACH_ENUM2( PaneContents, p )
#define FOREACH_PaneContents( p ) FOREACH_ENUM( PaneContents, p )
class PaneDisplay: public ActorFrame
{
stepmania/src/PlayerNumber.h
+2 -2
View File
@@ -22,7 +22,7 @@ const RString& PlayerNumberToString( PlayerNumber pn );
const RString& PlayerNumberToLocalizedString( PlayerNumber pn );
LuaDeclareType( PlayerNumber );
#define FOREACH_PlayerNumber( pn ) FOREACH_ENUM2( PlayerNumber, pn )
#define FOREACH_PlayerNumber( pn ) FOREACH_ENUM( PlayerNumber, pn )
#define FOREACH_HumanPlayer( pn ) for( PlayerNumber pn=GetNextHumanPlayer((PlayerNumber)-1); pn!=PLAYER_INVALID; pn=GetNextHumanPlayer(pn) )
#define FOREACH_EnabledPlayer( pn ) for( PlayerNumber pn=GetNextEnabledPlayer((PlayerNumber)-1); pn!=PLAYER_INVALID; pn=GetNextEnabledPlayer(pn) )
#define FOREACH_CpuPlayer( pn ) for( PlayerNumber pn=GetNextCpuPlayer((PlayerNumber)-1); pn!=PLAYER_INVALID; pn=GetNextCpuPlayer(pn) )
@@ -77,7 +77,7 @@ const RString& MultiPlayerToString( MultiPlayer mp );
const RString& MultiPlayerToLocalizedString( MultiPlayer mp );
LuaDeclareType( MultiPlayer );
#define FOREACH_MultiPlayer( pn ) FOREACH_ENUM2( MultiPlayer, pn )
#define FOREACH_MultiPlayer( pn ) FOREACH_ENUM( MultiPlayer, pn )
#define FOREACH_EnabledMultiPlayer( mp ) for( MultiPlayer mp=GetNextEnabledMultiPlayer((MultiPlayer)-1); mp!=MultiPlayer_Invalid; mp=GetNextEnabledMultiPlayer(mp) )
stepmania/src/RageDisplay.cpp
+1 -1
View File
@@ -614,7 +614,7 @@ PixelFormat RageDisplay::FindPixelFormat( int iBPP, int iRmask, int iGmask, int
{
PixelFormatDesc tmp = { iBPP, { iRmask, iGmask, iBmask, iAmask } };
FOREACH_ENUM2( PixelFormat, iPixFmt )
FOREACH_ENUM( PixelFormat, iPixFmt )
{
const PixelFormatDesc *pf = GetPixelFormatDesc( PixelFormat(iPixFmt) );
if( !SupportsTextureFormat(PixelFormat(iPixFmt), bRealtime) )
stepmania/src/RageDisplay_D3D.cpp
+2 -2
View File
@@ -795,7 +795,7 @@ void RageDisplay_D3D::SendCurrentMatrices()
g_pd3dDevice->SetTransform( D3DTS_VIEW, (D3DMATRIX*)GetViewTop() );
g_pd3dDevice->SetTransform( D3DTS_WORLD, (D3DMATRIX*)GetWorldTop() );
FOREACH_ENUM2( TextureUnit, tu )
FOREACH_ENUM( TextureUnit, tu )
{
// Optimization opportunity: Turn off texture transform if not using texture coords.
g_pd3dDevice->SetTextureStageState( tu, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2 );
@@ -1074,7 +1074,7 @@ void RageDisplay_D3D::DrawLineStrip( const RageSpriteVertex v[], int iNumVerts,
void RageDisplay_D3D::ClearAllTextures()
{
FOREACH_ENUM2( TextureUnit, i )
FOREACH_ENUM( TextureUnit, i )
SetTexture( i, 0 );
g_currentTextureUnit = TextureUnit_1;
}
stepmania/src/RageDisplay_OGL.cpp
+1 -1
View File
@@ -1323,7 +1323,7 @@ void RageDisplay_OGL::DrawLineStripInternal( const RageSpriteVertex v[], int iNu
void RageDisplay_OGL::ClearAllTextures()
{
FOREACH_ENUM2( TextureUnit, i )
FOREACH_ENUM( TextureUnit, i )
SetTexture( i, 0 );
// HACK: Reset the active texture to 0.
stepmania/src/RageInputDevice.h
+1 -1
View File
@@ -49,7 +49,7 @@ enum InputDevice
NUM_InputDevice, // leave this at the end
InputDevice_Invalid // means this is NULL
};
#define FOREACH_InputDevice( i ) FOREACH_ENUM2( InputDevice, i )
#define FOREACH_InputDevice( i ) FOREACH_ENUM( InputDevice, i )
const RString& InputDeviceToString( InputDevice i );
InputDevice StringToInputDevice( const RString& s );
inline bool IsJoystick( InputDevice id ) { return DEVICE_JOY1 <= id && id < DEVICE_JOY1+NUM_JOYSTICKS; }
stepmania/src/ScreenEdit.h
+1 -1
View File
@@ -125,7 +125,7 @@ enum EditButton
NUM_EditButton, // leave this at the end
EditButton_Invalid
};
#define FOREACH_EditButton( e ) FOREACH_ENUM2( EditButton, e )
#define FOREACH_EditButton( e ) FOREACH_ENUM( EditButton, e )
const int NUM_EDIT_TO_DEVICE_SLOTS = 2;
const int NUM_EDIT_TO_MENU_SLOTS = 2;
stepmania/src/ScreenEvaluation.cpp
+2 -2
View File
@@ -41,14 +41,14 @@ static const char *JudgeLineNames[] =
"W1", "W2", "W3", "W4", "W5", "Miss", "Held", "MaxCombo"
};
XToString( JudgeLine, NUM_JudgeLine );
#define FOREACH_JudgeLine( rc ) FOREACH_ENUM2( JudgeLine, rc )
#define FOREACH_JudgeLine( rc ) FOREACH_ENUM( JudgeLine, rc )
static const char *StatLineNames[NUM_StatLine] =
{
"Jumps", "Holds", "Mines", "Hands", "Rolls",
};
XToString( StatLine, NUM_StatLine );
#define FOREACH_StatLine( rc ) FOREACH_ENUM2( StatLine, rc )
#define FOREACH_StatLine( rc ) FOREACH_ENUM( StatLine, rc )
#define CHEER_DELAY_SECONDS THEME->GetMetricF(m_sName,"CheerDelaySeconds")
#define BAR_ACTUAL_MAX_COMMAND THEME->GetMetricA(m_sName,"BarActualMaxCommand")
stepmania/src/ScreenOptionsEditCourse.cpp
+1 -1
View File
@@ -35,7 +35,7 @@ static const char *CourseEntryActionNames[] = {
"Delete",
};
XToString( CourseEntryAction, NUM_CourseEntryAction );
#define FOREACH_CourseEntryAction( i ) FOREACH_ENUM2( CourseEntryAction, i )
#define FOREACH_CourseEntryAction( i ) FOREACH_ENUM( CourseEntryAction, i )
static MenuDef g_TempMenu(
"ScreenMiniMenuContext"
stepmania/src/ScreenOptionsEditCourseEntry.cpp
+1 -1
View File
@@ -26,7 +26,7 @@ enum EditCourseEntryRow
ROW_DONE,
NUM_EditCourseEntryRow
};
#define FOREACH_EditCourseEntryRow( i ) FOREACH_ENUM2( EditCourseEntryRow, i )
#define FOREACH_EditCourseEntryRow( i ) FOREACH_ENUM( EditCourseEntryRow, i )
AutoScreenMessage( SM_BackFromCoursePlayerOptions );
stepmania/src/ScreenOptionsEditWorkout.cpp
+4 -4
View File
@@ -50,7 +50,7 @@ static RString MakeMeterString( int iMeter )
void ScreenOptionsEditWorkout::BeginScreen()
{
vector<OptionRowHandler*> vHands;
FOREACH_ENUM2( WorkoutDetailsRow, rowIndex )
FOREACH_ENUM( WorkoutDetailsRow, rowIndex )
{
const MenuRowDef &mr = g_MenuRows[rowIndex];
OptionRowHandler *pHand = OptionRowHandlerUtil::MakeSimple( mr );
@@ -62,7 +62,7 @@ void ScreenOptionsEditWorkout::BeginScreen()
{
DEFAULT_FAIL(rowIndex);
case WorkoutDetailsRow_WorkoutProgram:
FOREACH_ENUM2( WorkoutProgram, i )
FOREACH_ENUM( WorkoutProgram, i )
pHand->m_Def.m_vsChoices.push_back( WorkoutProgramToLocalizedString(i) );
break;
case WorkoutDetailsRow_Minutes:
@@ -84,7 +84,7 @@ void ScreenOptionsEditWorkout::BeginScreen()
// }
// break;
case WorkoutDetailsRow_WorkoutStepsType:
FOREACH_ENUM2( WorkoutStepsType, i )
FOREACH_ENUM( WorkoutStepsType, i )
pHand->m_Def.m_vsChoices.push_back( WorkoutStepsTypeToLocalizedString(i) );
break;
}
@@ -129,7 +129,7 @@ void ScreenOptionsEditWorkout::ImportOptions( int iRow, const vector<PlayerNumbe
void ScreenOptionsEditWorkout::ExportOptions( int iRow, const vector<PlayerNumber> &vpns )
{
FOREACH_ENUM2( WorkoutDetailsRow, i )
FOREACH_ENUM( WorkoutDetailsRow, i )
{
iRow = i;
OptionRow &row = *m_pRows[iRow];
stepmania/src/ScreenOptionsManageCourses.cpp
+1 -1
View File
@@ -122,7 +122,7 @@ static const char *CourseActionNames[] = {
"Delete",
};
XToString( CourseAction, NUM_CourseAction );
#define FOREACH_CourseAction( i ) FOREACH_ENUM2( CourseAction, i )
#define FOREACH_CourseAction( i ) FOREACH_ENUM( CourseAction, i )
static MenuDef g_TempMenu(
"ScreenMiniMenuContext"
stepmania/src/ScreenOptionsManageEditSteps.cpp
+1 -1
View File
@@ -37,7 +37,7 @@ static const char *StepsEditActionNames[] = {
"Delete",
};
XToString( StepsEditAction, NUM_StepsEditAction );
#define FOREACH_StepsEditAction( i ) FOREACH_ENUM2( StepsEditAction, i )
#define FOREACH_StepsEditAction( i ) FOREACH_ENUM( StepsEditAction, i )
static MenuDef g_TempMenu(
"ScreenMiniMenuContext"
stepmania/src/ScreenOptionsManageProfiles.cpp
+1 -1
View File
@@ -42,7 +42,7 @@ static const char *ProfileActionNames[] = {
};
XToString( ProfileAction, NUM_ProfileAction );
XToLocalizedString( ProfileAction );
#define FOREACH_ProfileAction( i ) FOREACH_ENUM2( ProfileAction, i )
#define FOREACH_ProfileAction( i ) FOREACH_ENUM( ProfileAction, i )
static MenuDef g_TempMenu(
"ScreenMiniMenuContext"
stepmania/src/ScreenOptionsManageWorkouts.cpp
+1 -1
View File
@@ -28,7 +28,7 @@ static const char *ManageWorkoutsActionNames[] = {
"Delete",
};
XToString( ManageWorkoutsAction, NUM_ManageWorkoutsAction );
#define FOREACH_ManageWorkoutsAction( i ) FOREACH_ENUM2( ManageWorkoutsAction, i )
#define FOREACH_ManageWorkoutsAction( i ) FOREACH_ENUM( ManageWorkoutsAction, i )
static MenuDef g_TempMenu(
"ScreenMiniMenuContext"
stepmania/src/ScreenOptionsReviewWorkout.cpp
+1 -1
View File
@@ -52,7 +52,7 @@ void ScreenOptionsReviewWorkout::Init()
void ScreenOptionsReviewWorkout::BeginScreen()
{
vector<OptionRowHandler*> vHands;
FOREACH_ENUM2( ReviewWorkoutRow, rowIndex )
FOREACH_ENUM( ReviewWorkoutRow, rowIndex )
{
const MenuRowDef &mr = g_MenuRows[rowIndex];
OptionRowHandler *pHand = OptionRowHandlerUtil::MakeSimple( mr );
stepmania/src/ScreenRanking.h
+1 -1
View File
@@ -31,7 +31,7 @@ enum PageType
NUM_PageType,
PageType_Invalid
};
#define FOREACH_PageType( pt ) FOREACH_ENUM2( PageType, pt )
#define FOREACH_PageType( pt ) FOREACH_ENUM( PageType, pt )
const RString& PageTypeToString( PageType pt );
PageType StringToPageType( const RString& s );
stepmania/src/ScreenSelectMaster.h
+1 -1
View File
@@ -17,7 +17,7 @@ enum MenuDir
MenuDir_Auto, // when players join and the selection becomes invalid
NUM_MenuDir,
};
#define FOREACH_MenuDir( md ) FOREACH_ENUM2( MenuDir, md )
#define FOREACH_MenuDir( md ) FOREACH_ENUM( MenuDir, md )
const RString& MenuDirToString( MenuDir md );
class ScreenSelectMaster : public ScreenSelect
stepmania/src/ScreenSetTime.cpp
+1 -1
View File
@@ -20,7 +20,7 @@ static const char *SetTimeSelectionNames[] = {
"Second",
};
XToString( SetTimeSelection, NUM_SetTimeSelection );
#define FOREACH_SetTimeSelection( s ) FOREACH_ENUM2( SetTimeSelection, s )
#define FOREACH_SetTimeSelection( s ) FOREACH_ENUM( SetTimeSelection, s )
const float g_X[NUM_SetTimeSelection] =
{
stepmania/src/ScreenTextEntry.h
+1 -1
View File
@@ -16,7 +16,7 @@ enum KeyboardRow
NUM_KeyboardRow,
KeyboardRow_Invalid
};
#define FOREACH_KeyboardRow( i ) FOREACH_ENUM2( KeyboardRow, i )
#define FOREACH_KeyboardRow( i ) FOREACH_ENUM( KeyboardRow, i )
const int KEYS_PER_ROW = 13;
enum KeyboardRowSpecialKey
{
stepmania/src/ThemeManager.h
+1 -1
View File
@@ -22,7 +22,7 @@ enum ElementCategory
NUM_ElementCategory,
ElementCategory_Invalid
};
#define FOREACH_ElementCategory( ec ) FOREACH_ENUM2( ElementCategory, ec )
#define FOREACH_ElementCategory( ec ) FOREACH_ENUM( ElementCategory, ec )
const RString& ElementCategoryToString( ElementCategory ec );
ElementCategory StringToElementCategory( const RString& s );
stepmania/src/Tween.h
+1 -1
View File
@@ -18,7 +18,7 @@ enum TweenType
NUM_TweenType,
TweenType_Invalid
};
#define FOREACH_TweenType( tt ) FOREACH_ENUM2( TweenType, tt )
#define FOREACH_TweenType( tt ) FOREACH_ENUM( TweenType, tt )
LuaDeclareType( TweenType );
class ITween
stepmania/src/UnlockManager.cpp
+1 -1
View File
@@ -512,7 +512,7 @@ void UnlockManager::Load()
FOREACH_CONST( UnlockEntry, m_UnlockEntries, e )
{
RString str = ssprintf( "Unlock: %s; ", join("\n",e->m_cmd.m_vsArgs).c_str() );
FOREACH_ENUM2( UnlockRequirement, j )
FOREACH_ENUM( UnlockRequirement, j )
if( e->m_fRequirement[j] )
str += ssprintf( "%s = %f; ", UnlockRequirementToString(j).c_str(), e->m_fRequirement[j] );
if( e->m_bRequirePassHardSteps )
stepmania/src/song.h
+1 -1
View File
@@ -30,7 +30,7 @@ enum BackgroundLayer
NUM_BackgroundLayer,
BACKGROUND_LAYER_Invalid
};
#define FOREACH_BackgroundLayer( bl ) FOREACH_ENUM2( BackgroundLayer, bl )
#define FOREACH_BackgroundLayer( bl ) FOREACH_ENUM( BackgroundLayer, bl )
struct LyricSegment
{