Merge branch 'how-to-play'

sharkwouter · Nov 28, 2024 · 4b7b99b · 4b7b99b
2 parents 123530c + 0ceedc4
commit 4b7b99b
Show file tree

Hide file tree

Showing 34 changed files with 3,441 additions and 32 deletions.
diff --git a/assets/CREDITS_PSP.md b/assets/CREDITS_PSP.md
diff --git a/assets/images/keyboard_arrows.svg b/assets/images/keyboard_arrows.svg
diff --git a/assets/images/keyboard_backspace.svg b/assets/images/keyboard_backspace.svg
diff --git a/assets/images/keyboard_escape.svg b/assets/images/keyboard_escape.svg
diff --git a/assets/images/keyboard_space.svg b/assets/images/keyboard_space.svg
diff --git a/assets/images/mouse.svg b/assets/images/mouse.svg
diff --git a/assets/images/mouse_left.svg b/assets/images/mouse_left.svg
diff --git a/assets/images/mouse_right.svg b/assets/images/mouse_right.svg
diff --git a/assets/images/mouse_scroll.svg b/assets/images/mouse_scroll.svg
diff --git a/assets/images/steam_button_start_icon.svg b/assets/images/steam_button_start_icon.svg
diff --git a/assets/images/switch_buttons_down.svg b/assets/images/switch_buttons_down.svg
diff --git a/assets/images/switch_buttons_left.svg b/assets/images/switch_buttons_left.svg
diff --git a/assets/images/switch_buttons_right.svg b/assets/images/switch_buttons_right.svg
diff --git a/assets/images/switch_buttons_up.svg b/assets/images/switch_buttons_up.svg
diff --git a/assets/images/switch_dpad.svg b/assets/images/switch_dpad.svg
diff --git a/assets/images/switch_stick_l.svg b/assets/images/switch_stick_l.svg
diff --git a/src/ButtonImage.hpp b/src/ButtonImage.hpp
@@ -0,0 +1,24 @@
+#ifndef BUTTONIMAGE_HPP
+#define BUTTONIMAGE_HPP
+
+enum class ButtonImage {
+    KEYBOARD_MOVEMENT,
+    KEYBOARD_CONFIRM,
+    KEYBOARD_CANCEL,
+    KEYBOARD_MENU,
+
+    MOUSE_MOVEMENT,
+    MOUSE_CONFIRM,
+    MOUSE_CANCEL,
+    MOUSE_MENU,
+
+    GAMEPAD_MOVEMENT1,
+    GAMEPAD_MOVEMENT2,
+    GAMEPAD_CONFIRM,
+    GAMEPAD_CANCEL,
+    GAMEPAD_MENU,
+
+    AMOUNT
+};
+
+#endif // BUTTONIMAGE_HPP
diff --git a/src/EventManager.cpp b/src/EventManager.cpp
@@ -118,6 +118,9 @@ Event EventManager::getEventFromMouseButton(Uint8 button) {
         case SDL_BUTTON_RIGHT:
             event = Event::CANCEL;
             break;
+        case SDL_BUTTON_MIDDLE:
+            event = Event::MENU;
+            break;
         default:
             event = Event::OTHER;
             break;

diff --git a/src/OptionManager.cpp b/src/OptionManager.cpp
@@ -225,6 +225,15 @@ void OptionManager::setFullscreen(bool value) {
     write();
 }
 
+bool OptionManager::getHowToPlaySeen() {
+    return this->options.get("how_to_play_seen", false).asBool();
+}
+
+void OptionManager::setHowToPlaySeen(bool value) {
+    this->options["how_to_play_seen"] = value;
+    write();
+}
+
 int OptionManager::getScreenWidth() {
     int result = this->options.get("screen_width", 0).asInt();
     if (result == 0) {
@@ -241,11 +250,7 @@ int OptionManager::getScreenHeight() {
     return result;
 }
 
-int OptionManager::getScreenRefreshRate() {
-    return this->options.get("screen_refresh_rate", 0).asInt();
-}
-
-void OptionManager::setScreenResolution(int width, int height, int refresh_rate) {
+void OptionManager::setScreenResolution(int width, int height) {
     int new_shell_size = DEFAULT_SHELL_SIZE;
     while (width < (new_shell_size * DEFAULT_BOARD_WIDTH) || height < (new_shell_size * (DEFAULT_BOARD_HEIGHT +1))) {
         new_shell_size = new_shell_size/2;
@@ -262,17 +267,10 @@ void OptionManager::setScreenResolution(int width, int height, int refresh_rate)
 
     this->options["screen_width"] = width;
     this->options["screen_height"] = height;
-    this->options["screen_refresh_rate"] = refresh_rate;
 
     write();
 }
 
 int OptionManager::getShellSize() {
     return this->options.get("shell_size", DEFAULT_SHELL_SIZE).asInt();
 }
-
-bool OptionManager::getShellSizeChanged() {
-    bool current_shell_size_changed = this->shell_size_changed;
-    this->shell_size_changed = false;
-    return current_shell_size_changed;
-}