Unstable v0.1100.0.4 (November 11th 2020)

2020-11-06 20:12:15 +02:00
parent 6b36bf809d
commit b772654326
297 changed files with 12502 additions and 4277 deletions
@@ -368,6 +368,9 @@ namespace Barotrauma
            SoundPlayer.OverrideMusicDuration = 18.0f;
            crewDead = false;

+            LevelData lvlData = GameMain.GameSession.LevelData;
+            bool beaconActive = GameMain.GameSession.Level.CheckBeaconActive();
+
            GameMain.GameSession.EndRound("", traitorResults, transitionType);
            var continueButton = GameMain.GameSession.RoundSummary?.ContinueButton;
            RoundSummary roundSummary = null;
@@ -452,6 +455,8 @@ namespace Barotrauma
                    }
                }

+                lvlData.IsBeaconActive = beaconActive;
+
                SaveUtil.SaveGame(GameMain.GameSession.SavePath);
            }
            else
@@ -712,7 +717,7 @@ namespace Barotrauma
                }
            }

-            XElement petsElement = new XElement("pets");
+            petsElement = new XElement("pets");
            PetBehavior.SavePets(petsElement);
            modeElement.Add(petsElement);