Various warning fixes

include/libultraship/libultra/os.h

@@ -32,7 +32,7 @@
 #define CONT_JOYPORT 0x0004
 #define CONT_EEPROM 0x8000
 #define CONT_EEP16K 0x4000
-#define CONT_TYPE_MASK 0x1f07
+#define CONT_TYPE_MASK 0x1F07
 #define CONT_TYPE_NORMAL 0x0005
 #define CONT_TYPE_MOUSE 0x0002
 #define CONT_TYPE_VOICE 0x0100
@@ -148,4 +148,4 @@ u32 osAiGetLength(void);
 };
 #endif
 
-#endif
+#endif

src/Context.cpp

@@ -71,7 +71,7 @@ std::shared_ptr<Context> Context::CreateUninitializedInstance(const std::string
 }
 
 Context::Context(std::string name, std::string shortName, std::string configFilePath)
-    : mName(std::move(name)), mShortName(std::move(shortName)), mConfigFilePath(std::move(configFilePath)) {
+    : mConfigFilePath(std::move(configFilePath)), mName(std::move(name)), mShortName(std::move(shortName)) {
 }
 
 void Context::Init(const std::vector<std::string>& otrFiles, const std::unordered_set<uint32_t>& validHashes,

src/config/Config.cpp

@@ -137,7 +137,7 @@ void Config::EraseBlock(const std::string& key) {
         nlohmann::json& gjson2 = gjson;
         std::vector<std::string> dots = StringHelper::Split(key, ".");
         if (dots.size() > 1) {
-            int curDot = 0;
+            size_t curDot = 0;
             for (auto& dot : dots) {
                 if (gjson2.contains(dot)) {
                     if (curDot == dots.size()) {

src/controller/controldevice/controller/mapping/keyboard/KeyboardKeyToAxisDirectionMapping.cpp

@@ -8,9 +8,8 @@
 namespace Ship {
 KeyboardKeyToAxisDirectionMapping::KeyboardKeyToAxisDirectionMapping(uint8_t portIndex, Stick stick,
                                                                      Direction direction, KbScancode scancode)
-    : ControllerInputMapping(ShipDeviceIndex::Keyboard),
-      ControllerAxisDirectionMapping(ShipDeviceIndex::Keyboard, portIndex, stick, direction),
-      KeyboardKeyToAnyMapping(scancode) {
+    : ControllerInputMapping(ShipDeviceIndex::Keyboard), KeyboardKeyToAnyMapping(scancode),
+      ControllerAxisDirectionMapping(ShipDeviceIndex::Keyboard, portIndex, stick, direction) {
 }
 
 float KeyboardKeyToAxisDirectionMapping::GetNormalizedAxisDirectionValue() {

src/controller/controldevice/controller/mapping/keyboard/KeyboardKeyToButtonMapping.cpp

@@ -7,8 +7,8 @@
 namespace Ship {
 KeyboardKeyToButtonMapping::KeyboardKeyToButtonMapping(uint8_t portIndex, CONTROLLERBUTTONS_T bitmask,
                                                        KbScancode scancode)
-    : ControllerInputMapping(ShipDeviceIndex::Keyboard),
-      ControllerButtonMapping(ShipDeviceIndex::Keyboard, portIndex, bitmask), KeyboardKeyToAnyMapping(scancode) {
+    : ControllerInputMapping(ShipDeviceIndex::Keyboard), KeyboardKeyToAnyMapping(scancode),
+      ControllerButtonMapping(ShipDeviceIndex::Keyboard, portIndex, bitmask) {
 }
 
 void KeyboardKeyToButtonMapping::UpdatePad(CONTROLLERBUTTONS_T& padButtons) {

src/controller/controldevice/controller/mapping/keyboard/KeyboardScancodes.h

@@ -3,12 +3,13 @@
 #ifdef __cplusplus
 namespace Ship {
 #endif
+
 typedef enum KbEventType {
     LUS_KB_EVENT_KEY_DOWN = 0,
     LUS_KB_EVENT_KEY_UP = 1,
     LUS_KB_EVENT_ALL_KEYS_UP = 2,
     LUS_KB_EVENT_MAX
-};
+} KbEventType;
 
 typedef enum KbScancode {
     LUS_KB_UNKNOWN = 0,
@@ -115,8 +116,8 @@ typedef enum KbScancode {
     LUS_KB_ARROWKEY_RIGHT = 333,
     LUS_KB_ARROWKEY_DOWN = 336,
     LUS_KB_MAX
+} KbScancode;
 
-};
 #ifdef __cplusplus
 } // namespace Ship
-#endif
+#endif

src/controller/controldevice/controller/mapping/sdl/SDLAxisDirectionToAnyMapping.cpp

@@ -56,6 +56,8 @@ std::string SDLAxisDirectionToAnyMapping::GetPhysicalInputName() {
                 return "R";
             }
             break;
+        default:
+            break;
     }
 
     return StringHelper::Sprintf("Axis %d %s", mControllerAxis,

src/controller/controldevice/controller/mapping/sdl/SDLButtonToAnyMapping.cpp

@@ -58,6 +58,8 @@ std::string SDLButtonToAnyMapping::GetGameCubeButtonName() {
             return StringHelper::Sprintf("D-Pad %s", ICON_FA_ARROW_LEFT);
         case SDL_CONTROLLER_BUTTON_DPAD_RIGHT:
             return StringHelper::Sprintf("D-Pad %s", ICON_FA_ARROW_RIGHT);
+        default:
+            break;
     }
 
     return GetGenericButtonName();
@@ -112,6 +114,8 @@ std::string SDLButtonToAnyMapping::GetPlaystationButtonName() {
                 return StringHelper::Sprintf("%s", ICON_FA_MICROPHONE_SLASH);
             }
             break;
+        default:
+            break;
     }
 
     return GetGenericButtonName();
@@ -152,6 +156,8 @@ std::string SDLButtonToAnyMapping::GetSwitchButtonName() {
         case SDL_CONTROLLER_BUTTON_MISC1:
             return "Capture"; /* Xbox Series X share button, PS5 microphone button, Nintendo Switch Pro capture button,
                                  Amazon Luna microphone button */
+        default:
+            break;
     }
 
     return GetGenericButtonName();
@@ -206,6 +212,8 @@ std::string SDLButtonToAnyMapping::GetXboxButtonName() {
             return "P3";
         case SDL_CONTROLLER_BUTTON_PADDLE4:
             return "P4";
+        default:
+            break;
     }
 
     return GetGenericButtonName();

src/controller/controldevice/controller/mapping/sdl/SDLButtonToButtonMapping.cpp

@@ -8,8 +8,8 @@
 namespace Ship {
 SDLButtonToButtonMapping::SDLButtonToButtonMapping(ShipDeviceIndex shipDeviceIndex, uint8_t portIndex,
                                                    CONTROLLERBUTTONS_T bitmask, int32_t sdlControllerButton)
-    : ControllerInputMapping(shipDeviceIndex), ControllerButtonMapping(shipDeviceIndex, portIndex, bitmask),
-      SDLButtonToAnyMapping(shipDeviceIndex, sdlControllerButton) {
+    : ControllerInputMapping(shipDeviceIndex), SDLButtonToAnyMapping(shipDeviceIndex, sdlControllerButton),
+      ControllerButtonMapping(shipDeviceIndex, portIndex, bitmask) {
 }
 
 void SDLButtonToButtonMapping::UpdatePad(CONTROLLERBUTTONS_T& padButtons) {

src/controller/controldevice/controller/mapping/sdl/SDLGyroMapping.cpp

@@ -10,7 +10,7 @@ namespace Ship {
 SDLGyroMapping::SDLGyroMapping(ShipDeviceIndex shipDeviceIndex, uint8_t portIndex, float sensitivity,
                                float neutralPitch, float neutralYaw, float neutralRoll)
     : ControllerInputMapping(shipDeviceIndex), ControllerGyroMapping(shipDeviceIndex, portIndex, sensitivity),
-      mNeutralPitch(neutralPitch), SDLMapping(shipDeviceIndex), mNeutralYaw(neutralYaw), mNeutralRoll(neutralRoll) {
+      SDLMapping(shipDeviceIndex), mNeutralPitch(neutralPitch), mNeutralYaw(neutralYaw), mNeutralRoll(neutralRoll) {
 }
 
 void SDLGyroMapping::Recalibrate() {

src/graphic/Fast3D/gfx_pc.cpp

@@ -3848,9 +3848,12 @@ const char* GfxGetOpcodeName(int8_t opcode) {
         } else {
             SPDLOG_CRITICAL("Unhandled OP code: 0x{:X}, for loaded ucode: {}", (uint8_t)opcode,
                             (uint32_t)ucode_handler_index);
-            return nullptr;
         }
+    } else {
+        SPDLOG_CRITICAL("Unhandled OP code: 0x{:X}, invalid ucode: {}", (uint8_t)opcode, (uint32_t)ucode_handler_index);
     }
+
+    return nullptr;
 }
 
 // TODO, implement a system where we can get the current opcode handler by writing to the GWords. If the powers that be
@@ -3890,6 +3893,8 @@ static void gfx_step() {
             SPDLOG_CRITICAL("Unhandled OP code: 0x{:X}, for loaded ucode: {}", (uint8_t)opcode,
                             (uint32_t)ucode_handler_index);
         }
+    } else {
+        SPDLOG_CRITICAL("Unhandled OP code: 0x{:X}, invalid ucode: {}", (uint8_t)opcode, (uint32_t)ucode_handler_index);
     }
 
     ++cmd;

src/graphic/Fast3D/gfx_pc.h

@@ -205,7 +205,7 @@ typedef enum Attribute {
     CULL_BOTH,
     MV_VIEWPORT,
     MV_LIGHT,
-};
+} Attribute;
 
 extern RDP g_rdp;
 extern RSP g_rsp;

src/resource/archive/Archive.cpp

@@ -13,7 +13,7 @@
 
 namespace Ship {
 Archive::Archive(const std::string& path)
-    : mHasGameVersion(false), mGameVersion(UNKNOWN_GAME_VERSION), mPath(path), mIsLoaded(false) {
+    : mIsLoaded(false), mHasGameVersion(false), mGameVersion(UNKNOWN_GAME_VERSION), mPath(path) {
     mHashes = std::make_shared<std::unordered_map<uint64_t, std::string>>();
 }
 

src/window/gui/ConsoleWindow.cpp

@@ -17,7 +17,7 @@ int32_t ConsoleWindow::HelpCommand(std::shared_ptr<Console> console, const std::
 
             if (!cmd.second.Arguments.empty()) {
                 *output += "\n   - Arguments:";
-                for (int i = 0; i < cmd.second.Arguments.size(); i += 1) {
+                for (size_t i = 0; i < cmd.second.Arguments.size(); i += 1) {
                     const CommandArgument& argument = cmd.second.Arguments[i];
 
                     *output += "\n     - Info=" + argument.Info;
@@ -399,7 +399,7 @@ void ConsoleWindow::DrawElement() {
         }
 
         const std::vector<ConsoleLine> channel = mLog[mCurrentChannel];
-        for (size_t i = 0; i < static_cast<int32_t>(channel.size()); i++) {
+        for (size_t i = 0; i < channel.size(); i++) {
             ConsoleLine line = channel[i];
             if (!mFilter.empty() && line.Text.find(mFilter) == std::string::npos) {
                 continue;
@@ -410,8 +410,9 @@ void ConsoleWindow::DrawElement() {
             std::string id = line.Text + "##" + std::to_string(i);
             ImGui::TableNextRow();
             ImGui::TableSetColumnIndex(0);
-            const bool isSelected = (mSelectedId == i) || std::find(mSelectedEntries.begin(), mSelectedEntries.end(),
-                                                                    i) != mSelectedEntries.end();
+            const bool isSelected =
+                (mSelectedId == (int32_t)i) ||
+                std::find(mSelectedEntries.begin(), mSelectedEntries.end(), i) != mSelectedEntries.end();
             ImGui::PushStyleColor(ImGuiCol_Text, mPriorityColours[line.Priority]);
             if (ImGui::Selectable(id.c_str(), isSelected)) {
                 if (ImGui::IsKeyDown(ImGui::GetKeyIndex(ImGuiKey_LeftCtrl)) && !isSelected) {

src/window/gui/Gui.cpp

@@ -548,12 +548,12 @@ int16_t Gui::GetIntegerScaleFactor() {
             // The same comparison as below, but checked against the configured factor
             if (((float)gfx_current_game_window_viewport.height / gfx_current_game_window_viewport.width) <
                 ((float)gfx_current_dimensions.height / gfx_current_dimensions.width)) {
-                if (factor > gfx_current_game_window_viewport.height / gfx_current_dimensions.height) {
+                if ((uint32_t)factor > gfx_current_game_window_viewport.height / gfx_current_dimensions.height) {
                     // Scale to window height
                     factor = gfx_current_game_window_viewport.height / gfx_current_dimensions.height;
                 }
             } else {
-                if (factor > gfx_current_game_window_viewport.width / gfx_current_dimensions.width) {
+                if ((uint32_t)factor > gfx_current_game_window_viewport.width / gfx_current_dimensions.width) {
                     // Scale to window width
                     factor = gfx_current_game_window_viewport.width / gfx_current_dimensions.width;
                 }

src/window/gui/GuiElement.cpp

@@ -3,7 +3,7 @@
 #include "libultraship/libultraship.h"
 
 namespace Ship {
-GuiElement::GuiElement(bool isVisible) : mIsInitialized(false), mIsVisible(isVisible) {
+GuiElement::GuiElement(bool isVisible) : mIsVisible(isVisible), mIsInitialized(false) {
 }
 
 GuiElement::GuiElement() : GuiElement(false) {

src/window/gui/GuiMenuBar.cpp

@@ -3,7 +3,7 @@
 
 namespace Ship {
 GuiMenuBar::GuiMenuBar(const std::string& visibilityConsoleVariable, bool isVisible)
-    : mVisibilityConsoleVariable(visibilityConsoleVariable), GuiElement(isVisible) {
+    : GuiElement(isVisible), mVisibilityConsoleVariable(visibilityConsoleVariable) {
     if (!mVisibilityConsoleVariable.empty()) {
         mIsVisible = CVarGetInteger(mVisibilityConsoleVariable.c_str(), mIsVisible);
         SyncVisibilityConsoleVariable();

src/window/gui/GuiWindow.cpp

@@ -5,8 +5,8 @@
 namespace Ship {
 GuiWindow::GuiWindow(const std::string& consoleVariable, bool isVisible, const std::string& name, ImVec2 originalSize,
                      uint32_t windowFlags)
-    : mName(name), mVisibilityConsoleVariable(consoleVariable), mOriginalSize(originalSize), mWindowFlags(windowFlags),
-      GuiElement(isVisible) {
+    : GuiElement(isVisible), mName(name), mVisibilityConsoleVariable(consoleVariable), mOriginalSize(originalSize),
+      mWindowFlags(windowFlags) {
     if (!mVisibilityConsoleVariable.empty()) {
         mIsVisible = CVarGetInteger(mVisibilityConsoleVariable.c_str(), mIsVisible);
         SyncVisibilityConsoleVariable();

src/window/gui/GuiWindow.h

@@ -30,8 +30,8 @@ class GuiWindow : public GuiElement {
     void SyncVisibilityConsoleVariable();
 
   private:
-    std::string mVisibilityConsoleVariable;
     std::string mName;
+    std::string mVisibilityConsoleVariable;
     ImVector<ImRect> mGroupPanelLabelStack;
     ImVec2 mOriginalSize;
     uint32_t mWindowFlags;

src/window/gui/InputEditorWindow.cpp

@@ -271,7 +271,7 @@ void InputEditorWindow::DrawButtonLineEditMappingButton(uint8_t port, CONTROLLER
         ImGui::OpenPopup(popupId.c_str());
     }
     if (ImGui::IsItemHovered(ImGuiHoveredFlags_DelayNormal | ImGuiHoveredFlags_NoSharedDelay)) {
-        ImGui::SetTooltip(mapping->GetPhysicalDeviceName().c_str());
+        ImGui::SetTooltip("%s", mapping->GetPhysicalDeviceName().c_str());
     }
     ImGui::PopStyleColor();
     ImGui::PopStyleColor();
@@ -538,7 +538,7 @@ void InputEditorWindow::DrawStickDirectionLineEditMappingButton(uint8_t port, ui
         ImGui::OpenPopup(popupId.c_str());
     }
     if (ImGui::IsItemHovered(ImGuiHoveredFlags_DelayNormal | ImGuiHoveredFlags_NoSharedDelay)) {
-        ImGui::SetTooltip(mapping->GetPhysicalDeviceName().c_str());
+        ImGui::SetTooltip("%s", mapping->GetPhysicalDeviceName().c_str());
     }
     ImGui::PopStyleColor();
     ImGui::PopStyleColor();
@@ -1100,7 +1100,7 @@ void InputEditorWindow::DrawGyroSection(uint8_t port) {
         auto id = mapping->GetGyroMappingId();
         ImGui::AlignTextToFramePadding();
         ImGui::SetNextItemOpen(true, ImGuiCond_Once);
-        ImGui::BulletText(mapping->GetPhysicalDeviceName().c_str());
+        ImGui::BulletText("%s", mapping->GetPhysicalDeviceName().c_str());
         DrawRemoveGyroMappingButton(port, id);
 
         static float sPitch, sYaw = 0.0f;