From 6cf0fa4053132fe97296aabf620f5cbda16a488b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20Reuh=20Fildadut?= Date: Thu, 13 Oct 2022 00:25:20 +0900 Subject: [PATCH] ldtk: identify level in error messages --- ldtk/ldtk.can | 8 ++++---- ldtk/ldtk.lua | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ldtk/ldtk.can b/ldtk/ldtk.can index 3c3ac06..18e32ed 100644 --- a/ldtk/ldtk.can +++ b/ldtk/ldtk.can @@ -534,7 +534,7 @@ let level_mt = { -- @number[opt=0] y offset Y position to draw the level at -- @require love draw = :(x=0, y=0) - assert(@loaded == true, "level not loaded") + assert(@loaded == true, ("level %q not loaded"):format(@identifier)) lg.push() lg.translate(x + @x, y + @y) @drawBackground() @@ -554,7 +554,7 @@ let level_mt = { -- @number[opt=0] y offset Y position to draw the backgroud at -- @require love drawBackground = :(x=0, y=0) - assert(@loaded == true, "level not loaded") + assert(@loaded == true, ("level %q not loaded"):format(@identifier)) -- background color lg.setColor(@background.color) lg.rectangle("fill", x, y, @width, @height) @@ -581,7 +581,7 @@ let level_mt = { -- -- @tparam[opt] table callbacks load = :(callbacks={}) - assert(@loaded == false, "level already loaded") + assert(@loaded == false, ("level %q already loaded"):format(@identifier)) if @_json.bgRelPath then let pos = @_json.__bgPos let cropRect = pos.cropRect @@ -623,7 +623,7 @@ let level_mt = { -- -- @tparam[opt] table callbacks unload = :(callbacks={}) - assert(@loaded == true, "level not loaded") + assert(@loaded == true, ("level %q not loaded"):format(@identifier)) let onRemoveLayer = callbacks.onRemoveLayer for _, l in ipairs(@layers) do l:_unloadCallbacks(callbacks) diff --git a/ldtk/ldtk.lua b/ldtk/ldtk.lua index 644513d..375e167 100644 --- a/ldtk/ldtk.lua +++ b/ldtk/ldtk.lua @@ -353,7 +353,7 @@ level_mt = { -- ./ldtk/ldtk.can:525 ["draw"] = function(self, x, y) -- ./ldtk/ldtk.can:536 if x == nil then x = 0 end -- ./ldtk/ldtk.can:536 if y == nil then y = 0 end -- ./ldtk/ldtk.can:536 -assert(self["loaded"] == true, "level not loaded") -- ./ldtk/ldtk.can:537 +assert(self["loaded"] == true, ("level %q not loaded"):format(self["identifier"])) -- ./ldtk/ldtk.can:537 lg["push"]() -- ./ldtk/ldtk.can:538 lg["translate"](x + self["x"], y + self["y"]) -- ./ldtk/ldtk.can:539 self:drawBackground() -- ./ldtk/ldtk.can:540 @@ -365,7 +365,7 @@ end, -- ./ldtk/ldtk.can:545 ["drawBackground"] = function(self, x, y) -- ./ldtk/ldtk.can:556 if x == nil then x = 0 end -- ./ldtk/ldtk.can:556 if y == nil then y = 0 end -- ./ldtk/ldtk.can:556 -assert(self["loaded"] == true, "level not loaded") -- ./ldtk/ldtk.can:557 +assert(self["loaded"] == true, ("level %q not loaded"):format(self["identifier"])) -- ./ldtk/ldtk.can:557 lg["setColor"](self["background"]["color"]) -- ./ldtk/ldtk.can:559 lg["rectangle"]("fill", x, y, self["width"], self["height"]) -- ./ldtk/ldtk.can:560 lg["setColor"](white) -- ./ldtk/ldtk.can:562 @@ -377,7 +377,7 @@ end -- ./ldtk/ldtk.can:565 end, -- ./ldtk/ldtk.can:565 ["load"] = function(self, callbacks) -- ./ldtk/ldtk.can:583 if callbacks == nil then callbacks = {} end -- ./ldtk/ldtk.can:583 -assert(self["loaded"] == false, "level already loaded") -- ./ldtk/ldtk.can:584 +assert(self["loaded"] == false, ("level %q already loaded"):format(self["identifier"])) -- ./ldtk/ldtk.can:584 if self["_json"]["bgRelPath"] then -- ./ldtk/ldtk.can:585 local pos -- ./ldtk/ldtk.can:586 pos = self["_json"]["__bgPos"] -- ./ldtk/ldtk.can:586 @@ -415,7 +415,7 @@ self["loaded"] = true -- ./ldtk/ldtk.can:612 end, -- ./ldtk/ldtk.can:612 ["unload"] = function(self, callbacks) -- ./ldtk/ldtk.can:625 if callbacks == nil then callbacks = {} end -- ./ldtk/ldtk.can:625 -assert(self["loaded"] == true, "level not loaded") -- ./ldtk/ldtk.can:626 +assert(self["loaded"] == true, ("level %q not loaded"):format(self["identifier"])) -- ./ldtk/ldtk.can:626 local onRemoveLayer -- ./ldtk/ldtk.can:627 onRemoveLayer = callbacks["onRemoveLayer"] -- ./ldtk/ldtk.can:627 for _, l in ipairs(self["layers"]) do -- ./ldtk/ldtk.can:628