diff options
| author | Guillaume Melquiond <guillaume.melquiond@gmail.com> | 2007-01-03 17:10:43 +0000 |
|---|---|---|
| committer | Guillaume Melquiond <guillaume.melquiond@gmail.com> | 2007-01-03 17:10:43 +0000 |
| commit | 1673de8b5553f6dcd4898c84b8d44ba8b30740f1 (patch) | |
| tree | 3dcc47461a6b4914c4e81492e7be885c3a1502ea /src/game-server/mapcomposite.cpp | |
| parent | 6b7441516002d6e7cca424416bb67c6bc7d7c9d2 (diff) | |
| download | manaserv-1673de8b5553f6dcd4898c84b8d44ba8b30740f1.tar.gz manaserv-1673de8b5553f6dcd4898c84b8d44ba8b30740f1.tar.bz2 manaserv-1673de8b5553f6dcd4898c84b8d44ba8b30740f1.tar.xz manaserv-1673de8b5553f6dcd4898c84b8d44ba8b30740f1.zip | |
Split persistent player data from game server data. Enabled inventory code back.
Diffstat (limited to 'src/game-server/mapcomposite.cpp')
| -rw-r--r-- | src/game-server/mapcomposite.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/game-server/mapcomposite.cpp b/src/game-server/mapcomposite.cpp index 8b7ef9d7..1b824447 100644 --- a/src/game-server/mapcomposite.cpp +++ b/src/game-server/mapcomposite.cpp @@ -24,8 +24,10 @@ #include <algorithm> #include <cassert> -#include "map.h" +#include "point.h" +#include "game-server/map.hpp" #include "game-server/mapcomposite.hpp" +#include "game-server/player.hpp" /* TODO: Implement overlapping map zones instead of strict partitioning. Purpose: to decrease the number of zone changes, as overlapping allows for @@ -393,7 +395,7 @@ ZoneIterator MapComposite::getInsideRectangleIterator(Rectangle const &p) const return ZoneIterator(r, this); } -ZoneIterator MapComposite::getAroundPlayerIterator(Player *obj, int radius) const +ZoneIterator MapComposite::getAroundPlayerIterator(MovingObject *obj, int radius) const { MapRegion r1; fillRegion(r1, obj->getOldPosition(), radius); |