From 89c92564b59b811355e5382e949f041443efd057 Mon Sep 17 00:00:00 2001 From: juanjp600 Date: Fri, 23 Jun 2017 10:30:45 -0300 Subject: [PATCH] Consistent Update parameter order (deltaTime, cam) instead of (cam, deltaTime) --- .../BackgroundSprite/BackgroundCreatureManager.cs | 2 +- BarotraumaClient/Source/Screens/EditCharacterScreen.cs | 2 +- BarotraumaClient/Source/Screens/EditMapScreen.cs | 2 +- BarotraumaShared/Source/Characters/AICharacter.cs | 4 ++-- .../Source/Characters/Animation/Ragdoll.cs | 6 +++--- BarotraumaShared/Source/Characters/Character.cs | 6 +++--- BarotraumaShared/Source/Items/Item.cs | 3 +-- BarotraumaShared/Source/Map/Gap.cs | 2 +- BarotraumaShared/Source/Map/Hull.cs | 2 +- BarotraumaShared/Source/Map/MapEntity.cs | 10 +++++----- BarotraumaShared/Source/Screens/GameScreen.cs | 8 ++++---- 11 files changed, 23 insertions(+), 24 deletions(-) diff --git a/BarotraumaClient/Source/Characters/BackgroundSprite/BackgroundCreatureManager.cs b/BarotraumaClient/Source/Characters/BackgroundSprite/BackgroundCreatureManager.cs index 3f9b7a8ba..443221132 100644 --- a/BarotraumaClient/Source/Characters/BackgroundSprite/BackgroundCreatureManager.cs +++ b/BarotraumaClient/Source/Characters/BackgroundSprite/BackgroundCreatureManager.cs @@ -103,7 +103,7 @@ namespace Barotrauma activeSprites.Clear(); } - public void Update(Camera cam, float deltaTime) + public void Update(float deltaTime, Camera cam) { if (checkActiveTimer<0.0f) { diff --git a/BarotraumaClient/Source/Screens/EditCharacterScreen.cs b/BarotraumaClient/Source/Screens/EditCharacterScreen.cs index 5c70fbd7b..4ef1ff39f 100644 --- a/BarotraumaClient/Source/Screens/EditCharacterScreen.cs +++ b/BarotraumaClient/Source/Screens/EditCharacterScreen.cs @@ -103,7 +103,7 @@ namespace Barotrauma { Character.UpdateAnimAll((float)deltaTime); - Ragdoll.UpdateAll(cam, (float)deltaTime); + Ragdoll.UpdateAll((float)deltaTime, cam); GameMain.World.Step((float)deltaTime); } diff --git a/BarotraumaClient/Source/Screens/EditMapScreen.cs b/BarotraumaClient/Source/Screens/EditMapScreen.cs index fe7a802e6..9214cb9da 100644 --- a/BarotraumaClient/Source/Screens/EditMapScreen.cs +++ b/BarotraumaClient/Source/Screens/EditMapScreen.cs @@ -1061,7 +1061,7 @@ namespace Barotrauma if (item == null) continue; item.SetTransform(dummyCharacter.SimPosition, 0.0f); - item.Update(cam, (float)deltaTime); + item.Update((float)deltaTime, cam); item.SetTransform(item.body.SimPosition, 0.0f); } diff --git a/BarotraumaShared/Source/Characters/AICharacter.cs b/BarotraumaShared/Source/Characters/AICharacter.cs index d8940593c..a37196b79 100644 --- a/BarotraumaShared/Source/Characters/AICharacter.cs +++ b/BarotraumaShared/Source/Characters/AICharacter.cs @@ -25,9 +25,9 @@ namespace Barotrauma this.aiController = aiController; } - public override void Update(Camera cam, float deltaTime) + public override void Update(float deltaTime, Camera cam) { - base.Update(cam, deltaTime); + base.Update(deltaTime, cam); if (!Enabled || IsRemotePlayer) return; diff --git a/BarotraumaShared/Source/Characters/Animation/Ragdoll.cs b/BarotraumaShared/Source/Characters/Animation/Ragdoll.cs index 1cacc9327..73a508b8d 100644 --- a/BarotraumaShared/Source/Characters/Animation/Ragdoll.cs +++ b/BarotraumaShared/Source/Characters/Animation/Ragdoll.cs @@ -609,11 +609,11 @@ namespace Barotrauma } } - public static void UpdateAll(Camera cam, float deltaTime) + public static void UpdateAll(float deltaTime, Camera cam) { foreach (Ragdoll r in list) { - r.Update(cam, deltaTime); + r.Update(deltaTime, cam); } } @@ -740,7 +740,7 @@ namespace Barotrauma protected bool levitatingCollider = true; - public void Update(Camera cam, float deltaTime) + public void Update(float deltaTime, Camera cam) { if (!character.Enabled || Frozen) return; diff --git a/BarotraumaShared/Source/Characters/Character.cs b/BarotraumaShared/Source/Characters/Character.cs index 9b631143b..ffc375016 100644 --- a/BarotraumaShared/Source/Characters/Character.cs +++ b/BarotraumaShared/Source/Characters/Character.cs @@ -1230,7 +1230,7 @@ namespace Barotrauma } } - public static void UpdateAll(Camera cam, float deltaTime) + public static void UpdateAll(float deltaTime, Camera cam) { if (GameMain.Client == null) { @@ -1258,11 +1258,11 @@ namespace Barotrauma for (int i = 0; i < CharacterList.Count; i++) { - CharacterList[i].Update(cam, deltaTime); + CharacterList[i].Update(deltaTime, cam); } } - public virtual void Update(Camera cam, float deltaTime) + public virtual void Update(float deltaTime, Camera cam) { if (GameMain.Client != null && this == Controlled && !isSynced) return; diff --git a/BarotraumaShared/Source/Items/Item.cs b/BarotraumaShared/Source/Items/Item.cs index 22087a01c..6d96519d1 100644 --- a/BarotraumaShared/Source/Items/Item.cs +++ b/BarotraumaShared/Source/Items/Item.cs @@ -757,9 +757,8 @@ namespace Barotrauma } - public override void Update(Camera cam, float deltaTime) + public override void Update(float deltaTime, Camera cam) { - ApplyStatusEffects(ActionType.Always, deltaTime, null); foreach (ItemComponent ic in components) diff --git a/BarotraumaShared/Source/Map/Gap.cs b/BarotraumaShared/Source/Map/Gap.cs index 792705dc9..5c968136d 100644 --- a/BarotraumaShared/Source/Map/Gap.cs +++ b/BarotraumaShared/Source/Map/Gap.cs @@ -189,7 +189,7 @@ namespace Barotrauma } } - public override void Update(Camera cam, float deltaTime) + public override void Update(float deltaTime, Camera cam) { flowForce = Vector2.Zero; diff --git a/BarotraumaShared/Source/Map/Hull.cs b/BarotraumaShared/Source/Map/Hull.cs index c1e0c31a2..a5856595b 100644 --- a/BarotraumaShared/Source/Map/Hull.cs +++ b/BarotraumaShared/Source/Map/Hull.cs @@ -394,7 +394,7 @@ namespace Barotrauma if (GameMain.Server != null) GameMain.Server.CreateEntityEvent(this); } - public override void Update(Camera cam, float deltaTime) + public override void Update(float deltaTime, Camera cam) { Oxygen -= OxygenDetoriationSpeed * deltaTime; diff --git a/BarotraumaShared/Source/Map/MapEntity.cs b/BarotraumaShared/Source/Map/MapEntity.cs index cd63c52f8..6921d6677 100644 --- a/BarotraumaShared/Source/Map/MapEntity.cs +++ b/BarotraumaShared/Source/Map/MapEntity.cs @@ -294,27 +294,27 @@ namespace Barotrauma /// /// Call Update() on every object in Entity.list /// - public static void UpdateAll(Camera cam, float deltaTime) + public static void UpdateAll(float deltaTime, Camera cam) { foreach (Hull hull in Hull.hullList) { - hull.Update(cam, deltaTime); + hull.Update(deltaTime, cam); } foreach (Gap gap in Gap.GapList) { - gap.Update(cam, deltaTime); + gap.Update(deltaTime, cam); } foreach (Item item in Item.ItemList) { - item.Update(cam, deltaTime); + item.Update(deltaTime, cam); } Spawner?.Update(); } - public virtual void Update(Camera cam, float deltaTime) { } + public virtual void Update(float deltaTime, Camera cam) { } public virtual void FlipX() { diff --git a/BarotraumaShared/Source/Screens/GameScreen.cs b/BarotraumaShared/Source/Screens/GameScreen.cs index 8a03909a5..7d6ced9ca 100644 --- a/BarotraumaShared/Source/Screens/GameScreen.cs +++ b/BarotraumaShared/Source/Screens/GameScreen.cs @@ -81,7 +81,7 @@ namespace Barotrauma #if CLIENT if (GameMain.GameSession != null) GameMain.GameSession.Update((float)deltaTime); - BackgroundCreatureManager.Update(cam, (float)deltaTime); + BackgroundCreatureManager.Update((float)deltaTime, cam); GameMain.ParticleManager.Update((float)deltaTime); @@ -100,7 +100,7 @@ namespace Barotrauma } #endif - Character.UpdateAll(cam, (float)deltaTime); + Character.UpdateAll((float)deltaTime, cam); StatusEffect.UpdateAll((float)deltaTime); @@ -123,11 +123,11 @@ namespace Barotrauma pb.SetPrevTransform(pb.SimPosition, pb.Rotation); } - MapEntity.UpdateAll(cam, (float)deltaTime); + MapEntity.UpdateAll((float)deltaTime, cam); Character.UpdateAnimAll((float)deltaTime); - Ragdoll.UpdateAll(cam, (float)deltaTime); + Ragdoll.UpdateAll((float)deltaTime, cam); foreach (Submarine sub in Submarine.Loaded) {