X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_hook.qc;h=54cca3e95da7810c57b3a4990ba67db3d15160dd;hb=9f1091e432a2db424bfad2482694ee8b34edbe9c;hp=360078d2a31124fde23eb212159440944d802649;hpb=a0feb46a5f3f7db30054e67266e1c59f712f3da7;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc
index 360078d2a..54cca3e95 100644
--- a/qcsrc/server/g_hook.qc
+++ b/qcsrc/server/g_hook.qc
@@ -113,7 +113,7 @@ bool GrapplingHookSend(entity this, entity to, int sf)
 	WriteByte(MSG_ENTITY, sf);
 	if(sf & 1)
 	{
-		WriteByte(MSG_ENTITY, num_for_edict(self.realowner));
+		WriteByte(MSG_ENTITY, etof(self.realowner));
 	}
 	if(sf & 2)
 	{
@@ -243,7 +243,7 @@ void GrapplingHookThink()
 						if((frozen_pulling && self.aiment.frozen) || !frozen_pulling)
 						{
 							self.aiment.velocity = self.aiment.velocity - dv * 0.5;
-							self.aiment.flags &= ~FL_ONGROUND;
+							UNSET_ONGROUND(self.aiment);
 							if(self.aiment.flags & FL_PROJECTILE)
 								UpdateCSQCProjectile(self.aiment);
 						}
@@ -255,7 +255,7 @@ void GrapplingHookThink()
 					}
 				}
 
-				pull_entity.flags &= ~FL_ONGROUND;
+				UNSET_ONGROUND(pull_entity);
 			}
 
 			if(!frozen_pulling && !(self.aiment.flags & FL_PROJECTILE))
@@ -280,7 +280,7 @@ void GrapplingHookThink()
 			self.realowner.velocity = dir*spd;
 			self.realowner.movetype = MOVETYPE_FLY;
 
-			self.realowner.flags &= ~FL_ONGROUND;
+			UNSET_ONGROUND(self.realowner);
 		}
 	}
 
@@ -419,11 +419,3 @@ void GrappleHookInit()
 		hook_shotorigin[3] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_HOOK.m_id), false, false, 4);
 	}
 }
-
-void SetGrappleHookBindings()
-{SELFPARAM();
-	// this function has been modified for Xonotic
-	// don't remove these lines! old server or demos coud overwrite the new aliases
-	stuffcmd(self, "alias +hook +button6\n");
-	stuffcmd(self, "alias -hook -button6\n");
-}