Merge pull request #680 from blueapple128/master

fix some build errors and broken symlink
kozec · Aug 19, 2022 · f544bd0 · f544bd0
2 parents a3aae2c + 265a612
commit f544bd0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/images/RSTICK.svg b/images/RSTICK.svg
@@ -1 +1 @@
-button-images/LSTICK.bw.svg
+button-images/RSTICK.bw.svg
diff --git a/scc/drivers/remotepad_controller.c b/scc/drivers/remotepad_controller.c
@@ -28,7 +28,7 @@ inline static SCButton libretro_button_to_sc_button(int id) {
 	case RETRO_DEVICE_ID_JOYPAD_L2:			return B_LT;
 	case RETRO_DEVICE_ID_JOYPAD_R2:			return B_RT;
 	case RETRO_DEVICE_ID_JOYPAD_L3:			return B_STICKPRESS;
-	case RETRO_DEVICE_ID_JOYPAD_R3:			return B_RPAD;
+	case RETRO_DEVICE_ID_JOYPAD_R3:			return B_RPADPRESS;
 	default:
 		return 0;
 	}

diff --git a/scc/drivers/scc_future.h b/scc/drivers/scc_future.h
@@ -40,6 +40,16 @@ typedef enum SCButton {
 	_SCButton_padding = 0xFFFFFFFF	// uint32_t
 } SCButton;
 
+struct GyroInput {
+	GyroValue			gpitch;
+	GyroValue			groll;
+	GyroValue			gyaw;
+	GyroValue			q1;
+	GyroValue			q2;
+	GyroValue			q3;
+	GyroValue			q4;
+};
+
 struct ControllerInput {
 	SCButton				buttons;
 	union {