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

Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

Browse Source
This commit is contained in:
EvilFactory
2023-10-19 12:18:30 -03:00
parent 966236652a 331565f726
commit 9838cc59ee
613 changed files with 22122 additions and 11481 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Screens/GameScreen.cs
+8 -9
View File
@@ -161,26 +161,25 @@ namespace Barotrauma
sw.Stop();
GameMain.PerformanceCounter.AddElapsedTicks("Update:Level", sw.ElapsedTicks);
if (Character.Controlled != null)
if (Character.Controlled is { } controlled)
{
if (Character.Controlled.SelectedItem != null && Character.Controlled.CanInteractWith(Character.Controlled.SelectedItem))
if (controlled.SelectedItem != null && controlled.CanInteractWith(controlled.SelectedItem))
{
Character.Controlled.SelectedItem.UpdateHUD(cam, Character.Controlled, (float)deltaTime);
controlled.SelectedItem.UpdateHUD(cam, controlled, (float)deltaTime);
}
if (Character.Controlled.Inventory != null)
if (controlled.Inventory != null)
{
foreach (Item item in Character.Controlled.Inventory.AllItems)
foreach (Item item in controlled.Inventory.AllItems)
{
if (Character.Controlled.HasEquippedItem(item))
if (controlled.HasEquippedItem(item))
{
item.UpdateHUD(cam, Character.Controlled, (float)deltaTime);
item.UpdateHUD(cam, controlled, (float)deltaTime);
}
}
}
}
sw.Restart();
sw.Restart();
Character.UpdateAll((float)deltaTime, cam);
#elif SERVER