From ae07c3174aab8ecc259a64c703dd0797ee9c4822 Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Sun, 7 Apr 2019 21:48:03 +0300 Subject: [PATCH] (05de9c4) Added Linux launch scripts to the project --- Barotrauma/BarotraumaClient/Launch_Barotrauma | 3 +++ Barotrauma/BarotraumaClient/LinuxClient.csproj | 3 +++ .../GameModes/MultiPlayerCampaign.cs | 17 +---------------- .../BarotraumaServer/Launch_BarotraumaServer | 3 +++ Barotrauma/BarotraumaServer/Server.csproj | 6 +++++- 5 files changed, 15 insertions(+), 17 deletions(-) create mode 100644 Barotrauma/BarotraumaClient/Launch_Barotrauma create mode 100644 Barotrauma/BarotraumaServer/Launch_BarotraumaServer diff --git a/Barotrauma/BarotraumaClient/Launch_Barotrauma b/Barotrauma/BarotraumaClient/Launch_Barotrauma new file mode 100644 index 000000000..8792fad24 --- /dev/null +++ b/Barotrauma/BarotraumaClient/Launch_Barotrauma @@ -0,0 +1,3 @@ +#!/bin/sh + +exec mono "./Barotrauma.exe" MONO_LOG_LEVEL=debug "$@" diff --git a/Barotrauma/BarotraumaClient/LinuxClient.csproj b/Barotrauma/BarotraumaClient/LinuxClient.csproj index 9f61fb02c..f0fa4331e 100644 --- a/Barotrauma/BarotraumaClient/LinuxClient.csproj +++ b/Barotrauma/BarotraumaClient/LinuxClient.csproj @@ -164,6 +164,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest diff --git a/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/MultiPlayerCampaign.cs b/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/MultiPlayerCampaign.cs index 595edeff3..aab0cdf65 100644 --- a/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/MultiPlayerCampaign.cs +++ b/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/MultiPlayerCampaign.cs @@ -79,22 +79,7 @@ namespace Barotrauma } }; - if (GameMain.Client != null && interactor == Character.Controlled) - { - var msgBox = new GUIMessageBox("", TextManager.Get("CampaignEnterOutpostPrompt") - .Replace("[locationname]", Submarine.MainSub.AtStartPosition ? Map.CurrentLocation.Name : Map.SelectedLocation.Name), - new string[] { TextManager.Get("Yes"), TextManager.Get("No") }) - { - UserData = "watchmanprompt" - }; - msgBox.Buttons[0].OnClicked = (btn, userdata) => - { - GameMain.Client.RequestRoundEnd(); - return true; - }; - msgBox.Buttons[0].OnClicked += msgBox.Close; - msgBox.Buttons[1].OnClicked += msgBox.Close; - } + return background; } public override void Update(float deltaTime) diff --git a/Barotrauma/BarotraumaServer/Launch_BarotraumaServer b/Barotrauma/BarotraumaServer/Launch_BarotraumaServer new file mode 100644 index 000000000..4c7906d0e --- /dev/null +++ b/Barotrauma/BarotraumaServer/Launch_BarotraumaServer @@ -0,0 +1,3 @@ +#!/bin/sh + +exec mono "./DedicatedServer.exe" "$@" diff --git a/Barotrauma/BarotraumaServer/Server.csproj b/Barotrauma/BarotraumaServer/Server.csproj index 34d9a0dc1..1d344c8fe 100644 --- a/Barotrauma/BarotraumaServer/Server.csproj +++ b/Barotrauma/BarotraumaServer/Server.csproj @@ -213,9 +213,13 @@ - + + + + PreserveNewest +