Begin fixing ammo field usage

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / w_hook.qc

diff --git a/qcsrc/common/weapons/w_hook.qc b/qcsrc/common/weapons/w_hook.qc
index 6d4c39fee903a130525e6843b185be8e28be733b..8a5cc0531499b75aa25dd4e477a3aa13238f042e 100644 (file)
--- a/qcsrc/common/weapons/w_hook.qc
+++ b/qcsrc/common/weapons/w_hook.qc
@@ -2,7 +2,7 @@
 REGISTER_WEAPON(
 /* WEP_##id */ HOOK,
 /* function */ w_hook,
-/* ammotype */ IT_CELLS|IT_FUEL,
+/* ammotype */ ammo_fuel,
 /* impulse  */ 0,
 /* flags    */ WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH,
 /* rating   */ 0,
@@ -11,31 +11,35 @@ REGISTER_WEAPON(
 /* fullname */ _("Grappling Hook")
 );
 
-#define HOOK_SETTINGS(weapon) \
-       WEP_ADD_CVAR(weapon, MO_BOTH, animtime) \
-       WEP_ADD_CVAR(weapon, MO_BOTH, ammo) \
-       WEP_ADD_CVAR(weapon, MO_BOTH, refire) \
-       WEP_ADD_CVAR(weapon, MO_PRI,  hooked_ammo) \
-       WEP_ADD_CVAR(weapon, MO_PRI,  hooked_time_free) \
-       WEP_ADD_CVAR(weapon, MO_PRI,  hooked_time_max) \
-       WEP_ADD_CVAR(weapon, MO_SEC,  damage) \
-       WEP_ADD_CVAR(weapon, MO_SEC,  duration) \
-       WEP_ADD_CVAR(weapon, MO_SEC,  edgedamage) \
-       WEP_ADD_CVAR(weapon, MO_SEC,  force) \
-       WEP_ADD_CVAR(weapon, MO_SEC,  gravity) \
-       WEP_ADD_CVAR(weapon, MO_SEC,  lifetime) \
-       WEP_ADD_CVAR(weapon, MO_SEC,  power) \
-       WEP_ADD_CVAR(weapon, MO_SEC,  radius) \
-       WEP_ADD_CVAR(weapon, MO_SEC,  speed) \
-       WEP_ADD_CVAR(weapon, MO_SEC,  health) \
-       WEP_ADD_CVAR(weapon, MO_SEC,  damageforcescale) \
-       WEP_ADD_PROP(weapon, reloading_ammo, reload_ammo) \
-       WEP_ADD_PROP(weapon, reloading_time, reload_time) \
-       WEP_ADD_PROP(weapon, switchdelay_raise, switchdelay_raise) \
-       WEP_ADD_PROP(weapon, switchdelay_drop, switchdelay_drop)
+#define HOOK_SETTINGS(w_cvar,w_prop) HOOK_SETTINGS_LIST(w_cvar, w_prop, HOOK, hook)
+#define HOOK_SETTINGS_LIST(w_cvar,w_prop,id,sn) \
+       w_cvar(id, sn, MO_BOTH, animtime) \
+       w_cvar(id, sn, MO_BOTH, ammo) \
+       w_cvar(id, sn, MO_BOTH, refire) \
+       w_cvar(id, sn, MO_PRI,  hooked_ammo) \
+       w_cvar(id, sn, MO_PRI,  hooked_time_free) \
+       w_cvar(id, sn, MO_PRI,  hooked_time_max) \
+       w_cvar(id, sn, MO_SEC,  damage) \
+       w_cvar(id, sn, MO_SEC,  duration) \
+       w_cvar(id, sn, MO_SEC,  edgedamage) \
+       w_cvar(id, sn, MO_SEC,  force) \
+       w_cvar(id, sn, MO_SEC,  gravity) \
+       w_cvar(id, sn, MO_SEC,  lifetime) \
+       w_cvar(id, sn, MO_SEC,  power) \
+       w_cvar(id, sn, MO_SEC,  radius) \
+       w_cvar(id, sn, MO_SEC,  speed) \
+       w_cvar(id, sn, MO_SEC,  health) \
+       w_cvar(id, sn, MO_SEC,  damageforcescale) \
+       w_prop(id, sn, float,  reloading_ammo, reload_ammo) \
+       w_prop(id, sn, float,  reloading_time, reload_time) \
+       w_prop(id, sn, float,  switchdelay_raise, switchdelay_raise) \
+       w_prop(id, sn, float,  switchdelay_drop, switchdelay_drop) \
+       w_prop(id, sn, string, weaponreplace, weaponreplace) \
+       w_prop(id, sn, float,  weaponstart, weaponstart) \
+       w_prop(id, sn, float,  weaponstartoverride, weaponstartoverride)
 
 #ifdef SVQC
-HOOK_SETTINGS(hook)
+HOOK_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP)
 
 .float dmg;
 .float dmg_edge;
