diff --git a/Subsurface/Source/GameSession/ShiftSummary.cs b/Subsurface/Source/GameSession/ShiftSummary.cs index dc01341f9..330044795 100644 --- a/Subsurface/Source/GameSession/ShiftSummary.cs +++ b/Subsurface/Source/GameSession/ShiftSummary.cs @@ -35,8 +35,8 @@ namespace Barotrauma { this.gameSession = gameSession; - startLocation = gameSession.Map==null ? null : gameSession.Map.CurrentLocation; - endLocation = gameSession.Map==null ? null : gameSession.Map.SelectedLocation; + startLocation = gameSession.Map==null ? null : gameSession.Map.CurrentLocation; + endLocation = gameSession.Map==null ? null : gameSession.Map.SelectedLocation; selectedMission = gameSession.Mission; } @@ -122,15 +122,15 @@ namespace Barotrauma new GUITextBlock(new Rectangle(0, y, 0, 20), "Mission: " + GameMain.GameSession.Mission.Name, GUI.Style, innerFrame, GUI.LargeFont); y += 30; - new GUITextBlock(new Rectangle(0, y, 0, 30), - (GameMain.GameSession.Mission.Completed) ? GameMain.GameSession.Mission.SuccessMessage : GameMain.GameSession.Mission.FailureMessage, - GUI.Style, innerFrame); - y += 40; + new GUITextBlock(new Rectangle(0, y, innerFrame.Rect.Width - 170, 0), + (GameMain.GameSession.Mission.Completed) ? GameMain.GameSession.Mission.SuccessMessage : GameMain.GameSession.Mission.FailureMessage+" asdf asdf rthdrthfgdh dsrt dfgh dftsret dfth dftdthdft sdre sdr ds askjinflaje wwwwwwwwww wwwwwwww wwwwwwwwwwwwwww wwwwwwwwwww", + GUI.Style, innerFrame, true); + //y += 50; if (GameMain.GameSession.Mission.Completed && singleplayer) { - new GUITextBlock(new Rectangle(0, y, 0, 30), "Reward: " + GameMain.GameSession.Mission.Reward, GUI.Style, innerFrame); - y += 30; + new GUITextBlock(new Rectangle(0, 0, 0, 30), "Reward: " + GameMain.GameSession.Mission.Reward, GUI.Style, Alignment.BottomLeft, Alignment.BottomLeft, innerFrame); + //y += 30; } } diff --git a/Subsurface/Source/Screens/NetLobbyScreen.cs b/Subsurface/Source/Screens/NetLobbyScreen.cs index 0dd49e7cc..a89c08ce6 100644 --- a/Subsurface/Source/Screens/NetLobbyScreen.cs +++ b/Subsurface/Source/Screens/NetLobbyScreen.cs @@ -299,8 +299,6 @@ namespace Barotrauma { GameMain.LightManager.LosEnabled = false; - GUI.ScreenOverlayColor = Color.Transparent; - textBox.Select(); Character.Controlled = null; @@ -429,15 +427,15 @@ namespace Barotrauma GameMain.GraphicsWidth<1000 ? GUI.SmallFont : GUI.Font); jobText.UserData = job; - GUIButton infoButton = new GUIButton(new Rectangle(0, 0, 15, 15), "?", GUI.Style, jobText); + GUIButton infoButton = new GUIButton(new Rectangle(0, 2, 15, 15), "?", GUI.Style, jobText); infoButton.UserData = -1; infoButton.OnClicked += ViewJobInfo; - GUIButton upButton = new GUIButton(new Rectangle(30, 0, 15, 15), "^", GUI.Style, jobText); + GUIButton upButton = new GUIButton(new Rectangle(30, 2, 15, 15), "^", GUI.Style, jobText); upButton.UserData = -1; upButton.OnClicked += ChangeJobPreference; - GUIButton downButton = new GUIButton(new Rectangle(50, 0, 15, 15), "˅", GUI.Style, jobText); + GUIButton downButton = new GUIButton(new Rectangle(50, 2, 15, 15), "˅", GUI.Style, jobText); downButton.UserData = 1; downButton.OnClicked += ChangeJobPreference; }