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

AICharacter position syncing

Browse Source
This commit is contained in:
Regalis
2016-12-29 22:01:50 +02:00
parent 98183c47fb
commit 020aac55ea
3 changed files with 47 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Characters/Character.cs
+27 -30
View File
@@ -1309,46 +1309,43 @@ namespace Barotrauma
if (this != Character.Controlled) if (this != Character.Controlled)
{ {
if (GameMain.Server != null) if (GameMain.Server != null && !(this is AICharacter))
{ {
if (!IsDead) if (memInput.Count > 0)
{ {
if (memInput.Count > 0) AnimController.Frozen = false;
prevDequeuedInput = dequeuedInput;
dequeuedInput = memInput[memInput.Count - 1];
cursorPosition = memMousePos[memMousePos.Count - 1];
memInput.RemoveAt(memInput.Count - 1);
memMousePos.RemoveAt(memMousePos.Count - 1);
if (dequeuedInput == InputNetFlags.None)
{ {
AnimController.Frozen = false; if (isStillCountdown<=0)
prevDequeuedInput = dequeuedInput;
dequeuedInput = memInput[memInput.Count - 1];
cursorPosition = memMousePos[memMousePos.Count - 1];
memInput.RemoveAt(memInput.Count - 1);
memMousePos.RemoveAt(memMousePos.Count - 1);
if (dequeuedInput == InputNetFlags.None)
{ {
if (isStillCountdown<=0) while (memInput.Count>5 && memInput[memInput.Count-1]==0)
{ {
while (memInput.Count>5 && memInput[memInput.Count-1]==0) //remove inputs where the player is not moving at all
{ //helps the server catch up, shouldn't affect final position
//remove inputs where the player is not moving at all memInput.RemoveAt(memInput.Count - 1);
//helps the server catch up, shouldn't affect final position memMousePos.RemoveAt(memMousePos.Count - 1);
memInput.RemoveAt(memInput.Count - 1);
memMousePos.RemoveAt(memMousePos.Count - 1);
}
isStillCountdown = 15;
} }
else
{
isStillCountdown--;
}
} else
{
isStillCountdown = 15; isStillCountdown = 15;
} }
//DebugConsole.NewMessage(Convert.ToString(memInput.Count), Color.Lime); else
} {
else isStillCountdown--;
}
} else
{ {
AnimController.Frozen = true; isStillCountdown = 15;
return;
} }
//DebugConsole.NewMessage(Convert.ToString(memInput.Count), Color.Lime);
}
else
{
AnimController.Frozen = true;
return;
} }
} }
} }
Subsurface/Source/Networking/GameServer.cs
+18 -12
View File
@@ -664,15 +664,12 @@ namespace Barotrauma.Networking
foreach (GUIComponent gc in GameMain.NetLobbyScreen.ChatBox.children) foreach (GUIComponent gc in GameMain.NetLobbyScreen.ChatBox.children)
{ {
if (gc is GUITextBlock) if (gc is GUITextBlock && gc.UserData is ChatMessage)
{ {
if (gc.UserData is ChatMessage) ChatMessage cMsg = (ChatMessage)gc.UserData;
if (cMsg.NetStateID > c.lastRecvChatMsgID)
{ {
ChatMessage cMsg = (ChatMessage)gc.UserData; cMsg.ServerWrite(outmsg, c);
if (cMsg.NetStateID > c.lastRecvChatMsgID)
{
cMsg.ServerWrite(outmsg, c);
}
} }
} }
} }
@@ -686,11 +683,20 @@ namespace Barotrauma.Networking
foreach (Character character in Character.CharacterList) foreach (Character character in Character.CharacterList)
{ {
if (character is AICharacter) continue; if (character is AICharacter)
{
outmsg.Write((byte)ServerNetObject.ENTITY_POSITION); //TODO: don't send if the ai character is far from the client
character.ServerWrite(outmsg, c); //(some sort of distance-based culling might be a good idea for player-controlled characters as well)
outmsg.WritePadBits(); outmsg.Write((byte)ServerNetObject.ENTITY_POSITION);
character.ServerWrite(outmsg, c);
outmsg.WritePadBits();
}
else
{
outmsg.Write((byte)ServerNetObject.ENTITY_POSITION);
character.ServerWrite(outmsg, c);
outmsg.WritePadBits();
}
} }
foreach (Submarine sub in Submarine.Loaded) foreach (Submarine sub in Submarine.Loaded)
Subsurface/Source/Networking/NetEntityEvent/NetEntityEvent.cs
+1
View File
@@ -44,6 +44,7 @@ namespace Barotrauma.Networking
{ {
if (Data[i] != other.Data[i]) return false; if (Data[i] != other.Data[i]) return false;
} }
return true;
} }
else else
{ {