Merge remote-tracking branch 'origin/main' into sokol

Author: nesbox

demos/bunny/wasmmark/src/tic80.zig

@@ -422,8 +422,8 @@ pub fn nosfx() void {
 // ------
 // MEMORY
 
-pub fn pmemset(index: u32, value: u3) void {
-    raw.pmem(index, value);
+pub fn pmemset(index: u32, value: u32) void {
+    _ = raw.pmem(index, value);
 }
 
 pub fn pmemget(index: u32) u32 {

demos/fenneldemo.fnl

@@ -16,7 +16,7 @@
   (when (btn 1) (set y (+ y 1)))
   (when (btn 2) (set x (- x 1)))
   (when (btn 3) (set x (+ x 1)))
-  (cls 0)
+  (cls 13)
   (spr (+ 1 (* (// (% t 60) 30) 2))
        x y 14 3 0 0 2 2)
   (print "HELLO WORLD!" 84 84)

demos/wasm/src/tic80.zig

@@ -422,8 +422,8 @@ pub fn nosfx() void {
 // ------
 // MEMORY
 
-pub fn pmemset(index: u32, value: u3) void {
-    raw.pmem(index, value);
+pub fn pmemset(index: u32, value: u32) void {
+    _ = raw.pmem(index, value);
 }
 
 pub fn pmemget(index: u32) u32 {

src/core/core.c

@@ -357,7 +357,7 @@ void tic_api_reset(tic_mem* memory)
     {
         resetVbank(memory);
     }
-    
+
     memory->ram->vram.vars.cursor.sprite = tic_cursor_arrow;
     memory->ram->vram.vars.cursor.system = true;
     memory->ram->input.mouse.relative = 0;

src/studio/studio.c

@@ -2278,9 +2278,6 @@ static void processMouseStates(Studio* studio)
 
     tic_mem* tic = studio->tic;
 
-    tic->ram->vram.vars.cursor.sprite = tic_cursor_arrow;
-    tic->ram->vram.vars.cursor.system = true;
-
     for(s32 i = 0; i < COUNT_OF(studio->mouse.state); i++)
     {
         MouseState* state = &studio->mouse.state[i];

templates/zig/src/tic80.zig

@@ -422,8 +422,8 @@ pub fn nosfx() void {
 // ------
 // MEMORY
 
-pub fn pmemset(index: u32, value: u3) void {
-    raw.pmem(index, value);
+pub fn pmemset(index: u32, value: u32) void {
+    _ = raw.pmem(index, value);
 }
 
 pub fn pmemget(index: u32) u32 {