Fix iceblock killing, userects, android jumping

Author: alesan99

enemy.lua

@@ -2123,6 +2123,8 @@ function enemy:update(dt)
 					end
 				end
 			end
+		end
+		if self.userect then
 			self.userect.x, self.userect.y = self.x+self.carryrange[1], self.y+self.carryrange[2]
 		end
 	end
@@ -3253,7 +3255,7 @@ function enemy:output(transformed)
 		self.userect.delete = true
 		self.destroying = true
 	end
-	if self.userect and not self.userect.delete then
+	if self.userect then
 		self.userect.delete = true
 	end
 	if self.blockportaltile and not self.dontremoveblockportaltileondeath then

game.lua

@@ -2359,6 +2359,11 @@ function game_draw()
 					end
 				end
 			end
+			
+			for j, w in pairs(userects) do
+				love.graphics.setColor(0, 255, 255, 150)
+				love.graphics.rectangle("line", math.floor((w.x-xscroll)*16*scale)+.5, math.floor((w.y-yscroll-.5)*16*scale)+.5, w.width*16*scale-1, w.height*16*scale-1)
+			end
 			love.graphics.setLineWidth(lw)
 
 			--animation numbers

ice.lua

@@ -286,8 +286,10 @@ function ice:meltice(destroy)
 			if a ~= "bowser" then
 				addpoints(firepoints[a], self.x, self.y)
 			end
-		elseif self.a == "enemy" and (not b.resistsiceblock) and (not b.resistsenemykill) and (not b.resistseverything) and (not b.resistseverything) and b:shotted("right", nil, nil, false, true) then
-			addpoints(firepoints[b.t] or 100, self.x, self.y)
+		elseif self.a == "enemy" then
+			if (not b.resistsiceblock) and (not b.resistsenemykill) and (not b.resistseverything) and (not b.resistseverything) and b:shotted("right", nil, nil, false, true) then
+				addpoints(firepoints[b.t] or 100, self.x, self.y)
+			end
 		else
 			b.instantdelete = true
 		end

main.lua

@@ -2515,7 +2515,9 @@ if android then
 
 		local button = getandroidbutton(x, y)
 		if button == "jump" and ((not editormode) or ((not editormenuopen) and (not HIDEANDROIDBUTTONS))) then --a
-			love.keypressed(controls[1]["jump"][1])
+			if not touchkey[controls[1]["jump"][1]] then
+				love.keypressed(controls[1]["jump"][1])
+			end
 			touchkey[controls[1]["jump"][1]] = id
 			return true
 		elseif button == "run" and ((not editormode) or ((not editormenuopen) and (not HIDEANDROIDBUTTONS))) then--b

mario.lua

@@ -655,6 +655,9 @@ function mario:update(dt)
 									self.yoshitoungeenemy = {graphic=v.graphic,quad=v.quad,width=v.width,height=v.height,
 										offsetX=v.offsetX or 0,offsetY=v.offsetY or 0,quadcenterX=v.quadcenterX or 0,quadcenterY=v.quadcenterY or 0,
 										animationscalex=v.animationscalex, animationscaley=v.animationscaley}
+									if v.output then
+										v:output()
+									end
 									v.instantdelete = true
 								end
 								local dobreak = true
@@ -8081,6 +8084,7 @@ function mario:flag()
 	--kill shit
 	for i, v in pairs(objects["enemy"]) do
 		if v.deleteonflagpole then
+			v:output()
 			v.instantdelete = true
 		end
 	end

yoshi.lua

@@ -118,6 +118,9 @@ function yoshi:update(dt)
 					if (not v.shot) and v.width and aabb(x, y, w, h, v.x, v.y, v.width, v.height) then
 						addpoints(firepoints[obj], v.x, v.y)
 						v:shotted(self.animationdirection)
+						if v.output then
+							v:output()
+						end
 						v.instantdelete = true
 						self.toungeenemy = {graphic=v.graphic, quad=v.quad}
 						local dobreak = true