From f7ef93611cb2429ec3f1f5f77befcd1b5647be37 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Thu, 8 Nov 2012 19:09:35 +0000 Subject: Removed the SquirrelVM. It has been crashing the server. http://forum.mc-server.org/showthread.php?tid=610 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1024 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/PluginManager.h | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) (limited to 'source/PluginManager.h') diff --git a/source/PluginManager.h b/source/PluginManager.h index 8fc74c90c..ebbd0ca89 100644 --- a/source/PluginManager.h +++ b/source/PluginManager.h @@ -5,7 +5,11 @@ struct lua_State; class cLuaCommandBinder; -class cSquirrelCommandBinder; + +#ifdef USE_SQUIRREL + class cSquirrelCommandBinder; +#endif // USE_SQUIRREL + class cPlugin; // fwd: cWorld.h @@ -124,11 +128,16 @@ public: //tolua_export cLuaCommandBinder* GetLuaCommandBinder() const { return m_LuaCommandBinder; } - cSquirrelCommandBinder* GetSquirrelCommandBinder() { return m_SquirrelCommandBinder; } + #ifdef USE_SQUIRREL + cSquirrelCommandBinder * GetSquirrelCommandBinder() { return m_SquirrelCommandBinder; } + #endif // USE_SQUIRREL bool HasPlugin( cPlugin* a_Plugin ) const; + private: + friend class cRoot; + cPluginManager(); ~cPluginManager(); @@ -142,8 +151,15 @@ private: void ReloadPluginsNow(); void UnloadPluginsNow(); - cLuaCommandBinder* m_LuaCommandBinder; - cSquirrelCommandBinder* m_SquirrelCommandBinder; + cLuaCommandBinder * m_LuaCommandBinder; + + #ifdef USE_SQUIRREL + cSquirrelCommandBinder * m_SquirrelCommandBinder; + #endif // USE_SQUIRREL bool m_bReloadPlugins; }; //tolua_export + + + + -- cgit v1.2.3