From ae20fbf2a0c68285dd23ffc44eeab10b296bec99 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Thu, 8 Mar 2012 18:48:17 -0600 Subject: [PATCH] deprecate WheelBase:IsLocked() now that GetWheelState() exists --- Docs/Changelog_sm5.txt | 2 +- src/WheelBase.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt index b79a1d3417..cc56097497 100644 --- a/Docs/Changelog_sm5.txt +++ b/Docs/Changelog_sm5.txt @@ -14,7 +14,7 @@ StepMania 5.0 alpha 2 | 201203?? * [MusicWheel] Added RouletteStopped message, which is broadcast when Roulette is finished and the wheel is locked. [AJ] * [WheelBase] Made WheelState a Lua-enabled enum and added - GetWheelState() Lua binding. [AJ] + GetWheelState() Lua binding. Deprecated IsLocked() Lua binding. [AJ] 2012/03/07 ---------- diff --git a/src/WheelBase.cpp b/src/WheelBase.cpp index 35dfbc5a26..9edde1aa57 100644 --- a/src/WheelBase.cpp +++ b/src/WheelBase.cpp @@ -539,7 +539,6 @@ public: return 1; } static int IsSettled( T* p, lua_State *L ){ lua_pushboolean( L, p->IsSettled() ); return 1; } - static int IsLocked( T* p, lua_State *L ){ lua_pushboolean( L, p->WheelIsLocked() ); return 1; } static int SetOpenSection( T* p, lua_State *L ){ p->SetOpenSection( SArg(1) ); return 0; } static int GetCurrentIndex( T* p, lua_State *L ){ lua_pushnumber( L, p->GetCurrentIndex() ); return 1; } static int GetNumItems( T* p, lua_State *L ){ lua_pushnumber( L, p->GetNumItems() ); return 1; } @@ -550,6 +549,9 @@ public: DEFINE_METHOD( GetSelectedType, GetSelectedType() ) DEFINE_METHOD( GetWheelState, GetWheelState() ) + // deprecated; use GetWheelState instead: + static int IsLocked( T* p, lua_State *L ){ lua_pushboolean( L, p->WheelIsLocked() ); return 1; } + LunaWheelBase() { ADD_METHOD( GetWheelItem );