Restore "Merge pull request #890 from SnipUndercover/reload-vanillla-portraits-on-map-exit"

This reverts commit 2cc15b9.

Author: maddie480

Celeste.Mod.mm/Patches/Level.cs

@@ -20,6 +20,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
 
@@ -29,12 +30,12 @@ class patch_Level : Level {
         // We're effectively in GameLoader, but still need to "expose" private fields to our mod.
         private float flash;
 
-        private Color flashColor = Color.White;
-
+        private Color flashColor = Color.White;
+
         private bool doFlash;
 
-        private bool flashDrawPlayer;
-
+        private bool flashDrawPlayer;
+
         private static EventInstance PauseSnapshot;
         public static EventInstance _PauseSnapshot => PauseSnapshot;
 
@@ -102,19 +103,19 @@ public static void RegisterLoadOverride(Level level, LoadOverride loadOverride)
         [PatchLevelUpdate] // ... except for manually manipulating the method via MonoModRules
         public extern new void Update();
 
-        /// <summary>
-        /// Flash the screen a solid color. Respects the user's advanced photosensitivity settings.
-        /// </summary>
-        /// <param name="color"></param>
+        /// <summary>
+        /// Flash the screen a solid color. Respects the user's advanced photosensitivity settings.
+        /// </summary>
+        /// <param name="color"></param>
         /// <param name="drawPlayerOver">Whether the player should render over the flash.</param>
         [MonoModReplace] // We copy the entirety of this method instead of doing an IL patch because it's 5 lines of code.
-        public new void Flash(Color color, bool drawPlayerOver = false) {
-            if (CoreModule.Settings.AllowScreenFlash) {
-                doFlash = true;
-                flashDrawPlayer = drawPlayerOver;
-                flash = 1f;
-                flashColor = color;
-            }
+        public new void Flash(Color color, bool drawPlayerOver = false) {
+            if (CoreModule.Settings.AllowScreenFlash) {
+                doFlash = true;
+                flashDrawPlayer = drawPlayerOver;
+                flash = 1f;
+                flashColor = color;
+            }
         }
 
         [MonoModReplace]
@@ -200,19 +201,19 @@ void Unpause() {
             }
 
             Everest.Events.Level.Pause(this, startIndex, minimal, quickReset);
-        }
-
+        }
+
         /// <summary>
         /// Forcefully close the pause menu; resume from paused.
-        /// </summary>
+        /// </summary>
         public void Unpause() {
-            if (Paused) {
-                PauseMainMenuOpen = false;
-                if (Entities.FindFirst<TextMenu>() is patch_TextMenu menu)
-                    menu.CloseAndRun(Everest.SaveSettings(), null);
-                Paused = false;
-                Audio.Play("event:/ui/game/unpause");
-                unpauseTimer = 0.15f;
+            if (Paused) {
+                PauseMainMenuOpen = false;
+                if (Entities.FindFirst<TextMenu>() is patch_TextMenu menu)
+                    menu.CloseAndRun(Everest.SaveSettings(), null);
+                Paused = false;
+                Audio.Play("event:/ui/game/unpause");
+                unpauseTimer = 0.15f;
             }
         }
 
@@ -589,8 +590,13 @@ private static void _GCCollect() {
         public override void End() {
             orig_End();
 
+            // reload the vanilla Portraits.xml in case it was overridden by a map
+            // else, if the Portraits.xml doesn't have portrait_madeline defined,
+            // the game will crash when trying to load a save file (since it shows madeline's portrait)
+            GFX.PortraitsSpriteBank = new SpriteBank(GFX.Portraits, Path.Combine("Graphics", "Portraits.xml"));
+
             // if we are not entering PICO-8 or the Reflection Fall cutscene...
-            if (!(patch_Engine.NextScene is Pico8.Emulator) && !(patch_Engine.NextScene is OverworldReflectionsFall)) {
+            if (patch_Engine.NextScene is not (Pico8.Emulator or OverworldReflectionsFall)) {
                 // break all links between this level and its entities.
                 foreach (Entity entity in Entities) {
                     ((patch_Entity) entity).DissociateFromScene();