Server serialization functions require client

This commit is contained in:
juanjp600
2016-09-07 17:32:20 -03:00
parent a02931054a
commit bfd8bc6b35
18 changed files with 66 additions and 55 deletions

View File

@@ -652,7 +652,7 @@ namespace Barotrauma.Items.Components
}
}
public override void ServerWrite(Lidgren.Network.NetOutgoingMessage msg)
public override void ServerWrite(Lidgren.Network.NetOutgoingMessage msg, Barotrauma.Networking.Client c)
{
msg.Write(docked);

View File

@@ -477,7 +477,7 @@ namespace Barotrauma.Items.Components
}
}
public override void ServerWrite(Lidgren.Network.NetOutgoingMessage msg)
public override void ServerWrite(Lidgren.Network.NetOutgoingMessage msg, Barotrauma.Networking.Client c)
{
msg.Write(isOpen);
msg.WriteRangedSingle(stuck, 0.0f, 100.0f, 8);

View File

@@ -74,8 +74,8 @@ namespace Barotrauma.Items.Components
private string msg;
protected ushort netStateID;
public ushort NetStateID
protected UInt32 netStateID;
public UInt32 NetStateID
{
get { return netStateID; }
}
@@ -659,9 +659,9 @@ namespace Barotrauma.Items.Components
}
public virtual void ClientWrite(NetOutgoingMessage msg) { }
public virtual void ServerRead(NetIncomingMessage msg) { }
public virtual void ServerRead(NetIncomingMessage msg, Client c) { }
public virtual void ServerWrite(NetOutgoingMessage msg) { }
public virtual void ServerWrite(NetOutgoingMessage msg, Client c) { }
public virtual void ClientRead(NetIncomingMessage msg) { }
public virtual XElement Save(XElement parentElement)

View File

@@ -202,13 +202,13 @@ namespace Barotrauma.Items.Components
msg.Write(IsActive);
}
public override void ServerRead(Lidgren.Network.NetIncomingMessage msg)
public override void ServerRead(Lidgren.Network.NetIncomingMessage msg, Barotrauma.Networking.Client c)
{
FlowPercentage = msg.ReadRangedInteger(-10, 10) * 10.0f;
IsActive = msg.ReadBoolean();
}
public override void ServerWrite(Lidgren.Network.NetOutgoingMessage msg)
public override void ServerWrite(Lidgren.Network.NetOutgoingMessage msg, Barotrauma.Networking.Client c)
{
//flowpercentage can only be adjusted at 10% intervals -> no need for more accuracy than this
msg.WriteRangedInteger(-10, 10, (int)(flowPercentage / 10.0f));

View File

@@ -410,13 +410,13 @@ namespace Barotrauma.Items.Components
msg.Write(IsActive);
}
public override void ServerRead(Lidgren.Network.NetIncomingMessage msg)
public override void ServerRead(Lidgren.Network.NetIncomingMessage msg, Barotrauma.Networking.Client c)
{
IsActive = msg.ReadBoolean();
isActiveTickBox.Selected = IsActive;
}
public override void ServerWrite(Lidgren.Network.NetOutgoingMessage msg)
public override void ServerWrite(Lidgren.Network.NetOutgoingMessage msg, Barotrauma.Networking.Client c)
{
msg.Write(IsActive);
}

View File

@@ -545,7 +545,7 @@ namespace Barotrauma.Items.Components
msg.WriteRangedSingle(fissionRate, 0.0f, 100.0f, 8);
}
public override void ServerRead(NetIncomingMessage msg)
public override void ServerRead(NetIncomingMessage msg, Client c)
{
autoTemp = msg.ReadBoolean();
ShutDownTemp = msg.ReadRangedSingle(0.0f, 10000.0f, 8);
@@ -554,7 +554,7 @@ namespace Barotrauma.Items.Components
FissionRate = msg.ReadRangedSingle(0.0f, 100.0f, 8);
}
public override void ServerWrite(NetOutgoingMessage msg)
public override void ServerWrite(NetOutgoingMessage msg, Client c)
{
msg.WriteRangedSingle(temperature, 0.0f, 10000.0f, 16);

View File

@@ -344,7 +344,7 @@ namespace Barotrauma.Items.Components
}
}
public override void ServerRead(Lidgren.Network.NetIncomingMessage msg)
public override void ServerRead(Lidgren.Network.NetIncomingMessage msg, Barotrauma.Networking.Client c)
{
AutoPilot = msg.ReadBoolean();
@@ -368,7 +368,7 @@ namespace Barotrauma.Items.Components
}
}
public override void ServerWrite(Lidgren.Network.NetOutgoingMessage msg)
public override void ServerWrite(Lidgren.Network.NetOutgoingMessage msg, Barotrauma.Networking.Client c)
{
msg.Write(autoPilot);

View File

@@ -252,12 +252,12 @@ namespace Barotrauma.Items.Components
msg.WriteRangedSingle(chargeSpeed, 0.0f, 1.0f, 8);
}
public override void ServerRead(Lidgren.Network.NetIncomingMessage msg)
public override void ServerRead(Lidgren.Network.NetIncomingMessage msg, Barotrauma.Networking.Client c)
{
RechargeSpeed = msg.ReadRangedSingle(0.0f, 1.0f, 8) * maxRechargeSpeed;
}
public override void ServerWrite(Lidgren.Network.NetOutgoingMessage msg)
public override void ServerWrite(Lidgren.Network.NetOutgoingMessage msg, Barotrauma.Networking.Client c)
{
float chargeSpeed = MathHelper.Clamp(rechargeSpeed / MaxRechargeSpeed, 0.0f, 1.0f);
msg.WriteRangedSingle(chargeSpeed, 0.0f, 1.0f, 8);

View File

@@ -536,7 +536,7 @@ namespace Barotrauma.Items.Components
}
}
public override void ServerRead(Lidgren.Network.NetIncomingMessage msg)
public override void ServerRead(Lidgren.Network.NetIncomingMessage msg, Barotrauma.Networking.Client c)
{
Nodes.Clear();