From d4f8789a36aba42eaa8a33f0077a399fbe897a7c Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 26 Sep 2006 01:46:15 +0000 Subject: [PATCH] new binding method (LuaXType will be phased out) --- stepmania/src/UnlockManager.cpp | 4 +++- stepmania/src/UnlockManager.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/stepmania/src/UnlockManager.cpp b/stepmania/src/UnlockManager.cpp index 3f564273b7..fa125e2a75 100644 --- a/stepmania/src/UnlockManager.cpp +++ b/stepmania/src/UnlockManager.cpp @@ -15,6 +15,7 @@ #include #include "CommonMetrics.h" #include "LuaFunctions.h" +#include "LuaManager.h" UnlockManager* UNLOCKMAN = NULL; // global and accessable from anywhere in our program @@ -36,6 +37,7 @@ static const char *UnlockRequirementNames[] = XToString( UnlockRequirement, NUM_UnlockRequirement ); StringToX( UnlockRequirement ); LuaXType( UnlockRequirement, NUM_UnlockRequirement, "UnlockRequirement_", false ) +LuaXType2( UnlockRequirement, NUM_UnlockRequirement, "UnlockRequirement_" ); static const char *UnlockRewardTypeNames[] = { @@ -702,7 +704,7 @@ public: static int IsLocked( T* p, lua_State *L ) { lua_pushboolean(L, p->IsLocked() ); return 1; } static int GetDescription( T* p, lua_State *L ) { lua_pushstring(L, p->GetDescription() ); return 1; } static int GetUnlockRewardType( T* p, lua_State *L ) { lua_pushnumber(L, p->m_Type ); return 1; } - static int GetRequirement( T* p, lua_State *L ) { UnlockRequirement i = (UnlockRequirement)IArg(1); lua_pushnumber(L, p->m_fRequirement[i] ); return 1; } + static int GetRequirement( T* p, lua_State *L ) { UnlockRequirement i = Enum::Check( L, 1 ); lua_pushnumber(L, p->m_fRequirement[i] ); return 1; } static int GetRequirePassHardSteps( T* p, lua_State *L ){ lua_pushboolean(L, p->m_bRequirePassHardSteps); return 1; } static void Register(lua_State *L) diff --git a/stepmania/src/UnlockManager.h b/stepmania/src/UnlockManager.h index 347b007385..5c97d07687 100644 --- a/stepmania/src/UnlockManager.h +++ b/stepmania/src/UnlockManager.h @@ -26,6 +26,7 @@ enum UnlockRequirement NUM_UnlockRequirement, UnlockRequirement_INVALID, }; +LuaDeclareType( UnlockRequirement ); enum UnlockRewardType {