summaryrefslogtreecommitdiff
path: root/src/game-server/mapcomposite.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/game-server/mapcomposite.h')
-rw-r--r--src/game-server/mapcomposite.h15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/game-server/mapcomposite.h b/src/game-server/mapcomposite.h
index c8eb2e88..9a6bde07 100644
--- a/src/game-server/mapcomposite.h
+++ b/src/game-server/mapcomposite.h
@@ -30,7 +30,6 @@
#include "game-server/map.h"
class Actor;
-class Being;
class CharacterComponent;
class Map;
class MapComposite;
@@ -76,11 +75,11 @@ struct CharacterIterator
{
ZoneIterator iterator;
unsigned short pos;
- Being *current;
+ Actor *current;
CharacterIterator(const ZoneIterator &);
void operator++();
- Being *operator*() const { return current; }
+ Actor *operator*() const { return current; }
operator bool() const { return iterator; }
};
@@ -91,11 +90,11 @@ struct BeingIterator
{
ZoneIterator iterator;
unsigned short pos;
- Being *current;
+ Actor *current;
BeingIterator(const ZoneIterator &);
void operator++();
- Being *operator*() const { return current; }
+ Actor *operator*() const { return current; }
operator bool() const { return iterator; }
};
@@ -106,11 +105,11 @@ struct FixedActorIterator
{
ZoneIterator iterator;
unsigned short pos;
- Actor *current;
+ Entity *current;
FixedActorIterator(const ZoneIterator &);
void operator++();
- Actor *operator*() const { return current; }
+ Entity *operator*() const { return current; }
operator bool() const { return iterator; }
};
@@ -315,7 +314,7 @@ class MapComposite
* Gets an iterator on the objects around the old and new positions of
* a character (including the ones that were but are now elsewhere).
*/
- ZoneIterator getAroundBeingIterator(Being *, int radius) const;
+ ZoneIterator getAroundBeingIterator(Actor *, int radius) const;
/**
* Gets everything related to the map.