diff options
| author | David Athay <ko2fan@gmail.com> | 2009-01-27 17:14:34 +0000 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2009-01-27 17:14:34 +0000 |
| commit | fa5469bd27d117abd98ca58dad61a6378fe8215c (patch) | |
| tree | 81e04d035dfc54fa9f4cca62523232ce567c9ce6 /src/game-server/character.cpp | |
| parent | f666fd38beefb554d90503811e5a43d504a18345 (diff) | |
| parent | c423c02890cfb4520da0ac75e00d1bd9f1663ce0 (diff) | |
| download | manaserv-fa5469bd27d117abd98ca58dad61a6378fe8215c.tar.gz manaserv-fa5469bd27d117abd98ca58dad61a6378fe8215c.tar.bz2 manaserv-fa5469bd27d117abd98ca58dad61a6378fe8215c.tar.xz manaserv-fa5469bd27d117abd98ca58dad61a6378fe8215c.zip | |
Merge branch 'master' of git@gitorious.org:tmwserv/mainline
Diffstat (limited to 'src/game-server/character.cpp')
| -rw-r--r-- | src/game-server/character.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/game-server/character.cpp b/src/game-server/character.cpp index 780a142b..a17e3d89 100644 --- a/src/game-server/character.cpp +++ b/src/game-server/character.cpp @@ -26,6 +26,7 @@ #include "game-server/character.hpp" #include "defines.h" +#include "common/configuration.hpp" #include "game-server/accountconnection.hpp" #include "game-server/attackzone.hpp" #include "game-server/buysell.hpp" @@ -130,9 +131,9 @@ void Character::respawn() } //warp back to spawn point - static const int spawnMap = 1; - static const int spawnX = 1024; - static const int spawnY = 1024; + int spawnMap = Configuration::getValue("respawnMap", 1); + int spawnX = Configuration::getValue("respawnX", 1024); + int spawnY = Configuration::getValue("respawnY", 1024); GameState::enqueueWarp(this, MapManager::getMap(spawnMap), spawnX, spawnY); //make alive again |