summaryrefslogtreecommitdiff
path: root/src/game-server/movingobject.cpp
diff options
context:
space:
mode:
authorGuillaume Melquiond <guillaume.melquiond@gmail.com>2007-07-07 16:50:47 +0000
committerGuillaume Melquiond <guillaume.melquiond@gmail.com>2007-07-07 16:50:47 +0000
commit04e694b067a21dee8e13368c17d1815cc0624ce4 (patch)
treea57ab98d76040838fa369e6823544baeb19d1bbc /src/game-server/movingobject.cpp
parent60b4a57bdfe664a6729b3573a6a614621b6c2b2c (diff)
downloadmanaserv-04e694b067a21dee8e13368c17d1815cc0624ce4.tar.gz
manaserv-04e694b067a21dee8e13368c17d1815cc0624ce4.tar.bz2
manaserv-04e694b067a21dee8e13368c17d1815cc0624ce4.tar.xz
manaserv-04e694b067a21dee8e13368c17d1815cc0624ce4.zip
Simplified code by using map pointers only, instead of using both map IDs and map pointers.
Diffstat (limited to 'src/game-server/movingobject.cpp')
-rw-r--r--src/game-server/movingobject.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game-server/movingobject.cpp b/src/game-server/movingobject.cpp
index 7eb040e3..2375c903 100644
--- a/src/game-server/movingobject.cpp
+++ b/src/game-server/movingobject.cpp
@@ -21,7 +21,7 @@
*/
#include "game-server/map.hpp"
-#include "game-server/mapmanager.hpp"
+#include "game-server/mapcomposite.hpp"
#include "game-server/movingobject.hpp"
void MovingObject::move()
@@ -44,7 +44,7 @@ void MovingObject::move()
return;
}
- Map *map = mapManager->getMap(getMapId());
+ Map *map = getMap()->getMap();
/* If no path exists, the for-loop won't be entered. Else a path for the
* current destination has already been calculated.