summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/common/resourcemanager.cpp3
-rw-r--r--src/scripting/lua.cpp3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/common/resourcemanager.cpp b/src/common/resourcemanager.cpp
index 8db4546..5d2a8cf 100644
--- a/src/common/resourcemanager.cpp
+++ b/src/common/resourcemanager.cpp
@@ -41,11 +41,14 @@ void ResourceManager::initialize()
{
PHYSFS_permitSymbolicLinks(1);
+ const std::string serverPath =
+ Configuration::getValue("serverPath", ".");
const std::string clientDataPath =
Configuration::getValue("clientDataPath", "example/clientdata");
const std::string serverDataPath =
Configuration::getValue("serverDataPath", "example/serverdata");
+ PHYSFS_addToSearchPath(serverPath.c_str(), 1);
PHYSFS_addToSearchPath(clientDataPath.c_str(), 1);
PHYSFS_addToSearchPath(serverDataPath.c_str(), 1);
}
diff --git a/src/scripting/lua.cpp b/src/scripting/lua.cpp
index 507b348..ca91624 100644
--- a/src/scripting/lua.cpp
+++ b/src/scripting/lua.cpp
@@ -1694,6 +1694,5 @@ LuaScript::LuaScript():
lua_settable(mState, LUA_REGISTRYINDEX);
lua_settop(mState, 0);
- loadFile("scripts/libs/libmana.lua");
+ loadFile("scripts/lua/libmana.lua");
}
-