summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-02-25 21:18:46 +0100
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-02-25 22:14:44 +0100
commit3629aebb96959afc56cf04d1f2fc4a9f03e94183 (patch)
tree888f44e806a98b050cad38727b4afb0b73e75824 /src/common
parentef18650cacc0ce7ef71885bf6d23e1adeb4d7e19 (diff)
downloadmanaserv-3629aebb96959afc56cf04d1f2fc4a9f03e94183.tar.gz
manaserv-3629aebb96959afc56cf04d1f2fc4a9f03e94183.tar.xz
manaserv-3629aebb96959afc56cf04d1f2fc4a9f03e94183.zip
Merged the example client and server data
It's easier to just talk about world data and to modify it as a whole. If there is really a need to separate it, a project can still choose to do that (and in whatever suitable way). There is no need to enforce this separation or to do it in our example. Reviewed-by: Erik Schilling
Diffstat (limited to 'src/common')
-rw-r--r--src/common/resourcemanager.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/common/resourcemanager.cpp b/src/common/resourcemanager.cpp
index 5c177f7..edff1e0 100644
--- a/src/common/resourcemanager.cpp
+++ b/src/common/resourcemanager.cpp
@@ -44,14 +44,11 @@ void ResourceManager::initialize()
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");
+ const std::string worldDataPath =
+ Configuration::getValue("worldDataPath", "example");
PHYSFS_addToSearchPath(serverPath.c_str(), 1);
- PHYSFS_addToSearchPath(clientDataPath.c_str(), 1);
- PHYSFS_addToSearchPath(serverDataPath.c_str(), 1);
+ PHYSFS_addToSearchPath(worldDataPath.c_str(), 1);
}
/**