Restore round handler resetting behaviour by not setting game_stopped during round...
authorMario <mario@smbclan.net>
Mon, 9 Jan 2017 10:47:14 +0000 (20:47 +1000)
committerMario <mario@smbclan.net>
Mon, 9 Jan 2017 10:47:14 +0000 (20:47 +1000)
qcsrc/server/command/vote.qc
qcsrc/server/round_handler.qc

index e6cd4c1..63d78a1 100644 (file)
@@ -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);
                                });
-                       //}
+                       }
                }
        }
 }
index c26bf62..fc2c44e 100644 (file)
@@ -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
                {