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

(e38a3fef5) Fixed characters not letting go of the character they're grabbing when the health interface is closed with Esc or by clicking outside the window.

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-03-29 21:51:24 +02:00
parent c9db9ec4ff
commit 854c90c89a
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Characters/Health/CharacterHealth.cs
+11 -4
View File
@@ -108,13 +108,15 @@ namespace Barotrauma
if (openHealthWindow == value) return; if (openHealthWindow == value) return;
if (value != null && !value.UseHealthWindow) return; if (value != null && !value.UseHealthWindow) return;
var prevOpenHealthWindow = openHealthWindow;
openHealthWindow = value; openHealthWindow = value;
toggledThisFrame = true; toggledThisFrame = true;
if (Character.Controlled == null) { return; } if (Character.Controlled == null) { return; }
if (value == null && if (value == null &&
Character.Controlled?.SelectedCharacter?.CharacterHealth != null && Character.Controlled?.SelectedCharacter?.CharacterHealth != null &&
Character.Controlled.SelectedCharacter.CharacterHealth == openHealthWindow && Character.Controlled.SelectedCharacter.CharacterHealth == prevOpenHealthWindow &&
!Character.Controlled.SelectedCharacter.CanInventoryBeAccessed) !Character.Controlled.SelectedCharacter.CanInventoryBeAccessed)
{ {
Character.Controlled.DeselectCharacter(); Character.Controlled.DeselectCharacter();
@@ -545,11 +547,13 @@ namespace Barotrauma
} }
if (PlayerInput.KeyHit(InputType.Health) && GUI.KeyboardDispatcher.Subscriber == null && if (PlayerInput.KeyHit(InputType.Health) && GUI.KeyboardDispatcher.Subscriber == null &&
Character.AllowInput && Character.FocusedCharacter == null && !toggledThisFrame) Character.Controlled.AllowInput && !toggledThisFrame)
{ {
if (openHealthWindow != null) if (openHealthWindow != null)
{
OpenHealthWindow = null; OpenHealthWindow = null;
else }
else if (Character.Controlled == Character && Character.Controlled.FocusedCharacter == null)
{ {
OpenHealthWindow = this; OpenHealthWindow = this;
forceAfflictionContainerUpdate = true; forceAfflictionContainerUpdate = true;
@@ -562,7 +566,10 @@ namespace Barotrauma
HUD.CloseHUD(HUDLayoutSettings.HealthWindowAreaLeft)) HUD.CloseHUD(HUDLayoutSettings.HealthWindowAreaLeft))
{ {
//emulate a Health input to get the character to deselect the item server-side //emulate a Health input to get the character to deselect the item server-side
Character.Keys[(int)InputType.Health].Hit = true; if (GameMain.Client != null)
{
Character.Controlled.Keys[(int)InputType.Health].Hit = true;
}
OpenHealthWindow = null; OpenHealthWindow = null;
} }
} }
Barotrauma/BarotraumaShared/Source/Characters/Character.cs
+2 -1
View File
@@ -268,6 +268,7 @@ namespace Barotrauma
public Character FocusedCharacter public Character FocusedCharacter
{ {
get { return focusedCharacter; } get { return focusedCharacter; }
set { focusedCharacter = value; }
} }
public Character SelectedCharacter public Character SelectedCharacter
@@ -1709,7 +1710,7 @@ namespace Barotrauma
} }
} }
if (SelectedCharacter != null && IsKeyHit(InputType.Grab)) //Let people use ladders and buttons and stuff when dragging chars if (SelectedCharacter != null && (IsKeyHit(InputType.Grab) || IsKeyHit(InputType.Health))) //Let people use ladders and buttons and stuff when dragging chars
{ {
DeselectCharacter(); DeselectCharacter();
} }