summaryrefslogtreecommitdiff
path: root/src/game-server/mapcomposite.h
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-03-16 23:20:38 +0100
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-04-04 20:18:50 +0200
commit4d84c4ffd2c4f25a67b2f094baf6ac81c68ebb07 (patch)
treecb6fc8a565689caaded7977fe249820a61dadee9 /src/game-server/mapcomposite.h
parentb30e3355dbbd160ad77f2987b9758ad349830cac (diff)
downloadmanaserv-4d84c4ffd2c4f25a67b2f094baf6ac81c68ebb07.tar.gz
manaserv-4d84c4ffd2c4f25a67b2f094baf6ac81c68ebb07.tar.bz2
manaserv-4d84c4ffd2c4f25a67b2f094baf6ac81c68ebb07.tar.xz
manaserv-4d84c4ffd2c4f25a67b2f094baf6ac81c68ebb07.zip
Renamed Thing to Entity
In preparation for using an entity/component system for the entities in the game world, this name will be more recognizable and easier to talk about. Reviewed-by: Yohann Ferreira
Diffstat (limited to 'src/game-server/mapcomposite.h')
-rw-r--r--src/game-server/mapcomposite.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/game-server/mapcomposite.h b/src/game-server/mapcomposite.h
index 96939a9c..079e5e48 100644
--- a/src/game-server/mapcomposite.h
+++ b/src/game-server/mapcomposite.h
@@ -35,7 +35,7 @@ class Map;
class MapComposite;
class Point;
class Rectangle;
-class Thing;
+class Entity;
struct MapContent;
struct MapZone;
@@ -205,9 +205,9 @@ struct MapContent
MapZone &getZone(const Point &pos) const;
/**
- * Things (items, characters, monsters, etc) located on the map.
+ * Entities (items, characters, monsters, etc) located on the map.
*/
- std::vector< Thing * > things;
+ std::vector< Entity * > entities;
/**
* Buckets of MovingObjects located on the map, referenced by ID.
@@ -270,12 +270,12 @@ class MapComposite
/**
* Inserts a thing on the map. Sets its public ID if relevant.
*/
- bool insert(Thing *);
+ bool insert(Entity *);
/**
* Removes a thing from the map.
*/
- void remove(Thing *);
+ void remove(Entity *);
/**
* Updates zones of every moving beings.
@@ -317,7 +317,7 @@ class MapComposite
/**
* Gets everything related to the map.
*/
- const std::vector< Thing * > &getEverything() const;
+ const std::vector< Entity * > &getEverything() const;
/**
* Gets the cached value of a map-bound script variable