(a2943d8b7) Merge branch 'dev' into human-ai

2019-05-16 05:04:10 +03:00
parent 60f52375e6
commit 039d07f693
76 changed files with 1407 additions and 856 deletions
@@ -635,21 +635,21 @@ namespace Barotrauma
                                    " -ownerkey " + ownerKey.ToString();

                string filename = "DedicatedServer.exe";
-#if LINUX || OSX
+#if LINUX
+                filename = "./DedicatedServer";
+#elif OSX
                filename = "mono";
                arguments = "./DedicatedServer.exe " + arguments;
 #endif
-
                var processInfo = new ProcessStartInfo
                {
                    FileName = filename,
-                    Arguments = arguments,
+                    Arguments = arguments
 #if !DEBUG
                    WindowStyle = ProcessWindowStyle.Hidden
 #endif
                };
                GameMain.ServerChildProcess = Process.Start(processInfo);
-
                Thread.Sleep(1000); //wait until the server is ready before connecting

                GameMain.Client = new GameClient(name, "127.0.0.1:" + port.ToString(),ownerKey);