Syncing character/construction selection
This commit is contained in:
@@ -2064,6 +2064,16 @@ namespace Barotrauma
|
|||||||
msg.Write(aiming);
|
msg.Write(aiming);
|
||||||
msg.Write(use);
|
msg.Write(use);
|
||||||
|
|
||||||
|
if (selectedCharacter != null || selectedConstruction != null)
|
||||||
|
{
|
||||||
|
msg.Write(true);
|
||||||
|
msg.Write(selectedCharacter != null ? selectedCharacter.ID : selectedConstruction.ID);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
msg.Write(false);
|
||||||
|
}
|
||||||
|
|
||||||
if (aiming)
|
if (aiming)
|
||||||
{
|
{
|
||||||
//TODO: write this with less accuracy?
|
//TODO: write this with less accuracy?
|
||||||
@@ -2074,7 +2084,6 @@ namespace Barotrauma
|
|||||||
msg.Write(AnimController.TargetDir == Direction.Right);
|
msg.Write(AnimController.TargetDir == Direction.Right);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
msg.Write(SimPosition.X);
|
msg.Write(SimPosition.X);
|
||||||
msg.Write(SimPosition.Y);
|
msg.Write(SimPosition.Y);
|
||||||
|
|
||||||
@@ -2106,6 +2115,27 @@ namespace Barotrauma
|
|||||||
keys[(int)InputType.Use].Held = useInput;
|
keys[(int)InputType.Use].Held = useInput;
|
||||||
keys[(int)InputType.Use].SetState(false, useInput);
|
keys[(int)InputType.Use].SetState(false, useInput);
|
||||||
|
|
||||||
|
bool entitySelected = msg.ReadBoolean();
|
||||||
|
if (entitySelected)
|
||||||
|
{
|
||||||
|
ushort entityID = msg.ReadUInt16();
|
||||||
|
Entity selectedEntity = Entity.FindEntityByID(entityID);
|
||||||
|
if (selectedEntity is Character)
|
||||||
|
{
|
||||||
|
SelectCharacter((Character)selectedEntity);
|
||||||
|
}
|
||||||
|
else if (selectedEntity is Item)
|
||||||
|
{
|
||||||
|
selectedConstruction = (Item)selectedEntity;
|
||||||
|
if (selectedConstruction != null) selectedConstruction.Pick(this, true, true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (selectedCharacter != null) DeselectCharacter();
|
||||||
|
selectedConstruction = null;
|
||||||
|
}
|
||||||
|
|
||||||
if (aimInput)
|
if (aimInput)
|
||||||
{
|
{
|
||||||
cursorPosition = new Vector2(
|
cursorPosition = new Vector2(
|
||||||
|
|||||||
Reference in New Issue
Block a user