diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-05-13 13:39:52 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-05-16 23:25:19 +0200 |
| commit | e5c7ef4573adcdcafec7523a77724b171456b215 (patch) | |
| tree | 797833ddc766d92131da86096de81741a94f4d20 /src/game-server/monster.cpp | |
| parent | 0a48f0d41653d0a0758fc84fd6a18830bd37da18 (diff) | |
| download | manaserv-e5c7ef4573adcdcafec7523a77724b171456b215.tar.gz manaserv-e5c7ef4573adcdcafec7523a77724b171456b215.tar.bz2 manaserv-e5c7ef4573adcdcafec7523a77724b171456b215.tar.xz manaserv-e5c7ef4573adcdcafec7523a77724b171456b215.zip | |
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
Diffstat (limited to 'src/game-server/monster.cpp')
| -rw-r--r-- | src/game-server/monster.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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" |