Fix dev menu button on touch screen

RSDKModding · Mar 9, 2024 · b95a333 · b95a333
1 parent 8f838e2
commit b95a333
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.clang-format b/.clang-format
@@ -12,7 +12,7 @@ AllowShortLoopsOnASingleLine: true
 BinPackArguments: true
 BinPackParameters: true
 SpaceAfterCStyleCast: false
-BreakBeforeBraces: Attach
+BreakBeforeBraces: Custom
 BreakBeforeTernaryOperators: true
 BreakBeforeBinaryOperators: NonAssignment
 Cpp11BracedListStyle: false
@@ -23,7 +23,6 @@ AlignConsecutiveAssignments: true
 AlignConsecutiveDeclarations: false
 AlignConsecutiveMacros: true
 UseTab: Never
-BreakBeforeBraces: Custom
 BraceWrapping:
     AfterClass:      true
     AfterControlStatement: false

diff --git a/RSDKv4/NativeObjects/OptionsMenu.cpp b/RSDKv4/NativeObjects/OptionsMenu.cpp
@@ -128,6 +128,11 @@ void OptionsMenu_Main(void *objPtr)
                         self->buttons[i]->state = SUBMENUBUTTON_STATE_FLASHING2;
                         self->buttons[i]->b     = 0xFF;
                         self->state             = OPTIONSMENU_STATE_ACTION;
+#if !RETRO_USE_ORIGINAL_CODE
+                        self->unused1 = Engine.devMenu && self->selectedButton == OPTIONSMENU_BUTTON_INSTRUCTIONS;
+                        if (self->unused1)
+                            StopMusic(true);
+#endif
                         break;
                     }
                     y -= 30.0;