Restart the map instead of reloading if current map == next map

Applies to both rotation and nextmap votes

1 files changed, 10 insertions, 1 deletions

diff --git a/src/game/g_maprotation.c b/src/game/g_maprotation.c
index 2438ebc..b3198a4 100644
--- a/src/game/g_maprotation.c
+++ b/src/game/g_maprotation.c
@@ -615,8 +615,10 @@ static void G_IssueMapChange( int rotation )
   int   map = G_GetCurrentMap( rotation );
   char  cmd[ MAX_TOKEN_CHARS ];
   char  newmap[ MAX_CVAR_VALUE_STRING ];
+  char  currentmap[ MAX_CVAR_VALUE_STRING ];
 
   Q_strncpyz( newmap, mapRotations.rotations[rotation].maps[map].name, sizeof( newmap ));
+  trap_Cvar_VariableStringBuffer( "mapname", currentmap, sizeof( currentmap ));
 
   if (!Q_stricmp( newmap, "*VOTE*") )
   {
@@ -642,7 +644,14 @@ static void G_IssueMapChange( int rotation )
       mapRotations.rotations[ rotation ].maps[ map ].layouts );
   }
 
-  trap_SendConsoleCommand( EXEC_APPEND, va( "map %s\n", newmap ) );
+  if( !Q_stricmp( currentmap, newmap ) )
+  {
+    trap_SendConsoleCommand( EXEC_APPEND, "map_restart\n" );
+  }
+  else
+  {
+    trap_SendConsoleCommand( EXEC_APPEND, va( "map %s\n", newmap ) );
+  }
 
   // load up map defaults if g_mapConfigs is set
   G_MapConfigs( newmap );