@@ -182,8 +186,8 @@ float w_hook(float req)
                        if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_HOOK))
                        {
                                if(!self.hook)
-                               if not(self.hook_state & HOOK_WAITING_FOR_RELEASE)
-                               if not(self.hook_state & HOOK_FIRING)
+                               if(!(self.hook_state & HOOK_WAITING_FOR_RELEASE))
+                               if(!(self.hook_state & HOOK_FIRING))
                                if (time > self.hook_refire)
                                if (weapon_prepareattack(0, -1))
                                {
@@ -208,7 +212,7 @@ float w_hook(float req)
                                self.hook_refire = max(self.hook_refire, time + WEP_CVAR_PRI(hook, refire) * W_WeaponRateFactor());
 
                                // hook also inhibits health regeneration, but only for 1 second
-                               if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
+                               if(!(self.items & IT_UNLIMITED_WEAPON_AMMO))
                                        self.pauseregen_finished = max(self.pauseregen_finished, time + autocvar_g_balance_pause_fuel_regen);
                        }
 
@@ -226,7 +230,7 @@ float w_hook(float req)
                                {
                                        if ( time > self.hook_time_fueldecrease )
                                        {
-                                               if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
+                                               if(!(self.items & IT_UNLIMITED_WEAPON_AMMO))
                                                {
                                                        if ( self.ammo_fuel >= (time - self.hook_time_fueldecrease) * hooked_fuel )
                                                        {
@@ -252,16 +256,16 @@ float w_hook(float req)
 
                        if (self.BUTTON_CROUCH)
                        {
-                               self.hook_state &~= HOOK_PULLING;
+                               self.hook_state &= ~HOOK_PULLING;
                                if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_HOOK))
-                                       self.hook_state &~= HOOK_RELEASING;
+                                       self.hook_state &= ~HOOK_RELEASING;
                                else
                                        self.hook_state |= HOOK_RELEASING;
                        }
                        else
                        {
                                self.hook_state |= HOOK_PULLING;
-                               self.hook_state &~= HOOK_RELEASING;
+                               self.hook_state &= ~HOOK_RELEASING;
 
                                if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_HOOK))
                                {
@@ -272,7 +276,7 @@ float w_hook(float req)
                                else
                                {
                                        self.hook_state |= HOOK_REMOVING;
-                                       self.hook_state &~= HOOK_WAITING_FOR_RELEASE;
+                                       self.hook_state &= ~HOOK_WAITING_FOR_RELEASE;
                                }
                        }
                        
@@ -286,18 +290,13 @@ float w_hook(float req)
                        precache_sound ("weapons/hook_impact.wav"); // done by g_hook.qc
                        precache_sound ("weapons/hook_fire.wav");
                        precache_sound ("weapons/hookbomb_fire.wav");
-                       #define WEP_ADD_CVAR(weapon,mode,name) /*nothing*/
-                       #define WEP_ADD_PROP(weapon,prop,name) WEP_SET_PROP(WEP_HOOK,weapon,prop,name)
-                       HOOK_SETTINGS(hook)
-                       #undef WEP_ADD_CVAR
-                       #undef WEP_ADD_PROP
+                       HOOK_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP)
                        return TRUE;
                }
                case WR_SETUP:
                {
-                       weapon_setup(WEP_HOOK);
                        self.current_ammo = ammo_fuel;
-                       self.hook_state &~= HOOK_WAITING_FOR_RELEASE;
+                       self.hook_state &= ~HOOK_WAITING_FOR_RELEASE;
                        return TRUE;
                }
                case WR_CHECKAMMO1:
@@ -313,11 +312,7 @@ float w_hook(float req)
                }
                case WR_CONFIG:
                {
-                       #define WEP_ADD_CVAR(weapon,mode,name) WEP_CONFIG_WRITE_CVARS(weapon,mode,name)
-                       #define WEP_ADD_PROP(weapon,prop,name) WEP_CONFIG_WRITE_PROPS(weapon,prop,name)
-                       HOOK_SETTINGS(hook)
-                       #undef WEP_ADD_CVAR
-                       #undef WEP_ADD_PROP
+                       HOOK_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
                        return TRUE;
                }
                case WR_RESETPLAYER: