From 263ce31bd6b80d0cdb33232ce09a81c14d6a0e95 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Thu, 23 Aug 2012 20:49:21 +0000 Subject: Added plugin name to deprecation messages 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 --- source/cPlugin_NewLua.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'source/cPlugin_NewLua.h') diff --git a/source/cPlugin_NewLua.h b/source/cPlugin_NewLua.h index a2eddf89b..7ae38c1e5 100644 --- a/source/cPlugin_NewLua.h +++ b/source/cPlugin_NewLua.h @@ -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 \ No newline at end of file -- cgit v1.2.3