Round end cinematic, CoroutineManager deltatime

This commit is contained in:
Regalis11
2015-12-26 19:33:23 +02:00
parent b2d5704f7e
commit 064e2eadd0
18 changed files with 138 additions and 38 deletions
+3 -7
View File
@@ -153,6 +153,8 @@ namespace Barotrauma
{
base.Select();
GUI.ScreenOverlayColor = Color.Transparent;
gameMode = GameMain.GameSession.gameMode as SinglePlayerMode;
foreach (GUIComponent component in topPanel.children)
@@ -163,8 +165,6 @@ namespace Barotrauma
button.Enabled = GameMain.GameSession.Map.CurrentLocation.Type.HasHireableCharacters;
break;
}
//hireButton.Enabled = location.Type.HasHireableCharacters;
UpdateCharacterLists();
}
@@ -201,11 +201,7 @@ namespace Barotrauma
c.Salary.ToString(),
null, null,
Alignment.TopRight, GUI.Style, frame);
}
}
else
{
//(topPanel.FindChild(PanelTab.CurrentLocation) as GUIButton).Enabled = false;
}
}
}
+3 -4
View File
@@ -282,8 +282,8 @@ namespace Barotrauma
public override void Select()
{
GameMain.LightManager.LosEnabled = false;
//infoFrame.ClearChildren();
GUI.ScreenOverlayColor = Color.Transparent;
textBox.Select();
@@ -297,8 +297,7 @@ namespace Barotrauma
serverMessage.Enabled = GameMain.Server != null;
autoRestartBox.Enabled = GameMain.Server != null;
ServerName = (GameMain.Server==null) ? "Server" : GameMain.Server.Name;
infoFrame.RemoveChild(infoFrame.children.Find(c => c.UserData as string == "startButton"));
infoFrame.RemoveChild(infoFrame.children.Find(c => c.UserData as string == "settingsButton"));
infoFrame.RemoveChild(infoFrame.children.Find(c => c.UserData as string == "spectateButton"));