diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-05-29 22:11:12 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-05-30 17:50:55 +0200 |
| commit | 3e669831a05c36a38519b6f22cb1ed3c11837f2f (patch) | |
| tree | 21a2763b425480c909d43efe0856cfbab48e3573 /src | |
| parent | 8a95ed77fec7c2ef3c0fac81258f70db25009b48 (diff) | |
| download | manaserv-3e669831a05c36a38519b6f22cb1ed3c11837f2f.tar.gz manaserv-3e669831a05c36a38519b6f22cb1ed3c11837f2f.tar.xz manaserv-3e669831a05c36a38519b6f22cb1ed3c11837f2f.zip | |
Copied basic Lua libs back from tmwserv-data and added dummy data
The dummy data is currently mostly empty data though, so still nothing
to see as far as the example content is concerned.
Reviewed-by: Bertram
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/resourcemanager.cpp | 3 | ||||
| -rw-r--r-- | src/scripting/lua.cpp | 3 |
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"); } - |