Fix a couple of problems indicated by compiler warnings (#127)

* Fix a couple of problems indicated by compiler warnings * Fix formatting * Remove libultra/hardware.h completely
Kenix3 · Feb 24, 2023 · 8b6ea36 · 8b6ea36
1 parent 980a5d4
commit 8b6ea36
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 101 deletions.
diff --git a/include/libultraship/libultra.h b/include/libultraship/libultra.h
@@ -8,7 +8,6 @@
 #include "libultra/gbi.h"
 #include "libultra/gs2dex.h"
 #include "libultra/gu.h"
-#include "libultra/hardware.h"
 #include "libultra/internal.h"
 #include "libultra/interrupt.h"
 #include "libultra/mbi.h"

diff --git a/include/libultraship/libultra/hardware.h b/include/libultraship/libultra/hardware.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -466,6 +466,6 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang")
 		-Wno-parentheses
 		-Wno-narrowing
 		-Wno-missing-field-initializers
-        -Wno-int-conversion
+        $<$<COMPILE_LANGUAGE:C,OBJC>:-Wno-int-conversion>
 	)
 endif()
diff --git a/src/controller/ControlDeck.cpp b/src/controller/ControlDeck.cpp
@@ -54,7 +54,7 @@ void ControlDeck::ScanPhysicalDevices() {
 
     mPhysicalDevices.push_back(std::make_shared<DummyController>("Disconnected", "None", false));
 
-    for (const auto device : mPhysicalDevices) {
+    for (const auto& device : mPhysicalDevices) {
         for (int32_t i = 0; i < MAXCONTROLLERS; i++) {
             device->CreateDefaultBinding(i);
         }
@@ -124,8 +124,7 @@ void ControlDeck::LoadControllerSettings() {
         config->setString(StringHelper::Sprintf("Controllers.Deck.Slot_%d", (int)i), backend->GetGuid());
     }
 
-    for (const auto device : mPhysicalDevices) {
-
+    for (const auto& device : mPhysicalDevices) {
         std::string guid = device->GetGuid();
 
         for (int32_t virtualSlot = 0; virtualSlot < MAXCONTROLLERS; virtualSlot++) {

diff --git a/src/core/Window.cpp b/src/core/Window.cpp
@@ -55,8 +55,8 @@ std::shared_ptr<Window> Window::CreateInstance(const std::string name, const std
 }
 
 Window::Window(std::string Name)
-    : mName(std::move(Name)), mAudioPlayer(nullptr), mControlDeck(nullptr), mResourceManager(nullptr), mLogger(nullptr),
-      mConfig(nullptr) {
+    : mLogger(nullptr), mConfig(nullptr), mResourceManager(nullptr), mAudioPlayer(nullptr), mControlDeck(nullptr),
+      mName(std::move(Name)) {
     mWindowManagerApi = nullptr;
     mRenderingApi = nullptr;
     mIsFullscreen = false;

diff --git a/src/menu/GameOverlay.cpp b/src/menu/GameOverlay.cpp
@@ -216,7 +216,12 @@ void GameOverlay::Draw() {
                     this->TextDraw(30, textY, true, color, "%s %s", text, var->String.c_str());
                     break;
                 case ConsoleVariableType::Color:
-                    this->TextDraw(30, textY, true, color, "#%08X", text, var->Color);
+                    this->TextDraw(30, textY, true, color, "%s (%u, %u, %u, %u)", text, var->Color.r, var->Color.g,
+                                   var->Color.b, var->Color.a);
+                    break;
+                case ConsoleVariableType::Color24:
+                    this->TextDraw(30, textY, true, color, "%s (%u, %u, %u)", text, var->Color24.r, var->Color24.g,
+                                   var->Color24.b);
                     break;
             }
 

diff --git a/src/menu/ImGuiImpl.cpp b/src/menu/ImGuiImpl.cpp
@@ -2,6 +2,7 @@
 
 #include "ImGuiImpl.h"
 
+#include <cstring>
 #include <iostream>
 #include <map>
 #include <utility>
@@ -629,7 +630,8 @@ void DrawMainMenuAndCalculateGameSize(void) {
                 console->Dispatch("reset");
             }
 #if !defined(__SWITCH__) && !defined(__WIIU__)
-            const char* keyboardShortcut = SohImGui::GetCurrentRenderingBackend().first == "sdl" ? "F10" : "ALT+Enter";
+            const char* keyboardShortcut =
+                strcmp(SohImGui::GetCurrentRenderingBackend().first, "sdl") == 0 ? "F10" : "ALT+Enter";
             if (ImGui::MenuItem("Toggle Fullscreen", keyboardShortcut)) {
                 Window::GetInstance()->ToggleFullscreen();
             }

diff --git a/src/resource/Archive.cpp b/src/resource/Archive.cpp
@@ -345,7 +345,7 @@ bool Archive::LoadMainMPQ(bool enableWriting, bool generateCrcMap) {
         }
     }
     bool baseLoaded = false;
-    int i = 0;
+    size_t i = 0;
     while (!baseLoaded && i < mOtrArchives.size()) {
 #if defined(__SWITCH__) || defined(__WIIU__)
         std::string fullPath = mOtrArchives[i];
@@ -376,7 +376,7 @@ bool Archive::LoadMainMPQ(bool enableWriting, bool generateCrcMap) {
         SPDLOG_ERROR("No valid OTR file was provided.");
         return false;
     }
-    for (int j = i; j < mOtrArchives.size(); j++) {
+    for (size_t j = i; j < mOtrArchives.size(); j++) {
 #if defined(__SWITCH__) || defined(__WIIU__)
         std::string fullPath = mOtrArchives[j];
 #else