From c2be4fcb38f4bffcf113e3399b73072bce6d4ae5 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 31 May 2005 06:27:37 +0000 Subject: [PATCH] LuaXToString( PlayMode ) --- stepmania/src/GameConstantsAndTypes.cpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/stepmania/src/GameConstantsAndTypes.cpp b/stepmania/src/GameConstantsAndTypes.cpp index 261436328d..42c56f8b37 100644 --- a/stepmania/src/GameConstantsAndTypes.cpp +++ b/stepmania/src/GameConstantsAndTypes.cpp @@ -10,6 +10,13 @@ #include "GameManager.h" #include +#include "LuaFunctions.h" +#define LuaXToString(X) \ +LuaFunction( X##ToString, X##ToString( (X) IArg(1) ) ); + +#define LuaStringToX(X) \ +LuaFunction( StringTo##X, (X) StringTo##X( SArg(1) ) ); + static const CString RadarCategoryNames[] = { "Stream", @@ -52,6 +59,7 @@ static const CString PlayModeNames[] = { XToString( PlayMode, NUM_PLAY_MODES ); XToThemedString( PlayMode, NUM_PLAY_MODES ); StringToX( PlayMode ); +LuaXToString( PlayMode ); static void LuaPlayMode(lua_State* L) { FOREACH_PlayMode( pm ) @@ -249,17 +257,6 @@ XToThemedString( PeakComboAward, NUM_PEAK_COMBO_AWARDS ); StringToX( PeakComboAward ); -#include "LuaFunctions.h" -#define LuaXToString(X) \ -CString Lua##X##ToString( int n ) \ -{ return X##ToString( (X) n ); } \ -LuaFunction( X##ToString, Lua##X##ToString( IArg(1) ) ); - -#define LuaStringToX(X) \ -X LuaStringTo##X( CString s ) \ -{ return (X) StringTo##X( s ); } \ -LuaFunction( StringTo##X, LuaStringTo##X( SArg(1) ) ); - LuaXToString( Difficulty ); LuaStringToX( Difficulty );