Merge branch 'master' into moRags

2017-12-17 22:58:16 +03:00
parent 1e5b25bd1a 6127bb473d
commit 9e307d8302
3 changed files with 49 additions and 70 deletions
@@ -1400,6 +1400,8 @@ namespace Barotrauma

        public virtual void Update(float deltaTime, Camera cam)
        {
+            UpdateProjSpecific(deltaTime, cam);
+
            if (GameMain.Client != null && this == Controlled && !isSynced) return;

            if (!Enabled) return;
@@ -1544,6 +1546,8 @@ namespace Barotrauma

        partial void UpdateControlled(float deltaTime, Camera cam);

+        partial void UpdateProjSpecific(float deltaTime, Camera cam);
+
        private void UpdateOxygen(float deltaTime)
        {
            float prevOxygen = oxygen;