fix: restore pairs(objects) order

Author: qixils

animation.lua

@@ -871,15 +871,15 @@ function animation:update(dt)
 			elseif v[1] == "transformenemy" then
 				transformenemyanimation(v[2])
 			elseif v[1] == "killallenemies" then
-				for i2, v2 in pairs(objects) do
-					if i1 ~= "tile" and i2 ~= "buttonblock" then
-						for i, v in pairs(objects[i2]) do
-							if v.active and v.shotted and (not v.resistseverything) then
+				for i2, v2 in kpairs(objects, objectskeys) do
+					if i2 ~= "tile" and i2 ~= "buttonblock" then
+						for i3, v3 in pairs(objects[i2]) do
+							if v3.active and v3.shotted and (not v3.resistseverything) then
 								local dir = "right"
 								if math.random(1,2) == 1 then
 									dir = "left"
 								end
-								v:shotted(dir)
+								v3:shotted(dir)
 							end
 						end
 					end

game.lua

@@ -712,7 +712,7 @@ function game_update(dt)
 	end
 	--UPDATE OBJECTS
 	local delete
-	for i, v in pairs(objects) do
+	for i, v in kpairs(objects, objectskeys) do
 		if i ~= "tile" and i ~= "portalwall" and i ~= "screenboundary" and i ~= "coin" and i ~= "risingwater" and i ~= "clearpipesegment" and i ~= "tracksegment" and i ~= "funnel" and i ~= "clearpipe" then
 			delete = nil
 			for j, w in pairs(v) do
@@ -1617,7 +1617,7 @@ function game_draw()
 			--[[for j, w in pairs(objects["redseesaw"]) do --has overlapping shadows
 				w:draw()
 			end]]
-			for j, w in pairs(objects) do	
+			for j, w in kpairs(objects, objectskeys) do
 				if j ~= "tile" then
 					for i, v in pairs(w) do
 						if v.drawable and (not v.nodropshadow) then--and not v.drawback then
@@ -2040,7 +2040,7 @@ function game_draw()
 		end
 
 		--OBJECTS
-		for j, w in pairs(objects) do	
+		for j, w in kpairs(objects, objectskeys) do	
 			if j ~= "tile" then
 				for i, v in pairs(w) do
 					if v.drawable and not v.drawback then
@@ -2141,7 +2141,7 @@ function game_draw()
 					for j, w in pairs(objects["tilemoving"]) do
 						w:draw()
 					end
-					for j, w in pairs(objects) do	
+					for j, w in kpairs(objects, objectskeys) do	
 						if j ~= "tile" then
 							for i, v in pairs(w) do
 								if v.drawable and (not v.nodropshadow) then--and not v.drawback then
@@ -2305,7 +2305,7 @@ function game_draw()
 		if HITBOXDEBUG and (editormode or testlevel) then
 			local lw = love.graphics.getLineWidth()
 			love.graphics.setLineWidth(.5*scale)
-			for i, v in pairs(objects) do
+			for i, v in kpairs(objects, objectskeys) do
 				for j, k in pairs(v) do
 					if k.width then
 						if xscroll >= k.x-width and k.x+k.width > xscroll then
@@ -4118,161 +4118,32 @@ function startlevel(level, reason)
 	portals = {}
 	blockedportaltiles = {}
 
