X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_hook.qc;h=b7291dee3f8cedc4c92d82846330bb930593b8de;hb=36f4b513fd7eac9b2dc37d393cebf3b7d98ac9af;hp=bb3a8546480b0001934674521349e5541fd35a56;hpb=04f7d85114bae0e592f9b0ef38d97902ed39f560;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc
index bb3a85464..b7291dee3 100644
--- a/qcsrc/server/g_hook.qc
+++ b/qcsrc/server/g_hook.qc
@@ -47,43 +47,6 @@ And you should be done!
 
 ============================================*/
 
-.string aiment_classname;
-.float aiment_deadflag;
-void SetMovetypeFollow(entity ent, entity e)
-{
-	// FIXME this may not be warpzone aware
-	ent.movetype = MOVETYPE_FOLLOW; // make the hole follow
-	ent.solid = SOLID_NOT; // MOVETYPE_FOLLOW is always non-solid - this means this cannot be teleported by warpzones any more! Instead, we must notice when our owner gets teleported.
-	ent.aiment = e; // make the hole follow bmodel
-	ent.punchangle = e.angles; // the original angles of bmodel
-	ent.view_ofs = ent.origin - e.origin; // relative origin
-	ent.v_angle = ent.angles - e.angles; // relative angles
-	ent.aiment_classname = strzone(e.classname);
-	ent.aiment_deadflag = e.deadflag;
-}
-void UnsetMovetypeFollow(entity ent)
-{
-	ent.movetype = MOVETYPE_FLY;
-	PROJECTILE_MAKETRIGGER(ent);
-	ent.aiment = world;
-}
-float LostMovetypeFollow(entity ent)
-{
-/*
-	if(ent.movetype != MOVETYPE_FOLLOW)
-		if(ent.aiment)
-			error("???");
-*/
-	if(ent.aiment)
-	{
-		if(ent.aiment.classname != ent.aiment_classname)
-			return 1;
-		if(ent.aiment.deadflag != ent.aiment_deadflag)
-			return 1;
-	}
-	return 0;
-}
-
 .float hook_length;
 .float hook_switchweapon;
 
@@ -332,7 +295,7 @@ void FireGrapplingHook (void)
 	if((arena_roundbased && time < warmup) || (time < game_starttime))
 		return;
 
-    if(g_freezetag && self.freezetag_frozen)
+    if(self.freezetag_frozen)
         return;
 
 	makevectors(self.v_angle);