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-03-23 18:12:56 +0000
committerStijn Buys <ingar@osirion.org>2008-03-23 18:12:56 +0000
commit22e136d88817b64ec904a7e7232a2cf9e80e74bd (patch)
treeea369bba78930ff55325412760d14102d326f85b /src/core/player.cc
parent8485d43feca5597c4b412c6912aadcd9586e3cde (diff)
improved network connection handling, keep alive and time out
Diffstat (limited to 'src/core/player.cc')
-rw-r--r--src/core/player.cc16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/core/player.cc b/src/core/player.cc
index b89da99..71ac8de 100644
--- a/src/core/player.cc
+++ b/src/core/player.cc
@@ -44,21 +44,25 @@ void Player::clear_assets()
player_control = 0;
}
-void Player::serialize_client_update(std::ostream & os)
+void Player::update_info()
{
Cvar *cl_name = Cvar::find("cl_name");
if (cl_name) {
- player_name = cl_name->str();
+ if (cl_name->str().size())
+ player_name = cl_name->str();
}
-
+
Cvar *cl_color = Cvar::find("cl_color");
math::Color color(1.0, 1.0, 1.0, 1.0);
if (cl_color) {
std::istringstream is(cl_color->str());
- is >> color;
- player_color = color;
+ if (is >> color)
+ player_color = color;
}
-
+}
+
+void Player::serialize_client_update(std::ostream & os)
+{
os << " " << player_color << " \"" << player_name << "\"";
}