From e5c7ef4573adcdcafec7523a77724b171456b215 Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Thu, 13 May 2010 13:39:52 +0200 Subject: Changed and split up the default location for loading data Instead of loading data from a 'data' directory in the current working directory, the server now uses clientDataPath and serverDataPath as specified in the configuration. This removes the need to set up symbolic links in order to merge these two types of data. The default values point to example/clientdata and example/serverdata, where a minimal example world can be developed to make setting up an initial server quick and easy. The XML::Document convenience class was copied over from the client. Also, the ResourceManager is now shared between both servers, since the account client is reading items.xml. Reviewed-by: Jared Adams --- src/game-server/monster.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/game-server/monster.cpp') diff --git a/src/game-server/monster.cpp b/src/game-server/monster.cpp index 5bd56cca..2489e735 100644 --- a/src/game-server/monster.cpp +++ b/src/game-server/monster.cpp @@ -21,10 +21,10 @@ #include "game-server/monster.hpp" #include "common/configuration.hpp" +#include "common/resourcemanager.hpp" #include "game-server/character.hpp" #include "game-server/collisiondetection.hpp" #include "game-server/item.hpp" -#include "game-server/resourcemanager.hpp" #include "game-server/mapcomposite.hpp" #include "game-server/state.hpp" #include "scripting/script.hpp" -- cgit v1.2.3-60-g2f50