Merge branch 'dedicated-server' of https://github.com/Regalis11/Barotrauma into dedicated-server

2017-06-19 15:13:15 -03:00
parent fbe7dfc6fb 6f75a928ea
commit 384819c528
1 changed files with 5 additions and 3 deletions
--- a/BarotraumaShared/Source/Screens/GameScreen.cs
+++ b/BarotraumaShared/Source/Screens/GameScreen.cs
@@ -1,5 +1,7 @@
-using System;
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
+#if CLIENT
+using Microsoft.Xna.Framework.Input;
+#endif

 namespace Barotrauma
 {
@@ -47,7 +49,7 @@ namespace Barotrauma
        public override void Update(double deltaTime)
        {

-#if DEBUG
+#if DEBUG && CLIENT
            if (GameMain.GameSession != null && GameMain.GameSession.Level != null && GameMain.GameSession.Submarine != null &&
                !DebugConsole.IsOpen)
            {