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/account-server | |
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/account-server')
-rw-r--r-- | src/account-server/serverhandler.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/account-server/serverhandler.cpp b/src/account-server/serverhandler.cpp index 9224338f..1f55bc98 100644 --- a/src/account-server/serverhandler.cpp +++ b/src/account-server/serverhandler.cpp @@ -46,7 +46,7 @@ using namespace ManaServ; struct MapStatistics { std::vector<int> players; - unsigned short nbThings; + unsigned short nbEntities; unsigned short nbMonsters; }; @@ -278,7 +278,7 @@ void ServerHandler::processMessage(NetComputer *comp, MessageIn &msg) comp->send(outMsg); MapStatistics &m = server->maps[id]; - m.nbThings = 0; + m.nbEntities = 0; m.nbMonsters = 0; } } @@ -448,7 +448,7 @@ void ServerHandler::processMessage(NetComputer *comp, MessageIn &msg) break; } MapStatistics &m = i->second; - m.nbThings = msg.readInt16(); + m.nbEntities = msg.readInt16(); m.nbMonsters = msg.readInt16(); int nb = msg.readInt16(); m.players.resize(nb); @@ -639,7 +639,7 @@ void GameServerHandler::dumpStatistics(std::ostream &os) j_end = server->maps.end(); j != j_end; ++j) { const MapStatistics &m = j->second; - os << "<map id=\"" << j->first << "\" nb_things=\"" << m.nbThings + os << "<map id=\"" << j->first << "\" nb_entities=\"" << m.nbEntities << "\" nb_monsters=\"" << m.nbMonsters << "\">\n"; for (std::vector< int >::const_iterator k = m.players.begin(), k_end = m.players.end(); k != k_end; ++k) |