Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2013-02-21 20:01:36 +0000
committerStijn Buys <ingar@osirion.org>2013-02-21 20:01:36 +0000
commit98699db58a16f0831de66fe86302ebd1b1cb5507 (patch)
tree4d8def823ad6ffb11d44d9e09f65a44623c36854 /src/core/netserver.cc
parent283a59e352d252e03793abec8d5e59ab50497f0c (diff)
Replaced iterator post-increment operators with pre-increment operators.
Diffstat (limited to 'src/core/netserver.cc')
-rw-r--r--src/core/netserver.cc30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/core/netserver.cc b/src/core/netserver.cc
index 467be4d..aae806e 100644
--- a/src/core/netserver.cc
+++ b/src/core/netserver.cc
@@ -99,7 +99,7 @@ NetServer::~NetServer()
// delete all clients
Clients:: iterator it;
- for (it = clients.begin(); it != clients.end(); it++) {
+ for (it = clients.begin(); it != clients.end(); ++it) {
// notify the game server
if ((*it)->state() == NetClient::Connected)
@@ -129,7 +129,7 @@ void NetServer::abort()
// find the client corresponding to a player
NetClient *NetServer::find_client(Player const *player)
{
- for (Clients::iterator it = clients.begin(); it != clients.end(); it++) {
+ for (Clients::iterator it = clients.begin(); it != clients.end(); ++it) {
if ((*it)->player() == player) {
return (*it);
}
@@ -162,7 +162,7 @@ void NetServer::reap()
if (client->error()) {
// notify other clients
- for (Clients::iterator cit = clients.begin(); cit != clients.end(); cit++) {
+ for (Clients::iterator cit = clients.begin(); cit != clients.end(); ++cit) {
if ((*cit) != (*it)) {
send_player_disconnect_info((*cit), (*it)->player());
}
@@ -238,7 +238,7 @@ void NetServer::receive()
// get messages from clients
bool msg_received = false;
- for (Clients::iterator it = clients.begin(); it != clients.end() && !msg_received; it++) {
+ for (Clients::iterator it = clients.begin(); it != clients.end() && !msg_received; ++it) {
NetClient *client = *it;
if ((client->host() == client_host) && (client->port() == (int) client_port)) {
@@ -304,12 +304,12 @@ void NetServer::client_initialize(NetClient *client)
client->transmit();
// send zones
- for (Zone::Registry::iterator it = Zone::registry().begin(); it != Zone::registry().end(); it++) {
+ for (Zone::Registry::iterator it = Zone::registry().begin(); it != Zone::registry().end(); ++it) {
send_zone_update(client, (*it).second);
}
// send player list
- for (GameInterface::Players::iterator it = server()->players().begin(); it != server()->players().end(); it++) {
+ for (GameInterface::Players::iterator it = server()->players().begin(); it != server()->players().end(); ++it) {
if (((*it)->id() != client->player()->id())) {
send_player_update(client, (*it));
}
@@ -353,7 +353,7 @@ void NetServer::client_frame(NetClient *client, unsigned long timestamp)
// send entities in zone
if (client->player()->zone()) {
- for (Zone::Content::iterator it = zone->content().begin(); it != zone->content().end(); it++) {
+ for (Zone::Content::iterator it = zone->content().begin(); it != zone->content().end(); ++it) {
Entity *entity = (*it);
if (!entity->entity_destroyed) {
@@ -377,7 +377,7 @@ void NetServer::client_frame(NetClient *client, unsigned long timestamp)
}
// send updates for entities in the zone
- for (Entity::Registry::iterator it = Entity::registry().begin(); it != Entity::registry().end(); it++) {
+ for (Entity::Registry::iterator it = Entity::registry().begin(); it != Entity::registry().end(); ++it) {
Entity *entity = (*it).second;
if (entity->zone() == zone) {
@@ -421,7 +421,7 @@ void NetServer::client_frame(NetClient *client, unsigned long timestamp)
}
// send updates for other players
- for (GameInterface::Players::iterator it = server()->players().begin(); it != server()->players().end(); it++) {
+ for (GameInterface::Players::iterator it = server()->players().begin(); it != server()->players().end(); ++it) {
if (((*it)->id() != client->player()->id()) && ((*it)->dirty())) {
send_player_update(client, (*it));
}
@@ -432,7 +432,7 @@ void NetServer::client_frame(NetClient *client, unsigned long timestamp)
void NetServer::transmit()
{
// send updates to each client
- for (Clients::iterator it = clients.begin(); it != clients.end(); it++) {
+ for (Clients::iterator it = clients.begin(); it != clients.end(); ++it) {
NetClient *client = *it;
client->transmit();
}
@@ -448,7 +448,7 @@ void NetServer::frame(unsigned long timestamp)
*/
// send updates to each client
- for (Clients::iterator it = clients.begin(); it != clients.end(); it++) {
+ for (Clients::iterator it = clients.begin(); it != clients.end(); ++it) {
NetClient *client = *it;
client->transmit();
@@ -465,7 +465,7 @@ void NetServer::frame(unsigned long timestamp)
}
// clear dirty state
- for (Clients::iterator it = clients.begin(); it != clients.end(); it++) {
+ for (Clients::iterator it = clients.begin(); it != clients.end(); ++it) {
NetClient *client = *it;
if (client->player()->dirty() || client->player()->zonechange()) {
client->player()->set_dirty(false);
@@ -572,7 +572,7 @@ void NetServer::send_entity_create(NetClient *client, Entity *entity)
client->send_raw(msg.str());
// send entity menus
- for (Entity::Menus::iterator it = entity->menus().begin(); it != entity->menus().end(); it++) {
+ for (Entity::Menus::iterator it = entity->menus().begin(); it != entity->menus().end(); ++it) {
msg.clear();
msg.str("");
msg << "menu " << entity->id() << " ";
@@ -665,7 +665,7 @@ void NetServer::send_infotypes(NetClient *client)
std::ostringstream msg;
msg << "inf 0 " << InfoType::registry().size();
- for (InfoType::Registry::const_iterator it = InfoType::registry().begin(); it != InfoType::registry().end(); it++) {
+ for (InfoType::Registry::const_iterator it = InfoType::registry().begin(); it != InfoType::registry().end(); ++it) {
msg << " \"" << (*it)->label() << "\"";
}
msg << '\n';
@@ -695,7 +695,7 @@ void NetServer::send_inventory_update(NetClient *client, Entity *entity, const u
// send items
size_t nbitems = 0;
std::ostringstream itemstr;
- for (Inventory::Items::const_iterator it = entity->inventory()->items().begin(); it != entity->inventory()->items().end(); it++) {
+ for (Inventory::Items::const_iterator it = entity->inventory()->items().begin(); it != entity->inventory()->items().end(); ++it) {
const Item *item = (*it);
if (send_full_update || (item->timestamp() >= timestamp)) {
itemstr << item->id() << " " << item->info()->id() << " ";