From aaa4ff61f7b17759c4f4ccb3ac9011dd5f8a93f5 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Thu, 24 Jul 2008 00:47:13 +0000 Subject: primary, secondary, tertiary color rendering --- src/core/player.cc | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'src/core/player.cc') diff --git a/src/core/player.cc b/src/core/player.cc index 4ad2c3a..18dabed 100644 --- a/src/core/player.cc +++ b/src/core/player.cc @@ -59,18 +59,27 @@ void Player::update_info() if (cl_color) { std::istringstream is(cl_color->str()); if (is >> color) - player_color = color; + player_color.assign(color); + } + + Cvar *cl_color_second = Cvar::find("cl_colorsecond"); + math::Color color_second(1.0, 1.0, 1.0, 1.0); + if (cl_color_second) { + std::istringstream is(cl_color_second->str()); + if (is >> color_second) + player_color_second.assign(color_second); } } void Player::serialize_client_update(std::ostream & os) { - os << " " << player_color << " \"" << player_name << "\""; + os << " " << player_color << " " << player_color_second << " \"" << player_name << "\""; } void Player::recieve_client_update(std::istream &is) { is >> player_color; + is >> player_color_second; std::string n; char c; -- cgit v1.2.3