Make most server includes order insensitive

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / mutator_melee_only.qc

diff --git a/qcsrc/server/mutators/mutator_melee_only.qc b/qcsrc/server/mutators/mutator_melee_only.qc
index 639bba507ce522f6e1eeebe4e33901da998e27dd..3ffc0ffddc22ebe9fee18d9722716a292f81529d 100644 (file)
--- a/qcsrc/server/mutators/mutator_melee_only.qc
+++ b/qcsrc/server/mutators/mutator_melee_only.qc
@@ -1,12 +1,18 @@
+#include "../_.qh"
+
+#include "mutator.qh"
+
 MUTATOR_HOOKFUNCTION(melee_SetStartItems)
 {
-       start_ammo_shells = 0;
-       warmup_start_ammo_shells = 0;
-       
-       WEPSET_COPY_AW(start_weapons, WEP_SHOTGUN);
-       WEPSET_COPY_AW(warmup_start_weapons, WEP_SHOTGUN);
-               
-       return FALSE;
+       start_ammo_shells = warmup_start_ammo_shells = 0;
+       start_weapons = warmup_start_weapons = WEPSET_SHOTGUN;
+
+       return false;
+}
+
+MUTATOR_HOOKFUNCTION(melee_ForbidThrowing)
+{
+       return true;
 }
 
 MUTATOR_HOOKFUNCTION(melee_FilterItem)
@@ -15,30 +21,31 @@ MUTATOR_HOOKFUNCTION(melee_FilterItem)
        {
                case IT_5HP:
                case IT_ARMOR_SHARD:
-                       return FALSE;
+                       return false;
        }
-       
-       return TRUE;
+
+       return true;
 }
 
 MUTATOR_HOOKFUNCTION(melee_BuildMutatorsString)
 {
        ret_string = strcat(ret_string, ":MeleeOnly");
-       return FALSE;
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(melee_BuildMutatorsPrettyString)
 {
        ret_string = strcat(ret_string, ", Melee Only Arena");
-       return FALSE;
+       return false;
 }
 
 MUTATOR_DEFINITION(mutator_melee_only)
 {
        MUTATOR_HOOK(SetStartItems, melee_SetStartItems, CBC_ORDER_ANY);
+       MUTATOR_HOOK(ForbidThrowCurrentWeapon, melee_ForbidThrowing, CBC_ORDER_ANY);
        MUTATOR_HOOK(FilterItem, melee_FilterItem, CBC_ORDER_ANY);
        MUTATOR_HOOK(BuildMutatorsString, melee_BuildMutatorsString, CBC_ORDER_ANY);
        MUTATOR_HOOK(BuildMutatorsPrettyString, melee_BuildMutatorsPrettyString, CBC_ORDER_ANY);
 
-       return FALSE;
+       return false;
 }