Restore round handler resetting behaviour by not setting game_stopped during round...

diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc
index e6cd4c154b6e13286be160c1f13ed13ab5836101..63d78a18f2a634229057ea7d27d1396ddf8ce6c2 100644 (file)
--- a/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@ -367,8 +367,8 @@ void reset_map(bool dorespawn)
        {
                if (!MUTATOR_CALLHOOK(reset_map_players))
                {
-                       //if (restart_mapalreadyrestarted || (time < game_starttime))
-                       //{
+                       if (restart_mapalreadyrestarted || (time < game_starttime))
+                       {
                                FOREACH_CLIENT(IS_PLAYER(it),
                                {
                                        /*
@@ -386,7 +386,7 @@ void reset_map(bool dorespawn)
                                        it.movement = '0 0 0';
                                        PutClientInServer(it);
                                });
-                       //}
+                       }
                }
        }
 }

diff --git a/qcsrc/server/round_handler.qc b/qcsrc/server/round_handler.qc
index c26bf629c7d8dd4235e7c9d65d1736502b07bc6a..fc2c44e5af7d5118cea2786daa9facb91f569cba 100644 (file)
--- a/qcsrc/server/round_handler.qc
+++ b/qcsrc/server/round_handler.qc
@@ -58,7 +58,7 @@ void round_handler_Think(entity this)
                        // schedule a new round
                        this.wait = true;
                        this.nextthink = time + this.delay;
-                       game_stopped = true;
+                       //game_stopped = true; // not all modes actually pause during round intermission
                }
                else
                {