code/animation.lua

@@ -47,11 +47,11 @@ end
 function Animation:animate()
 	if self.frames[self.frame] ~= 0 then
 		-- try to animate
-		self.subframe = self.subframe + self.speed
+		self.subframe = self.subframe + 1
 
 		if self.subframe > self.frames[self.frame]*game.framerate then
 			self.subframe = self.subframe - self.frames[self.frame]*game.framerate
-			self.frame = self.frame + 1
+			self.frame = self.frame + self.speed
 		end
 
 		-- cycle

code/entities/player.lua

@@ -34,7 +34,10 @@ function Player:new(x,y)
 
 	-- hook values
 	o.hook_swing_speed = math.rad(0.05)
-	o.hook_anchor = nil
+	o.hook_anchor = {
+		x = nil,
+		y = nil
+	}
 
 	-- walljump values
 	o.walljump_nodrift_amount = 12
@@ -163,7 +166,7 @@ function Player:doLogic()
 		if self.is_hooked then
 			self:unhook()
 		else
-			local anchor = self:checkNearest("HookAnchor","hook_specific")
+			local anchor = self:checkNearest("HookAnchor",self.hook_distance)
 			if anchor then
 				self.is_hooked = true
 				self.hook_distance = anchor.hook_distance
@@ -356,7 +359,6 @@ end
 function Player:unhook()
 	self.is_hooked = false
 	self.hook_anchor = nil
-	self.hook_distance = nil
 end
 
 function Player:debug()

code/entity.lua

@@ -44,8 +44,6 @@ function Entity:checkNearest(type,maxdistance)
 			local distance_y = entity.pos.y - self.pos.y
 			local distance = math.sqrt(distance_x ^ 2 + distance_y ^ 2)
 
-			if maxdistance == "hook_specific" then maxdistance = entity.hook_distance end
-
 			if not maxdistance or distance < maxdistance then
 				if shortest == -1 or distance < shortest then
 					shortest = distance