+	objectskeys = {
+		"mariohammer", "icicle", "thwomp", "threeup", "ceilblocker", "energyball", "belt", "brofireball", "bomb",
+		"musicchanger", "mole", "lightbridge", "splunkin", "bulletbill", "cannonballcannon", "randomizer",
+		"collectable", "plant", "lakito", "laser", "squid", "star", "bowser", "powblock", "animationoutput",
+		"chainchomp", "energylauncher", "skewer", "platformspawner", "collectablelock", "cubedispenser", "door",
+		"bigmole", "hammersuit", "flipblock", "notgate", "frozencoin", "portalent", "yoshi", "coin", "bigbill",
+		"torpedolauncher", "seesawplatform", "groundlight", "koopa", "flyingfish", "kingbill", "spike", "donut",
+		"player", "mushroom", "clearpipesegment", "angrysun", "turretshot", "edgewrap", "spikeball", "rocketturret",
+		"redseesaw", "koopaling", "levelball", "torpedoted", "upfire", "magikoopa", "fireball", "cheep", "pixeltile",
+		"tilemoving", "platform", "drybones", "hammerbro", "animationtrigger", "meteor", "pushbutton", "leaf",
+		"wrench", "hammer", "muncher", "fire", "faithplate", "castlefire", "ninji", "doorsprite", "boo",
+		"blocktogglebutton", "iceball", "longfire", "animatedtiletrigger", "cannonball", "tiletool", "text",
+		"turretrocket", "funnel", "trackcontroller", "rsflipflop", "portalwall", "smallspring", "core",
+		"screenboundary", "boomboom", "cappy", "grinder", "ice", "checkpointflag", "plantfire", "geldispenser",
+		"castlefirefire", "tracksegment", "plantcreepersegment", "rockywrench", "wallindicator", "oneup", "box",
+		"snakeblock", "risingwater", "plantcreeper", "orgate", "pbutton", "delayer", "camerastop", "vine", "glados",
+		"gel", "yoshiegg", "spring", "pokey", "sidestepper", "windleaf", "button", "turret", "flower", "tile",
+		"mariotail", "laserdetector", "regiontrigger", "boomerang", "smbsitem", "walltimer", "fuzzy", "frogsuit",
+		"checkpoint", "lightbridgebody", "andgate", "fishbone", "goomba", "squarewave", "parabeetle", "amp",
+		"energycatcher", "pedestal", "buttonblock", "enemy", "enemytool", "barrel", "poisonmush"
+	}
 	objects = {}
