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

cleanup arg order

Browse Source
This commit is contained in:
Glenn Maynard
2006-09-26 08:54:54 +00:00
parent 5d1b947002
commit f567a0fd28
19 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Actor.cpp
+1 -1
View File
@@ -208,7 +208,7 @@ void Actor::LoadFromNode( const RString& sDir, const XNode* pNode )
Lua *L = LUA->Get();
this->PushSelf( L );
LuaHelpers::Push( sName, L );
LuaHelpers::Push( L, sName );
ActorUtil::GetParam( L, sName );
if( lua_isnil(L, -1) && !bOptional )
stepmania/src/ActorUtil.cpp
+3 -3
View File
@@ -135,7 +135,7 @@ void ActorUtil::SetParamFromStack( Lua *L, RString sName, LuaReference *pOld )
PushParamsTable( L );
int iParams = lua_gettop(L);
LuaHelpers::Push( sName, L );
LuaHelpers::Push( L, sName );
int iName = lua_gettop(L);
/* Save the old value. */
@@ -165,7 +165,7 @@ void ActorUtil::GetParam( Lua *L, const RString &sName )
{
/* Search the params table. */
PushParamsTable( L );
LuaHelpers::Push( sName, L );
LuaHelpers::Push( L, sName );
lua_rawget( L, -2 );
lua_remove( L, -2 );
@@ -628,7 +628,7 @@ ActorUtil::ActorParam::ActorParam( RString sName, RString sValue )
m_pOld = new LuaReference;
m_sName = sName;
Lua *L = LUA->Get();
LuaHelpers::Push( sValue, L );
LuaHelpers::Push( L, sValue );
ActorUtil::SetParamFromStack( L, m_sName, m_pOld );
LUA->Release( L );
}
stepmania/src/CourseEntryDisplay.cpp
+2 -2
View File
@@ -81,9 +81,9 @@ void CourseEntryDisplay::SetDifficulty( PlayerNumber pn, const RString &text, Di
return;
Lua *L = LUA->Get();
LuaHelpers::Push( dc, L );
LuaHelpers::Push( L, dc );
m_textDifficultyNumber[pn].m_pLuaInstance->Set( L, "Difficulty" );
LuaHelpers::Push( dc, L );
LuaHelpers::Push( L, dc );
m_textFoot[pn].m_pLuaInstance->Set( L, "Difficulty" );
LUA->Release(L);
stepmania/src/DifficultyMeter.cpp
+2 -2
View File
@@ -203,9 +203,9 @@ void DifficultyMeter::SetInternal( int iMeter, Difficulty dc, const RString &sDi
sNewText.insert( sNewText.end(), iNumOff, off );
Lua *L = LUA->Get();
LuaHelpers::Push( dc, L );
LuaHelpers::Push( L, dc );
m_textFeet.m_pLuaInstance->Set( L, "Difficulty" );
LuaHelpers::Push( iMeter, L );
LuaHelpers::Push( L, iMeter );
m_textFeet.m_pLuaInstance->Set( L, "Meter" );
LUA->Release(L);
m_textFeet.PlayCommand( "DifficultyChanged" );
stepmania/src/DynamicActorScroller.cpp
+1 -1
View File
@@ -116,7 +116,7 @@ void DynamicActorScroller::ConfigureActor( Actor *pActor, int iItem )
m_LoadFunction.PushSelf( L );
ASSERT( !lua_isnil(L, -1) );
pActor->PushSelf( L );
LuaHelpers::Push( iItem, L );
LuaHelpers::Push( L, iItem );
lua_call( L, 2, 0 ); // 2 args, 0 results
LUA->Release(L);
}
stepmania/src/EnumHelper.cpp
+1 -1
View File
@@ -23,7 +23,7 @@ int CheckEnum( lua_State *L, LuaReference &table, int iPos, int iInvalid, const
lua_pushvalue( L, iPos );
RString sGot;
LuaHelpers::Pop( L, sGot );
LuaHelpers::Push( ssprintf("Expected %s; got \"%s\"", szType, sGot.c_str() ), L );
LuaHelpers::Push( L, ssprintf("Expected %s; got \"%s\"", szType, sGot.c_str() ) );
lua_error( L );
}
int iRet = lua_tointeger( L, -1 );
stepmania/src/EnumHelper.h
+2 -2
View File
@@ -132,7 +132,7 @@ static const RString EMPTY_STRING;
#define LuaDeclareType(X) \
namespace LuaHelpers { bool FromStack( lua_State *L, X &Object, int iOffset ); } \
namespace LuaHelpers { void Push( const X &Object, lua_State *L ); }
namespace LuaHelpers { void Push( lua_State *L, const X &Object ); }
#define LuaXType(X) \
static void Lua##X(lua_State* L) \
@@ -168,7 +168,7 @@ LuaReference EnumTraits<X>::EnumToString; \
X EnumTraits<X>::Invalid; \
const char *EnumTraits<X>::szName = #X; \
namespace LuaHelpers { bool FromStack( lua_State *L, X &Object, int iOffset ) { Object = Enum::Check<X>( L, iOffset ); return true; } } \
namespace LuaHelpers { void Push( const X &Object, lua_State *L ) { Enum::Push<X>( L, Object ); } }
namespace LuaHelpers { void Push( lua_State *L, const X &Object ) { Enum::Push<X>( L, Object ); } }
#endif
stepmania/src/LuaBinding.h
+2 -2
View File
@@ -241,10 +241,10 @@ public:
template<> Luna<T>::RegTypeVector* Luna<T>::s_pvMethods = NULL; \
static Luna##T registera##T; \
/* Call PushSelf, so we always call the derived Luna<T>::Push. */ \
namespace LuaHelpers { template<> void Push( T *pObject, lua_State *L ) { pObject->PushSelf( L ); } }
namespace LuaHelpers { template<> void Push( lua_State *L, T *pObject ) { pObject->PushSelf( L ); } }
#define DEFINE_METHOD( method_name, expr ) \
static int method_name( T* p, lua_State *L ) { LuaHelpers::Push( p->expr, L ); return 1; }
static int method_name( T* p, lua_State *L ) { LuaHelpers::Push( L, p->expr ); return 1; }
#define ADD_METHOD( method_name ) \
AddMethod( #method_name, method_name )
stepmania/src/LuaExpressionTransform.cpp
+3 -3
View File
@@ -31,9 +31,9 @@ const Actor::TweenState &LuaExpressionTransform::GetPosition( float fPositionOff
m_exprTransformFunction.PushSelf( L );
ASSERT( !lua_isnil(L, -1) );
a.PushSelf( L );
LuaHelpers::Push( fPositionOffsetFromCenter, L );
LuaHelpers::Push( iItemIndex, L );
LuaHelpers::Push( iNumItems, L );
LuaHelpers::Push( L, fPositionOffsetFromCenter );
LuaHelpers::Push( L, iItemIndex );
LuaHelpers::Push( L, iNumItems );
lua_call( L, 4, 0 ); // 4 args, 0 results
LUA->Release(L);
stepmania/src/LuaFunctions.h
+1 -1
View File
@@ -14,7 +14,7 @@ struct LuaFunctionList
#define LuaFunction( func, expr ) \
int LuaFunc_##func( lua_State *L ) { \
LuaHelpers::Push( expr, L ); return 1; \
LuaHelpers::Push( L, expr ); return 1; \
} \
static LuaFunctionList g_##func( #func, LuaFunc_##func ); /* register it */
stepmania/src/LuaManager.cpp
+6 -6
View File
@@ -48,7 +48,7 @@ const char *ChunkReaderString::Reader( lua_State *L, void *pPtr, size_t *pSize )
void LuaManager::SetGlobal( const RString &sName, int val )
{
Lua *L = LUA->Get();
LuaHelpers::Push( val, L );
LuaHelpers::Push( L, val );
lua_setglobal( L, sName );
LUA->Release( L );
}
@@ -56,7 +56,7 @@ void LuaManager::SetGlobal( const RString &sName, int val )
void LuaManager::SetGlobal( const RString &sName, const RString &val )
{
Lua *L = LUA->Get();
LuaHelpers::Push( val, L );
LuaHelpers::Push( L, val );
lua_setglobal( L, sName );
LUA->Release( L );
}
@@ -70,10 +70,10 @@ void LuaManager::UnsetGlobal( const RString &sName )
}
void LuaHelpers::Push( const bool &Object, lua_State *L ) { lua_pushboolean( L, Object ); }
void LuaHelpers::Push( const float &Object, lua_State *L ) { lua_pushnumber( L, Object ); }
void LuaHelpers::Push( const int &Object, lua_State *L ) { lua_pushinteger( L, Object ); }
void LuaHelpers::Push( const RString &Object, lua_State *L ) { lua_pushlstring( L, Object.data(), Object.size() ); }
void LuaHelpers::Push( lua_State *L, const bool &Object ) { lua_pushboolean( L, Object ); }
void LuaHelpers::Push( lua_State *L, const float &Object ) { lua_pushnumber( L, Object ); }
void LuaHelpers::Push( lua_State *L, const int &Object ) { lua_pushinteger( L, Object ); }
void LuaHelpers::Push( lua_State *L, const RString &Object ) { lua_pushlstring( L, Object.data(), Object.size() ); }
bool LuaHelpers::FromStack( Lua *L, bool &Object, int iOffset ) { Object = !!lua_toboolean( L, iOffset ); return true; }
bool LuaHelpers::FromStack( Lua *L, float &Object, int iOffset ) { Object = (float)lua_tonumber( L, iOffset ); return true; }
stepmania/src/LuaManager.h
+6 -6
View File
@@ -77,12 +77,12 @@ namespace LuaHelpers
bool RunAtExpressionS( RString &sStr );
template<class T>
void Push( T *pObject, Lua *L );
void Push( lua_State *L, T *pObject );
void Push( const bool &Object, Lua *L );
void Push( const float &Object, Lua *L );
void Push( const int &Object, Lua *L );
void Push( const RString &Object, Lua *L );
void Push( lua_State *L, const bool &Object );
void Push( lua_State *L, const float &Object );
void Push( lua_State *L, const int &Object );
void Push( lua_State *L, const RString &Object );
bool FromStack( Lua *L, bool &Object, int iOffset );
bool FromStack( Lua *L, float &Object, int iOffset );
@@ -118,7 +118,7 @@ namespace LuaHelpers
lua_newtable( L );
for( unsigned i = 0; i < aIn.size(); ++i )
{
LuaHelpers::Push( aIn[i], L );
LuaHelpers::Push( L, aIn[i] );
lua_rawseti( L, -2, i+1 );
}
}
stepmania/src/MenuTimer.cpp
+1 -1
View File
@@ -164,7 +164,7 @@ void MenuTimer::SetText( float fSeconds )
ASSERT( !lua_isnil(L, -1) );
// 1st parameter
LuaHelpers::Push( fSeconds, L );
LuaHelpers::Push( L, fSeconds );
// call function with 1 argument and 1 result
lua_call(L, 1, 1);
stepmania/src/OptionRowHandler.cpp
+2 -2
View File
@@ -950,7 +950,7 @@ public:
lua_pushvalue( L, 1 );
/* Argument 3 (pn): */
LuaHelpers::Push( p, L );
LuaHelpers::Push( L, p );
ASSERT( lua_gettop(L) == 6 ); /* vbSelectedOut, m_iLuaTable, function, self, arg, arg */
@@ -1004,7 +1004,7 @@ public:
lua_pushvalue( L, 1 );
/* Argument 3 (pn): */
LuaHelpers::Push( p, L );
LuaHelpers::Push( L, p );
ASSERT( lua_gettop(L) == 6 ); /* vbSelectedOut, m_iLuaTable, function, self, arg, arg */
stepmania/src/PercentageDisplay.cpp
+1 -1
View File
@@ -167,7 +167,7 @@ void PercentageDisplay::Refresh()
Lua *L = LUA->Get();
m_Format.PushSelf( L );
ASSERT( !lua_isnil(L, -1) );
LuaHelpers::Push( fPercentDancePoints, L );
LuaHelpers::Push( L, fPercentDancePoints );
lua_call( L, 1, 1 ); // 1 args, 1 result
LuaHelpers::Pop( L, sNumToDisplay );
LUA->Release(L);
stepmania/src/Player.cpp
+14 -14
View File
@@ -191,13 +191,13 @@ void Player::Init(
expr.PushSelf( L );
ASSERT( !lua_isnil(L, -1) );
temp.PushSelf( L );
LuaHelpers::Push( pPlayerState->m_PlayerNumber, L );
LuaHelpers::Push( pPlayerState->m_mp, L );
LuaHelpers::Push( iEnabledPlayerIndex, L );
LuaHelpers::Push( iNumEnabledPlayers, L );
LuaHelpers::Push( bPlayerUsingBothSides, L );
LuaHelpers::Push( !!i, L );
LuaHelpers::Push( !!j, L );
LuaHelpers::Push( L, pPlayerState->m_PlayerNumber );
LuaHelpers::Push( L, pPlayerState->m_mp );
LuaHelpers::Push( L, iEnabledPlayerIndex );
LuaHelpers::Push( L, iNumEnabledPlayers );
LuaHelpers::Push( L, bPlayerUsingBothSides );
LuaHelpers::Push( L, !!i );
LuaHelpers::Push( L, !!j );
lua_call( L, 8, 0 ); // 8 args, 0 results
LUA->Release(L);
@@ -226,13 +226,13 @@ void Player::Init(
expr.PushSelf( L );
ASSERT( !lua_isnil(L, -1) );
m_sprJudgmentFrame->PushSelf( L );
LuaHelpers::Push( pPlayerState->m_PlayerNumber, L );
LuaHelpers::Push( pPlayerState->m_mp, L );
LuaHelpers::Push( iEnabledPlayerIndex, L );
LuaHelpers::Push( iNumEnabledPlayers, L );
LuaHelpers::Push( bPlayerUsingBothSides, L );
LuaHelpers::Push( false, L );
LuaHelpers::Push( false, L );
LuaHelpers::Push( L, pPlayerState->m_PlayerNumber );
LuaHelpers::Push( L, pPlayerState->m_mp );
LuaHelpers::Push( L, iEnabledPlayerIndex );
LuaHelpers::Push( L, iNumEnabledPlayers );
LuaHelpers::Push( L, bPlayerUsingBothSides );
LuaHelpers::Push( L, false );
LuaHelpers::Push( L, false );
lua_call( L, 8, 0 ); // 8 args, 0 results
LUA->Release( L );
}
stepmania/src/Preference.cpp
+1 -1
View File
@@ -89,7 +89,7 @@ void IPreference::SetFromStack( lua_State *L )
} \
template<> void PrefPushValue( lua_State *L, const type &v ) \
{ \
LuaHelpers::Push( v, L ); \
LuaHelpers::Push( L, v ); \
}
READFROM_AND_WRITETO( int )
stepmania/src/ScreenOptions.cpp
+1 -1
View File
@@ -223,7 +223,7 @@ void ScreenOptions::InitMenu( const vector<OptionRowHandler*> &vHands )
int iIndex = p - m_pRows.begin();
Lua *L = LUA->Get();
LuaHelpers::Push( iIndex, L );
LuaHelpers::Push( L, iIndex );
(*p)->m_pLuaInstance->Set( L, "iIndex" );
LUA->Release( L );
stepmania/src/SongManager.cpp
+2 -2
View File
@@ -1870,8 +1870,8 @@ public:
p->GetExtraStageInfo( bExtra2, pStyle, pSong, pSteps, &po, &so );
pSong->PushSelf( L );
pSteps->PushSelf( L );
LuaHelpers::Push( po.GetString(true), L );
LuaHelpers::Push( so.GetString(), L );
LuaHelpers::Push( L, po.GetString(true) );
LuaHelpers::Push( L, so.GetString() );
return 4;
}