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>2008-05-01 12:41:31 +0000
committerStijn Buys <ingar@osirion.org>2008-05-01 12:41:31 +0000
commitf5266b403c50cb2b6d712e6d8f41b62ad2433efb (patch)
treefbd1cbafbb6d43b2fd5838cff8ce85df245bac86 /src/core/gameserver.cc
parente2b18c44a6ae38bb84f717c86988a80da137c3e7 (diff)
lights
Diffstat (limited to 'src/core/gameserver.cc')
-rw-r--r--src/core/gameserver.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/gameserver.cc b/src/core/gameserver.cc
index 1aa57f0..2169e21 100644
--- a/src/core/gameserver.cc
+++ b/src/core/gameserver.cc
@@ -143,7 +143,7 @@ void GameServer::say(Player *player, std::string const &message)
con_print <<player->name() << ": " << message << "\n";
// broadcast to remote clients
- if (server_network != 0 ) {
+ if (server_network) {
std::string netmessage("msg public ");
netmessage.append(player->name());
netmessage.append(": ");
@@ -286,12 +286,14 @@ void GameServer::frame(float seconds)
if (entity->entity_destroyed) {
if (!entity->entity_created) {
std::ostringstream netmsg;
+ netmsg.str("");
netmsg << "die " << entity->id() << "\n";
server_network->broadcast(netmsg.str());
}
core::Entity::remove(entity->id());
} else if (entity->entity_created) {
std::ostringstream netmsg;
+ netmsg.str("");
netmsg << "ent ";
entity->serialize(netmsg);
netmsg << "\n";
@@ -300,9 +302,11 @@ void GameServer::frame(float seconds)
} else if (entity->dirty()) {
std::ostringstream netmsg;
+ netmsg.str("");
netmsg << "sup " << entity->id() << " ";
entity->serialize_server_update(netmsg);
netmsg << "\n";
+ netmsg.flush();
server_network->broadcast(netmsg.str());
}
entity->entity_dirty = false;