-	objects["player"] = {}
-	objects["portalwall"] = {}
-	objects["tile"] = {}
-	objects["tilemoving"] = {}
-	objects["enemy"] = {}
-	objects["goomba"] = {}
-	objects["koopa"] = {}
-	objects["mushroom"] = {}
-	objects["flower"] = {}
-	objects["oneup"] = {}
-	objects["star"] = {}
-	objects["vine"] = {}
-	objects["box"] = {}
-	objects["door"] = {}
-	objects["button"] = {}
-	objects["groundlight"] = {}
-	objects["wallindicator"] = {}
-	objects["walltimer"] = {}
-	objects["notgate"] = {}
-	objects["lightbridge"] = {}
-	objects["lightbridgebody"] = {}
-	objects["faithplate"] = {}
-	objects["laser"] = {}
-	objects["laserdetector"] = {}
-	objects["gel"] = {}
-	objects["geldispenser"] = {}
-	objects["cubedispenser"] = {}
-	objects["pushbutton"] = {}
-	objects["bulletbill"] = {}
-	objects["hammerbro"] = {}
-	objects["hammer"] = {}
-	objects["fireball"] = {}
-	objects["platform"] = {}
-	objects["platformspawner"] = {}
-	objects["plant"] = {}
-	objects["castlefire"] = {}
-	objects["castlefirefire"] = {}
-	objects["fire"] = {}
-	objects["bowser"] = {}
-	objects["spring"] = {}
-	objects["cheep"] = {}
-	objects["flyingfish"] = {}
-	objects["upfire"] = {}
-	objects["seesawplatform"] = {}
-	objects["ceilblocker"] = {}
-	objects["lakito"] = {}
-	objects["squid"] = {}
-	objects["poisonmush"] = {}
-	objects["bigbill"] = {}
-	objects["kingbill"] = {}
-	objects["sidestepper"] = {}
-	objects["barrel"] = {}
-	objects["icicle"] = {}
-	objects["angrysun"] = {}
-	objects["splunkin"] = {}
-	objects["threeup"] = {}
-	objects["brofireball"] = {}
-	objects["smbsitem"] = {}
-	objects["thwomp"] = {}
-	objects["fishbone"] = {}
-	objects["drybones"] = {}
-	objects["muncher"] = {}
-	objects["meteor"] = {}
-	objects["donut"] = {}
-	objects["boomerang"] = {}
-	objects["parabeetle"] = {}
-	objects["ninji"] = {}
-	objects["hammersuit"] = {}
-	objects["mariohammer"] = {}
-	objects["boo"] = {}
-	objects["mole"] = {}
-	objects["bigmole"] = {}
-	objects["bomb"] = {}
-	objects["plantfire"] = {}
-	objects["flipblock"] = {}
-	objects["torpedoted"] = {}
-	objects["torpedolauncher"] = {}
-	objects["frogsuit"] = {}
-	objects["boomboom"] = {}
-	objects["levelball"] = {}
-	objects["leaf"] = {}
-	objects["mariotail"] = {}
-	objects["windleaf"] = {}
-	objects["energylauncher"] = {}
-	objects["energyball"] = {}
-	objects["energycatcher"] = {}
-	objects["turret"] = {}
-	objects["turretshot"] = {}
-	objects["blocktogglebutton"] = {}
-	objects["buttonblock"] = {}
-	objects["squarewave"] = {}
-	objects["delayer"] = {}
-	objects["coin"] = {}
-	objects["frozencoin"] = {}
-	objects["amp"] = {}
-	objects["fuzzy"] = {}
-	objects["funnel"] = {}
-	objects["longfire"] = {}
-	objects["cannonball"] = {}
-	objects["cannonballcannon"] = {}
-	objects["rocketturret"] = {}
-	objects["turretrocket"] = {}
-	objects["glados"] = {}
-	objects["core"] = {}
-	objects["pedestal"] = {}
-	objects["portalent"] = {}
-	objects["text"] = {}
-	objects["regiontrigger"] = {}
-	objects["tiletool"] = {}
-	objects["iceball"] = {}
-	objects["enemytool"] = {}
-	objects["randomizer"] = {}
-	objects["yoshiegg"] = {}
-	objects["yoshi"] = {}
-	objects["musicchanger"] = {}
-	objects["pbutton"] = {}
-	objects["pokey"] = {}
-	objects["chainchomp"] = {}
-	objects["rockywrench"] = {}
-	objects["wrench"] = {}
-	objects["koopaling"] = {}
-	objects["checkpoint"] = {}
-	objects["doorsprite"] = {}
-	objects["magikoopa"] = {}
-	objects["skewer"] = {}
-	objects["belt"] = {}
-	objects["animationtrigger"] = {}
-	objects["animationoutput"] = {}
-	objects["animatedtiletrigger"] = {}
-	objects["rsflipflop"] = {}
-	objects["orgate"] = {}
-	objects["andgate"] = {}
-	objects["collectable"] = {}
-	objects["collectablelock"] = {}
-	objects["powblock"] = {}
-	objects["smallspring"] = {}
-	objects["risingwater"] = {}
-	objects["redseesaw"] = {}
-	objects["snakeblock"] = {}
-	objects["spike"] = {}
-	objects["spikeball"] = {}
-	objects["camerastop"] = {}
-	objects["clearpipesegment"] = {}
-	objects["plantcreeper"] = {}
-	objects["plantcreepersegment"] = {}
-	objects["tracksegment"] = {}
-	objects["trackcontroller"] = {}
-	objects["checkpointflag"] = {}
-	objects["ice"] = {}
-	objects["grinder"] = {}
-	
-	objects["cappy"] = {}
-	
-	objects["screenboundary"] = {}
+	for i = 1, #objectskeys do
+		local key = objectskeys[i]
+		objects[key] = {}
+	end
 	objects["screenboundary"]["left"] = screenboundary:new(0)
 
 	splitxscroll = {0}
@@ -4894,8 +4765,8 @@ function loadmap(filename)
 	table.sort(checkpoints)
 
 	--Add links
-	for i, v in pairs(objects) do
-		for j, w in pairs(v) do
+	for key, value in kpairs(objects, objectskeys) do
+		for j, w in pairs(value) do
 			if w.link then
 				w:link()
 			end
@@ -6052,7 +5923,7 @@ function insideportal(x, y, width, height) --returns whether an object is in, an
 end
 
 function moveoutportal() --pushes objects out of the portal i in.
-	for i, v in pairs(objects) do
+	for i, v in kpairs(objects, objectskeys) do
 		if i ~= "tile" and i ~= "portalwall" then
 			for j, w in pairs(v) do
 				if w.active and w.static == false then
