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

FillNetworkData uses NetBuffer instead of OutgoingMessage

Browse Source
This commit is contained in:
Regalis
2015-11-04 20:21:34 +02:00
parent 9f9f0205e7
commit 5a21d64b3a
23 changed files with 36 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Subsurface/Source/Characters/AI/AIController.cs
View File

@@ -58,7 +58,7 @@ namespace Barotrauma
//protected Structure lastStructurePicked;
public virtual void FillNetworkData(NetOutgoingMessage message) { }
public virtual void FillNetworkData(NetBuffer message) { }
public virtual void ReadNetworkData(NetIncomingMessage message) { }
}

2
Subsurface/Source/Characters/AI/EnemyAIController.cs
View File

@@ -508,7 +508,7 @@ namespace Barotrauma
spriteBatch.DrawString(GUI.Font, "cooldown: " + coolDownTimer, pos - Vector2.UnitY * 120.0f, Color.Red);
}
public override void FillNetworkData(NetOutgoingMessage message)
public override void FillNetworkData(NetBuffer message)
{
message.Write((byte)state);

2
Subsurface/Source/Characters/AICharacter.cs
View File

@@ -83,7 +83,7 @@ namespace Barotrauma
return result;
}
public override bool FillNetworkData(NetworkEventType type, NetOutgoingMessage message, object data)
public override bool FillNetworkData(NetworkEventType type, NetBuffer message, object data)
{
switch (type)
{

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

@@ -1186,7 +1186,7 @@ namespace Barotrauma
}
}
public override bool FillNetworkData(NetworkEventType type, NetOutgoingMessage message, object data)
public override bool FillNetworkData(NetworkEventType type, NetBuffer message, object data)
{
switch (type)
{

4
Subsurface/Source/Items/CharacterInventory.cs
View File

@@ -355,7 +355,7 @@ namespace Barotrauma
}
}
public override bool FillNetworkData(NetworkEventType type, NetOutgoingMessage message, object data)
public override bool FillNetworkData(NetworkEventType type, NetBuffer message, object data)
{
for (int i = 0; i < 5; i++ )
{
@@ -371,7 +371,7 @@ namespace Barotrauma
return true;
}
public override void ReadNetworkData(NetworkEventType type, NetIncomingMessage message)
public override void ReadNetworkData(NetworkEventType type, NetBuffer message)
{
for (int i = 0; i<5; i++)
{

4
Subsurface/Source/Items/Components/Holdable/Holdable.cs
View File

@@ -263,13 +263,13 @@ namespace Barotrauma.Items.Components
}
}
public override void FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetOutgoingMessage message)
public override void FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetBuffer message)
{
message.Write(item.SimPosition.X);
message.Write(item.SimPosition.Y);
}
public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetIncomingMessage message)
public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetBuffer message)
{
Vector2 newPos = Vector2.Zero;

4
Subsurface/Source/Items/Components/ItemComponent.cs
View File

@@ -701,11 +701,11 @@ namespace Barotrauma.Items.Components
return ic;
}
public virtual void FillNetworkData(NetworkEventType type, NetOutgoingMessage message)
public virtual void FillNetworkData(NetworkEventType type, NetBuffer message)
{
}
public virtual void ReadNetworkData(NetworkEventType type, NetIncomingMessage message)
public virtual void ReadNetworkData(NetworkEventType type, NetBuffer message)
{
}
}

4
Subsurface/Source/Items/Components/Machines/Pump.cs
View File

