Ticket #35: fix_trac_35_v2.patch

code/cgame/cg_draw.c

@@ -4189 +4189 @@
                 return;
         }
 
+#ifdef SMOKINGUNS
+    // iLag -- Draw the game restart timer when the round is over.
+    // Needs to be here or the intermission checker will override it.
+        if ( !CG_DrawFollow() ) {
+                if(cg_warmupmessage.integer)
+                        CG_DrawWarmup();
+        }
+#endif
+
         if ( cg.snap->ps.pm_type == PM_INTERMISSION ) {
                 CG_DrawIntermission();
                 return;
@@ -4241 +4250 @@
         // Draw chat messages
         CG_DrawChatMessages();
 
-        if ( !CG_DrawFollow() ) {
-                if(cg_warmupmessage.integer)
-                        CG_DrawWarmup();
-        }
-
         CG_DrawSpectator();
 
         CG_ScanForCrosshairEntity( &changeCrosshair, &isPlayer );

code/game/g_main.c

@@ -1580 +1580 @@
 void ExitLevel (void) {
         int             i;
         gclient_t *cl;
-#ifndef SMOKINGUNS
         char nextmap[MAX_STRING_CHARS];
+#ifndef SMOKINGUNS
         char d1[MAX_STRING_CHARS];
 #endif
 
@@ -1612 +1612 @@
                 trap_SendConsoleCommand( EXEC_APPEND, "vstr nextmap\n" );
         }
 #else
-        trap_SendConsoleCommand( EXEC_APPEND, "vstr nextmap\n" );
+        trap_Cvar_VariableStringBuffer( "nextmap", nextmap, sizeof(nextmap) );
+    if ( Q_stricmp( nextmap , "" ) ){
+        trap_SendConsoleCommand( EXEC_APPEND, "vstr nextmap\n" );
+    } else {
+        Com_Printf("No nextmap specified!  Restarting current map in 5 seconds.\n");
+        trap_SendConsoleCommand( EXEC_APPEND, "map_restart 5\n" );
+    }
 #endif
 
         level.changemap = NULL;