Some cleanup

This commit is contained in:
juanjp600
2017-06-23 17:48:49 -03:00
parent d6d8a5b868
commit b7a0bff294
37 changed files with 43 additions and 212 deletions
@@ -1442,6 +1442,8 @@ namespace Barotrauma
if (!IsDead) LockHands = false;
}
partial void UpdateControlled(float deltaTime);
private void UpdateOxygen(float deltaTime)
{
float prevOxygen = oxygen;
@@ -1617,6 +1619,8 @@ namespace Barotrauma
joint.LimitEnabled = false;
}
}
partial void ImplodeFX();
public void Kill(CauseOfDeath causeOfDeath, bool isNetworkMessage = false)
{
+1
View File
@@ -66,5 +66,6 @@ namespace Barotrauma
}
}
partial void InitProjSpecific(XDocument doc);
}
}
@@ -32,6 +32,8 @@ namespace Barotrauma
InitProjSpecific();
}
partial void InitProjSpecific();
private bool UseItemOnSelf(int slotIndex)
{
if (Items[slotIndex] == null) return false;
@@ -106,6 +106,8 @@ namespace Barotrauma.Items.Components
InitProjSpecific();
}
partial void InitProjSpecific();
public override bool Select(Character character)
{
CheckFabricableItems(character);
@@ -70,6 +70,8 @@ namespace Barotrauma.Items.Components
InitProjSpecific();
}
partial void InitProjSpecific();
public override void Move(Vector2 amount)
{
base.Move(amount);
@@ -166,6 +166,8 @@ namespace Barotrauma.Items.Components
InitProjSpecific();
}
partial void InitProjSpecific();
public override void Update(float deltaTime, Camera cam)
{
if (GameMain.Server != null && nextServerLogWriteTime != null)
@@ -104,7 +104,9 @@ namespace Barotrauma.Items.Components
InitProjSpecific();
}
partial void InitProjSpecific();
public override void Update(float deltaTime, Camera cam)
{
if (unsentChanges)
@@ -95,6 +95,8 @@ namespace Barotrauma.Items.Components
InitProjSpecific();
}
partial void InitProjSpecific();
public override bool Pick(Character picker)
{
if (picker == null) return false;
+2
View File
@@ -80,6 +80,8 @@ namespace Barotrauma
}
partial void ExplodeProjSpecific(Vector2 worldPosition, Hull hull);
private Vector2 ClampParticlePos(Vector2 particlePos, Hull hull)
{
if (hull == null) return particlePos;
@@ -169,6 +169,8 @@ namespace Barotrauma
if (size.X < 1.0f) Remove();
}
partial void UpdateProjSpecific(float growModifier);
private void OnChangeHull(Vector2 pos, Hull particleHull)
{
if (particleHull == hull || particleHull==null) return;
@@ -535,5 +535,6 @@ namespace Barotrauma
DisposeProjSpecific();
}
partial void DisposeProjSpecific();
}
}
+5
View File
@@ -60,6 +60,9 @@ namespace Barotrauma
return FilePath + ": " + sourceRect;
}
partial void LoadTexture(ref Vector4 sourceVector, ref bool shouldReturn);
partial void CalculateSourceRect();
public Sprite(XElement element, string path = "", string file = "")
{
if (file == "")
@@ -157,6 +160,8 @@ namespace Barotrauma
DisposeTexture();
}
partial void DisposeTexture();
}
}