@@ -166,14 +166,14 @@ namespace Barotrauma.Items.Components
if (!IsActive) currPowerConsumption = 0.0f;
}
public override void FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetOutgoingMessage message)
public override void FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetBuffer message)
{
message.WriteRangedInteger(-10,10,(int)(flowPercentage/10.0f));
message.Write(IsActive);
message.WritePadBits();
}
public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetIncomingMessage message)
public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetBuffer message)
{
float newFlow = 0.0f;
bool newActive;

4
Subsurface/Source/Items/Components/Machines/Radar.cs
View File

@@ -296,12 +296,12 @@ namespace Barotrauma.Items.Components
spriteBatch.DrawString(GUI.SmallFont, (int)(dist / 80.0f) + " m", new Vector2(markerPos.X + 10, markerPos.Y + 15), Color.LightGreen);
}
public override void FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetOutgoingMessage message)
public override void FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetBuffer message)
{
message.Write(IsActive);
}
public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetIncomingMessage message)
public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetBuffer message)
{
try
{

4
Subsurface/Source/Items/Components/Machines/Reactor.cs
View File

@@ -423,7 +423,7 @@ namespace Barotrauma.Items.Components
}
}
public override void FillNetworkData(NetworkEventType type, NetOutgoingMessage message)
public override void FillNetworkData(NetworkEventType type, NetBuffer message)
{
message.Write(autoTemp);
message.WriteRangedSingle(temperature, 0.0f, 10000.0f, 16);
@@ -433,7 +433,7 @@ namespace Barotrauma.Items.Components
message.WriteRangedSingle(fissionRate, 0.0f, 100.0f, 8);
}
public override void ReadNetworkData(NetworkEventType type, NetIncomingMessage message)
public override void ReadNetworkData(NetworkEventType type, NetBuffer message)
{
bool newAutoTemp;
float newTemperature, newShutDownTemp;

4
Subsurface/Source/Items/Components/Machines/Steering.cs
View File

@@ -209,7 +209,7 @@ namespace Barotrauma.Items.Components
}
}
public override void FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetOutgoingMessage message)
public override void FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetBuffer message)
{
message.Write(targetVelocity.X);
message.Write(targetVelocity.Y);
@@ -217,7 +217,7 @@ namespace Barotrauma.Items.Components
message.Write(autoPilot);
}
public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetIncomingMessage message)
public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetBuffer message)
{
Vector2 newTargetVelocity = Vector2.Zero;
bool newAutoPilot = false;

4
Subsurface/Source/Items/Components/Power/PowerContainer.cs
View File

@@ -196,13 +196,13 @@ namespace Barotrauma.Items.Components
}
}
public override void FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetOutgoingMessage message)
public override void FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetBuffer message)
{
message.WriteRangedSingle(MathHelper.Clamp(rechargeSpeed/MaxRechargeSpeed, 0.0f, 1.0f), 0.0f, 1.0f, 8);
message.WriteRangedSingle(MathHelper.Clamp(charge/capacity,0.0f, 1.0f), 0.0f, 1.0f, 8);
}
public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetIncomingMessage message)
public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetBuffer message)
{
float newRechargeSpeed = 0f;
float newCharge = 0.0f;

4
Subsurface/Source/Items/Components/Signal/ConnectionPanel.cs
View File

@@ -124,7 +124,7 @@ namespace Barotrauma.Items.Components
base.Remove();
}
public override void FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetOutgoingMessage message)
public override void FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetBuffer message)
{
foreach (Connection c in connections)
{
@@ -137,7 +137,7 @@ namespace Barotrauma.Items.Components
}
}
public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetIncomingMessage message)
public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetBuffer message)
{
System.Diagnostics.Debug.WriteLine("connectionpanel update");
foreach (Connection c in connections)

4
Subsurface/Source/Items/Components/Signal/Wire.cs
View File

@@ -428,7 +428,7 @@ namespace Barotrauma.Items.Components
base.Remove();
}
public override void FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetOutgoingMessage message)
public override void FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetBuffer message)
{
message.Write((byte)Math.Min(Nodes.Count, 10));
for (int i = 0; i < Math.Min(Nodes.Count,10); i++)
@@ -438,7 +438,7 @@ namespace Barotrauma.Items.Components
}
}
public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetIncomingMessage message)
public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetBuffer message)
{
Nodes.Clear();

4
Subsurface/Source/Items/Inventory.cs
View File

@@ -295,7 +295,7 @@ namespace Barotrauma
spriteBatch.DrawString(GUI.Font, (int)item.Condition + " %", new Vector2(rect.X + rect.Width / 2, rect.Y + rect.Height / 2), Color.Red);
}
public virtual bool FillNetworkData(NetworkEventType type, NetOutgoingMessage message, object data)
public virtual bool FillNetworkData(NetworkEventType type, NetBuffer message, object data)
{
for (int i = 0; i<capacity; i++)
{
@@ -306,7 +306,7 @@ namespace Barotrauma
return true;
}
public virtual void ReadNetworkData(NetworkEventType type, NetIncomingMessage message)
public virtual void ReadNetworkData(NetworkEventType type, NetBuffer message)
{
List<ushort> newItemIDs = new List<ushort>();

2
Subsurface/Source/Items/Item.cs
View File

@@ -1223,7 +1223,7 @@ namespace Barotrauma
NetworkEventType.ImportantComponentUpdate : NetworkEventType.ComponentUpdate, ID, isClient, index);
}
public override bool FillNetworkData(NetworkEventType type, NetOutgoingMessage message, object data)
public override bool FillNetworkData(NetworkEventType type, NetBuffer message, object data)
{
message.Write((byte)MathHelper.Clamp(condition*2.55f,0.0f,255.0f));

2
Subsurface/Source/Map/Entity.cs
View File

@@ -65,7 +65,7 @@ namespace Barotrauma
dictionary.Add(id, this);
}
public virtual bool FillNetworkData(NetworkEventType type, NetOutgoingMessage message, object data)
public virtual bool FillNetworkData(NetworkEventType type, NetBuffer message, object data)
{
return false;
}

