Renamed ShouldGiveRandomStartWeapons to ForbidRandomStartWeapons.

diff --git a/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc b/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc
index 329fc0ddec3d449116fb67a041ad96b27ea8df62..85bef1d49c4562a40b68dbd4e5f146551a523422 100644 (file)
--- a/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc
+++ b/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc
@@ -178,7 +178,7 @@ MUTATOR_HOOKFUNCTION(mutator_instagib, MakePlayerObserver)
        instagib_stop_countdown(player);
 }
 
-MUTATOR_HOOKFUNCTION(mutator_instagib, ShouldGiveRandomStartWeapons)
+MUTATOR_HOOKFUNCTION(mutator_instagib, ForbidRandomStartWeapons)
 {
        return true;
 }

diff --git a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
index d50094fb5c3e480866e8c58681d325424b5fd065..5611042b0b3100f1bb8cb0dcd2e06e546fa9720a 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
+++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
@@ -167,7 +167,7 @@ MUTATOR_HOOKFUNCTION(ok, PlayerPreThink)
        PHYS_INPUT_BUTTON_ATCK2(player) = false;
 }
 
-MUTATOR_HOOKFUNCTION(ok, ShouldGiveRandomStartWeapons)
+MUTATOR_HOOKFUNCTION(ok, ForbidRandomStartWeapons)
 {
        return true;
 }

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 60304838794bd24c6c895d506652698cf2095be3..ec6342a2a2212179a4b7dca0e8153634afd82076 100644 (file)
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -558,7 +558,7 @@ void PutPlayerInServer(entity this)
                this.health = start_health;
                this.armorvalue = start_armorvalue;
                this.weapons = start_weapons;
-               if (MUTATOR_CALLHOOK(ShouldGiveRandomStartWeapons, this) == false)
+               if (MUTATOR_CALLHOOK(ForbidRandomStartWeapons, this) == false)
                {
                        GiveRandomWeapons(this, random_start_weapons_count,
                                autocvar_g_random_start_weapons, random_start_ammo);

diff --git a/qcsrc/server/mutators/events.qh b/qcsrc/server/mutators/events.qh
index eae1a3ad3d9744354bb517285fa6706ef0738f11..fb452c3399b9bb4ab39721abb574ec32944ccff4 100644 (file)
--- a/qcsrc/server/mutators/events.qh
+++ b/qcsrc/server/mutators/events.qh
@@ -25,10 +25,10 @@ MUTATOR_HOOKABLE(PutClientInServer, EV_PutClientInServer);
 MUTATOR_HOOKABLE(ForbidSpawn, EV_ForbidSpawn);
 
 /** called when player spawns to determine whether to give them random start weapons. Return true to forbid giving them. */
-#define EV_ShouldGiveRandomStartWeapons(i, o) \
+#define EV_ForbidRandomStartWeapons(i, o) \
        /** player */ i(entity, MUTATOR_ARGV_0_entity) \
     /**/
-MUTATOR_HOOKABLE(ShouldGiveRandomStartWeapons, EV_ShouldGiveRandomStartWeapons);
+MUTATOR_HOOKABLE(ForbidRandomStartWeapons, EV_ForbidRandomStartWeapons);
 
 /** called when a player spawns as player, after shared setup, before his weapon is chosen (so items may be changed in here) */
 #define EV_PlayerSpawn(i, o) \