[Sonic Frontiers] Character Swapper: disable in Cyber Space, fix char…

…acter detection on load
hedge-dev · Oct 13, 2024 · ebd49f5 · ebd49f5
1 parent 7df3e73
commit ebd49f5
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/Source/Sonic Frontiers/Gameplay/Open Zone/Character Swapper.hmm b/Source/Sonic Frontiers/Gameplay/Open Zone/Character Swapper.hmm
@@ -19,6 +19,8 @@ Notes;
 - Keep your expectations within reason; don't expect guardians outside of Another Story to work 100% correctly as the other characters, especially event-driven ones like Shark.
 */
 //
+    #include "BlackboardStatus" noemit
+
     #lib "BlackboardItem"
     #lib "MathHelpers"
     #lib "PhotoMode"
@@ -50,9 +52,15 @@ Notes;
     if (!Win32.IsGameForegroundWindow())
         return;
 
+    if (IS_WORLD_FLAG(IsCyberSpace))
+        return;
+
     if (PhotoMode.IsEnabled())
         return;
 
+    if (_currentPlayer != Player.GetPlayerType())
+        _currentPlayer = Player.GetPlayerType();
+
     var pBlackboardItem = BlackboardItem.Get();
 
     if (pBlackboardItem == null)