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

(8311f9380) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-04-08 13:36:00 +03:00
parent d28b04ed3b
commit 9c07ebda53
2 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Barotrauma/BarotraumaClient/Source/Characters/Character.cs
View File

@@ -284,25 +284,22 @@ namespace Barotrauma
Lights.LightManager.ViewTarget = this;
CharacterHUD.Update(deltaTime, this, cam);
bool removeProgressBars = false;
foreach (HUDProgressBar progressBar in hudProgressBars.Values)
if (hudProgressBars.Any())
{
if (progressBar.FadeTimer <= 0.0f)
foreach (var progressBar in hudProgressBars)
{
removeProgressBars = true;
continue;
if (progressBar.Value.FadeTimer <= 0.0f)
{
progressBarRemovals.Add(progressBar);
continue;
}
progressBar.Value.Update(deltaTime);
}
progressBar.Update(deltaTime);
}
if (removeProgressBars)
{
// TODO: this generates garbage, can we fix anything here?
foreach (var pb in hudProgressBars.Where(pb => pb.Value.FadeTimer <= 0.0f).ToList())
if (progressBarRemovals.Any())
{
hudProgressBars.Remove(pb.Key);
progressBarRemovals.ForEach(pb => hudProgressBars.Remove(pb.Key));
progressBarRemovals.Clear();
}
}
}

1
Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveIdle.cs
View File

@@ -198,7 +198,6 @@ namespace Barotrauma
private void FindTargetHulls()
{
var idCard = character.Inventory.FindItemByIdentifier("idcard");
bool isCurrentHullOK = !HumanAIController.UnsafeHulls.Contains(character.CurrentHull) && !IsForbidden(character.CurrentHull);
targetHulls.Clear();