3
Subsurface/Source/Map/Hull.cs
View File

@@ -6,6 +6,7 @@ using System.Xml.Linq;
using FarseerPhysics;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Lidgren.Network;
namespace Barotrauma
{
@@ -471,7 +472,7 @@ namespace Barotrauma
h.ID = (ushort)int.Parse(element.Attribute("ID").Value);
}
public override bool FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetOutgoingMessage message, object data)
public override bool FillNetworkData(Networking.NetworkEventType type, NetBuffer message, object data)
{
message.WriteRangedSingle(MathHelper.Clamp(volume/FullVolume, 0.0f, 1.5f), 0.0f, 1.5f, 6);

2
Subsurface/Source/Map/Structure.cs
View File

@@ -636,7 +636,7 @@ namespace Barotrauma
}
public override bool FillNetworkData(NetworkEventType type, NetOutgoingMessage message, object data)
public override bool FillNetworkData(NetworkEventType type, NetBuffer message, object data)
{
message.Write((float)NetTime.Now);

2
Subsurface/Source/Map/Submarine.cs
View File

@@ -383,7 +383,7 @@ namespace Barotrauma
Level.Loaded.Move(-amount);
}
public override bool FillNetworkData(Networking.NetworkEventType type, NetOutgoingMessage message, object data)
public override bool FillNetworkData(Networking.NetworkEventType type, NetBuffer message, object data)
{
if (subBody == null) return false;

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

@@ -645,14 +645,12 @@ namespace Barotrauma.Networking
NetOutgoingMessage message = server.CreateMessage();
message.Write((byte)PacketTypes.NetworkEvent);
List<byte[]> msgBytes = new List<byte[]>();
foreach (NetworkEvent unreliableEvent in unreliableEvents)
{
NetOutgoingMessage tempMessage = server.CreateMessage();
NetBuffer tempMessage = new NetBuffer();// server.CreateMessage();
if (!unreliableEvent.FillData(tempMessage)) continue;
tempMessage.WritePadBits();

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

@@ -21,9 +21,7 @@ namespace Barotrauma.Networking
ItemFixed = 9,
UpdateProperty = 10,
WallDamage = 11,
WallDamage = 11
}
class NetworkEvent
@@ -123,7 +121,7 @@ namespace Barotrauma.Networking
events.Add(this);
}
public bool FillData(NetOutgoingMessage message)
public bool FillData(NetBuffer message)
{
message.Write((byte)eventType);

BIN
Subsurface_Solution.v12.suo
View File

Binary file not shown.