flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Added plugin name to deprecation messages

Browse Source 
Removed duplicate inheritance of m_Name in cPlugin_NewLua by making cWebPlugin interface-only

git-svn-id: http://mc-server.googlecode.com/svn/trunk@782 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com
2012-08-23 20:49:21 +00:00
parent a39adadd0f
commit 263ce31bd6
6 changed files with 45 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/cPlugin_NewLua.h
View File

@@ -46,18 +46,23 @@ public: //tolua_export
virtual bool OnUpdatingSign (cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ, AString & a_Line1, AString & a_Line2, AString & a_Line3, AString & a_Line4) override;
virtual bool OnWeatherChanged (cWorld * a_World) override;
virtual void SetName( const AString & a_Name ) override { cPlugin::SetName(a_Name); cWebPlugin::SetName(a_Name); }
const AString & GetDirectory(void) const {return m_Directory; }
virtual void SetName( const AString & a_Name ) override { cPlugin::SetName(a_Name); }
// cWebPlugin override
virtual const AString & GetName(void) const {return cPlugin::GetName(); }
// cWebPlugin and WebAdmin stuff
virtual AString HandleWebRequest( HTTPRequest * a_Request ) override;
bool AddWebTab( const AString & a_Title, lua_State * a_LuaState, int a_FunctionReference ); // >> EXPORTED IN MANUALBINDINGS <<
OBSOLETE bool AddTab( const AString & a_Title, lua_State * a_LuaState, int a_FunctionReference ); // >> EXPORTED IN MANUALBINDINGS <<
lua_State* GetLuaState() { return m_LuaState; }
OBSOLETE cPlugin_NewLua * CreateWebPlugin(lua_State* a_LuaState); //tolua_export
OBSOLETE cPlugin_NewLua * CreateWebPlugin(lua_State * a_LuaState); //tolua_export
cCriticalSection & GetCriticalSection() { return m_CriticalSection; }
private:
bool PushFunction( const char* a_FunctionName, bool a_bLogError = true );
bool CallFunction( int a_NumArgs, int a_NumResults, const char* a_FunctionName ); // a_FunctionName is only used for error messages, nothing else
@@ -65,5 +70,5 @@ private:
cCriticalSection m_CriticalSection;
std::string m_Directory;
lua_State* m_LuaState;
lua_State * m_LuaState;
};//tolua_export