Merge pull request #69 from MikeIsAStar/add-method-to-check-custom-re…

…gion-usage [MKW] Add a method to check custom region usage
WiiLink24 · Jun 24, 2024 · e10c127 · e10c127
2 parents c32e4f8 + 3bb4469
commit e10c127
Showing 1 changed file with 19 additions and 15 deletions.
diff --git a/payload/import/mkw/net/net.hpp b/payload/import/mkw/net/net.hpp
@@ -122,6 +122,24 @@ class NetController
         return m_joinType == JoinType::RoomHost;
     }
 
+    bool usingCustomRegion() const
+    {
+        using namespace mkw::HostSystem;
+
+        // Allow clients to modify their region without having to change
+        // their matching area.
+        extern SystemManager::MatchingArea customMatchingArea AT(0x80005EFC);
+        if (customMatchingArea < SystemManager::MatchingArea::Japan ||
+            customMatchingArea > SystemManager::MatchingArea::China) {
+            return true;
+        }
+
+        SystemManager::MatchingArea matchingArea =
+            SystemManager::Instance()->matchingArea();
+        return matchingArea < SystemManager::MatchingArea::Japan ||
+               matchingArea > SystemManager::MatchingArea::China;
+    }
+
     bool inVanillaMatch() const
     {
         switch (m_joinType) {
@@ -135,21 +153,7 @@ class NetController
         case JoinType::ContinentalBattle:
         case JoinType::FriendContinentalVersusRace:
         case JoinType::FriendContinentalBattle: {
-            using namespace mkw::HostSystem;
-
-            // Allow clients to modify their region without having to change
-            // their matching area.
-            extern SystemManager::MatchingArea customMatchingArea AT(0x80005EFC
-            );
-            if (customMatchingArea < SystemManager::MatchingArea::Japan ||
-                customMatchingArea > SystemManager::MatchingArea::China) {
-                return false;
-            }
-
-            SystemManager::MatchingArea matchingArea =
-                SystemManager::Instance()->matchingArea();
-            return matchingArea >= SystemManager::MatchingArea::Japan &&
-                   matchingArea <= SystemManager::MatchingArea::China;
+            return !usingCustomRegion();
         }
         case JoinType::RoomHost:
         case JoinType::RoomGuest: {