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

Updating HUDs of equipped items (= handheld sonars work again)

Browse Source
This commit is contained in:
Regalis
2016-10-19 16:37:44 +03:00
parent fbf4b4fcad
commit 813ebc79f4
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Characters/CharacterHUD.cs
+20 -6
View File
@@ -49,9 +49,24 @@ namespace Barotrauma
if (!character.IsUnconscious && character.Stun <= 0.0f) 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) if (character.SelectedCharacter != null && character.SelectedCharacter.Inventory != null)
@@ -80,12 +95,11 @@ namespace Barotrauma
if (character.Inventory != null) 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]; var item = character.Inventory.Items[i];
if (item == null || CharacterInventory.limbSlots[i]==InvSlotType.Any) continue; if (item == null || CharacterInventory.limbSlots[i] == InvSlotType.Any) continue;
//var statusHUD = item.GetComponent<StatusHUD>();
//if (statusHUD == null) continue;
foreach (ItemComponent ic in item.components) foreach (ItemComponent ic in item.components)
{ {
if (ic.DrawHudWhenEquipped) ic.DrawHUD(spriteBatch, character); if (ic.DrawHudWhenEquipped) ic.DrawHUD(spriteBatch, character);