1 files changed, 3 insertions, 16 deletions
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index c077a3b6..4f5159dd 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -3314,20 +3314,9 @@ qboolean G_SayArgv( int n, char *buffer, int bufferLength )
     return qfalse;
   if( n < 0 )
     return qfalse;
-  s = ConcatArgs( 0 );
-  while( 1 )
-  {
-    while( *s == ' ' )
-      s++;
-    if( !*s || n == 0 )
-      break;
-    n--;
-    while( *s && *s != ' ' )
-      s++;
-  }
-  if( n > 0 )
+  s = G_SayConcatArgs( n );
+  if( !*s )
     return qfalse;
-  //memccpy( buffer, s, ' ', bufferLength );
   while( *s && *s != ' ' && bufferLength > 1 )
   {
     *buffer++ = *s++;
@@ -3361,9 +3350,7 @@ void G_DecolorString( char *in, char *out, int len )
 
   while( *in && len > 0 ) {
     if( Q_IsColorString( in ) ) {
-      in++;
-      if( *in )
-        in++;
+      in += 2;
       continue;
     }
     *out++ = *in++;