Clang-format changes exist. Committing.

Z3DR · Feb 25, 2024 · ec5b5c9 · ec5b5c9
1 parent 8182417
commit ec5b5c9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/code/source/rnd/chest.cpp b/code/source/rnd/chest.cpp
@@ -26,10 +26,14 @@ namespace rnd {
   }
   u8 Chest_IsOverrideEnabled(game::actors::En_Box* actor, u16 chestType) {
     s16 gid = (actor->dyna.params << 0x14) >> 0x19;
-    if (gid == 0x3C && gSettingsContext.chestSize == 0) return false;
-    if (gid == 0x3C && gSettingsContext.chestSize == 1 && chestType == (u16)game::actors::EnBoxType::ENBOX_TYPE_SMALL) return true;
-    else if (chestType == (u16)game::actors::EnBoxType::ENBOX_TYPE_SMALL) return true;
-    else return false;
+    if (gid == 0x3C && gSettingsContext.chestSize == 0)
+      return false;
+    if (gid == 0x3C && gSettingsContext.chestSize == 1 && chestType == (u16)game::actors::EnBoxType::ENBOX_TYPE_SMALL)
+      return true;
+    else if (chestType == (u16)game::actors::EnBoxType::ENBOX_TYPE_SMALL)
+      return true;
+    else
+      return false;
   }
   }
 

diff --git a/code/source/rnd/custom_messages.cpp b/code/source/rnd/custom_messages.cpp
@@ -379,12 +379,12 @@ volatile const UnformattedMessage rCustomMessages[512] = {0};
 volatile const u32 numCustomMessageEntries = {0};
 
 bool SetCustomMessage(u16 id, game::MessageResEntry* msgResEntry) {
-// #if defined ENABLE_DEBUG || defined DEBUG_PRINT
-//   static u16 lastId;
-//   if (id && id != lastId)
-//     rnd::util::Print("Message ID is %#06x\n", id);
-//   lastId = id;
-// #endif
+  // #if defined ENABLE_DEBUG || defined DEBUG_PRINT
+  //   static u16 lastId;
+  //   if (id && id != lastId)
+  //     rnd::util::Print("Message ID is %#06x\n", id);
+  //   lastId = id;
+  // #endif
 
   UnformattedMessage customMsgData;
   s32 start = 0, end = numCustomMessageEntries - 1, current;