From 41289c098a9b30f6d66d72343b521601bc4a160d Mon Sep 17 00:00:00 2001 From: Regalis Date: Tue, 4 Oct 2016 18:28:56 +0300 Subject: [PATCH] Moved some UI element updates from draw to update --- Subsurface/Source/GUI/GUI.cs | 4 ++-- Subsurface/Source/GameSession/GameSession.cs | 8 ++------ Subsurface/Source/Networking/GameServer.cs | 3 ++- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Subsurface/Source/GUI/GUI.cs b/Subsurface/Source/GUI/GUI.cs index 2fb987745..ee9d1bccb 100644 --- a/Subsurface/Source/GUI/GUI.cs +++ b/Subsurface/Source/GUI/GUI.cs @@ -472,12 +472,12 @@ namespace Barotrauma { if (pauseMenuOpen) { - pauseMenu.Update(0.016f); + pauseMenu.Update(deltaTime); } if (settingsMenuOpen) { - GameMain.Config.SettingsFrame.Update(0.016f); + GameMain.Config.SettingsFrame.Update(deltaTime); } if (GUIMessageBox.MessageBoxes.Count > 0) diff --git a/Subsurface/Source/GameSession/GameSession.cs b/Subsurface/Source/GameSession/GameSession.cs index d026098aa..cc5fb63ea 100644 --- a/Subsurface/Source/GameSession/GameSession.cs +++ b/Subsurface/Source/GameSession/GameSession.cs @@ -317,19 +317,15 @@ namespace Barotrauma if (gameMode != null) gameMode.Update(deltaTime); if (Mission != null) Mission.Update(deltaTime); + if (infoFrame != null) infoFrame.Update(deltaTime); } public void Draw(SpriteBatch spriteBatch) { - //guiRoot.Draw(spriteBatch); infoButton.Draw(spriteBatch); if (gameMode != null) gameMode.Draw(spriteBatch); - if (infoFrame != null) - { - infoFrame.Update(0.016f); - infoFrame.Draw(spriteBatch); - } + if (infoFrame != null) infoFrame.Draw(spriteBatch); } public void Save(string filePath) diff --git a/Subsurface/Source/Networking/GameServer.cs b/Subsurface/Source/Networking/GameServer.cs index d8f64515c..80cd77a4d 100644 --- a/Subsurface/Source/Networking/GameServer.cs +++ b/Subsurface/Source/Networking/GameServer.cs @@ -284,6 +284,8 @@ namespace Barotrauma.Networking { if (ShowNetStats) netStats.Update(deltaTime); if (settingsFrame != null) settingsFrame.Update(deltaTime); + if (log.LogFrame != null) log.LogFrame.Update(deltaTime); + if (!started) return; @@ -1316,7 +1318,6 @@ namespace Barotrauma.Networking } else if (log.LogFrame!=null) { - log.LogFrame.Update(0.016f); log.LogFrame.Draw(spriteBatch); }