Line endings hate me now.

This commit is contained in:
Jason Felds
2011-04-29 15:03:05 -04:00
2 changed files with 21 additions and 1 deletions
+18
View File
@@ -1858,6 +1858,21 @@ void ScreenSelectMusic::AfterMusicChange()
AfterStepsOrTrailChange( vpns );
}
void ScreenSelectMusic::OpenOptionsList(PlayerNumber pn)
{
if( pn != PLAYER_INVALID )
{
m_OptionsList[pn].Open();
}
}
// lua start
#include "LuaBinding.h"
@@ -1865,6 +1880,8 @@ void ScreenSelectMusic::AfterMusicChange()
class LunaScreenSelectMusic: public Luna<ScreenSelectMusic>
{
public:
static int OpenOptionsList( T* p, lua_State *L ) { PlayerNumber pn = Enum::Check<PlayerNumber>(L, 1); p->OpenOptionsList(pn); return 0; }
static int GetGoToOptions( T* p, lua_State *L ) { lua_pushboolean( L, p->GetGoToOptions() ); return 1; }
static int GetMusicWheel( T* p, lua_State *L ) {
p->GetMusicWheel()->PushSelf(L);
@@ -1875,6 +1892,7 @@ public:
{
ADD_METHOD( GetGoToOptions );
ADD_METHOD( GetMusicWheel );
ADD_METHOD( OpenOptionsList );
}
};
+3 -1
View File
@@ -47,6 +47,8 @@ public:
bool GetGoToOptions() const { return m_bGoToOptions; }
MusicWheel *GetMusicWheel() { return &m_MusicWheel; }
void OpenOptionsList( PlayerNumber pn );
// Lua
virtual void PushSelf( lua_State *L );
@@ -60,7 +62,7 @@ protected:
void SwitchToPreferredDifficulty();
void AfterMusicChange();
void CheckBackgroundRequests( bool bForce );
void CheckBackgroundRequests( bool bForce );
bool DetectCodes( const InputEventPlus &input );
vector<Steps*> m_vpSteps;