spr.pset and spr.pget have now the same behaviour (ignoring no valid …

…x/y coordinates)
minigdx · Jan 6, 2024 · a1dba55 · a1dba55
1 parent 8f8f296
commit a1dba55
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/tiny-engine/src/commonMain/kotlin/com/github/minigdx/tiny/lua/GfxLib.kt b/tiny-engine/src/commonMain/kotlin/com/github/minigdx/tiny/lua/GfxLib.kt
@@ -49,7 +49,7 @@ class GfxLib(private val resourceAccess: GameResourceAccess) : TwoArgFunction()
                 arg.checkColorIndex()
             }
             resourceAccess.frameBuffer.clear(color)
-            return NONE
+            return NIL
         }
     }
 
@@ -58,7 +58,7 @@ class GfxLib(private val resourceAccess: GameResourceAccess) : TwoArgFunction()
         @TinyCall("set the color index at the coordinate (x,y).")
         override fun call(@TinyArg("x")arg1: LuaValue, @TinyArg("y")arg2: LuaValue, @TinyArg("color")arg3: LuaValue): LuaValue {
             resourceAccess.frameBuffer.pixel(arg1.checkint(), arg2.checkint(), arg3.checkint())
-            return NONE
+            return NIL
         }
     }
 

diff --git a/tiny-engine/src/commonMain/kotlin/com/github/minigdx/tiny/lua/SprLib.kt b/tiny-engine/src/commonMain/kotlin/com/github/minigdx/tiny/lua/SprLib.kt
@@ -7,6 +7,7 @@ import com.github.mingdx.tiny.doc.TinyFunction
 import com.github.mingdx.tiny.doc.TinyLib
 import com.github.minigdx.tiny.engine.GameOptions
 import com.github.minigdx.tiny.engine.GameResourceAccess
+import com.github.minigdx.tiny.graphic.PixelArray
 import org.luaj.vm2.LuaTable
 import org.luaj.vm2.LuaValue
 import org.luaj.vm2.Varargs
@@ -45,9 +46,8 @@ class SprLib(val gameOptions: GameOptions, val resourceAccess: GameResourceAcces
             val x = arg1.checkint()
             val y = arg2.checkint()
 
-            if (x in 0 until pixelArray.width && y in 0 until pixelArray.height) {
+            if (isInPixelArray(pixelArray, x, y)) {
                 val index = pixelArray.get(x, y)
-
                 val colorIndex = index.get(0)
                 return valueOf(colorIndex)
             } else {
@@ -56,6 +56,10 @@ class SprLib(val gameOptions: GameOptions, val resourceAccess: GameResourceAcces
         }
     }
 
+    private fun isInPixelArray(pixelArray: PixelArray, x: Int, y: Int): Boolean {
+        return x in 0 until pixelArray.width && y in 0 until pixelArray.height
+    }
+
     @TinyFunction(
         "Set the color index at the coordinate (x,y) in the current spritesheet.",
         example = SPR_PSET_EXAMPLE,
@@ -68,12 +72,15 @@ class SprLib(val gameOptions: GameOptions, val resourceAccess: GameResourceAcces
             @TinyArg("y") arg2: LuaValue,
             @TinyArg("color") arg3: LuaValue,
         ): LuaValue {
-            resourceAccess.spritesheet(currentSpritesheet)?.pixels?.set(
-                arg1.checkint(),
-                arg2.checkint(),
-                arg3.checkint(),
-            )
-            return arg3
+            val x = arg1.checkint()
+            val y = arg2.checkint()
+            val pixels = resourceAccess.spritesheet(currentSpritesheet)?.pixels ?: return NIL
+            return if (isInPixelArray(pixels, x, y)) {
+                pixels.set(x, y, arg3.checkint())
+                arg3
+            } else {
+                NIL
+            }
         }
     }