improve the admin chat prints

1 files changed, 15 insertions, 20 deletions

diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index dda123b..14f5885 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -1146,41 +1146,36 @@ void G_Say( gentity_t *ent, gentity_t *target, int mode, const char *chatText )
       case SAY_ADMINS:
         if( G_admin_permission( ent, ADMF_ADMINCHAT ) ) //Differentiate between inter-admin chatter and user-admin alerts
         {
-         G_LogPrintf( "say_admins: [ADMIN]%s^7: %s^7\n", ( ent ) ? ent->client->pers.netname : "console", chatText );
-         Com_sprintf( name, sizeof( name ), "%s[ADMIN]%s%c%c"EC": ", prefix,
-                    ( ent ) ? ent->client->pers.netname : "console", Q_COLOR_ESCAPE, COLOR_WHITE );
-         color = COLOR_MAGENTA;
+          G_LogPrintf( "say_admins: ^7[^nADMIN^7]%s^7: %s^7\n", ( ent ) ? ent->client->pers.netname : "console", chatText );
+          Com_sprintf( name, sizeof( name ), "%s^7[^nADMIN^7]%s^7: ", prefix, ( ent ) ? ent->client->pers.netname : "console" );
+          color = COLOR_WILD_WATERMELON;
         }
         else
         {
-          G_LogPrintf( "say_admins: [PLAYER]%s^7: %s^7\n", ent->client->pers.netname, chatText );
-          Com_sprintf( name, sizeof( name ), "%s[PLAYER]%s%c%c"EC": ", prefix,
-            ent->client->pers.netname, Q_COLOR_ESCAPE, COLOR_WHITE );
-          color = COLOR_MAGENTA;
+          G_LogPrintf( "say_admins: ^7[^ZPLAYER^7]%s^7: %s^7\n", ent->client->pers.netname, chatText );
+          Com_sprintf( name, sizeof( name ), "%s^7[^ZPLAYER^7]%s^7: ", prefix, ( ent ) ? ent->client->pers.netname : "console" );
+          color = COLOR_WILD_WATERMELON;
         }
         break;
 
         case SAY_HADMINS:
         if( G_admin_permission( ent, ADMF_HIGHADMINCHAT ) ) //Differentiate between inter-high-admin chatter and lower-admin-high-admin-admin alerts and user-admin alerts
         {
-          G_LogPrintf( "say_hadmins: ^5[^1HIGH ADMIN^5]^7%s^7: %s^7\n", ( ent ) ? ent->client->pers.netname : "console", chatText );
-          Com_sprintf( name, sizeof( name ), "%s^5[^1HIGH ADMIN^5]^7%s%c%c"EC": ", prefix,
-                    ( ent ) ? ent->client->pers.netname : "console", Q_COLOR_ESCAPE, COLOR_WHITE );
-          color = COLOR_RED;
+          G_LogPrintf( "say_hadmins: ^7[^QHIGH ADMIN^7]%s^7: %s^7\n", ( ent ) ? ent->client->pers.netname : "console", chatText );
+          Com_sprintf( name, sizeof( name ), "%s^7[^QHIGH ADMIN^7]%s^7: ", prefix, ( ent ) ? ent->client->pers.netname : "console" );
+          color = COLOR_AMERICAN_ROSE;
         }
         else if( G_admin_permission( ent, ADMF_ADMINCHAT ) ) 
         {
-         G_LogPrintf( "say_haadmins: ^1[^6LOWER ADMIN^1]^7%s^7: %s^7\n", ( ent ) ? ent->client->pers.netname : "console", chatText );
-         Com_sprintf( name, sizeof( name ), "%s[^6LOWER ADMIN^7]%s%c%c"EC": ", prefix,
-                    ( ent ) ? ent->client->pers.netname : "console", Q_COLOR_ESCAPE, COLOR_WHITE );
-         color = COLOR_RED;
+          G_LogPrintf( "say_haadmins: ^7[^ALOWER ADMIN^7]^7%s^7: %s^7\n", ( ent ) ? ent->client->pers.netname : "console", chatText );
+          Com_sprintf( name, sizeof( name ), "%s^7[^nLOWER ADMIN^7]^7%s^7: ", prefix, ( ent ) ? ent->client->pers.netname : "console" );
+          color = COLOR_AMERICAN_ROSE;
         }
         else
         {
-          G_LogPrintf( "say_hadmins: [PLAYER]%s^7: %s^7\n", ent->client->pers.netname, chatText );
-          Com_sprintf( name, sizeof( name ), "%s[PLAYER]%s%c%c"EC": ", prefix,
-            ent->client->pers.netname, Q_COLOR_ESCAPE, COLOR_WHITE );
-          color = COLOR_RED;
+          G_LogPrintf( "say_hadmins: ^7[^ZPLAYER^7]%s^7: %s^7\n", ent->client->pers.netname, chatText );
+          Com_sprintf( name, sizeof( name ), "%s^7[^ZPLAYER^7]%s^7: ", prefix, ( ent ) ? ent->client->pers.netname : "console" );
+          color = COLOR_AMERICAN_ROSE;
         }
         break;
 }