use a regular command for this
This commit is contained in:
+12
-14
@@ -219,10 +219,12 @@ void Player::Init(
|
|||||||
//
|
//
|
||||||
// Init judgment positions
|
// Init judgment positions
|
||||||
//
|
//
|
||||||
LuaReference expr = THEME->GetMetricR( sType,"JudgmentTransformCommandFunction" );
|
LuaReference expr = THEME->GetMetricR( sType,"JudgmentTransformCommand" );
|
||||||
|
|
||||||
bool bPlayerUsingBothSides = GAMESTATE->GetCurrentStyle()->m_StyleType==StyleType_OnePlayerTwoSides;
|
bool bPlayerUsingBothSides = GAMESTATE->GetCurrentStyle()->m_StyleType==StyleType_OnePlayerTwoSides;
|
||||||
Actor temp;
|
Actor temp;
|
||||||
|
temp.SetName( "Judgment" );
|
||||||
|
ActorUtil::LoadCommand( temp, sType, "Transform" );
|
||||||
|
|
||||||
int iEnabledPlayerIndex = -1;
|
int iEnabledPlayerIndex = -1;
|
||||||
int iNumEnabledPlayers = 0;
|
int iNumEnabledPlayers = 0;
|
||||||
@@ -255,19 +257,15 @@ void Player::Init(
|
|||||||
{
|
{
|
||||||
for( int j=0; j<NUM_CENTERED; j++ )
|
for( int j=0; j<NUM_CENTERED; j++ )
|
||||||
{
|
{
|
||||||
Lua *L = LUA->Get();
|
LuaThreadVariable var1( "Player", LuaReference::Create(pPlayerState->m_PlayerNumber) );
|
||||||
expr.PushSelf( L );
|
LuaThreadVariable var2( "MultiPlayer", LuaReference::Create(pPlayerState->m_mp) );
|
||||||
ASSERT( !lua_isnil(L, -1) );
|
LuaThreadVariable var3( "iEnabledPlayerIndex", LuaReference::Create(iEnabledPlayerIndex) );
|
||||||
temp.PushSelf( L );
|
LuaThreadVariable var4( "iNumEnabledPlayers", LuaReference::Create(iNumEnabledPlayers) );
|
||||||
LuaHelpers::Push( L, pPlayerState->m_PlayerNumber );
|
LuaThreadVariable var5( "bPlayerUsingBothSides", LuaReference::Create(bPlayerUsingBothSides) );
|
||||||
LuaHelpers::Push( L, pPlayerState->m_mp );
|
LuaThreadVariable var6( "bReverse", LuaReference::Create(!!i) );
|
||||||
LuaHelpers::Push( L, iEnabledPlayerIndex );
|
LuaThreadVariable var7( "bCentered", LuaReference::Create(!!j) );
|
||||||
LuaHelpers::Push( L, iNumEnabledPlayers );
|
|
||||||
LuaHelpers::Push( L, bPlayerUsingBothSides );
|
temp.PlayCommand( "Transform" );
|
||||||
LuaHelpers::Push( L, !!i );
|
|
||||||
LuaHelpers::Push( L, !!j );
|
|
||||||
lua_call( L, 8, 0 ); // 8 args, 0 results
|
|
||||||
LUA->Release(L);
|
|
||||||
|
|
||||||
m_tsJudgment[i][j] = temp.DestTweenState();
|
m_tsJudgment[i][j] = temp.DestTweenState();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user