Reducing usage of #if CLIENT / #elif SERVER

The server will implement some classes it probably shouldn't need because certain items or game states depend on them.
2017-06-14 17:30:40 -03:00
parent 389a9512d9
commit 7bc535780c
471 changed files with 3985 additions and 3159 deletions
@@ -0,0 +1,135 @@
+using System;
+using Microsoft.Xna.Framework;
+
+namespace Barotrauma
+{
+    partial class GameScreen : Screen
+    {
+        private Camera cam;
+
+        private Color waterColor = new Color(0.75f, 0.8f, 0.9f, 1.0f);
+
+        public override Camera Cam
+        {
+            get { return cam; }
+        }
+        
+        public override void Select()
+        {
+            base.Select();
+
+            if (Character.Controlled!=null)
+            {
+                cam.Position = Character.Controlled.WorldPosition;
+                cam.UpdateTransform();
+            }
+            else if (Submarine.MainSub != null)
+            {
+                cam.Position = Submarine.MainSub.WorldPosition;
+                cam.UpdateTransform();
+            }
+
+            foreach (MapEntity entity in MapEntity.mapEntityList)
+                entity.IsHighlighted = false;
+        }
+
+        public override void Deselect()
+        {
+            base.Deselect();
+
+#if CLIENT
+            Sounds.SoundManager.LowPassHFGain = 1.0f;
+#endif
+        }
+
+        /// <summary>
+        /// Allows the game to run logic such as updating the world,
+        /// checking for collisions, gathering input, and playing audio.
+        /// </summary>
+        public override void Update(double deltaTime)
+        {
+
+#if DEBUG
+            if (GameMain.GameSession != null && GameMain.GameSession.Level != null && GameMain.GameSession.Submarine != null &&
+                !DebugConsole.IsOpen)
+            {
+                var closestSub = Submarine.FindClosest(cam.WorldViewCenter);
+                if (closestSub == null) closestSub = GameMain.GameSession.Submarine;
+
+                Vector2 targetMovement = Vector2.Zero;
+                if (PlayerInput.KeyDown(Keys.I)) targetMovement.Y += 1.0f;
+                if (PlayerInput.KeyDown(Keys.K)) targetMovement.Y -= 1.0f;
+                if (PlayerInput.KeyDown(Keys.J)) targetMovement.X -= 1.0f;
+                if (PlayerInput.KeyDown(Keys.L)) targetMovement.X += 1.0f;
+
+                if (targetMovement != Vector2.Zero)
+                    closestSub.ApplyForce(targetMovement * closestSub.SubBody.Body.Mass * 100.0f);
+            }
+#endif
+
+            foreach (MapEntity e in MapEntity.mapEntityList)
+            {
+                e.IsHighlighted = false;
+            }
+
+            if (GameMain.GameSession != null) GameMain.GameSession.Update((float)deltaTime);
+
+#if CLIENT
+            BackgroundCreatureManager.Update(cam, (float)deltaTime);
+
+            GameMain.ParticleManager.Update((float)deltaTime);
+            
+            GameMain.LightManager.Update((float)deltaTime);
+#endif
+
+            if (Level.Loaded != null) Level.Loaded.Update((float)deltaTime);
+
+            if (Character.Controlled != null && Character.Controlled.SelectedConstruction != null)
+            {
+                if (Character.Controlled.SelectedConstruction == Character.Controlled.ClosestItem)
+                {
+                    Character.Controlled.SelectedConstruction.UpdateHUD(cam, Character.Controlled);
+                }
+            }
+            Character.UpdateAll(cam, (float)deltaTime);
+
+            StatusEffect.UpdateAll((float)deltaTime);
+
+            if (Character.Controlled != null && Lights.LightManager.ViewTarget != null)
+            {
+                cam.TargetPos = Lights.LightManager.ViewTarget.WorldPosition;
+            }
+
+            cam.MoveCamera((float)deltaTime);
+                
+            foreach (Submarine sub in Submarine.Loaded)
+            {
+                sub.SetPrevTransform(sub.Position);
+            }
+
+            foreach (PhysicsBody pb in PhysicsBody.list)
+            {
+                pb.SetPrevTransform(pb.SimPosition, pb.Rotation);
+            }
+
+            MapEntity.UpdateAll(cam, (float)deltaTime);
+
+            Character.UpdateAnimAll((float)deltaTime);
+
+            Ragdoll.UpdateAll(cam, (float)deltaTime);
+
+            foreach (Submarine sub in Submarine.Loaded)
+            {
+                sub.Update((float)deltaTime);
+            }
+                
+            GameMain.World.Step((float)deltaTime);
+
+            if (!PlayerInput.LeftButtonHeld())
+            {
+                Inventory.draggingSlot = null;
+                Inventory.draggingItem = null;
+            }
+        }
+    }
+}