X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_hook.qc;h=aa970f4be3626a6ef4187417ad8c6f4a3f84769a;hb=93afc08b09294e6dea4d0c98ce5226fdee9d1c92;hp=ad45fa1fb99c283473bebc95495a39b47949f1e0;hpb=3fc2359b7933352424af07db8f84cbb9342e934f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc
index ad45fa1fb..aa970f4be 100644
--- a/qcsrc/server/g_hook.qc
+++ b/qcsrc/server/g_hook.qc
@@ -21,8 +21,6 @@
 #include "../lib/warpzone/common.qh"
 #include "../lib/warpzone/server.qh"
 
-.int state;
-
 /*============================================
 
       Wazat's Xonotic Grappling Hook
@@ -72,8 +70,6 @@ And you should be done!
 
 ============================================*/
 
-.float hook_length;
-
 void RemoveGrapplingHooks(entity pl)
 {
 	if(pl.move_movetype == MOVETYPE_FLY)
@@ -338,7 +334,7 @@ void GrapplingHookTouch(entity this, entity toucher)
 
 void GrapplingHook_Damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector force)
 {
-	if(GetResourceAmount(this, RES_HEALTH) <= 0)
+	if(GetResource(this, RES_HEALTH) <= 0)
 		return;
 
 	if (!W_CheckProjectileDamage(inflictor.realowner, this.realowner, deathtype, -1)) // no exceptions
@@ -346,7 +342,7 @@ void GrapplingHook_Damage(entity this, entity inflictor, entity attacker, float
 
 	TakeResource(this, RES_HEALTH, damage);
 
-	if (GetResourceAmount(this, RES_HEALTH) <= 0)
+	if (GetResource(this, RES_HEALTH) <= 0)
 	{
 		if(attacker != this.realowner)
 		{
@@ -360,12 +356,16 @@ void GrapplingHook_Damage(entity this, entity inflictor, entity attacker, float
 
 void FireGrapplingHook(entity actor, .entity weaponentity)
 {
-	if(forbidWeaponUse(actor)) return;
+	if(weaponLocked(actor)) return;
 	if(actor.vehicle) return;
 
-	// TODO: offhand hook shoots from eye
+	int s = W_GunAlign(actor.(weaponentity), STAT(GUNALIGN, actor)) - 1;
+	vector vs = hook_shotorigin[s];
+	vector oldmovedir = actor.(weaponentity).movedir;
+	actor.(weaponentity).movedir = vs;
 	W_SetupShot_ProjectileSize(actor, weaponentity, '-3 -3 -3', '3 3 3', true, 0, SND_HOOK_FIRE, CH_WEAPON_B, 0, WEP_HOOK.m_id);
 	Send_Effect(EFFECT_HOOK_MUZZLEFLASH, w_shotorg, '0 0 0', 1);
+	actor.(weaponentity).movedir = oldmovedir;
 
 	entity missile = WarpZone_RefSys_SpawnSameRefSys(actor);
 	missile.owner = missile.realowner = actor;
@@ -397,7 +397,7 @@ void FireGrapplingHook(entity actor, .entity weaponentity)
 
 	missile.effects = /*EF_FULLBRIGHT | EF_ADDITIVE |*/ EF_LOWPRECISION;
 
-	SetResourceAmount(missile, RES_HEALTH, autocvar_g_balance_grapplehook_health);
+	SetResourceExplicit(missile, RES_HEALTH, autocvar_g_balance_grapplehook_health);
 	missile.event_damage = GrapplingHook_Damage;
 	missile.takedamage = DAMAGE_AIM;
 	missile.damageforcescale = 0;