From 52b792ecf203bfbb3b7477f36e16cb72f809dc4c Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@gmail.com>
Date: Tue, 3 Apr 2007 00:12:57 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@901 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/client.cpp       |  2 +-
 source/src/clients2c.cpp    | 11 ++++++++---
 source/src/renderextras.cpp |  3 ++-
 source/src/server.cpp       | 11 ++++-------
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/source/src/client.cpp b/source/src/client.cpp
index 9e84c15b..ce09fa44 100644
--- a/source/src/client.cpp
+++ b/source/src/client.cpp
@@ -225,7 +225,7 @@ void toserver(char *text)
 { 
     bool toteam = text && text[0] == '%';
     if(toteam) text++;
-    conoutf("%s:\f%i %s", player1->name, toteam, text);
+    conoutf("%s:\f%d %s", player1->name, toteam ? 1 : 0, text);
     addmsg(toteam ? SV_TEAMTEXT : SV_TEXT, "rs", text);
 }
 
diff --git a/source/src/clients2c.cpp b/source/src/clients2c.cpp
index 39fe9147..aa59a767 100644
--- a/source/src/clients2c.cpp
+++ b/source/src/clients2c.cpp
@@ -135,14 +135,19 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
         
         
         case SV_TEAMTEXT:
+        {
+            int cn = getint(p);
             getstring(text, p);
-            conoutf(text);
+            playerent *d = getclient(cn);
+            if(!d) break;
+            conoutf("%s:\f1 %s", d->name, text);
             break;
-               
+        }
+
         case SV_TEXT:
             if(!d) return;
             getstring(text, p);
-            conoutf("%s:\f0 %s", d->name, &text);
+            conoutf("%s:\f0 %s", d->name, text);
             break;
 
         case SV_MAPCHANGE:     
diff --git a/source/src/renderextras.cpp b/source/src/renderextras.cpp
index 95ef687a..2b7bf2f3 100644
--- a/source/src/renderextras.cpp
+++ b/source/src/renderextras.cpp
@@ -345,6 +345,7 @@ void drawequipicons()
 
 void drawradarent(float x, float y, float yaw, int col, int row, float iconsize, bool blend, char *label = NULL, ...)
 {
+    if(label && showmap) glColor3f(1, 1, 1);
     glPushMatrix();
     glTranslatef(x, y, 0);
     glRotatef(yaw, 0, 0, 1);
@@ -406,7 +407,7 @@ void drawradar(int w, int h)
     }
     glTranslatef(-(centerpos.x-res/2)/worldsize*radarsize, -(centerpos.y-res/2)/worldsize*radarsize, 0);
 
-    drawradarent(player1->o.x*coordtrans, player1->o.y*coordtrans, player1->yaw, player1->state==CS_ALIVE ? (player1->attacking ? 2 : 0) : 1, 2, iconsize, false, "\f3%s", player1->name); // local player
+    drawradarent(player1->o.x*coordtrans, player1->o.y*coordtrans, player1->yaw, player1->state==CS_ALIVE ? (player1->attacking ? 2 : 0) : 1, 2, iconsize, false, player1->name); // local player
 
     loopv(players) // other players
     {
diff --git a/source/src/server.cpp b/source/src/server.cpp
index e7b46770..a144768f 100644
--- a/source/src/server.cpp
+++ b/source/src/server.cpp
@@ -373,17 +373,14 @@ void ctfreset()
 
 void sendteamtext(char *text, int sender)
 {
+    if(!clients[sender]->team[0]) return;
     ENetPacket *packet = enet_packet_create(NULL, MAXTRANS, ENET_PACKET_FLAG_RELIABLE);
     ucharbuf p(packet->data, packet->dataLength);
     putint(p, SV_TEAMTEXT);
-    s_sprintfd(msg)("%s:\f1%s", clients[sender]->name, text);
-    sendstring(msg, p);
+    putint(p, sender);
+    sendstring(text, p);
     enet_packet_resize(packet, p.length());
-    loopv(clients)
-    {
-        if(i==sender) continue;
-        if(!strcmp(clients[i]->team, clients[sender]->team)) sendpacket(i, 1, packet);
-    }
+    loopv(clients) if(i!=sender && !strcmp(clients[i]->team, clients[sender]->team)) sendpacket(i, 1, packet);
     if(packet->referenceCount==0) enet_packet_destroy(packet);
 }