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

Item selection syncing fix

Browse Source
This commit is contained in:
Regalis
2017-05-23 17:36:45 +03:00
parent c049f2052e
commit b6a62eebae
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Characters/Animation/Ragdoll.cs
+4 -14
View File
@@ -268,17 +268,6 @@ namespace Barotrauma
private set; private set;
} }
public float StrongestImpact
{
get { return strongestImpact; }
set { strongestImpact = Math.Max(value, strongestImpact); }
}
public Structure Stairs
{
get { return stairs; }
}
public Ragdoll(Character character, XElement element) public Ragdoll(Character character, XElement element)
{ {
list.Add(this); list.Add(this);
@@ -1283,6 +1272,7 @@ namespace Barotrauma
{ {
newSelectedConstruction.Pick(character, true, true); newSelectedConstruction.Pick(character, true, true);
} }
character.SelectedConstruction = newSelectedConstruction;
} }
if (character.MemState[0].Animation == AnimController.Animation.CPR) if (character.MemState[0].Animation == AnimController.Animation.CPR)
@@ -1367,14 +1357,14 @@ namespace Barotrauma
{ {
character.SelectCharacter((Character)serverPos.Interact); character.SelectCharacter((Character)serverPos.Interact);
} }
else if (serverPos.Interact is Item) else
{ {
var newSelectedConstruction = (Item)serverPos.Interact; var newSelectedConstruction = (Item)serverPos.Interact;
if (newSelectedConstruction != null && if (newSelectedConstruction != null && character.SelectedConstruction != newSelectedConstruction)
character.SelectedConstruction != newSelectedConstruction)
{ {
newSelectedConstruction.Pick(character, true, true); newSelectedConstruction.Pick(character, true, true);
} }
character.SelectedConstruction = newSelectedConstruction;
} }
} }