Mission Randomizer: Fix Prologue softlock at end

* It ends with the current player model set to 0x91 (invalid and such) despite the player actually being Franklin. Added an additional check for this situation.
Parik27 · May 26, 2021 · d913394 · d913394
1 parent f04ddf1
commit d913394
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 2 deletions.
diff --git a/src/mission/missions_Data.hh b/src/mission/missions_Data.hh
@@ -91,6 +91,9 @@ public:
 
     MissionRandomizer_Data (FILE *file)
     {
+        if (!file)
+            return;
+
         char line[1024] = {0};
         while (fgets (line, 1024, file))
             {

diff --git a/src/mission/missions_PlayerSwitch.hh b/src/mission/missions_PlayerSwitch.hh
@@ -56,6 +56,37 @@ private:
 
     Context m_Context;
 
+    /*******************************************************/
+    bool
+    CheckCurrentPlayer (ePlayerIndex index)
+    {
+        if (*MissionRandomizer_GlobalsManager::PP_CURRENT_PED == int (index))
+            return true;
+
+        if (*MissionRandomizer_GlobalsManager::PP_CURRENT_PED
+            == int (eCharacter::_))
+            {
+                uint32_t hash = 0;
+                switch (index)
+                    {
+                    case ePlayerIndex::PLAYER_MICHAEL:
+                        hash = "player_zero"_joaat;
+                        break;
+                    case ePlayerIndex::PLAYER_FRANKLIN:
+                        hash = "player_one"_joaat;
+                        break;
+                    case ePlayerIndex::PLAYER_TREVOR:
+                        hash = "player_two"_joaat;
+                        break;
+                    default: return false;
+                    }
+
+                return "IS_PED_MODEL"_n("PLAYER_PED_ID"_n(), hash);
+            }
+
+        return false;
+    }
+
     /*******************************************************/
     bool
     SetCurrentPlayer (ePlayerIndex index)
@@ -69,8 +100,7 @@ private:
         if (!YscFunctions::SetCurrentPlayer (index, 1))
             return true;
 
-        bool success
-            = *MissionRandomizer_GlobalsManager::PP_CURRENT_PED == int (index);
+        bool success = CheckCurrentPlayer (index);
 
         if (!success)
             {