Fixed regression in map loader

No longer adds nodes attribute where it shouldn't belong. Made tile renderer no longer fail on bad image paths. Keys no longer assume they have two nodes when they don't.
CelestialCartographers · Feb 19, 2020 · 823838c · 823838c
1 parent 2a52813
commit 823838c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/celeste_render.jl b/src/celeste_render.jl
@@ -45,9 +45,9 @@ function drawTile(ctx::Cairo.CairoContext, x::Integer, y::Integer, tiles::Tiles,
 
     if tileValue != '0'
         quad, sprite, imagePath = getTileData(x, y, tiles, meta, states)
-        imagePathSprite = getSprite(imagePath, "Gameplay")
+        imagePathExists = imagePath !== nothing && getSprite(imagePath, "Gameplay") !== Ahorn.Assets.missingImage
 
-        if quad !== nothing && imagePathSprite.surface !== Ahorn.Assets.missingImage
+        if quad !== nothing && imagePathExists
             quadX, quadY = quad
 
             if !isempty(sprite)

diff --git a/src/entities/key.jl b/src/entities/key.jl
@@ -26,7 +26,7 @@ sprite = "collectables/key/idle00.png"
 function Ahorn.selection(entity::Maple.Key)
     x, y = Ahorn.position(entity)
 
-    if haskey(entity.data, "nodes")
+    if haskey(entity.data, "nodes") && length(entity["nodes"]) >= 2
         controllX, controllY = Int.(entity.data["nodes"][1])
         endX, endY = Int.(entity.data["nodes"][2])