From c2c7228a9b185669213e69c994c4722c387b4c18 Mon Sep 17 00:00:00 2001 From: Sergey Stepanov Date: Sun, 10 Mar 2024 00:46:49 +0300 Subject: [PATCH] Rename constants --- pkg/worker/caged/libretro/nanoarch/input.go | 10 ++++++---- pkg/worker/caged/libretro/nanoarch/nanoarch.go | 8 ++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkg/worker/caged/libretro/nanoarch/input.go b/pkg/worker/caged/libretro/nanoarch/input.go index 5bd033923..647e37b59 100644 --- a/pkg/worker/caged/libretro/nanoarch/input.go +++ b/pkg/worker/caged/libretro/nanoarch/input.go @@ -9,8 +9,10 @@ import ( //#include import "C" -const KeyPressed = C.int16_t(1) -const KeyReleased = C.int16_t(0) +const ( + Released C.int16_t = iota + Pressed +) // InputState stores full controller state. // It consists of: @@ -119,9 +121,9 @@ func (ks *KeyboardState) Pressed(key uint) C.int16_t { _, ok := ks.keys[key] ks.mu.Unlock() if ok { - return KeyPressed + return Pressed } - return KeyReleased + return Released } // ShiftPos sets mouse relative position state. diff --git a/pkg/worker/caged/libretro/nanoarch/nanoarch.go b/pkg/worker/caged/libretro/nanoarch/nanoarch.go index 0d04e8ae0..c69644628 100644 --- a/pkg/worker/caged/libretro/nanoarch/nanoarch.go +++ b/pkg/worker/caged/libretro/nanoarch/nanoarch.go @@ -653,17 +653,17 @@ func coreInputState(port C.unsigned, device C.unsigned, index C.unsigned, id C.u return y case C.RETRO_DEVICE_ID_MOUSE_LEFT: if l, _, _ := Nan0.mouse.Buttons(); l { - return KeyPressed + return Pressed } case C.RETRO_DEVICE_ID_MOUSE_RIGHT: if _, r, _ := Nan0.mouse.Buttons(); r { - return KeyPressed + return Pressed } case C.RETRO_DEVICE_ID_MOUSE_WHEELUP: case C.RETRO_DEVICE_ID_MOUSE_WHEELDOWN: case C.RETRO_DEVICE_ID_MOUSE_MIDDLE: if _, _, m := Nan0.mouse.Buttons(); m { - return KeyPressed + return Pressed } case C.RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELUP: case C.RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELDOWN: @@ -672,7 +672,7 @@ func coreInputState(port C.unsigned, device C.unsigned, index C.unsigned, id C.u } } - return KeyReleased + return Released } //export coreAudioSample