From 6ae5dcc6fbd5e63da6440e9443cf6cf192ba70e8 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Mon, 5 Mar 2012 21:32:20 -0600 Subject: [PATCH] [GameCommand] Added GetDifficulty(), GetCourseDifficulty(), GetPlayMode(), GetSortOrder(), GetAnnouncer(), GetPreferredModifiers(), and GetStageModifiers() Lua bindings. --- Docs/Changelog_sm5.txt | 6 ++++++ src/GameCommand.cpp | 19 +++++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt index 718e82ba42..9c5a6e458b 100644 --- a/Docs/Changelog_sm5.txt +++ b/Docs/Changelog_sm5.txt @@ -9,6 +9,12 @@ ________________________________________________________________________________ StepMania 5.0 alpha 2 | 20120??? -------------------------------------------------------------------------------- +2012/03/05 +---------- +* [GameCommand] Added GetDifficulty(), GetCourseDifficulty(), GetPlayMode(), + GetSortOrder(), GetAnnouncer(), GetPreferredModifiers(), and + GetStageModifiers() Lua bindings. [AJ] + 2012/03/04 ---------- * [Player] Changed default Hold window to 0.250f, like it was in 3.9. [AJ] diff --git a/src/GameCommand.cpp b/src/GameCommand.cpp index a78091761e..1330ca0078 100644 --- a/src/GameCommand.cpp +++ b/src/GameCommand.cpp @@ -872,6 +872,14 @@ public: static int GetCharacter( T* p, lua_State *L ) { if(p->m_pCharacter==NULL) lua_pushnil(L); else p->m_pCharacter->PushSelf(L); return 1; } static int GetSongGroup( T* p, lua_State *L ) { lua_pushstring(L, p->m_sSongGroup ); return 1; } static int GetUrl( T* p, lua_State *L ) { lua_pushstring(L, p->m_sUrl ); return 1; } + static int GetAnnouncer( T* p, lua_State *L ) { lua_pushstring(L, p->m_sAnnouncer ); return 1; } + static int GetPreferredModifiers( T* p, lua_State *L ) { lua_pushstring(L, p->m_sPreferredModifiers ); return 1; } + static int GetStageModifiers( T* p, lua_State *L ) { lua_pushstring(L, p->m_sStageModifiers ); return 1; } + + DEFINE_METHOD( GetCourseDifficulty, m_CourseDifficulty ) + DEFINE_METHOD( GetDifficulty, m_dc ) + DEFINE_METHOD( GetPlayMode, m_pm ) + DEFINE_METHOD( GetSortOrder, m_SortOrder ) LunaGameCommand() { @@ -880,10 +888,10 @@ public: ADD_METHOD( GetIndex ); ADD_METHOD( GetMultiPlayer ); ADD_METHOD( GetStyle ); - //ADD_METHOD( GetDifficulty ); - //ADD_METHOD( GetCourseDifficulty ); + ADD_METHOD( GetDifficulty ); + ADD_METHOD( GetCourseDifficulty ); ADD_METHOD( GetScreen ); - //ADD_METHOD( GetPlayMode ); + ADD_METHOD( GetPlayMode ); ADD_METHOD( GetProfileID ); ADD_METHOD( GetSong ); ADD_METHOD( GetSteps ); @@ -891,8 +899,11 @@ public: ADD_METHOD( GetTrail ); ADD_METHOD( GetCharacter ); ADD_METHOD( GetSongGroup ); - //ADD_METHOD( GetSortOrder ); + ADD_METHOD( GetSortOrder ); ADD_METHOD( GetUrl ); + ADD_METHOD( GetAnnouncer ); + ADD_METHOD( GetPreferredModifiers ); + ADD_METHOD( GetStageModifiers ); } };