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

Changed character update IDs from uint to ushort

Browse Source
This commit is contained in:
Regalis
2017-02-06 16:24:11 +02:00
parent 4b8d1054b1
commit 462a8b5da8
2 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Characters/Character.cs
+13 -17
View File
@@ -105,7 +105,7 @@ namespace Barotrauma
private CharacterInventory inventory; private CharacterInventory inventory;
public UInt32 LastNetworkUpdateID = 0; public UInt16 LastNetworkUpdateID = 0;
//public int LargeUpdateTimer; //public int LargeUpdateTimer;
@@ -2083,16 +2083,9 @@ namespace Barotrauma
{ {
case ClientNetObject.CHARACTER_INPUT: case ClientNetObject.CHARACTER_INPUT:
UInt32 networkUpdateID = msg.ReadUInt32(); UInt16 networkUpdateID = msg.ReadUInt16();
byte inputCount = msg.ReadByte(); byte inputCount = msg.ReadByte();
#if DEBUG
if (((long)networkUpdateID - (long)LastNetworkUpdateID)>10000)
{
DebugConsole.ThrowError("((long)networkUpdateID - (long)LastNetworkUpdateID) > 10000");
}
#endif
for (int i = 0; i < inputCount; i++) for (int i = 0; i < inputCount; i++)
{ {
InputNetFlags newInput = (InputNetFlags)msg.ReadRangedInteger(0, (int)InputNetFlags.MaxVal); InputNetFlags newInput = (InputNetFlags)msg.ReadRangedInteger(0, (int)InputNetFlags.MaxVal);
@@ -2116,7 +2109,10 @@ namespace Barotrauma
newMousePos.X = msg.ReadSingle(); newMousePos.X = msg.ReadSingle();
newMousePos.Y = msg.ReadSingle(); newMousePos.Y = msg.ReadSingle();
}*/ }*/
if ((i < ((long)networkUpdateID - (long)LastNetworkUpdateID)) && (i < 60))
if (NetIdUtils.IdMoreRecent((ushort)(networkUpdateID - i), LastNetworkUpdateID) && (i < 60))
{ {
NetInputMem newMem = new NetInputMem(); NetInputMem newMem = new NetInputMem();
newMem.states = newInput; newMem.states = newInput;
@@ -2128,7 +2124,7 @@ namespace Barotrauma
} }
} }
if (networkUpdateID > LastNetworkUpdateID) if (NetIdUtils.IdMoreRecent(networkUpdateID, LastNetworkUpdateID))
{ {
LastNetworkUpdateID = networkUpdateID; LastNetworkUpdateID = networkUpdateID;
} }
@@ -2175,11 +2171,11 @@ namespace Barotrauma
tempBuffer.Write(true); tempBuffer.Write(true);
if (LastNetworkUpdateID < memInput.Count + 1) if (LastNetworkUpdateID < memInput.Count + 1)
{ {
tempBuffer.Write((UInt32)0); tempBuffer.Write((UInt16)0);
} }
else else
{ {
tempBuffer.Write((UInt32)(LastNetworkUpdateID - memInput.Count - 1)); tempBuffer.Write((UInt16)(LastNetworkUpdateID - memInput.Count - 1));
} }
} }
else else
@@ -2251,10 +2247,10 @@ namespace Barotrauma
case ServerNetObject.ENTITY_POSITION: case ServerNetObject.ENTITY_POSITION:
bool facingRight = AnimController.Dir > 0.0f; bool facingRight = AnimController.Dir > 0.0f;
UInt32 networkUpdateID = 0; UInt16 networkUpdateID = 0;
if (msg.ReadBoolean()) if (msg.ReadBoolean())
{ {
networkUpdateID = msg.ReadUInt32(); networkUpdateID = msg.ReadUInt16();
} }
else else
{ {
@@ -2317,7 +2313,7 @@ namespace Barotrauma
int index = 0; int index = 0;
if (GameMain.NetworkMember.Character == this && AllowInput) if (GameMain.NetworkMember.Character == this && AllowInput)
{ {
while (index < memPos.Count && posInfo.ID > memPos[index].ID) while (index < memPos.Count && NetIdUtils.IdMoreRecent(posInfo.ID, memPos[index].ID))
index++; index++;
} }
else else
Subsurface/Source/Physics/PhysicsBody.cs
+3 -3
View File
@@ -17,19 +17,19 @@ namespace Barotrauma
public readonly Direction Direction; public readonly Direction Direction;
public readonly float Timestamp; public readonly float Timestamp;
public readonly UInt32 ID; public readonly UInt16 ID;
public PosInfo(Vector2 pos, Direction dir, float time) public PosInfo(Vector2 pos, Direction dir, float time)
: this(pos, dir, 0, time) : this(pos, dir, 0, time)
{ {
} }
public PosInfo(Vector2 pos, Direction dir, UInt32 ID) public PosInfo(Vector2 pos, Direction dir, UInt16 ID)
: this(pos, dir, ID, 0.0f) : this(pos, dir, ID, 0.0f)
{ {
} }
public PosInfo(Vector2 pos, Direction dir, UInt32 ID, float time) public PosInfo(Vector2 pos, Direction dir, UInt16 ID, float time)
{ {
Position = pos; Position = pos;
Direction = dir; Direction = dir;