@@ -8774,7 +8645,7 @@ function convertr(r, types, dontgivedefaultvalues) --convert right cick values
 end
 
 function lightsoutstencil()
-	for i2, v2 in pairs(objects) do
+	for i2, v2 in kpairs(objects, objectskeys) do
 		if i2 ~= "tile" and i2 ~="buttonblock" and i2 ~= "clearpipesegment" then
 			for i, v in pairs(objects[i2]) do
 				if (v.active or (i2 == "player" or i2 == "enemy")) and v.light and onscreen(v.x+v.width/2-v.light, v.y+v.height/2-v.light, v.light*2, v.light*2) then

physics.lua

@@ -51,7 +51,7 @@ local rotatepoint, getslopey
 function physicsupdate(dt)
 	local lobjects = objects
 
-	for j, w in pairs(lobjects) do
+	for j, w in kpairs(lobjects, objectskeys) do
 		if j ~= "tile" and j ~= "buttonblock" and j ~= "tracksegment" then
 			for i, v in pairs(w) do
 				local oldspeedx = v.speedx
@@ -128,7 +128,7 @@ function physicsupdate(dt)
 					local latetable = {"portalwall", "castlefirefire", "platform"}
 
 					--VS OTHER OBJECTS --but not portalwall
-					for h, u in pairs(lobjects) do
+					for h, u in kpairs(lobjects, objectskeys) do
 						if h ~= "tile" and h ~= "buttonblock" and h ~= "tracksegment" then
 							local pass = true
 							for k, l in pairs(latetable) do
@@ -955,7 +955,7 @@ function checkrect(x, y, width, height, list, statics, condition)
 		end
 	end
 
-	for i, v in pairs(objects) do
+	for i, v in kpairs(objects, objectskeys) do
 		local contains = false
 
 		if list and list ~= "all" then	

powblock.lua

@@ -88,7 +88,7 @@ function powblock:hit()
 	self.explode = true
 	self.active = false
 
-	for i2, v2 in pairs(objects) do
+	for i2, v2 in kpairs(objects, objectskeys) do
 		if i1 ~= "tile" and i2 ~= "buttonblock" then
 			for i, v in pairs(objects[i2]) do
 				if v.active and v.shotted and onscreen(v.x,v.y) and (not v.resistspowblock) and v.speedy == 0 then
@@ -152,4 +152,4 @@ end
 
 function powblock:passivecollide(a, b)
 	return false
-end
+end

smbsitem.lua

@@ -158,7 +158,7 @@ function smbsitem:action(b)
 		end
 		playsound(keysound)
 	elseif self.t == "luckystar" then
-		for i2, v2 in pairs(objects) do
+		for i2, v2 in kpairs(objects, objectskeys) do
 			if i1 ~= "tile" and i2 ~= "buttonblock" then
 				for i, v in pairs(objects[i2]) do
 					if v.active and v.shotted and onscreen(v.x,v.y) and (not v.resistspowblock) then
@@ -191,4 +191,4 @@ end
 function smbsitem:jump(x)
 	self.falling = true
 	self.speedy = -mushroomjumpforce
-end
+end

utils.lua

@@ -59,14 +59,46 @@ end
 --------------
 
 function hasvalue(tab, val)
-    for i, value in ipairs(tab) do
+    for i, value in pairs(tab) do
         if value == val then
             return true
         end
     end
     return false
 end
 
+function spairs(t, compare)
+	local sorted = {}
+	for k in pairs(t) do
+		table.insert(sorted, k)
+	end
+
+	if compare then
+		table.sort(sorted, function(a,b) return compare(a,b,t) end)
+	else
+		table.sort(sorted)
+	end
+
+	-- iterator
+	local i = 0
+    return function()
+        i = i + 1
+        if sorted[i] then
+            return sorted[i], t[sorted[i]]
+        end
+    end
+end
+
+function kpairs(t, keys)
+	local i = 0
+	return function()
+		i = i + 1
+		if keys[i] then
+			return keys[i], t[keys[i]]
+		end
+	end
+end
+
 function isPaused(source)
     return pausedaudio and hasvalue(pausedaudio, source)
 end