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

fix build errors with gcc

Browse Source
This commit is contained in:
Ted Percival
2005-03-12 22:32:54 +00:00
parent 5d677e1a5a
commit 17dbf884a7
2 changed files with 70 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/LuaManager.h
+47 -36
View File
@@ -26,26 +26,6 @@ namespace LuaHelpers
bool FromStack( int &Object, int iOffset, lua_State *L );
bool FromStack( void *&Object, int iOffset, lua_State *L );
bool FromStack( CString &Object, int iOffset, lua_State *L );
template<class T>
void ReadArrayFromTable( vector<T> aOut, lua_State *L )
{
if( L == NULL )
L = LUA->L;
luaL_checktype( L, -1, LUA_TTABLE );
unsigned iCount = luaL_getn( L, -1 );
for( unsigned i = 0; i < iCount; ++i )
{
lua_rawgeti( L, -1, i+1 );
T value = T();
LuaHelpers::FromStack( value, -1, L );
aOut.push_back( value );
lua_pop( L, 1 );
}
}
};
class LuaManager
@@ -93,23 +73,7 @@ public:
void PushStackNil();
void PushNopFunction();
template<class T>
static void PushStack( const T &val, lua_State *L = NULL )
{
if( L == NULL )
L = LUA->L;
LuaHelpers::Push( val, L );
}
template<class T>
static bool PopStack( T &val, lua_State *L = NULL )
{
if( L == NULL )
L = LUA->L;
bool bRet = LuaHelpers::FromStack( val, -1, L );
lua_pop( L, 1 );
return bRet;
}
bool GetStack( int pos, int &out );
void SetGlobal( const CString &sName );
@@ -120,8 +84,55 @@ public:
static void ReadArrayFromTableB( vector<bool> &aOut, lua_State *L = NULL );
lua_State *L;
template<class T>
static void PushStack( const T &val, lua_State *L = NULL );
template<class T>
static bool PopStack( T &val, lua_State *L = NULL );
};
namespace LuaHelpers
{
template<class T>
void ReadArrayFromTable( vector<T> aOut, lua_State *L )
{
if( L == NULL )
L = LUA->L;
luaL_checktype( L, -1, LUA_TTABLE );
unsigned iCount = luaL_getn( L, -1 );
for( unsigned i = 0; i < iCount; ++i )
{
lua_rawgeti( L, -1, i+1 );
T value = T();
LuaHelpers::FromStack( value, -1, L );
aOut.push_back( value );
lua_pop( L, 1 );
}
}
}
template<class T>
void LuaManager::PushStack( const T &val, lua_State *L)
{
if( L == NULL )
L = LUA->L;
LuaHelpers::Push( val, L );
}
template<class T>
bool LuaManager::PopStack( T &val, lua_State *L)
{
if( L == NULL )
L = LUA->L;
bool bRet = LuaHelpers::FromStack( val, -1, L );
lua_pop( L, 1 );
return bRet;
}
template<class T>
void CreateTableFromArray( const vector<T> &aIn, lua_State *L )
{
stepmania/src/MessageManager.h
+23 -24
View File
@@ -31,6 +31,29 @@ enum Message
};
const CString& MessageToString( Message m );
class MessageManager
{
public:
MessageManager();
~MessageManager();
void Subscribe( IMessageSubscriber* pSubscriber, const CString& sMessage );
void Subscribe( IMessageSubscriber* pSubscriber, Message m );
void Unsubscribe( IMessageSubscriber* pSubscriber, const CString& sMessage );
void Unsubscribe( IMessageSubscriber* pSubscriber, Message m );
void Broadcast( const CString& sMessage ) const;
void Broadcast( Message m ) const;
// Lua
void PushSelf( lua_State *L );
private:
typedef set<IMessageSubscriber*> SubscribersSet;
map<CString,SubscribersSet> m_MessageToSubscribers;
};
extern MessageManager* MESSAGEMAN; // global and accessable from anywhere in our program
template<class T>
class BroadcastOnChange
{
@@ -91,30 +114,6 @@ public:
BroadcastOnChangePtr<T>& operator[]( unsigned i ) { return val[i]; }
};
class MessageManager
{
public:
MessageManager();
~MessageManager();
void Subscribe( IMessageSubscriber* pSubscriber, const CString& sMessage );
void Subscribe( IMessageSubscriber* pSubscriber, Message m );
void Unsubscribe( IMessageSubscriber* pSubscriber, const CString& sMessage );
void Unsubscribe( IMessageSubscriber* pSubscriber, Message m );
void Broadcast( const CString& sMessage ) const;
void Broadcast( Message m ) const;
// Lua
void PushSelf( lua_State *L );
private:
typedef set<IMessageSubscriber*> SubscribersSet;
map<CString,SubscribersSet> m_MessageToSubscribers;
};
extern MessageManager* MESSAGEMAN; // global and accessable from anywhere in our program
#endif
/*