From 9d39702824e8fae5127e09fb5a05b521b48cd028 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sun, 9 Nov 2008 11:43:28 +0000 Subject: docking menus --- src/core/player.cc | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) (limited to 'src/core/player.cc') diff --git a/src/core/player.cc b/src/core/player.cc index ca985ab..f968fc3 100644 --- a/src/core/player.cc +++ b/src/core/player.cc @@ -133,7 +133,7 @@ void Player::serialize_client_update(std::ostream & os) os << player_color << " " << player_color_second << " " << "\"" << player_name << "\" " - << "\"" << player_rconpassword << "\""; + << "\"" << player_rconpassword << "\" "; } @@ -162,52 +162,53 @@ void Player::receive_client_update(std::istream &is) void Player::serialize_server_update(std::ostream & os) const { - unsigned int zo = (zone() ? zone()->id() : 0); - unsigned int co = (player_control ? player_control->id() : 0); - unsigned int mission = (player_mission_target ? player_mission_target->id() : 0); - unsigned int view = (player_view ? player_view->id() : 0); + unsigned int zone_id = (zone() ? zone()->id() : 0); + unsigned int view_id = (player_view ? player_view->id() : 0); + unsigned int control_id = (player_control ? player_control->id() : 0); + unsigned int mission_id = (player_mission_target ? player_mission_target->id() : 0); - os << player_id << " " << zo << " " << view << " " << co << " " << mission << " " << player_color << " \"" << player_name << "\""; + os << player_id << " " << zone_id << " " << view_id << " " << control_id << " " << mission_id << " " << player_color << " "; } void Player::receive_server_update(std::istream &is) { is >> player_id; - unsigned int zo = 0; - is >> zo; - set_zone(Zone::find(zo)); + unsigned int zone_id = 0; + is >> zone_id; + set_zone(Zone::find(zone_id)); - unsigned int view = 0; - is >> view; - set_view(Entity::find(view)); + unsigned int view_id = 0; + is >> view_id; + set_view(Entity::find(view_id)); - unsigned int co = 0; - is >> co; - if (co) { - Entity *e = Entity::find(co); + unsigned int control_id = 0; + is >> control_id; + if (control_id) { + Entity *e = Entity::find(control_id); if (e && e->type() == Entity::Controlable) { player_control = static_cast(e); } else { player_control = 0; - con_warn << "control set to unknown entity " << co << "\n"; + con_warn << "control set to unknown entity " << control_id << "\n"; } } else { player_control = 0; } - unsigned int mission = 0; - is >> mission; - if (mission) { - player_mission_target = Entity::find(mission); + unsigned int mission_id = 0; + is >> mission_id; + if (mission_id) { + player_mission_target = Entity::find(mission_id); if (!player_mission_target) { - con_warn << "mission target set to unknown entity " << co << "\n"; + con_warn << "mission target set to unknown entity " << mission_id << "\n"; } } else { player_mission_target = 0; } is >> player_color; - + + /* std::string n; char c; while ( (is.get(c)) && (c != '"')); @@ -216,6 +217,7 @@ void Player::receive_server_update(std::istream &is) if (n.size()) player_name = n; + */ } void Player::add_asset(EntityControlable *entity) -- cgit v1.2.3