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

Fixed input order execution + Controller direction syncing

Browse Source 
It was a dumb mistake indeed, now the player's movement is a lot less erratic. There's some very minor desync, though I might've just tested it incorrectly.
This commit is contained in:
juanjp600
2016-09-24 18:11:09 -03:00
parent 84ce612d06
commit 5567dff1c9
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Subsurface/Source/Characters/Character.cs
View File

@@ -787,6 +787,18 @@ namespace Barotrauma
}
}
if (GameMain.Server != null && Character.Controlled != this)
{
if ((dequeuedInput & 16) > 0)
{
AnimController.TargetDir = Direction.Left;
}
else
{
AnimController.TargetDir = Direction.Right;
}
}
if (attackCoolDown >0.0f)
{
attackCoolDown -= deltaTime;
@@ -1216,6 +1228,7 @@ namespace Barotrauma
newInput |= IsKeyDown(InputType.Right) ? (byte)2 : (byte)0;
newInput |= IsKeyDown(InputType.Up) ? (byte)4 : (byte)0;
newInput |= IsKeyDown(InputType.Down) ? (byte)8 : (byte)0;
newInput |= (AnimController.TargetDir == Direction.Left) ? (byte)16 : (byte)0;
memInput.Insert(0,newInput);
LastNetworkUpdateID++;
while (memInput.Count>60)
@@ -1684,15 +1697,16 @@ namespace Barotrauma
UInt32 networkUpdateID = msg.ReadUInt32();
byte inputCount = msg.ReadByte();
for (int i=0;i<inputCount;i++)
{
byte newInput = msg.ReadByte();
if ((i < (networkUpdateID-LastNetworkUpdateID)) && (i<60))
if ((i < ((long)networkUpdateID-(long)LastNetworkUpdateID)) && (i<60))
{
memInput.Insert(0, newInput);
memInput.Insert(i, newInput);
}
}
if (networkUpdateID > LastNetworkUpdateID)
{
LastNetworkUpdateID = networkUpdateID;

1
Subsurface/Source/Networking/GameServer.cs
View File

@@ -849,6 +849,7 @@ namespace Barotrauma.Networking
DebugConsole.NewMessage(Convert.ToString(spawnPosition.X) + "," + Convert.ToString(spawnPosition.Y), Color.Lime);
Character spawnedCharacter = Character.Create(Character.HumanConfigFile, spawnPosition, null, true, false);
spawnedCharacter.AnimController.Frozen = true;
c.Character = spawnedCharacter;
GameMain.GameSession.CrewManager.characters.Add(c.Character);