diff --git a/stepmania/src/EditMenu.cpp b/stepmania/src/EditMenu.cpp index e4ba429795..d06d1c449f 100644 --- a/stepmania/src/EditMenu.cpp +++ b/stepmania/src/EditMenu.cpp @@ -25,6 +25,15 @@ static const CString EditMenuRowNames[NUM_EDIT_MENU_ROWS] = { XToString( EditMenuRow, NUM_EDIT_MENU_ROWS ); XToThemedString( EditMenuRow, NUM_EDIT_MENU_ROWS ); +static const CString EditMenuActionNames[NUM_EDIT_MENU_ACTIONS] = { + "Edit", + "Delete", + "Create", +}; +XToString( EditMenuAction, NUM_EDIT_MENU_ACTIONS ); +XToThemedString( EditMenuAction, NUM_EDIT_MENU_ACTIONS ); +StringToX( EditMenuAction ); + #define ARROWS_X( i ) THEME->GetMetricF("EditMenu",ssprintf("Arrows%dX",i+1)) #define SONG_BANNER_WIDTH THEME->GetMetricF("EditMenu","SongBannerWidth") diff --git a/stepmania/src/EditMenu.h b/stepmania/src/EditMenu.h index d6913ab0c3..e5e917a864 100644 --- a/stepmania/src/EditMenu.h +++ b/stepmania/src/EditMenu.h @@ -27,6 +27,17 @@ enum EditMenuRow const CString& EditMenuRowToString( EditMenuRow r ); const CString& EditMenuRowToThemedString( EditMenuRow r ); +enum EditMenuAction +{ + EDIT_MENU_ACTION_EDIT, + EDIT_MENU_ACTION_DELETE, + EDIT_MENU_ACTION_CREATE, + NUM_EDIT_MENU_ACTIONS +}; +#define FOREACH_EditMenuAction( ema ) FOREACH_ENUM( EditMenuAction, NUM_EDIT_MENU_ACTIONS, ema ) +const CString& EditMenuActionToString( EditMenuAction ema ); +const CString& EditMenuActionToThemedString( EditMenuAction ema ); + class EditMenu: public ActorFrame { diff --git a/stepmania/src/GameConstantsAndTypes.cpp b/stepmania/src/GameConstantsAndTypes.cpp index 2dcbdd3ce6..889fcbea4a 100644 --- a/stepmania/src/GameConstantsAndTypes.cpp +++ b/stepmania/src/GameConstantsAndTypes.cpp @@ -294,27 +294,6 @@ static void LuaGoalType(lua_State* L) REGISTER_WITH_LUA_FUNCTION( LuaGoalType ); -static const CString EditMenuActionNames[NUM_EDIT_MENU_ACTIONS] = { - "Edit", - "Delete", - "Create", -}; -XToString( EditMenuAction, NUM_EDIT_MENU_ACTIONS ); -XToThemedString( EditMenuAction, NUM_EDIT_MENU_ACTIONS ); -StringToX( EditMenuAction ); -static void LuaEditMenuAction(lua_State* L) -{ - FOREACH_EditMenuAction( ema ) - { - CString s = EditMenuActionNames[ema]; - s.MakeUpper(); - LUA->SetGlobal( "EDIT_MENU_ACTION_"+s, ema ); - } -} -REGISTER_WITH_LUA_FUNCTION( LuaEditMenuAction ); - - - #include "LuaFunctions.h" LuaFunction_NoArgs( CoinMode, CoinModeToString(PREFSMAN->m_CoinMode) ) LuaFunction_NoArgs( Premium, PremiumToString(PREFSMAN->m_Premium) ) diff --git a/stepmania/src/GameConstantsAndTypes.h b/stepmania/src/GameConstantsAndTypes.h index 74271ece46..87dece5024 100644 --- a/stepmania/src/GameConstantsAndTypes.h +++ b/stepmania/src/GameConstantsAndTypes.h @@ -369,19 +369,6 @@ const CString& GoalTypeToString( GoalType gt ); GoalType StringToGoalType( const CString& s ); -enum EditMenuAction -{ - EDIT_MENU_ACTION_EDIT, - EDIT_MENU_ACTION_DELETE, - EDIT_MENU_ACTION_CREATE, - NUM_EDIT_MENU_ACTIONS -}; -#define FOREACH_EditMenuAction( ema ) FOREACH_ENUM( EditMenuAction, NUM_EDIT_MENU_ACTIONS, ema ) -const CString& EditMenuActionToString( EditMenuAction ema ); -EditMenuAction StringToEditMenuAction( const CString& s ); -const CString& EditMenuActionToThemedString( EditMenuAction ema ); - - #endif /*