Add weaponthrowable property to weapons

[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 11faefece59e39fd4ae74219f0ad5fc3ea7df82a..112c2fd1967382e43170bf8f14914b235ce9b0df 100644 (file)
--- a/qcsrc/common/weapons/w_hook.qc
+++ b/qcsrc/common/weapons/w_hook.qc
@@ -1,15 +1,18 @@
 #ifdef REGISTER_WEAPON
 REGISTER_WEAPON(
-/* WEP_##id */ HOOK,
-/* function */ w_hook,
-/* ammotype */ ammo_fuel,
-/* impulse  */ 0,
-/* flags    */ WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH,
-/* rating   */ 0,
-/* color       */ '0 0.5 0',
-/* model    */ "hookgun",
-/* netname  */ "hook",
-/* fullname */ _("Grappling Hook")
+/* WEP_##id  */ HOOK,
+/* function  */ W_Hook,
+/* ammotype  */ ammo_fuel,
+/* impulse   */ 0,
+/* flags     */ WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH,
+/* rating    */ 0,
+/* color     */ '0 0.5 0',
+/* modelname */ "hookgun",
+/* simplemdl */ "foobar",
+/* crosshair */ "gfx/crosshairhook 0.5",
+/* wepimg    */ "weaponhook",
+/* refname   */ "hook",
+/* wepname   */ _("Grappling Hook")
 );
 
 #define HOOK_SETTINGS(w_cvar,w_prop) HOOK_SETTINGS_LIST(w_cvar, w_prop, HOOK, hook)
@@ -35,7 +38,8 @@ REGISTER_WEAPON(
        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)
+       w_prop(id, sn, float,  weaponstartoverride, weaponstartoverride) \
+       w_prop(id, sn, float,  weaponthrowable, weaponthrowable)
 
 #ifdef SVQC
 HOOK_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP)
@@ -159,7 +163,7 @@ void W_Hook_Attack2()
                gren.velocity = gren.velocity + self.velocity;
 
        gren.gravity = WEP_CVAR_SEC(hook, gravity);
-       //W_SetupProjectileVelocity(gren); // just falling down!
+       //W_SetupProjVelocity_Basic(gren); // just falling down!
 
        gren.angles = '0 0 0';
        gren.flags = FL_PROJECTILE;
@@ -169,7 +173,7 @@ void W_Hook_Attack2()
        other = gren; MUTATOR_CALLHOOK(EditProjectile);
 }
 
-float w_hook(float req)
+float W_Hook(float req)
 {
        float hooked_time_max, hooked_fuel;
                
@@ -289,7 +293,7 @@ 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");
-                       HOOK_SETTINGS(WEP_SKIPCVAR, WEP_SET_PROP)
+                       HOOK_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
                        return TRUE;
                }
                case WR_SETUP:
@@ -328,11 +332,11 @@ float w_hook(float req)
                        return WEAPON_HOOK_MURDER;
                }
        }
-       return TRUE;
+       return FALSE;
 }
 #endif
 #ifdef CSQC
-float w_hook(float req)
+float W_Hook(float req)
 {
        switch(req)
        {
@@ -351,8 +355,13 @@ float w_hook(float req)
                        precache_sound("weapons/hookbomb_impact.wav");
                        return TRUE;
                }
+               case WR_ZOOMRETICLE:
+               {
+                       // no weapon specific image for this weapon
+                       return FALSE;
+               }
        }
-       return TRUE;
+       return FALSE;
 }
 #endif
 #endif