diff options
author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-03-16 23:20:38 +0100 |
---|---|---|
committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-04-04 20:18:50 +0200 |
commit | 4d84c4ffd2c4f25a67b2f094baf6ac81c68ebb07 (patch) | |
tree | cb6fc8a565689caaded7977fe249820a61dadee9 /src/game-server/accountconnection.cpp | |
parent | b30e3355dbbd160ad77f2987b9758ad349830cac (diff) | |
download | manaserv-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/accountconnection.cpp')
-rw-r--r-- | src/game-server/accountconnection.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/game-server/accountconnection.cpp b/src/game-server/accountconnection.cpp index 1e974349..52282a99 100644 --- a/src/game-server/accountconnection.cpp +++ b/src/game-server/accountconnection.cpp @@ -346,14 +346,14 @@ void AccountConnection::sendStatistics() MapComposite *m = i->second; if (!m->isActive()) continue; msg.writeInt16(i->first); - int nbThings = 0, nbMonsters = 0; - typedef std::vector< Thing * > Things; - const Things &things = m->getEverything(); + int nbEntities = 0, nbMonsters = 0; + typedef std::vector< Entity * > Entities; + const Entities &things = m->getEverything(); std::vector< int > players; - for (Things::const_iterator j = things.begin(), + for (Entities::const_iterator j = things.begin(), j_end = things.end(); j != j_end; ++j) { - Thing *t = *j; + Entity *t = *j; switch (t->getType()) { case OBJECT_CHARACTER: @@ -364,10 +364,10 @@ void AccountConnection::sendStatistics() ++nbMonsters; break; default: - ++nbThings; + ++nbEntities; } } - msg.writeInt16(nbThings); + msg.writeInt16(nbEntities); msg.writeInt16(nbMonsters); msg.writeInt16(players.size()); for (std::vector< int >::const_iterator j = players.begin(), |