X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fw_hook.qc;h=ca94ace96e1cfe6ea1bcb87d8200ef0ffc04c673;hb=014e27ddc7d207bd3ffe09a5d966f969e4a50712;hp=c573cbd96a39b34fe03518259664a4b783c85ba8;hpb=1483221b7777cd5fe57fb21517e9179866b3898f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/weapons/w_hook.qc b/qcsrc/common/weapons/w_hook.qc
index c573cbd96..ca94ace96 100644
--- 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)
@@ -159,7 +162,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;
@@ -289,7 +292,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:
@@ -351,6 +354,11 @@ 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;
 }