vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into animcontroller-overhaul

Browse Source
This commit is contained in:
Regalis
2016-10-19 21:15:44 +03:00
parent e2d0e7fe24 8cb9450217
commit 92b61ee816
9 changed files with 116 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Characters/Animation/Ragdoll.cs
+2
View File
@@ -1053,6 +1053,8 @@ namespace Barotrauma
private void UpdateNetPlayerPosition(float deltaTime)
{
if (GameMain.NetworkMember == null) return;
if (character == GameMain.NetworkMember.Character)
{
if (character.MemPos.Count < 2) return;
Subsurface/Source/Characters/CharacterHUD.cs
+21 -7
View File
@@ -18,7 +18,7 @@ namespace Barotrauma
private static GUIProgressBar drowningBar, healthBar;
private static float damageOverlayTimer;
public static float damageOverlayTimer { get; private set; }
public static void Reset()
{
@@ -49,9 +49,24 @@ namespace Barotrauma
if (!character.IsUnconscious && character.Stun <= 0.0f)
{
if (character.Inventory != null && !character.LockHands && character.Stun >= -0.1f)
if (character.Inventory != null)
{
character.Inventory.Update(deltaTime);
if (!character.LockHands && character.Stun >= -0.1f)
{
character.Inventory.Update(deltaTime);
}
for (int i = 0; i < character.Inventory.Items.Length - 1; i++)
{
var item = character.Inventory.Items[i];
if (item == null || CharacterInventory.limbSlots[i] == InvSlotType.Any) continue;
foreach (ItemComponent ic in item.components)
{
if (ic.DrawHudWhenEquipped) ic.UpdateHUD(character);
}
}
}
if (character.SelectedCharacter != null && character.SelectedCharacter.Inventory != null)
@@ -80,12 +95,11 @@ namespace Barotrauma
if (character.Inventory != null)
{
for (int i = 0; i< character.Inventory.Items.Length-1; i++)
for (int i = 0; i < character.Inventory.Items.Length - 1; i++)
{
var item = character.Inventory.Items[i];
if (item == null || CharacterInventory.limbSlots[i]==InvSlotType.Any) continue;
//var statusHUD = item.GetComponent<StatusHUD>();
//if (statusHUD == null) continue;
if (item == null || CharacterInventory.limbSlots[i] == InvSlotType.Any) continue;
foreach (ItemComponent ic in item.components)
{
if (ic.DrawHudWhenEquipped) ic.DrawHUD(spriteBatch, character);