From fc8352965d47d726086baae033a283839bb1358c Mon Sep 17 00:00:00 2001
From: Christopher Schwarz <lakitu7@gmail.com>
Date: Wed, 14 Oct 2009 23:56:20 +0000
Subject: * Various small style fixes/corrections/changes (Undeference, Timbo,
 benmachine) * Restore /ignore functionality to a couple message types I
 forgot (Undeference) * Fix some color bleeds on names (Rezyn) * Fix an
 uninitialized buffer in featured labels (Rezyn) * Apply team colors to only
 the letter and not the brackets too, in cg_chatteamprefix (Undeference) *
 Default cg_drawcrosshairs 2, crosshairs for everything (kevlarman)

---
 src/game/bg_public.h | 12 ++++++++++++
 src/game/g_team.c    | 13 +++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

(limited to 'src/game')

diff --git a/src/game/bg_public.h b/src/game/bg_public.h
index d1cc4572..8d74c18c 100644
--- a/src/game/bg_public.h
+++ b/src/game/bg_public.h
@@ -837,6 +837,18 @@ typedef enum
   NUM_TEAMS
 } team_t;
 
+// modes of text communication
+typedef enum
+{
+  SAY_ALL,
+  SAY_TEAM,
+  SAY_PRIVMSG,
+  SAY_TPRIVMSG,
+  SAY_AREA,
+  SAY_ADMINS,
+  SAY_ADMINS_PUBLIC,
+  SAY_RAW
+} saymode_t;
 
 // means of death
 typedef enum
diff --git a/src/game/g_team.c b/src/game/g_team.c
index dbaf2b40..62805b3c 100644
--- a/src/game/g_team.c
+++ b/src/game/g_team.c
@@ -289,14 +289,15 @@ Format:
 */
 void TeamplayInfoMessage( gentity_t *ent )
 {
-  char entry[ 19 ], string[ 1143 ];
-  int i, j, team, stringlength;
-  int sent = 0;
+  char      entry[ 19 ], string[ 1143 ];
+  int       i, j; 
+  int       team, stringlength;
+  int       sent = 0;
   gentity_t *player;
   gclient_t *cl;
   upgrade_t upgrade = UP_NONE;
-  int curWeaponClass = WP_NONE ; // sends weapon for humans, class for aliens
-  char *tmp;
+  int       curWeaponClass = WP_NONE ; // sends weapon for humans, class for aliens
+  char      *tmp;
 
   if( !g_allowTeamOverlay.integer )
      return;
@@ -332,7 +333,7 @@ void TeamplayInfoMessage( gentity_t *ent )
       curWeaponClass = WP_NONE;
       upgrade = UP_NONE;
     }
-    else if (cl->pers.teamSelection == TEAM_HUMANS )
+    else if ( cl->pers.teamSelection == TEAM_HUMANS )
     {
       curWeaponClass = cl->ps.weapon;
 
-- 
cgit