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

Merge branch 'master' of https://github.com/Faerdan/Barotrauma into Faerdan-master

Browse Source 
Conflicts:
	Barotrauma/BarotraumaClient/Source/Map/MapEntity.cs
	Barotrauma/BarotraumaClient/Source/Screens/GameScreen.cs
	Barotrauma/BarotraumaShared/Source/Characters/Character.cs
	Barotrauma/BarotraumaShared/Source/Items/Item.cs
This commit is contained in:
Joonas Rikkonen
2017-07-05 19:32:34 +03:00
parent 64ad5e5003 a09367c78f
commit bf5a0746ad
47 changed files with 473 additions and 483 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Map/Lights/LightManager.cs
+6 -6
View File
@@ -163,15 +163,15 @@ namespace Barotrauma.Lights
if (Character.Controlled != null)
{
if (Character.Controlled.ClosestItem != null)
if (Character.Controlled.FocusedItem != null)
{
Character.Controlled.ClosestItem.IsHighlighted = true;
Character.Controlled.ClosestItem.Draw(spriteBatch, false, true);
Character.Controlled.ClosestItem.IsHighlighted = true;
Character.Controlled.FocusedItem.IsHighlighted = true;
Character.Controlled.FocusedItem.Draw(spriteBatch, false, true);
Character.Controlled.FocusedItem.IsHighlighted = true;
}
else if (Character.Controlled.ClosestCharacter != null)
else if (Character.Controlled.FocusedCharacter != null)
{
Character.Controlled.ClosestCharacter.Draw(spriteBatch);
Character.Controlled.FocusedCharacter.Draw(spriteBatch);
}
}