X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_hook.qc;h=99bd819495bd9949394e05f2cc34c95e4d361b8e;hb=d4e9ae30b350c9f471dcb72929e976735c818919;hp=d372d3516fef98a1d8742fe0b0e1f3fe2c6cb81d;hpb=2ce2f533321210bef1f49b1245a8ea1fda15eea4;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc
index d372d3516..99bd81949 100644
--- a/qcsrc/server/g_hook.qc
+++ b/qcsrc/server/g_hook.qc
@@ -12,8 +12,8 @@
 #include "../common/constants.qh"
 #include "../common/util.qh"
 #include "../common/weapons/all.qh"
-#include "../warpzonelib/common.qh"
-#include "../warpzonelib/server.qh"
+#include "../lib/warpzone/common.qh"
+#include "../lib/warpzone/server.qh"
 
 .int state;
 
@@ -80,7 +80,7 @@ void RemoveGrapplingHook(entity pl)
 	//pl.disableclientprediction = false;
 }
 
-void GrapplingHookReset(void)
+void GrapplingHookReset()
 {SELFPARAM();
 	if(self.realowner.hook == self)
 		RemoveGrapplingHook(self.owner);
@@ -106,7 +106,7 @@ void GrapplingHook_Stop()
 .vector hook_start, hook_end;
 bool GrapplingHookSend(entity this, entity to, int sf)
 {
-	WriteByte(MSG_ENTITY, ENT_CLIENT_HOOK);
+	WriteHeader(MSG_ENTITY, ENT_CLIENT_HOOK);
 	sf = sf & 0x7F;
 	if(sound_allowed(MSG_BROADCAST, self.realowner))
 		sf |= 0x80;
@@ -151,10 +151,7 @@ void GrapplingHookThink()
 
 	self.nextthink = time;
 
-	int s = self.realowner.cvar_cl_gunalign;
-	if(s != 1 && s != 2 && s != 4)
-		s = 3; // default value
-	--s;
+	int s = W_GetGunAlignment(self.realowner);
 	vs = hook_shotorigin[s];
 
 	makevectors(self.realowner.v_angle);
@@ -302,7 +299,7 @@ void GrapplingHookThink()
 	}
 }
 
-void GrapplingHookTouch (void)
+void GrapplingHookTouch ()
 {SELFPARAM();
 	if(other.movetype == MOVETYPE_FOLLOW)
 		return;
@@ -342,7 +339,7 @@ void GrapplingHook_Damage (entity inflictor, entity attacker, float damage, int
 	}
 }
 
-void FireGrapplingHook (void)
+void FireGrapplingHook ()
 {SELFPARAM();
 	entity missile;
 	vector org;
@@ -353,10 +350,7 @@ void FireGrapplingHook (void)
 
 	makevectors(self.v_angle);
 
-	int s = self.cvar_cl_gunalign;
-	if(s != 1 && s != 2 && s != 4)
-		s = 3; // default value
-	--s;
+	int s = W_GetGunAlignment(self);
 	vs = hook_shotorigin[s];
 
 	// UGLY WORKAROUND: play this on CH_WEAPON_B so it can't cut off fire sounds