[Payload] Treat all warnings as errors

WiiLink24 · Jan 26, 2024 · a7bb71f · a7bb71f
1 parent 4223ad4
commit a7bb71f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 12 deletions.
diff --git a/payload/import/mkwItem.hpp b/payload/import/mkwItem.hpp
@@ -6,6 +6,8 @@
 namespace mkw::Item
 {
 
+#if RMC
+
 enum class ItemBox {
     GreenShell = 0x00,
     RedShell = 0x01,
@@ -273,4 +275,6 @@ static ItemBox ItemObjectToItemBox(ItemObject itemObject)
     }
 }
 
+#endif
+
 } // namespace mkw::Item
diff --git a/payload/import/mkwRegistry.hpp b/payload/import/mkwRegistry.hpp
@@ -5,6 +5,8 @@
 namespace mkw::Registry
 {
 
+#if RMC
+
 enum class Character {
     Mario = 0x00,
     BabyPeach = 0x01,
@@ -195,4 +197,6 @@ static bool IsBattleCourse(Course course)
     return course >= Course::DelfinoPier && course <= Course::N64Skyscraper;
 }
 
+#endif
+
 } // namespace mkw::Registry
diff --git a/payload/make-payload.py b/payload/make-payload.py
@@ -29,7 +29,7 @@ def build(game):
         if key != "Title":
             flags.append("-D" + key + "=" + value)
 
-    flags += ["-g", "-Os", "-fPIE", "-std=c++20", "-n", "-fno-rtti", "-fno-exceptions", "-ffunction-sections", "-fdata-sections", "-Wl,--gc-sections", "-Wno-address-of-packed-member"]
+    flags += ["-g", "-Os", "-fPIE", "-std=c++20", '-Wall', '-Werror', "-n", "-fno-rtti", "-fno-exceptions", "-ffunction-sections", "-fdata-sections", "-Wl,--gc-sections", "-Wno-address-of-packed-member"]
     flags += extra_build_flags
 
     out_path = os.path.join("build", game["Title"])

diff --git a/payload/wwfcError.cpp b/payload/wwfcError.cpp
@@ -89,12 +89,12 @@ char* HandleWWFCErrorMessage(char* strstrResult, const char* command)
     }
 
     // TODO: Convert UTF-8 to UTF-16 properly
-    int i = 0;
-    for (; value[i] != '\0' && i < (sizeof(s_wwfcErrorMsg) / sizeof(u16)) - 1;
-         i++) {
-        s_wwfcErrorMsg[i] = value[i];
+    size_t n = 0;
+    for (; value[n] != '\0' && n < (sizeof(s_wwfcErrorMsg) / sizeof(u16)) - 1;
+         n++) {
+        s_wwfcErrorMsg[n] = value[n];
     }
-    s_wwfcErrorMsg[i] = '\0';
+    s_wwfcErrorMsg[n] = '\0';
 
     s_wwfcErrorCode = error;
 

diff --git a/payload/wwfcLogin.cpp b/payload/wwfcLogin.cpp
@@ -141,17 +141,17 @@ static u64 DecodeUintString(const char* str, u32 bitCount)
 {
     u64 value = 0;
 
-    for (int i = 0; i < (bitCount >> 2); i++) {
+    for (u32 n = 0; n < (bitCount >> 2); n++) {
         u8 nybble = 0;
-        if (str[i] >= '0' && str[i] <= '9') {
-            nybble = str[i] - '0';
-        } else if (str[i] >= 'a' && str[i] <= 'f') {
-            nybble = (str[i] - 'a') + 0xA;
+        if (str[n] >= '0' && str[n] <= '9') {
+            nybble = str[n] - '0';
+        } else if (str[n] >= 'a' && str[n] <= 'f') {
+            nybble = (str[n] - 'a') + 0xA;
         } else {
             return 0;
         }
 
-        value |= u64(nybble) << ((bitCount - 4) - i * 4);
+        value |= u64(nybble) << ((bitCount - 4) - n * 4);
     }
 
     return value;