* Fix broken vote display strings, when reasons are used, broken in t…

…he ioq3 merge. If other things use Com_Sprintf with a string inside itself, they are probably broken too, so be on the lookout
mejibyte · Jul 5, 2011 · 1f52c6e · 1f52c6e
1 parent d3296f6
commit 1f52c6e
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
@@ -1292,9 +1292,8 @@ void Cmd_CallVote_f( gentity_t *ent )
       sizeof( level.voteDisplayString[ team ] ), "Kick player '%s'", name );
     if( reason[ 0 ] )
     {
-      Com_sprintf( level.voteDisplayString[ team ],
-        sizeof( level.voteDisplayString[ team ] ), "%s for '%s'",
-        level.voteDisplayString[ team ], reason );
+      Q_strcat( level.voteDisplayString[ team ],
+        sizeof( level.voteDisplayString[ team ] ), va( " for '%s'", reason ) );
     }
   }
   else if( team == TEAM_NONE )
@@ -1315,9 +1314,8 @@ void Cmd_CallVote_f( gentity_t *ent )
         "Mute player '%s'", name );
       if( reason[ 0 ] )
       {
-        Com_sprintf( level.voteDisplayString[ team ],
-          sizeof( level.voteDisplayString[ team ] ), "%s for '%s'",
-          level.voteDisplayString[ team ], reason );
+        Q_strcat( level.voteDisplayString[ team ],
+          sizeof( level.voteDisplayString[ team ] ), va( " for '%s'", reason ) );
       }
     }
     else if( !Q_stricmp( vote, "unmute" ) )
@@ -1441,9 +1439,8 @@ void Cmd_CallVote_f( gentity_t *ent )
       "Take away building rights from '%s'", name );
     if( reason[ 0 ] )
     {
-      Com_sprintf( level.voteDisplayString[ team ],
-        sizeof( level.voteDisplayString[ team ] ), "%s for '%s'",
-        level.voteDisplayString[ team ], reason );
+      Q_strcat( level.voteDisplayString[ team ],
+        sizeof( level.voteDisplayString[ team ] ), va( " for '%s'", reason ) );
     }
   }
   else if( !Q_stricmp( vote, "allowbuild" ) )