From 51d22ce2f47e9ba240c70c1a15546b931feb8944 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 27 Sep 2006 01:48:30 +0000 Subject: [PATCH] update binding --- stepmania/src/DifficultyIcon.cpp | 2 +- stepmania/src/DifficultyMeter.cpp | 2 +- stepmania/src/GameState.cpp | 28 ++++++++++++++-------------- stepmania/src/GrooveRadar.cpp | 4 ++-- stepmania/src/ProfileManager.cpp | 4 ++-- stepmania/src/StatsManager.cpp | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/stepmania/src/DifficultyIcon.cpp b/stepmania/src/DifficultyIcon.cpp index ab084b130f..728b32947d 100644 --- a/stepmania/src/DifficultyIcon.cpp +++ b/stepmania/src/DifficultyIcon.cpp @@ -134,7 +134,7 @@ public: return 0; } static int Unset( T* p, lua_State *L ) { p->Unset(); return 0; } - static int SetPlayer( T* p, lua_State *L ) { p->SetPlayer( (PlayerNumber)IArg(1) ); return 0; } + static int SetPlayer( T* p, lua_State *L ) { p->SetPlayer( Enum::Check(L, 1) ); return 0; } static int SetFromDifficulty( T* p, lua_State *L ) { p->SetFromDifficulty( Enum::Check(L, 1) ); return 0; } static void Register(lua_State *L) diff --git a/stepmania/src/DifficultyMeter.cpp b/stepmania/src/DifficultyMeter.cpp index 5dcc4c24c9..b25790a5d9 100644 --- a/stepmania/src/DifficultyMeter.cpp +++ b/stepmania/src/DifficultyMeter.cpp @@ -289,7 +289,7 @@ public: } static int SetFromGameState( T* p, lua_State *L ) { - PlayerNumber pn = (PlayerNumber)IArg(1); + PlayerNumber pn = Enum::Check(L, 1); p->SetFromGameState( pn ); return 0; } diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index 2a049845bd..0aa17c6824 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -1826,14 +1826,14 @@ class LunaGameState: public Luna public: LunaGameState() { LUA->Register( Register ); } - DEFINE_METHOD( IsPlayerEnabled, IsPlayerEnabled((PlayerNumber)IArg(1)) ) - DEFINE_METHOD( IsHumanPlayer, IsHumanPlayer((PlayerNumber)IArg(1)) ) - DEFINE_METHOD( GetPlayerDisplayName, GetPlayerDisplayName((PlayerNumber)IArg(1)) ) + DEFINE_METHOD( IsPlayerEnabled, IsPlayerEnabled(Enum::Check(L, 1)) ) + DEFINE_METHOD( IsHumanPlayer, IsHumanPlayer(Enum::Check(L, 1)) ) + DEFINE_METHOD( GetPlayerDisplayName, GetPlayerDisplayName(Enum::Check(L, 1)) ) DEFINE_METHOD( GetMasterPlayerNumber, m_MasterPlayerNumber ) DEFINE_METHOD( GetMultiplayer, m_bMultiplayer ) static int GetPlayerState( T* p, lua_State *L ) { - PlayerNumber pn = (PlayerNumber)IArg(1); + PlayerNumber pn = Enum::Check(L, 1); p->m_pPlayerState[pn]->PushSelf(L); return 1; } @@ -1847,7 +1847,7 @@ public: { PlayerNumber pn = PLAYER_INVALID; if( lua_gettop(L) >= 2 && !lua_isnil(L,2) ) - pn = (PlayerNumber)IArg(2); + pn = Enum::Check(L, 2); p->ApplyGameCommand(SArg(1),pn); return 0; } @@ -1860,7 +1860,7 @@ public: } static int GetCurrentSteps( T* p, lua_State *L ) { - PlayerNumber pn = (PlayerNumber)IArg(1); + PlayerNumber pn = Enum::Check(L, 1); Steps *pSteps = p->m_pCurSteps[pn]; if( pSteps ) { pSteps->PushSelf(L); } else { lua_pushnil(L); } @@ -1868,7 +1868,7 @@ public: } static int SetCurrentSteps( T* p, lua_State *L ) { - PlayerNumber pn = (PlayerNumber)IArg(1); + PlayerNumber pn = Enum::Check(L, 1); if( lua_isnil(L,2) ) { p->m_pCurSteps[pn].Set( NULL ); } else { Steps *pS = Luna::check(L,2); p->m_pCurSteps[pn].Set( pS ); } MESSAGEMAN->Broadcast( (Message)(Message_CurrentStepsP1Changed+pn) ); @@ -1883,7 +1883,7 @@ public: } static int GetCurrentTrail( T* p, lua_State *L ) { - PlayerNumber pn = (PlayerNumber)IArg(1); + PlayerNumber pn = Enum::Check(L, 1); Trail *pTrail = p->m_pCurTrail[pn]; if( pTrail ) { pTrail->PushSelf(L); } else { lua_pushnil(L); } @@ -1891,7 +1891,7 @@ public: } static int SetCurrentTrail( T* p, lua_State *L ) { - PlayerNumber pn = (PlayerNumber)IArg(1); + PlayerNumber pn = Enum::Check(L, 1); if( lua_isnil(L,2) ) { p->m_pCurTrail[pn].Set( NULL ); } else { Trail *pS = Luna::check(L,2); p->m_pCurTrail[pn].Set( pS ); } MESSAGEMAN->Broadcast( (Message)(Message_CurrentTrailP1Changed+pn) ); @@ -1942,8 +1942,8 @@ public: DEFINE_METHOD( GetPlayMode, m_PlayMode ) DEFINE_METHOD( GetSortOrder, m_SortOrder ) DEFINE_METHOD( StageIndex, GetStageIndex() ) - DEFINE_METHOD( IsGoalComplete, IsGoalComplete((PlayerNumber)IArg(1)) ) - DEFINE_METHOD( PlayerIsUsingModifier, PlayerIsUsingModifier((PlayerNumber)IArg(1),SArg(2)) ) + DEFINE_METHOD( IsGoalComplete, IsGoalComplete(Enum::Check(L, 1)) ) + DEFINE_METHOD( PlayerIsUsingModifier, PlayerIsUsingModifier(Enum::Check(L, 1), SArg(2)) ) DEFINE_METHOD( GetCourseSongIndex, GetCourseSongIndex() ) DEFINE_METHOD( GetLoadingCourseSongIndex, GetLoadingCourseSongIndex() ) DEFINE_METHOD( IsFinalStage, IsFinalStage() ) @@ -1960,7 +1960,7 @@ public: DEFINE_METHOD( GetGameplayLeadIn, m_bGameplayLeadIn ) DEFINE_METHOD( PlayerUsingBothSides, PlayerUsingBothSides() ) DEFINE_METHOD( GetCoins, m_iCoins ) - DEFINE_METHOD( IsSideJoined, m_bSideIsJoined[(PlayerNumber)IArg(1)] ) + DEFINE_METHOD( IsSideJoined, m_bSideIsJoined[Enum::Check(L, 1)] ) DEFINE_METHOD( GetCoinsNeededToJoin, GetCoinsNeededToJoin() ) DEFINE_METHOD( PlayersCanJoin, PlayersCanJoin() ) DEFINE_METHOD( GetNumSidesJoined, GetNumSidesJoined() ) @@ -1969,7 +1969,7 @@ public: DEFINE_METHOD( GetSongOptionsString, m_SongOptions.GetCurrent().GetString() ) static int IsWinner( T* p, lua_State *L ) { - PlayerNumber pn = (PlayerNumber)IArg(1); + PlayerNumber pn = Enum::Check(L, 1); lua_pushboolean(L, p->GetStageResult(pn)==RESULT_WIN); return 1; } static int IsDraw( T* p, lua_State *L ) @@ -1978,7 +1978,7 @@ public: } static int IsDisqualified( T* p, lua_State *L ) { - PlayerNumber pn = (PlayerNumber)IArg(1); + PlayerNumber pn = Enum::Check(L, 1); lua_pushboolean(L, p->IsDisqualified(pn)); return 1; } static int GetCurrentGame( T* p, lua_State *L ) { const_cast(p->GetCurrentGame())->PushSelf( L ); return 1; } diff --git a/stepmania/src/GrooveRadar.cpp b/stepmania/src/GrooveRadar.cpp index f13d2eabfd..cfb8c0dd71 100644 --- a/stepmania/src/GrooveRadar.cpp +++ b/stepmania/src/GrooveRadar.cpp @@ -227,7 +227,7 @@ public: static int SetFromRadarValues( T* p, lua_State *L ) { - PlayerNumber pn = (PlayerNumber)IArg(1); + PlayerNumber pn = Enum::Check(L, 1); if( lua_isnil(L,2) ) { p->SetEmpty( pn ); @@ -239,7 +239,7 @@ public: } return 0; } - static int SetEmpty( T* p, lua_State *L ) { p->SetEmpty( (PlayerNumber)IArg(1) ); return 0; } + static int SetEmpty( T* p, lua_State *L ) { p->SetEmpty( Enum::Check(L, 1) ); return 0; } static int tweenonscreen( T* p, lua_State *L ) { p->TweenOnScreen(); return 0; } static int tweenoffscreen( T* p, lua_State *L ) { p->TweenOffScreen(); return 0; } diff --git a/stepmania/src/ProfileManager.cpp b/stepmania/src/ProfileManager.cpp index a0462c6f1c..45a1942db0 100644 --- a/stepmania/src/ProfileManager.cpp +++ b/stepmania/src/ProfileManager.cpp @@ -823,8 +823,8 @@ class LunaProfileManager: public Luna public: LunaProfileManager() { LUA->Register( Register ); } - static int IsPersistentProfile( T* p, lua_State *L ) { lua_pushboolean(L, p->IsPersistentProfile((PlayerNumber)IArg(1)) ); return 1; } - static int GetProfile( T* p, lua_State *L ) { PlayerNumber pn = (PlayerNumber)IArg(1); Profile* pP = p->GetProfile(pn); ASSERT(pP); pP->PushSelf(L); return 1; } + static int IsPersistentProfile( T* p, lua_State *L ) { lua_pushboolean(L, p->IsPersistentProfile(Enum::Check(L, 1)) ); return 1; } + static int GetProfile( T* p, lua_State *L ) { PlayerNumber pn = Enum::Check(L, 1); Profile* pP = p->GetProfile(pn); ASSERT(pP); pP->PushSelf(L); return 1; } static int GetMachineProfile( T* p, lua_State *L ) { p->GetMachineProfile()->PushSelf(L); return 1; } static int SaveMachineProfile( T* p, lua_State *L ) { p->SaveMachineProfile(); return 0; } static int GetLocalProfile( T* p, lua_State *L ) diff --git a/stepmania/src/StatsManager.cpp b/stepmania/src/StatsManager.cpp index 888f173795..34da1f64d9 100644 --- a/stepmania/src/StatsManager.cpp +++ b/stepmania/src/StatsManager.cpp @@ -224,7 +224,7 @@ public: static int Reset( T* p, lua_State *L ) { p->Reset(); return 0; } static int GetFinalGrade( T* p, lua_State *L ) { - PlayerNumber pn = (PlayerNumber)IArg(1); + PlayerNumber pn = Enum::Check(L, 1); if( !GAMESTATE->IsHumanPlayer(pn) ) lua_pushnumber( L, Grade_NoData );