diff options
| author | Mat <mail@mathias.is> | 2020-05-07 21:14:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-07 21:14:00 +0200 |
| commit | c710f6a4ea2231051a9e6406128d6e06af86e58e (patch) | |
| tree | d86451d18434a1e02d8753ee2486d11068f69494 /src/Bindings | |
| parent | Remove coverity_scan branch reference (diff) | |
| download | cuberite-c710f6a4ea2231051a9e6406128d6e06af86e58e.tar cuberite-c710f6a4ea2231051a9e6406128d6e06af86e58e.tar.gz cuberite-c710f6a4ea2231051a9e6406128d6e06af86e58e.tar.bz2 cuberite-c710f6a4ea2231051a9e6406128d6e06af86e58e.tar.lz cuberite-c710f6a4ea2231051a9e6406128d6e06af86e58e.tar.xz cuberite-c710f6a4ea2231051a9e6406128d6e06af86e58e.tar.zst cuberite-c710f6a4ea2231051a9e6406128d6e06af86e58e.zip | |
Diffstat (limited to 'src/Bindings')
| -rw-r--r-- | src/Bindings/PluginLua.cpp | 6 | ||||
| -rw-r--r-- | src/Bindings/PluginManager.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Bindings/PluginLua.cpp b/src/Bindings/PluginLua.cpp index fac07f00b..13e2084ca 100644 --- a/src/Bindings/PluginLua.cpp +++ b/src/Bindings/PluginLua.cpp @@ -94,18 +94,18 @@ bool cPluginLua::Load(void) lua_setglobal(m_LuaState, LUA_PLUGIN_NAME_VAR_NAME); // Add the plugin's folder to the package.path and package.cpath variables (#693): - m_LuaState.AddPackagePath("path", FILE_IO_PREFIX + GetLocalFolder() + "/?.lua"); + m_LuaState.AddPackagePath("path", GetLocalFolder() + "/?.lua"); #ifdef _WIN32 m_LuaState.AddPackagePath("cpath", GetLocalFolder() + "\\?.dll"); #else - m_LuaState.AddPackagePath("cpath", FILE_IO_PREFIX + GetLocalFolder() + "/?.so"); + m_LuaState.AddPackagePath("cpath", GetLocalFolder() + "/?.so"); #endif tolua_pushusertype(m_LuaState, this, "cPluginLua"); lua_setglobal(m_LuaState, "g_Plugin"); } - std::string PluginPath = FILE_IO_PREFIX + GetLocalFolder() + "/"; + std::string PluginPath = GetLocalFolder() + "/"; // List all Lua files for this plugin. Info.lua has a special handling - make it the last to load: AStringVector Files = cFile::GetFolderContents(PluginPath.c_str()); diff --git a/src/Bindings/PluginManager.h b/src/Bindings/PluginManager.h index 79b7511ea..3b35a826a 100644 --- a/src/Bindings/PluginManager.h +++ b/src/Bindings/PluginManager.h @@ -387,7 +387,7 @@ public: /** Returns the path where individual plugins' folders are expected. The path doesn't end in a slash. */ - static AString GetPluginsPath(void) { return FILE_IO_PREFIX "Plugins"; } // tolua_export + static AString GetPluginsPath(void) { return "Plugins"; } // tolua_export private: friend class cRoot; |