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

Setting ragdoll position without limbs going through walls, rotating entire ragdoll, using combined network messages client->server, fixed fabricators

Browse Source
This commit is contained in:
Regalis
2015-11-08 22:20:29 +02:00
parent 5a21d64b3a
commit cd48d12be6
31 changed files with 551 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
Subsurface/Source/Networking/NetworkEvent.cs
View File

@@ -26,7 +26,7 @@ namespace Barotrauma.Networking
class NetworkEvent
{
public static List<NetworkEvent> events = new List<NetworkEvent>();
public static List<NetworkEvent> Events = new List<NetworkEvent>();
private static bool[] isImportant;
private static bool[] overridePrevious;
@@ -68,6 +68,8 @@ namespace Barotrauma.Networking
private object data;
public NetConnection SenderConnection;
//private NetOutgoingMessage message;
public ushort ID
@@ -110,7 +112,7 @@ namespace Barotrauma.Networking
if (overridePrevious[(int)type])
{
if (events.Find(e => e.id == id && e.eventType == type) != null) return;
if (Events.Find(e => e.id == id && e.eventType == type) != null) return;
}
this.id = id;
@@ -118,7 +120,7 @@ namespace Barotrauma.Networking
this.data = data;
events.Add(this);
Events.Add(this);
}
public bool FillData(NetBuffer message)
@@ -147,7 +149,31 @@ namespace Barotrauma.Networking
return true;
}
public static bool ReadData(NetIncomingMessage message)
public static void ReadMessage(NetIncomingMessage message, bool resend=false)
{
byte msgCount = message.ReadByte();
long currPos = message.PositionInBytes;
for (int i = 0; i < msgCount; i++)
{
byte msgLength = message.ReadByte();
try
{
NetworkEvent.ReadData(message, resend);
}
catch
{
int afghj = 1;
}
//+1 because msgLength is one additional byte
currPos += msgLength + 1;
message.Position = currPos * 8;
}
}
public static bool ReadData(NetIncomingMessage message, bool resend=false)
{
NetworkEventType eventType;
ushort id;
@@ -175,9 +201,11 @@ namespace Barotrauma.Networking
return false;
}
object data;
try
{
e.ReadNetworkData(eventType, message);
e.ReadNetworkData(eventType, message, out data);
}
catch (Exception exception)
{
@@ -187,6 +215,12 @@ namespace Barotrauma.Networking
return false;
}
if (resend)
{
var resendEvent = new NetworkEvent(eventType, id, false, data);
resendEvent.SenderConnection = message.SenderConnection;
}
return true;
}
}