From d7caea9f0a3714193b87b96b2ba80f43529cd61e Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Mon, 21 Feb 2011 03:18:37 -0600 Subject: [PATCH] [OptionRow] Added GetLayoutType() and GetSelectType() Lua bindings. --- Docs/Changelog_sm-ssc.txt | 1 + src/OptionRow.cpp | 4 ++++ src/OptionRowHandler.cpp | 2 ++ 3 files changed, 7 insertions(+) diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt index 0c2880a055..8138cab2a1 100644 --- a/Docs/Changelog_sm-ssc.txt +++ b/Docs/Changelog_sm-ssc.txt @@ -17,6 +17,7 @@ sm-ssc v1.2.3 | 201102?? -------- * Reverted ArrowSpacing back to 64 (which was the previous value). Please re-adjust your speed mods accordingly. [AJ] +* [OptionRow] Added GetLayoutType() and GetSelectType() Lua bindings. [AJ] ================================================================================ sm-ssc v1.2.2 | 20110220 diff --git a/src/OptionRow.cpp b/src/OptionRow.cpp index 24dfaf752a..f6d699af8a 100644 --- a/src/OptionRow.cpp +++ b/src/OptionRow.cpp @@ -944,8 +944,10 @@ class LunaOptionRow: public Luna public: DEFINE_METHOD( FirstItemGoesDown, GetFirstItemGoesDown() ) static int GetChoiceInRowWithFocus( T* p, lua_State *L ) { lua_pushnumber( L, p->GetChoiceInRowWithFocus(Enum::Check(L, 1)) ); return 1; } + DEFINE_METHOD( GetLayoutType, GetHandler()->m_Def.m_layoutType ) static int GetName( T* p, lua_State *L ) { lua_pushstring( L, p->GetHandler()->m_Def.m_sName ); return 1; } static int GetNumChoices( T* p, lua_State *L ) { lua_pushnumber( L, p->GetHandler()->m_Def.m_vsChoices.size() ); return 1; } + DEFINE_METHOD( GetSelectType, GetHandler()->m_Def.m_selectType ) DEFINE_METHOD( GetRowTitle, GetRowTitle() ) static int HasFocus( T* p, lua_State *L ) { lua_pushboolean( L, p->GetRowHasFocus(Enum::Check(L, 1)) ); return 1; } static int OneChoiceForAllPlayers( T* p, lua_State *L ) { lua_pushboolean( L, p->GetHandler()->m_Def.m_bOneChoiceForAllPlayers ); return 1; } @@ -954,9 +956,11 @@ public: { ADD_METHOD( FirstItemGoesDown ); ADD_METHOD( GetChoiceInRowWithFocus ); + ADD_METHOD( GetLayoutType ); ADD_METHOD( GetName ); ADD_METHOD( GetNumChoices ); ADD_METHOD( GetRowTitle ); + ADD_METHOD( GetSelectType ); ADD_METHOD( HasFocus ); ADD_METHOD( OneChoiceForAllPlayers ); } diff --git a/src/OptionRowHandler.cpp b/src/OptionRowHandler.cpp index c6b43459b6..e3206c0f0f 100644 --- a/src/OptionRowHandler.cpp +++ b/src/OptionRowHandler.cpp @@ -36,6 +36,7 @@ static const char *SelectTypeNames[] = { }; XToString( SelectType ); StringToX( SelectType ); +LuaXType( SelectType ); static const char *LayoutTypeNames[] = { "ShowAllInRow", @@ -43,6 +44,7 @@ static const char *LayoutTypeNames[] = { }; XToString( LayoutType ); StringToX( LayoutType ); +LuaXType( LayoutType ); RString OptionRowHandler::OptionTitle() const {