From 3629aebb96959afc56cf04d1f2fc4a9f03e94183 Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Sat, 25 Feb 2012 21:18:46 +0100 Subject: 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 --- src/common/resourcemanager.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/common') diff --git a/src/common/resourcemanager.cpp b/src/common/resourcemanager.cpp index 5c177f72..edff1e0a 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); } /** -- cgit v1.2.3-70-g09d2