From 8bd49fe30b8663a27e1103f149f6f836866bbfc8 Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Mon, 15 Jun 2009 13:01:04 +0000 Subject: some clean up. fixed double server side record messages --- src/game/client/components/chat.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/game/client/components/chat.cpp') diff --git a/src/game/client/components/chat.cpp b/src/game/client/components/chat.cpp index a03aab65..37015337 100644 --- a/src/game/client/components/chat.cpp +++ b/src/game/client/components/chat.cpp @@ -89,11 +89,6 @@ void CHAT::on_message(int msgtype, void *rawmsg) { NETMSG_SV_CHAT *msg = (NETMSG_SV_CHAT *)rawmsg; add_line(msg->cid, msg->team, msg->message); - - if(msg->cid >= 0) - gameclient.sounds->play(SOUNDS::CHN_GUI, SOUND_CHAT_CLIENT, 0, vec2(0,0)); - else - gameclient.sounds->play(SOUNDS::CHN_GUI, SOUND_CHAT_SERVER, 0, vec2(0,0)); } } @@ -127,6 +122,12 @@ void CHAT::add_line(int client_id, int team, const char *line) str_format(lines[current_line].text, sizeof(lines[current_line].text), ": %s", line); } + // play sound + if(client_id >= 0) + gameclient.sounds->play(SOUNDS::CHN_GUI, SOUND_CHAT_CLIENT, 0, vec2(0,0)); + else + gameclient.sounds->play(SOUNDS::CHN_GUI, SOUND_CHAT_SERVER, 0, vec2(0,0)); + dbg_msg("chat", "%s%s", lines[current_line].name, lines[current_line].text); } -- cgit 1.4.1