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

ItemInventories don't have own ID's anymore but rely on owner ID, relaying reliablemessages through server

Browse Source
This commit is contained in:
Regalis
2015-10-21 01:39:00 +03:00
parent daf1e2bfd8
commit 0233579e37
12 changed files with 118 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Characters/AICharacter.cs
+4 -4
View File
@@ -95,8 +95,8 @@ namespace Barotrauma
message.Write(LargeUpdateTimer <= 0);
message.Write(AnimController.TargetDir == Direction.Right);
message.Write(AnimController.TargetMovement.X);
message.Write(AnimController.TargetMovement.Y);
message.WriteRangedSingle(MathHelper.Clamp(AnimController.TargetMovement.X, -10.0f, 10.0f), -10.0f, 10.0f, 16);
message.WriteRangedSingle(MathHelper.Clamp(AnimController.TargetMovement.Y, -10.0f, 10.0f), -10.0f, 10.0f, 16);
if (LargeUpdateTimer <= 0)
{
@@ -165,8 +165,8 @@ namespace Barotrauma
try
{
targetDir = message.ReadBoolean();
targetMovement.X = message.ReadFloat();
targetMovement.Y = message.ReadFloat();
targetMovement.X = message.ReadRangedSingle(-10.0f, 10.0f, 8);
targetMovement.Y = message.ReadRangedSingle(-10.0f, 10.0f, 8);
}
catch
Subsurface/Source/Characters/Character.cs
+11 -2
View File
@@ -1100,6 +1100,11 @@ namespace Barotrauma
{
return true;
}
else if (type == NetworkEventType.InventoryUpdate)
{
if (inventory == null) return false;
return inventory.FillNetworkData(NetworkEventType.InventoryUpdate, message, data);
}
var hasInputs =
(GetInputState(InputType.Left) ||
@@ -1229,6 +1234,12 @@ namespace Barotrauma
}
return;
}
else if (type == NetworkEventType.InventoryUpdate)
{
if (inventory == null) return;
inventory.ReadNetworkData(NetworkEventType.InventoryUpdate, message);
return;
}
bool actionKeyState = false;
bool secondaryKeyState = false;
@@ -1393,8 +1404,6 @@ namespace Barotrauma
if (GameMain.Client!=null && GameMain.Client.Character == this) GameMain.Client.Character = null;
if (inventory != null) inventory.Remove();
if (aiTarget != null)
aiTarget.Remove();