Integrate C++11 branch into 5_1-new
This commit is contained in:
@@ -33,7 +33,7 @@ public:
|
||||
void SetGameController( GameController gc ) { m_GameController = gc; }
|
||||
RString GetPath( const RString &sButtonName, const RString &sElement );
|
||||
bool PushActorTemplate( Lua *L, const RString &sButton, const RString &sElement, bool bSpriteOnly );
|
||||
Actor *LoadActor( const RString &sButton, const RString &sElement, Actor *pParent = NULL, bool bSpriteOnly = false );
|
||||
Actor *LoadActor( const RString &sButton, const RString &sElement, Actor *pParent = nullptr, bool bSpriteOnly = false );
|
||||
|
||||
RString GetMetric( const RString &sButtonName, const RString &sValue );
|
||||
int GetMetricI( const RString &sButtonName, const RString &sValueName );
|
||||
|
||||
Reference in New Issue
Block a user