4 files changed, 22 insertions, 16 deletions
diff --git a/src/game/g_admin.c b/src/game/g_admin.c
index e05abc0e..baf520ce 100644
--- a/src/game/g_admin.c
+++ b/src/game/g_admin.c
@@ -2548,7 +2548,7 @@ qboolean G_admin_endvote( gentity_t *ent, int skiparg )
   }
   level.voteNo[ team ] = cancel ? level.numVotingClients[ team ] : 0;
   level.voteYes[ team ] = cancel ? 0 : level.numVotingClients[ team ];
-  CheckVote( team );
+  G_CheckVote( team );
   if( team == TEAM_NONE )
     AP( msg );
   else
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index e6adfaf0..5f0d2199 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -1043,6 +1043,9 @@ void Cmd_CallVote_f( gentity_t *ent )
     return;
   }
 
+  if( level.voteExecuteTime[ team ] )
+    G_ExecuteVote( team );
+
   level.voteThreshold[ team ] = 50;
 
   if( g_voteLimit.integer > 0 &&
diff --git a/src/game/g_local.h b/src/game/g_local.h
index 50e73a9e..4034bcbb 100644
--- a/src/game/g_local.h
+++ b/src/game/g_local.h
@@ -960,7 +960,8 @@ void SendScoreboardMessageToAllClients( void );
 void QDECL G_Printf( const char *fmt, ... );
 void QDECL G_Error( const char *fmt, ... );
 void G_Vote( gentity_t *ent, team_t team, qboolean voting );
-void CheckVote( team_t teamnum );
+void G_ExecuteVote( team_t team );
+void G_CheckVote( team_t team );
 void LogExit( const char *string );
 int  G_TimeTilSuddenDeath( void );
 
diff --git a/src/game/g_main.c b/src/game/g_main.c
index 3c676de1..52ff8a2a 100644
--- a/src/game/g_main.c
+++ b/src/game/g_main.c
@@ -2074,12 +2074,23 @@ FUNCTIONS CALLED EVERY FRAME
 */
 
 
+void G_ExecuteVote( team_t team )
+{
+  level.voteExecuteTime[ team ] = 0;
+
+  trap_SendConsoleCommand( EXEC_APPEND, va( "%s\n",
+    level.voteString[ team ] ) );
+
+  if( !Q_stricmpn( level.voteString[ team ], "map", 3 ) )
+    level.restarted = qtrue;
+}
+
 /*
 ==================
-CheckVote
+G_CheckVote
 ==================
 */
-void CheckVote( team_t team )
+void G_CheckVote( team_t team )
 {
   float    votePassThreshold = (float)level.voteThreshold[ team ] / 100.0f;
   qboolean pass = qfalse;
@@ -2090,15 +2101,7 @@ void CheckVote( team_t team )
   if( level.voteExecuteTime[ team ] &&
       level.voteExecuteTime[ team ] < level.time )
   {
-    level.voteExecuteTime[ team ] = 0;
-
-    trap_SendConsoleCommand( EXEC_APPEND,
-      va( "%s\n", level.voteString[ team ] ) );
-    if( !Q_stricmp( level.voteString[ team ], "map_restart" ) ||
-        !Q_stricmpn( level.voteString[ team ], "map", 3 ) )
-    {
-      level.restarted = qtrue;
-    }
+    G_ExecuteVote( team );
   }
 
   if( !level.voteTime[ team ] )
@@ -2391,9 +2394,8 @@ void G_RunFrame( int levelTime )
   CheckTeamStatus( );
 
   // cancel vote if timed out
-  CheckVote( TEAM_NONE );
-  CheckVote( TEAM_ALIENS );
-  CheckVote( TEAM_HUMANS );
+  for( i = 0; i < NUM_TEAMS; i++ )
+    G_CheckVote( i );
 
   level.frameMsec = trap_Milliseconds();
 }