Rename sv_hook_gamerestart to sv_hook_readyrestart, a more accurate name for its...

diff --git a/gamemodes-server.cfg b/gamemodes-server.cfg
index 6d8ee6f07364532ee1ecb47cc6e051b8a4181823..cd71ecec0ee51d59ce45d0084598e74dbd826d44 100644 (file)
--- a/gamemodes-server.cfg
+++ b/gamemodes-server.cfg
@@ -29,7 +29,9 @@ alias sv_hook_gamestart_ka
 alias sv_hook_gamestart_ft
 alias sv_hook_gamestart_inv
 alias sv_hook_gamestart_duel
-alias sv_hook_gamerestart
+// there is currently no hook for when the match is restarted
+// see sv_hook_readyrestart for previous uses of this hook
+//alias sv_hook_gamerestart
 alias sv_hook_gameend
 
 

diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc
index b611ab2665896975ab0b4ce15c24da2480f61190..90073beaaa2273e33a876264a85358aa71ac1b4e 100644 (file)
--- a/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@ -477,7 +477,7 @@ void ReadyRestart_force()
 void ReadyRestart()
 {
        if (MUTATOR_CALLHOOK(ReadyRestart_Deny) || game_stopped || race_completing) localcmd("restart\n");
-       else localcmd("\nsv_hook_gamerestart\n");
+       else localcmd("\nsv_hook_readyrestart\n");
 
        // Reset ALL scores, but only do that at the beginning of the countdown if sv_ready_restart_after_countdown is off!
        // Otherwise scores could be manipulated during the countdown.

diff --git a/xonotic-server.cfg b/xonotic-server.cfg
index 4e9685ba43e4e254a97925dbd721d733c3165d25..fad9b90f611fc6380b01ea28337f827a6a23749b 100644 (file)
--- a/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@ -19,6 +19,8 @@ set sv_ready_restart 0 "allow a map to be restarted once all players pressed the
 set sv_ready_restart_after_countdown 0 "reset players and map items after the countdown ended, instead of at the beginning of the countdown"
 set sv_ready_restart_repeatable 0 "allows the players to restart the game as often as needed"
 
+alias sv_hook_readyrestart
+
 //nifreks lockonrestart feature, used in team-based game modes, if set to 1 and all players readied up no other player can then join the game anymore, useful to block spectators from joining
 set teamplay_lockonrestart 0 "lock teams once all players readied up and the game restarted (no new players can join after restart unless using the server-command unlockteams)"