From d2272964dfbd421d8fd2111f59449ae4f98801ce Mon Sep 17 00:00:00 2001
From: /dev/humancontroller <devhc@example.com>
Date: Sat, 15 Apr 2017 15:22:57 +0200
Subject: in the vote calling code, add double quotes around some substituted
 argument strings

---
 src/game/g_cmds.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index b9cca49..90fae9b 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -1963,9 +1963,9 @@ void Cmd_CallVote_f( gentity_t *ent )
       "!ban %s \"%s\" vote kick", level.clients[ clientNum ].pers.ip,
       g_adminTempBan.string );
     if ( reason[0]!='\0' )
-      Q_strcat( level.voteString, sizeof( level.voteString ), va( ": %s^7", reason ) );
+      Q_strcat( level.voteString, sizeof( level.voteString ), va( ": \"%s^7\"", reason ) );
     G_SanitiseString( ent->client->pers.netname, n1, sizeof( n1 ) );
-    Q_strcat( level.voteString, sizeof( level.voteString ), va( ", %s", n1 ) );
+    Q_strcat( level.voteString, sizeof( level.voteString ), va( ", \"%s\"", n1 ) );
     Com_sprintf( level.voteDisplayString, sizeof( level.voteDisplayString ),
       "Kick player \'%s\'", name );
 
@@ -1978,7 +1978,7 @@ void Cmd_CallVote_f( gentity_t *ent )
           trap_SendServerCommand( ent-g_entities, "print \"callvote: admin is immune from vote spec\n\"" );
           return;
     }
-    Com_sprintf( level.voteString, sizeof( level.voteString ), "!putteam %i s %s", clientNum, g_adminTempSpec.string );
+    Com_sprintf( level.voteString, sizeof( level.voteString ), "!putteam %i s \"%s\"", clientNum, g_adminTempSpec.string );
     Com_sprintf( level.voteDisplayString, sizeof( level.voteDisplayString ), "Spec player \'%s\'", name );
 
   }
@@ -2000,7 +2000,7 @@ void Cmd_CallVote_f( gentity_t *ent )
       return;
     }
     Com_sprintf( level.voteString, sizeof( level.voteString ),
-      "!mute %i %s", clientNum, g_adminTempMute.string );
+      "!mute %i \"%s\"", clientNum, g_adminTempMute.string );
     Com_sprintf( level.voteDisplayString, sizeof( level.voteDisplayString ),
       "Mute player \'%s\'", name );
   }
@@ -2030,7 +2030,7 @@ void Cmd_CallVote_f( gentity_t *ent )
        G_admin_adminlog_log( ent, "vote", NULL, 0, qfalse );
        return;
     }
-    Com_sprintf( level.voteString, sizeof( level.voteString ), "%s", arg1 );
+    Com_sprintf( level.voteString, sizeof( level.voteString ), "map_restart" );
     Com_sprintf( level.voteDisplayString,
         sizeof( level.voteDisplayString ), "Restart current map" );
     level.votePassThreshold = g_mapVotesPercent.integer;
@@ -2063,7 +2063,7 @@ void Cmd_CallVote_f( gentity_t *ent )
       return;
     }
 
-    Com_sprintf( level.voteString, sizeof( level.voteString ), "%s %s", arg1, arg2 );
+    Com_sprintf( level.voteString, sizeof( level.voteString ), "map \"%s\"", arg2 );
     Com_sprintf( level.voteDisplayString,
         sizeof( level.voteDisplayString ), "Change to map '%s'", arg2 );
     level.votePassThreshold = map_vote_percent( arg2, g_mapVotesPercent.integer );
@@ -2099,7 +2099,7 @@ void Cmd_CallVote_f( gentity_t *ent )
     }
 
     Com_sprintf( level.voteString, sizeof( level.voteString ),
-      "set g_nextMap %s", arg2 );
+      "set g_nextMap \"%s\"", arg2 );
     Com_sprintf( level.voteDisplayString,
         sizeof( level.voteDisplayString ), "Set the next map to '%s^7'", arg2 );
     level.votePassThreshold = map_vote_percent( arg2, g_mapVotesPercent.integer );
@@ -2135,7 +2135,7 @@ void Cmd_CallVote_f( gentity_t *ent )
         "layout '%s' could not be found on the server\n\"", arg2 ) );
       return;
     }
-    Com_sprintf( level.voteString, sizeof( level.voteString ), "!restart %s", arg2 );
+    Com_sprintf( level.voteString, sizeof( level.voteString ), "!restart \"%s\"", arg2 );
     Com_sprintf( level.voteDisplayString,
         sizeof( level.voteDisplayString ), "Change to map layout '%s'", arg2 );
     level.votePassThreshold = g_mapVotesPercent.integer;
@@ -2654,10 +2654,10 @@ void Cmd_CallTeamVote_f( gentity_t *ent )
       g_adminTempBan.string );
     if( reason[0] )
       Q_strcat( level.teamVoteString[ cs_offset ], sizeof( level.teamVoteString[ cs_offset ] ),
-        va( ": %s", reason ) );
+        va( ": \"%s\"", reason ) );
     G_SanitiseString( ent->client->pers.netname, n1, sizeof( n1 ) );
     Q_strcat( level.teamVoteString[ cs_offset ], sizeof( level.teamVoteString[ cs_offset ] ),
-      va( ", %s", n1 ) );
+      va( ", \"%s\"", n1 ) );
     Com_sprintf( level.teamVoteDisplayString[ cs_offset ],
         sizeof( level.teamVoteDisplayString[ cs_offset ] ),
         "Kick player '%s'", name );
-- 
cgit