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

EntityEvent type written into item update messages using WriteRangedInteger, item position updates include the velocity of the item

Browse Source
This commit is contained in:
Regalis
2017-02-07 21:18:22 +02:00
parent e2a872ad90
commit 304c67f904
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Items/Item.cs
+23 -8
View File
@@ -1701,9 +1701,9 @@ namespace Barotrauma
return;
}
//TODO: use WriteRangedInteger to write the event type
msg.Write((byte)((int)extraData[0]));
switch ((NetEntityEvent.Type)extraData[0])
NetEntityEvent.Type eventType = (NetEntityEvent.Type)extraData[0];
msg.WriteRangedInteger(0, Enum.GetValues(typeof(NetEntityEvent.Type)).Length - 1, (int)eventType);
switch (eventType)
{
case NetEntityEvent.Type.ComponentState:
int componentIndex = (int)extraData[1];
@@ -1741,7 +1741,9 @@ namespace Barotrauma
return;
}
NetEntityEvent.Type eventType = (NetEntityEvent.Type)msg.ReadByte();
NetEntityEvent.Type eventType =
(NetEntityEvent.Type)msg.ReadRangedInteger(0, Enum.GetValues(typeof(NetEntityEvent.Type)).Length - 1);
switch (eventType)
{
case NetEntityEvent.Type.ComponentState:
@@ -1790,9 +1792,9 @@ namespace Barotrauma
return;
}
//TODO: use WriteRangedInteger to write the event type
msg.Write((byte)((int)extraData[0]));
switch ((NetEntityEvent.Type)extraData[0])
NetEntityEvent.Type eventType = (NetEntityEvent.Type)extraData[0];
msg.WriteRangedInteger(0, Enum.GetValues(typeof(NetEntityEvent.Type)).Length - 1, (int)eventType);
switch (eventType)
{
case NetEntityEvent.Type.ComponentState:
int componentIndex = (int)extraData[1];
@@ -1822,7 +1824,8 @@ namespace Barotrauma
public void ServerRead(ClientNetObject type, NetIncomingMessage msg, Client c)
{
NetEntityEvent.Type eventType = (NetEntityEvent.Type)msg.ReadByte();
NetEntityEvent.Type eventType =
(NetEntityEvent.Type)msg.ReadRangedInteger(0, Enum.GetValues(typeof(NetEntityEvent.Type)).Length - 1);
switch (eventType)
{
@@ -2076,6 +2079,14 @@ namespace Barotrauma
msg.Write(MathUtils.AngleToByte(body.Rotation));
#if DEBUG
if (Math.Abs(body.LinearVelocity.X)>32.0f || Math.Abs(body.LinearVelocity.Y)>32.0f)
DebugConsole.ThrowError("Item velocity out of range ("+body.LinearVelocity+")");
#endif
msg.WriteRangedSingle(MathHelper.Clamp(body.LinearVelocity.X, -32.0f, 32.0f), -32.0f, 32.0f, 8);
msg.WriteRangedSingle(MathHelper.Clamp(body.LinearVelocity.Y, -32.0f, 32.0f), -32.0f, 32.0f, 8);
lastSentPos = SimPosition;
}
@@ -2088,6 +2099,10 @@ namespace Barotrauma
body.FarseerBody.Rotation = MathUtils.ByteToAngle(msg.ReadByte());
body.LinearVelocity = new Vector2(
msg.ReadRangedSingle(-32.0f, 32.0f, 8),
msg.ReadRangedSingle(-32.0f, 32.0f, 8));
DebugConsole.NewMessage("Received item pos, t: "+sendingTime+ " ("+Name+")", Color.LightGreen);