Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/netconnection.cc')
-rw-r--r--src/core/netconnection.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/netconnection.cc b/src/core/netconnection.cc
index dfb86f7..81f5b48 100644
--- a/src/core/netconnection.cc
+++ b/src/core/netconnection.cc
@@ -614,6 +614,7 @@ void NetConnection::parse_incoming_message(const std::string & message)
return;
}
+ // normal "pif" message about localplayer
if (!player_id) {
Zone *oldzone = connection()->localplayer()->zone();
connection()->localplayer()->receive_server_update(msgstream);
@@ -639,6 +640,7 @@ void NetConnection::parse_incoming_message(const std::string & message)
oldzone->content().clear();
}
+ // short "pif" message about a different player
} else if (player_id != localplayer()->id()) {
// find player
@@ -656,7 +658,7 @@ void NetConnection::parse_incoming_message(const std::string & message)
game()->players().push_back(player);
}
- player->receive_server_update(msgstream);
+ player->receive_short_server_update(msgstream);
player->set_dirty(false);
}
@@ -679,7 +681,6 @@ void NetConnection::parse_incoming_message(const std::string & message)
Player *player = 0;
for (GameInterface::Players::iterator it = game()->players().begin(); it != game()->players().end() && !player; it++) {
if( (*it)->id() == player_id) {
- // TODO find player assets and set owner to 0
game()->players().erase(it);
return;
}