vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed EndRound music looping forever. Closes #334

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-04-18 11:02:58 +03:00
parent 9a8f13140e
commit edf5bacc89
5 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/GameSession/GameModes/SinglePlayerCampaign.cs
+3 -8
View File
@@ -272,6 +272,7 @@ namespace Barotrauma
var cinematic = new TransitionCinematic(leavingSubs, GameMain.GameScreen.Cam, 5.0f);
SoundPlayer.OverrideMusicType = CrewManager.GetCharacters().Any(c => !c.IsDead) ? "endround" : "crewdead";
SoundPlayer.OverrideMusicDuration = 18.0f;
CoroutineManager.StartCoroutine(EndCinematic(cinematic), "EndCinematic");
@@ -282,18 +283,12 @@ namespace Barotrauma
{
while (cinematic.Running)
{
if (Submarine.MainSub == null) yield return CoroutineStatus.Success;
if (Submarine.MainSub == null) yield return CoroutineStatus.Success;
yield return CoroutineStatus.Running;
}
if (Submarine.MainSub == null) yield return CoroutineStatus.Success;
End("");
yield return new WaitForSeconds(18.0f);
SoundPlayer.OverrideMusicType = null;
if (Submarine.MainSub != null) End("");
yield return CoroutineStatus.Success;
}