Merge 091531e1da into fbbfc07ff1

soh/soh/Enhancements/TimeDisplay/TimeDisplay.h

@@ -1,6 +1,6 @@
 #include <libultraship/libultraship.h>
 
-class TimeDisplayWindow : public Ship::GuiWindow {
+class TimeDisplayWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 

soh/soh/Enhancements/audio/AudioEditor.h

@@ -7,7 +7,7 @@
 #include <imgui.h>
 #include "AudioCollection.h"
 
-class AudioEditor : public Ship::GuiWindow {
+class AudioEditor final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 

soh/soh/Enhancements/controls/InputViewer.h

@@ -17,7 +17,7 @@ typedef enum {
     STICK_MODE_ALWAYS_HIDDEN,
 } StickMode;
 
-class InputViewer : public Ship::GuiWindow {
+class InputViewer final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 
@@ -33,7 +33,7 @@ class InputViewer : public Ship::GuiWindow {
     void RenderButton(std::string btn, std::string btnOutline, int state, ImVec2 size, int outlineMode);
 };
 
-class InputViewerSettingsWindow : public Ship::GuiWindow {
+class InputViewerSettingsWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 

soh/soh/Enhancements/controls/SohInputEditorWindow.h

@@ -17,7 +17,7 @@ typedef struct {
     N64ButtonMask defaultBtn;
 } CustomButtonMap;
 
-class SohInputEditorWindow : public Ship::GuiWindow {
+class SohInputEditorWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
     ~SohInputEditorWindow();

soh/soh/Enhancements/cosmetics/CosmeticsEditor.h

@@ -60,7 +60,7 @@ void CosmeticsEditor_ResetAll();
 void CosmeticsEditor_ResetGroup(CosmeticGroup group);
 void ApplyOrResetCustomGfxPatches(bool manualChange = true);
 
-class CosmeticsEditorWindow : public Ship::GuiWindow {
+class CosmeticsEditorWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 

soh/soh/Enhancements/debugger/MessageViewer.h

@@ -25,7 +25,7 @@ void MessageDebug_DisplayCustomMessage(const char* customMessage);
 #ifdef __cplusplus
 }
 
-class MessageViewer : public Ship::GuiWindow {
+class MessageViewer final : public Ship::GuiWindow {
   public:
     static inline const char* TABLE_ID = "MessageViewer";
     using GuiWindow::GuiWindow;

soh/soh/Enhancements/debugger/SohStatsWindow.h

@@ -3,7 +3,7 @@
 
 #include <libultraship/libultraship.h>
 
-class SohStatsWindow : public Ship::GuiWindow {
+class SohStatsWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
     ~SohStatsWindow(){};

soh/soh/Enhancements/debugger/actorViewer.h

@@ -2,7 +2,7 @@
 
 #include <libultraship/libultraship.h>
 
-class ActorViewerWindow : public Ship::GuiWindow {
+class ActorViewerWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 

soh/soh/Enhancements/debugger/colViewer.cpp

@@ -20,7 +20,7 @@ extern "C" {
 extern PlayState* gPlayState;
 }
 
-typedef enum ColRenderSetting { ColRenderDisabled, ColRenderSolid, ColRenderTransparent } ColRenderSetting;
+enum ColRenderSetting { ColRenderDisabled, ColRenderSolid, ColRenderTransparent };
 
 static std::unordered_map<int32_t, const char*> ColRenderSettingNames = {
     { ColRenderDisabled, "Disabled" },

soh/soh/Enhancements/debugger/colViewer.h

@@ -5,7 +5,7 @@
 typedef enum { COLVIEW_DISABLED, COLVIEW_SOLID, COLVIEW_TRANSPARENT } ColViewerRenderSetting;
 
 #ifdef __cplusplus
-class ColViewerWindow : public Ship::GuiWindow {
+class ColViewerWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 

soh/soh/Enhancements/debugger/debugSaveEditor.cpp

@@ -106,7 +106,7 @@ char z2ASCII(int code) {
     return char(ret);
 }
 
-typedef enum MagicLevel { MAGIC_LEVEL_NONE, MAGIC_LEVEL_SINGLE, MAGIC_LEVEL_DOUBLE };
+enum MagicLevel { MAGIC_LEVEL_NONE, MAGIC_LEVEL_SINGLE, MAGIC_LEVEL_DOUBLE };
 
 std::unordered_map<int8_t, const char*> magicLevelMap = {
     { MAGIC_LEVEL_NONE, "None" },
@@ -114,7 +114,7 @@ std::unordered_map<int8_t, const char*> magicLevelMap = {
     { MAGIC_LEVEL_DOUBLE, "Double" },
 };
 
-typedef enum AudioOutput {
+enum AudioOutput {
     AUDIO_STEREO,
     AUDIO_MONO,
     AUDIO_HEADSET,
@@ -128,7 +128,7 @@ std::unordered_map<uint8_t, const char*> audioMap = {
     { AUDIO_SURROUND, "Surround" },
 };
 
-typedef enum ZTarget {
+enum ZTarget {
     Z_TARGET_SWITCH,
     Z_TARGET_HOLD,
 };

soh/soh/Enhancements/debugger/debugSaveEditor.h

@@ -1770,7 +1770,7 @@ const std::vector<std::string> state3 = {
     "Travelling to Hook Target",
 };
 
-class SaveEditorWindow : public Ship::GuiWindow {
+class SaveEditorWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 

soh/soh/Enhancements/debugger/dlViewer.h

@@ -2,7 +2,7 @@
 
 #include <libultraship/libultraship.h>
 
-class DLViewerWindow : public Ship::GuiWindow {
+class DLViewerWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 

soh/soh/Enhancements/debugger/hookDebugger.h

@@ -1,6 +1,6 @@
 #include <libultraship/libultraship.h>
 
-class HookDebuggerWindow : public Ship::GuiWindow {
+class HookDebuggerWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 

soh/soh/Enhancements/debugger/valueViewer.h

@@ -33,7 +33,7 @@ typedef struct {
     uint32_t y;
 } ValueTableElement;
 
-class ValueViewerWindow : public Ship::GuiWindow {
+class ValueViewerWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 

soh/soh/Enhancements/gameplaystatswindow.h

@@ -1,6 +1,6 @@
 #include <libultraship/libultraship.h>
 
-class GameplayStatsWindow : public Ship::GuiWindow {
+class GameplayStatsWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 

soh/soh/Enhancements/randomizer/Plandomizer.h

@@ -16,7 +16,7 @@ extern "C" {
 #include "soh/Enhancements/randomizer/item.h"
 
 #ifdef __cplusplus
-class PlandomizerWindow : public Ship::GuiWindow {
+class PlandomizerWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 

soh/soh/Enhancements/randomizer/randomizer_check_tracker.h

@@ -8,7 +8,7 @@
 
 namespace CheckTracker {
 
-class CheckTrackerSettingsWindow : public Ship::GuiWindow {
+class CheckTrackerSettingsWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
     ~CheckTrackerSettingsWindow(){};
@@ -19,7 +19,7 @@ class CheckTrackerSettingsWindow : public Ship::GuiWindow {
     void UpdateElement() override{};
 };
 
-class CheckTrackerWindow : public Ship::GuiWindow {
+class CheckTrackerWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
     void Draw() override;

soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.h

@@ -91,7 +91,7 @@ s16 GetLastEntranceOverride();
 s16 GetCurrentGrottoId();
 const EntranceData* GetEntranceData(s16);
 
-class EntranceTrackerSettingsWindow : public Ship::GuiWindow {
+class EntranceTrackerSettingsWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 
@@ -101,7 +101,7 @@ class EntranceTrackerSettingsWindow : public Ship::GuiWindow {
     void UpdateElement() override{};
 };
 
-class EntranceTrackerWindow : public Ship::GuiWindow {
+class EntranceTrackerWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
     void Draw() override;

soh/soh/Enhancements/randomizer/randomizer_item_tracker.h

@@ -30,7 +30,7 @@ typedef struct ItemTrackerDungeon {
     std::vector<uint32_t> items;
 } ItemTrackerDungeon;
 
-class ItemTrackerSettingsWindow : public Ship::GuiWindow {
+class ItemTrackerSettingsWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 
@@ -40,7 +40,7 @@ class ItemTrackerSettingsWindow : public Ship::GuiWindow {
     void UpdateElement() override{};
 };
 
-class ItemTrackerWindow : public Ship::GuiWindow {
+class ItemTrackerWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
     void Draw() override;

soh/soh/Enhancements/randomizer/randomizer_settings_window.h

@@ -6,7 +6,7 @@ namespace Rando {
 class Settings;
 }
 
-class RandomizerSettingsWindow : public Ship::GuiWindow {
+class RandomizerSettingsWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 

soh/soh/Enhancements/timesplits/TimeSplits.h

@@ -17,7 +17,7 @@ extern "C" {
 #include <libultraship/libultraship.h>
 
 #ifdef __cplusplus
-class TimeSplitWindow : public Ship::GuiWindow {
+class TimeSplitWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 
@@ -39,7 +39,7 @@ typedef enum SplitStatus {
     SPLIT_STATUS_ACTIVE,
     SPLIT_STATUS_INACTIVE,
     SPLIT_STATUS_COLLECTED,
-    SPLIT_STATUS_SKIPPED
+    SPLIT_STATUS_SKIPPED,
 } SplitStatus;
 
 typedef enum SplitType {

soh/soh/Notification/Notification.h

@@ -19,7 +19,7 @@ struct Options {
     float remainingTime = 0.0f; // Seconds
 };
 
-class Window : public Ship::GuiWindow {
+class Window final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
 

soh/soh/SohGui/SohModals.h

@@ -4,7 +4,7 @@
 #include "window/gui/GuiMenuBar.h"
 #include "window/gui/GuiElement.h"
 
-class SohModalWindow : public Ship::GuiWindow {
+class SohModalWindow final : public Ship::GuiWindow {
   public:
     using GuiWindow::GuiWindow;
     void Draw() override;