actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

update binding

Browse Source
This commit is contained in:
Glenn Maynard
2006-09-27 01:48:30 +00:00
parent a93ede5130
commit 51d22ce2f4
6 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/DifficultyIcon.cpp
+1 -1
View File
@@ -134,7 +134,7 @@ public:
return 0; return 0;
} }
static int Unset( T* p, lua_State *L ) { p->Unset(); 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<PlayerNumber>(L, 1) ); return 0; }
static int SetFromDifficulty( T* p, lua_State *L ) { p->SetFromDifficulty( Enum::Check<Difficulty>(L, 1) ); return 0; } static int SetFromDifficulty( T* p, lua_State *L ) { p->SetFromDifficulty( Enum::Check<Difficulty>(L, 1) ); return 0; }
static void Register(lua_State *L) static void Register(lua_State *L)
stepmania/src/DifficultyMeter.cpp
+1 -1
View File
@@ -289,7 +289,7 @@ public:
} }
static int SetFromGameState( T* p, lua_State *L ) static int SetFromGameState( T* p, lua_State *L )
{ {
PlayerNumber pn = (PlayerNumber)IArg(1); PlayerNumber pn = Enum::Check<PlayerNumber>(L, 1);
p->SetFromGameState( pn ); p->SetFromGameState( pn );
return 0; return 0;
} }
stepmania/src/GameState.cpp
+14 -14
View File
@@ -1826,14 +1826,14 @@ class LunaGameState: public Luna<GameState>
public: public:
LunaGameState() { LUA->Register( Register ); } LunaGameState() { LUA->Register( Register ); }
DEFINE_METHOD( IsPlayerEnabled, IsPlayerEnabled((PlayerNumber)IArg(1)) ) DEFINE_METHOD( IsPlayerEnabled, IsPlayerEnabled(Enum::Check<PlayerNumber>(L, 1)) )
DEFINE_METHOD( IsHumanPlayer, IsHumanPlayer((PlayerNumber)IArg(1)) ) DEFINE_METHOD( IsHumanPlayer, IsHumanPlayer(Enum::Check<PlayerNumber>(L, 1)) )
DEFINE_METHOD( GetPlayerDisplayName, GetPlayerDisplayName((PlayerNumber)IArg(1)) ) DEFINE_METHOD( GetPlayerDisplayName, GetPlayerDisplayName(Enum::Check<PlayerNumber>(L, 1)) )
DEFINE_METHOD( GetMasterPlayerNumber, m_MasterPlayerNumber ) DEFINE_METHOD( GetMasterPlayerNumber, m_MasterPlayerNumber )
DEFINE_METHOD( GetMultiplayer, m_bMultiplayer ) DEFINE_METHOD( GetMultiplayer, m_bMultiplayer )
static int GetPlayerState( T* p, lua_State *L ) static int GetPlayerState( T* p, lua_State *L )
{ {
PlayerNumber pn = (PlayerNumber)IArg(1); PlayerNumber pn = Enum::Check<PlayerNumber>(L, 1);
p->m_pPlayerState[pn]->PushSelf(L); p->m_pPlayerState[pn]->PushSelf(L);
return 1; return 1;
} }
@@ -1847,7 +1847,7 @@ public:
{ {
PlayerNumber pn = PLAYER_INVALID; PlayerNumber pn = PLAYER_INVALID;
if( lua_gettop(L) >= 2 && !lua_isnil(L,2) ) if( lua_gettop(L) >= 2 && !lua_isnil(L,2) )
pn = (PlayerNumber)IArg(2); pn = Enum::Check<PlayerNumber>(L, 2);
p->ApplyGameCommand(SArg(1),pn); p->ApplyGameCommand(SArg(1),pn);
return 0; return 0;
} }
@@ -1860,7 +1860,7 @@ public:
} }
static int GetCurrentSteps( T* p, lua_State *L ) static int GetCurrentSteps( T* p, lua_State *L )
{ {
PlayerNumber pn = (PlayerNumber)IArg(1); PlayerNumber pn = Enum::Check<PlayerNumber>(L, 1);
Steps *pSteps = p->m_pCurSteps[pn]; Steps *pSteps = p->m_pCurSteps[pn];
if( pSteps ) { pSteps->PushSelf(L); } if( pSteps ) { pSteps->PushSelf(L); }
else { lua_pushnil(L); } else { lua_pushnil(L); }
@@ -1868,7 +1868,7 @@ public:
} }
static int SetCurrentSteps( T* p, lua_State *L ) static int SetCurrentSteps( T* p, lua_State *L )
{ {
PlayerNumber pn = (PlayerNumber)IArg(1); PlayerNumber pn = Enum::Check<PlayerNumber>(L, 1);
if( lua_isnil(L,2) ) { p->m_pCurSteps[pn].Set( NULL ); } if( lua_isnil(L,2) ) { p->m_pCurSteps[pn].Set( NULL ); }
else { Steps *pS = Luna<Steps>::check(L,2); p->m_pCurSteps[pn].Set( pS ); } else { Steps *pS = Luna<Steps>::check(L,2); p->m_pCurSteps[pn].Set( pS ); }
MESSAGEMAN->Broadcast( (Message)(Message_CurrentStepsP1Changed+pn) ); MESSAGEMAN->Broadcast( (Message)(Message_CurrentStepsP1Changed+pn) );
@@ -1883,7 +1883,7 @@ public:
} }
static int GetCurrentTrail( T* p, lua_State *L ) static int GetCurrentTrail( T* p, lua_State *L )
{ {
PlayerNumber pn = (PlayerNumber)IArg(1); PlayerNumber pn = Enum::Check<PlayerNumber>(L, 1);
Trail *pTrail = p->m_pCurTrail[pn]; Trail *pTrail = p->m_pCurTrail[pn];
if( pTrail ) { pTrail->PushSelf(L); } if( pTrail ) { pTrail->PushSelf(L); }
else { lua_pushnil(L); } else { lua_pushnil(L); }
@@ -1891,7 +1891,7 @@ public:
} }
static int SetCurrentTrail( T* p, lua_State *L ) static int SetCurrentTrail( T* p, lua_State *L )
{ {
PlayerNumber pn = (PlayerNumber)IArg(1); PlayerNumber pn = Enum::Check<PlayerNumber>(L, 1);
if( lua_isnil(L,2) ) { p->m_pCurTrail[pn].Set( NULL ); } if( lua_isnil(L,2) ) { p->m_pCurTrail[pn].Set( NULL ); }
else { Trail *pS = Luna<Trail>::check(L,2); p->m_pCurTrail[pn].Set( pS ); } else { Trail *pS = Luna<Trail>::check(L,2); p->m_pCurTrail[pn].Set( pS ); }
MESSAGEMAN->Broadcast( (Message)(Message_CurrentTrailP1Changed+pn) ); MESSAGEMAN->Broadcast( (Message)(Message_CurrentTrailP1Changed+pn) );
@@ -1942,8 +1942,8 @@ public:
DEFINE_METHOD( GetPlayMode, m_PlayMode ) DEFINE_METHOD( GetPlayMode, m_PlayMode )
DEFINE_METHOD( GetSortOrder, m_SortOrder ) DEFINE_METHOD( GetSortOrder, m_SortOrder )
DEFINE_METHOD( StageIndex, GetStageIndex() ) DEFINE_METHOD( StageIndex, GetStageIndex() )
DEFINE_METHOD( IsGoalComplete, IsGoalComplete((PlayerNumber)IArg(1)) ) DEFINE_METHOD( IsGoalComplete, IsGoalComplete(Enum::Check<PlayerNumber>(L, 1)) )
DEFINE_METHOD( PlayerIsUsingModifier, PlayerIsUsingModifier((PlayerNumber)IArg(1),SArg(2)) ) DEFINE_METHOD( PlayerIsUsingModifier, PlayerIsUsingModifier(Enum::Check<PlayerNumber>(L, 1), SArg(2)) )
DEFINE_METHOD( GetCourseSongIndex, GetCourseSongIndex() ) DEFINE_METHOD( GetCourseSongIndex, GetCourseSongIndex() )
DEFINE_METHOD( GetLoadingCourseSongIndex, GetLoadingCourseSongIndex() ) DEFINE_METHOD( GetLoadingCourseSongIndex, GetLoadingCourseSongIndex() )
DEFINE_METHOD( IsFinalStage, IsFinalStage() ) DEFINE_METHOD( IsFinalStage, IsFinalStage() )
@@ -1960,7 +1960,7 @@ public:
DEFINE_METHOD( GetGameplayLeadIn, m_bGameplayLeadIn ) DEFINE_METHOD( GetGameplayLeadIn, m_bGameplayLeadIn )
DEFINE_METHOD( PlayerUsingBothSides, PlayerUsingBothSides() ) DEFINE_METHOD( PlayerUsingBothSides, PlayerUsingBothSides() )
DEFINE_METHOD( GetCoins, m_iCoins ) DEFINE_METHOD( GetCoins, m_iCoins )
DEFINE_METHOD( IsSideJoined, m_bSideIsJoined[(PlayerNumber)IArg(1)] ) DEFINE_METHOD( IsSideJoined, m_bSideIsJoined[Enum::Check<PlayerNumber>(L, 1)] )
DEFINE_METHOD( GetCoinsNeededToJoin, GetCoinsNeededToJoin() ) DEFINE_METHOD( GetCoinsNeededToJoin, GetCoinsNeededToJoin() )
DEFINE_METHOD( PlayersCanJoin, PlayersCanJoin() ) DEFINE_METHOD( PlayersCanJoin, PlayersCanJoin() )
DEFINE_METHOD( GetNumSidesJoined, GetNumSidesJoined() ) DEFINE_METHOD( GetNumSidesJoined, GetNumSidesJoined() )
@@ -1969,7 +1969,7 @@ public:
DEFINE_METHOD( GetSongOptionsString, m_SongOptions.GetCurrent().GetString() ) DEFINE_METHOD( GetSongOptionsString, m_SongOptions.GetCurrent().GetString() )
static int IsWinner( T* p, lua_State *L ) static int IsWinner( T* p, lua_State *L )
{ {
PlayerNumber pn = (PlayerNumber)IArg(1); PlayerNumber pn = Enum::Check<PlayerNumber>(L, 1);
lua_pushboolean(L, p->GetStageResult(pn)==RESULT_WIN); return 1; lua_pushboolean(L, p->GetStageResult(pn)==RESULT_WIN); return 1;
} }
static int IsDraw( T* p, lua_State *L ) static int IsDraw( T* p, lua_State *L )
@@ -1978,7 +1978,7 @@ public:
} }
static int IsDisqualified( T* p, lua_State *L ) static int IsDisqualified( T* p, lua_State *L )
{ {
PlayerNumber pn = (PlayerNumber)IArg(1); PlayerNumber pn = Enum::Check<PlayerNumber>(L, 1);
lua_pushboolean(L, p->IsDisqualified(pn)); return 1; lua_pushboolean(L, p->IsDisqualified(pn)); return 1;
} }
static int GetCurrentGame( T* p, lua_State *L ) { const_cast<Game*>(p->GetCurrentGame())->PushSelf( L ); return 1; } static int GetCurrentGame( T* p, lua_State *L ) { const_cast<Game*>(p->GetCurrentGame())->PushSelf( L ); return 1; }
stepmania/src/GrooveRadar.cpp
+2 -2
View File
@@ -227,7 +227,7 @@ public:
static int SetFromRadarValues( T* p, lua_State *L ) static int SetFromRadarValues( T* p, lua_State *L )
{ {
PlayerNumber pn = (PlayerNumber)IArg(1); PlayerNumber pn = Enum::Check<PlayerNumber>(L, 1);
if( lua_isnil(L,2) ) if( lua_isnil(L,2) )
{ {
p->SetEmpty( pn ); p->SetEmpty( pn );
@@ -239,7 +239,7 @@ public:
} }
return 0; 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<PlayerNumber>(L, 1) ); return 0; }
static int tweenonscreen( T* p, lua_State *L ) { p->TweenOnScreen(); 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; } static int tweenoffscreen( T* p, lua_State *L ) { p->TweenOffScreen(); return 0; }
stepmania/src/ProfileManager.cpp
+2 -2
View File
@@ -823,8 +823,8 @@ class LunaProfileManager: public Luna<ProfileManager>
public: public:
LunaProfileManager() { LUA->Register( Register ); } LunaProfileManager() { LUA->Register( Register ); }
static int IsPersistentProfile( T* p, lua_State *L ) { lua_pushboolean(L, p->IsPersistentProfile((PlayerNumber)IArg(1)) ); return 1; } static int IsPersistentProfile( T* p, lua_State *L ) { lua_pushboolean(L, p->IsPersistentProfile(Enum::Check<PlayerNumber>(L, 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 GetProfile( T* p, lua_State *L ) { PlayerNumber pn = Enum::Check<PlayerNumber>(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 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 SaveMachineProfile( T* p, lua_State *L ) { p->SaveMachineProfile(); return 0; }
static int GetLocalProfile( T* p, lua_State *L ) static int GetLocalProfile( T* p, lua_State *L )
stepmania/src/StatsManager.cpp
+1 -1
View File
@@ -224,7 +224,7 @@ public:
static int Reset( T* p, lua_State *L ) { p->Reset(); return 0; } static int Reset( T* p, lua_State *L ) { p->Reset(); return 0; }
static int GetFinalGrade( T* p, lua_State *L ) static int GetFinalGrade( T* p, lua_State *L )
{ {
PlayerNumber pn = (PlayerNumber)IArg(1); PlayerNumber pn = Enum::Check<PlayerNumber>(L, 1);
if( !GAMESTATE->IsHumanPlayer(pn) ) if( !GAMESTATE->IsHumanPlayer(pn) )
lua_pushnumber( L, Grade_NoData ); lua_pushnumber( L, Grade_NoData );