Mutators: remove MUTATOR_HOOKFUNCTION_1

diff --git a/qcsrc/common/mutators/base.qh b/qcsrc/common/mutators/base.qh
index f6fa534d6164a36c6fab9b8897e8ce4693104140..58213aabdca0e926ad060abf54f3ac419841aca6 100644 (file)
--- a/qcsrc/common/mutators/base.qh
+++ b/qcsrc/common/mutators/base.qh
@@ -249,10 +249,6 @@ STATIC_INIT_LATE(Mutators) {
 #define MUTATOR_HOOKFUNCTION(...) \
     EVAL(OVERLOAD(MUTATOR_HOOKFUNCTION, __VA_ARGS__))
 
 #define MUTATOR_HOOKFUNCTION(...) \
     EVAL(OVERLOAD(MUTATOR_HOOKFUNCTION, __VA_ARGS__))
 

-#define MUTATOR_HOOKFUNCTION_1(name) \
-    _MUTATOR_CALLBACK(name, HOOKFUNCTION_##name) \
-    bool HOOKFUNCTION_##name()
-

 #define MUTATOR_HOOKFUNCTION_2(mut, cb) \
     MUTATOR_HOOKFUNCTION_3(mut, cb, CBC_ORDER_ANY)
 
 #define MUTATOR_HOOKFUNCTION_2(mut, cb) \
     MUTATOR_HOOKFUNCTION_3(mut, cb, CBC_ORDER_ANY)
 

diff --git a/qcsrc/server/mutators/gamemode_ca.qc b/qcsrc/server/mutators/gamemode_ca.qc
index fe28a25bbe83753eaea28bae25fe8112b4c44d6b..fb66bb28f1c816a998b0ce4215aaa04e53d91930 100644 (file)
--- a/qcsrc/server/mutators/gamemode_ca.qc
+++ b/qcsrc/server/mutators/gamemode_ca.qc
@@ -214,7 +214,7 @@ MUTATOR_HOOKFUNCTION(ca, ClientConnect)
        return 1;
 }
 
        return 1;
 }
 

-MUTATOR_HOOKFUNCTION(ca_reset_map_global)
+MUTATOR_HOOKFUNCTION(ca, reset_map_global)

 {
        allowed_to_spawn = true;
        return 1;
 {
        allowed_to_spawn = true;
        return 1;