X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_hook.qc;h=71c32df3989edf357f88fe4e69cdba0d38bc61b9;hb=51841214cad4da54b91d5f8129bffa8f42c95eea;hp=4a3f3101ac663eaf3b92c0a31f27f97ac4ae5365;hpb=573cadc1c3fe8377499c3f6c8694255d907604dd;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc
index 4a3f3101a..71c32df39 100644
--- a/qcsrc/server/g_hook.qc
+++ b/qcsrc/server/g_hook.qc
@@ -6,10 +6,9 @@
 #include "weapons/selection.qh"
 #include "weapons/tracing.qh"
 #include "cl_player.qh"
-#include "t_teleporters.qh"
 #include "command/common.qh"
 #include "round_handler.qh"
-#include "vehicles/vehicle.qh"
+#include "../common/vehicles/all.qh"
 #include "../common/constants.qh"
 #include "../common/util.qh"
 #include "../common/weapons/all.qh"
@@ -91,7 +90,7 @@ void GrapplingHookReset(void)
 void GrapplingHookThink();
 void GrapplingHook_Stop()
 {
-	pointparticles(particleeffectnum("grapple_impact"), self.origin, '0 0 0', 1);
+	Send_Effect("grapple_impact", self.origin, '0 0 0', 1);
 	sound (self, CH_SHOTS, "weapons/hook_impact.wav", VOL_BASE, ATTEN_NORM);
 
 	self.state = 1;
@@ -316,7 +315,7 @@ void FireGrapplingHook (void)
 	vector org;
 	vector vs;
 
-	if(forbidWeaponUse()) return;
+	if(forbidWeaponUse(self)) return;
 	if(self.vehicle) return;
 
 	makevectors(self.v_angle);
@@ -334,7 +333,7 @@ void FireGrapplingHook (void)
 	tracebox(self.origin + self.view_ofs, '-3 -3 -3', '3 3 3', org, MOVE_NORMAL, self);
 	org = trace_endpos;
 
-	pointparticles(particleeffectnum("grapple_muzzleflash"), org, '0 0 0', 1);
+	Send_Effect("grapple_muzzleflash", org, '0 0 0', 1);
 
 	missile = WarpZone_RefSys_SpawnSameRefSys(self);
 	missile.owner = missile.realowner = self;
@@ -395,7 +394,7 @@ void FireGrapplingHook (void)
 
 void GrapplingHookFrame()
 {
-	if(g_grappling_hook && timeout_status != TIMEOUT_ACTIVE && self.weapon != WEP_HOOK)
+	if(g_grappling_hook && timeout_status != TIMEOUT_ACTIVE && self.weapon != WEP_HOOK.m_id)
 	{
 		// offhand hook controls
 		if(self.BUTTON_HOOK)
@@ -424,14 +423,14 @@ void GrapplingHookFrame()
 			//self.hook_state &= ~HOOK_RELEASING;
 		}
 	}
-	else if(!g_grappling_hook && self.switchweapon != WEP_HOOK)
+	else if(!g_grappling_hook && self.switchweapon != WEP_HOOK.m_id)
 	{
 		if(self.BUTTON_HOOK && !self.hook_switchweapon)
-			W_SwitchWeapon(WEP_HOOK);
+			W_SwitchWeapon(WEP_HOOK.m_id);
 	}
 	self.hook_switchweapon = self.BUTTON_HOOK;
 
-	if(!g_grappling_hook && self.weapon != WEP_HOOK)
+	if(!g_grappling_hook && self.weapon != WEP_HOOK.m_id)
 	{
 		self.hook_state &= ~HOOK_FIRING;
 		self.hook_state |= HOOK_REMOVING;
@@ -493,11 +492,11 @@ void GrappleHookInit()
 	}
 	else
 	{
-		WEP_ACTION(WEP_HOOK, WR_INIT);
-		hook_shotorigin[0] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_HOOK), false, false, 1);
-		hook_shotorigin[1] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_HOOK), false, false, 2);
-		hook_shotorigin[2] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_HOOK), false, false, 3);
-		hook_shotorigin[3] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_HOOK), false, false, 4);
+		WEP_ACTION(WEP_HOOK.m_id, WR_INIT);
+		hook_shotorigin[0] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_HOOK.m_id), false, false, 1);
+		hook_shotorigin[1] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_HOOK.m_id), false, false, 2);
+		hook_shotorigin[2] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_HOOK.m_id), false, false, 3);
+		hook_shotorigin[3] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_HOOK.m_id), false, false, 4);
 	}
 }