From 3f13112b69c17a8d3e647344b55a01f6d281b72e Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Wed, 20 Mar 2019 22:52:25 +0200 Subject: [PATCH] 814f6c9...58005a8 commit 58005a84e36a4658cb9a5dba2de3041d8e3511b1 Author: Joonas Rikkonen Date: Wed Mar 20 22:50:54 2019 +0200 Fixed incorrect submarine & level seed in server logs when playing campaign mode. commit 39119f862e7e69608cf418d06c74c784330461d2 Author: Joonas Rikkonen Date: Wed Mar 20 22:50:19 2019 +0200 Fixed campaign view button overlapping with the "ready to start" tickbox in NetLobbyScreen. Closes #1315 --- .../Source/Screens/NetLobbyScreen.cs | 14 +++++++------- .../Source/Networking/GameServer.cs | 12 +++++++----- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs b/Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs index 8f04f4235..5651d6695 100644 --- a/Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs +++ b/Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs @@ -632,6 +632,13 @@ namespace Barotrauma Visible = false }; + campaignViewButton = new GUIButton(new RectTransform(new Vector2(1.0f, 0.1f), rightInfoColumn.RectTransform), + TextManager.Get("CampaignView"), style: "GUIButtonLarge") + { + OnClicked = (btn, obj) => { ToggleCampaignView(true); return true; }, + Visible = false + }; + StartButton = new GUIButton(new RectTransform(new Vector2(0.3f, 0.1f), infoFrameContent.RectTransform, Anchor.BottomRight), TextManager.Get("StartGameButton"), style: "GUIButtonLarge") { @@ -644,13 +651,6 @@ namespace Barotrauma }; clientHiddenElements.Add(StartButton); - campaignViewButton = new GUIButton(new RectTransform(new Vector2(0.3f, 0.1f), infoFrameContent.RectTransform, Anchor.BottomRight) { RelativeOffset = new Vector2(0.0f, 0.06f) }, - TextManager.Get("CampaignView"), style: "GUIButtonLarge") - { - OnClicked = (btn, obj) => { ToggleCampaignView(true); return true; }, - Visible = false - }; - spectateButton = new GUIButton(new RectTransform(new Vector2(0.3f, 0.1f), infoFrameContent.RectTransform, Anchor.BottomRight), TextManager.Get("SpectateButton"), style: "GUIButtonLarge"); } diff --git a/Barotrauma/BarotraumaServer/Source/Networking/GameServer.cs b/Barotrauma/BarotraumaServer/Source/Networking/GameServer.cs index 4b4c86b02..8e1165135 100644 --- a/Barotrauma/BarotraumaServer/Source/Networking/GameServer.cs +++ b/Barotrauma/BarotraumaServer/Source/Networking/GameServer.cs @@ -1657,15 +1657,17 @@ namespace Barotrauma.Networking mirrorLevel: campaign.Map.CurrentLocation != campaign.Map.SelectedConnection.Locations[0]); campaign.AssignClientCharacterInfos(connectedClients); + Log("Game mode: " + selectedMode.Name, ServerLog.MessageType.ServerMessage); + Log("Submarine: " + GameMain.GameSession.Submarine.Name, ServerLog.MessageType.ServerMessage); + Log("Level seed: " + campaign.Map.SelectedConnection.Level.Seed, ServerLog.MessageType.ServerMessage); } else { GameMain.GameSession.StartRound(GameMain.NetLobbyScreen.LevelSeed, serverSettings.SelectedLevelDifficulty, teamCount > 1); - } - - Log("Submarine: " + selectedSub.Name, ServerLog.MessageType.ServerMessage); - Log("Game mode: " + selectedMode.Name, ServerLog.MessageType.ServerMessage); - Log("Level seed: " + GameMain.NetLobbyScreen.LevelSeed, ServerLog.MessageType.ServerMessage); + Log("Game mode: " + selectedMode.Name, ServerLog.MessageType.ServerMessage); + Log("Submarine: " + selectedSub.Name, ServerLog.MessageType.ServerMessage); + Log("Level seed: " + GameMain.NetLobbyScreen.LevelSeed, ServerLog.MessageType.ServerMessage); + } bool missionAllowRespawn = campaign == null && (!(GameMain.GameSession.GameMode is MissionMode) ||