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

Removed references to reliable sender

Browse Source 
Now the game is broken, progress is being made :)
This commit is contained in:
juanjp600
2016-08-25 18:55:32 -03:00
parent 6e456bcee2
commit 12f849be01
7 changed files with 1442 additions and 1522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/Subsurface_Solution/v14/.suo
View File

Binary file not shown.

2869
Subsurface/Barotrauma.csproj
View File

File diff suppressed because it is too large Load Diff

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

@@ -1,5 +1,4 @@
using Barotrauma.Items.Components;
using Barotrauma.Networking.ReliableMessages;
using Lidgren.Network;
using Microsoft.Xna.Framework;
using System;

7
Subsurface/Source/Networking/Client.cs
View File

@@ -1,5 +1,4 @@
using Barotrauma.Networking.ReliableMessages;
using Lidgren.Network;
using Lidgren.Network;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -40,8 +39,6 @@ namespace Barotrauma.Networking
public JobPrefab assignedJob;
public FileStreamSender FileStreamSender;
public ReliableChannel ReliableChannel;
public float deleteDisconnectedTimer;
@@ -55,7 +52,7 @@ namespace Barotrauma.Networking
public Client(NetPeer server, string name, byte ID)
: this(name, ID)
{
ReliableChannel = new ReliableChannel(server);
}
public Client(string name, byte ID)

32
Subsurface/Source/Networking/GameClient.cs
View File

@@ -2,7 +2,6 @@
using Lidgren.Network;
using Microsoft.Xna.Framework;
using System.Collections.Generic;
using Barotrauma.Networking.ReliableMessages;
using FarseerPhysics;
using System.IO;
using System.Linq;
@@ -17,8 +16,6 @@ namespace Barotrauma.Networking
private GUIMessageBox reconnectBox;
private ReliableChannel reliableChannel;
private FileStreamReceiver fileStreamReceiver;
private Queue<Pair<string, FileTransferMessageType>> requestFileQueue;
@@ -128,7 +125,6 @@ namespace Barotrauma.Networking
client = new NetClient(config);
netPeer = client;
reliableChannel = new ReliableChannel(client);
client.Start();
NetOutgoingMessage outmsg = client.CreateMessage();
@@ -429,8 +425,6 @@ namespace Barotrauma.Networking
DebugConsole.ThrowError("Error while receiving message from server", e);
#endif
}
reliableChannel.Update(deltaTime);
if (gameStarted && respawnManager != null)
{
@@ -452,17 +446,7 @@ namespace Barotrauma.Networking
}
}
var message = ComposeNetworkEventMessage(NetworkEventDeliveryMethod.ReliableChannel);
if (message != null)
{
ReliableMessage reliableMessage = reliableChannel.CreateMessage();
message.Position = 0;
reliableMessage.InnerMessage.Write(message.ReadBytes(message.LengthBytes));
reliableChannel.SendMessage(reliableMessage, client.ServerConnection);
}
message = ComposeNetworkEventMessage(NetworkEventDeliveryMethod.Unreliable);
var message = ComposeNetworkEventMessage(NetworkEventDeliveryMethod.Unreliable);
if (message != null) client.SendMessage(message, NetDeliveryMethod.Unreliable);
message = ComposeNetworkEventMessage(NetworkEventDeliveryMethod.ReliableLidgren);
@@ -525,12 +509,6 @@ namespace Barotrauma.Networking
byte packetType = inc.ReadByte();
if (packetType == (byte)PacketTypes.ReliableMessage)
{
if (!reliableChannel.CheckMessage(inc)) continue;
packetType = inc.ReadByte();
}
switch (packetType)
{
case (byte)PacketTypes.CanStartGame:
@@ -685,10 +663,8 @@ namespace Barotrauma.Networking
break;
case (byte)PacketTypes.ResendRequest:
reliableChannel.HandleResendRequest(inc);
break;
case (byte)PacketTypes.LatestMessageID:
reliableChannel.HandleLatestMessageID(inc);
break;
case (byte)PacketTypes.VoteStatus:
Voting.ReadData(inc);
@@ -1226,12 +1202,6 @@ namespace Barotrauma.Networking
var chatMessage = ChatMessage.Create(
gameStarted && myCharacter != null ? myCharacter.Name : name,
message, (ChatMessageType)type, gameStarted ? myCharacter : null);
ReliableMessage msg = reliableChannel.CreateMessage();
msg.InnerMessage.Write((byte)PacketTypes.Chatmessage);
chatMessage.WriteNetworkMessage(msg.InnerMessage);
reliableChannel.SendMessage(msg, client.ServerConnection);
}
/// <summary>

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

@@ -6,7 +6,6 @@ using System.Linq;
using Lidgren.Network;
using Microsoft.Xna.Framework;
using RestSharp;
using Barotrauma.Networking.ReliableMessages;
using Barotrauma.Items.Components;
namespace Barotrauma.Networking
@@ -343,9 +342,7 @@ namespace Barotrauma.Networking
foreach (Client c in connectedClients)
{
if (c.FileStreamSender != null) UpdateFileTransfer(c, deltaTime);
c.ReliableChannel.Update(deltaTime);
if (c.FileStreamSender != null) UpdateFileTransfer(c, deltaTime);
}
NetIncomingMessage inc = null;
@@ -482,12 +479,6 @@ namespace Barotrauma.Networking
return;
}
if (packetType == (byte)PacketTypes.ReliableMessage)
{
if (!sender.ReliableChannel.CheckMessage(inc)) return;
packetType = inc.ReadByte();
}
switch (packetType)
{
case (byte)PacketTypes.NetworkEvent:
@@ -581,10 +572,8 @@ namespace Barotrauma.Networking
break;
case (byte)PacketTypes.ResendRequest:
sender.ReliableChannel.HandleResendRequest(inc);
break;
case (byte)PacketTypes.LatestMessageID:
sender.ReliableChannel.HandleLatestMessageID(inc);
break;
case (byte)PacketTypes.Vote:
Voting.RegisterVote(inc, connectedClients);
@@ -653,17 +642,7 @@ namespace Barotrauma.Networking
foreach (Client c in recipients)
{
var message = ComposeNetworkEventMessage(NetworkEventDeliveryMethod.ReliableChannel, c.Connection);
if (message != null)
{
ReliableMessage reliableMessage = c.ReliableChannel.CreateMessage();
message.Position = 0;
reliableMessage.InnerMessage.Write(message.ReadBytes(message.LengthBytes));
c.ReliableChannel.SendMessage(reliableMessage, c.Connection);
}
message = ComposeNetworkEventMessage(NetworkEventDeliveryMethod.ReliableLidgren, c.Connection);
var message = ComposeNetworkEventMessage(NetworkEventDeliveryMethod.ReliableLidgren, c.Connection);
if (message!=null)
{
server.SendMessage(message, c.Connection, NetDeliveryMethod.ReliableUnordered);
@@ -1483,19 +1462,7 @@ namespace Barotrauma.Networking
recipients.Add(c);
}
AddChatMessage(message);
foreach (Client c in recipients)
{
ReliableMessage msg = c.ReliableChannel.CreateMessage();
msg.InnerMessage.Write((byte)PacketTypes.Chatmessage);
//msg.InnerMessage.Write((byte)type);
//msg.InnerMessage.Write(message);
message.WriteNetworkMessage(msg.InnerMessage);
c.ReliableChannel.SendMessage(msg, c.Connection);
}
AddChatMessage(message);
}
public override void SendChatMessage(string message, ChatMessageType? type = null)
@@ -1556,17 +1523,7 @@ namespace Barotrauma.Networking
public void SendChatMessage(ChatMessage chatMessage, List<Client> recipients)
{
foreach (Client c in recipients)
{
ReliableMessage msg = c.ReliableChannel.CreateMessage();
msg.InnerMessage.Write((byte)PacketTypes.Chatmessage);
//msg.InnerMessage.Write((byte)type);
//msg.InnerMessage.Write(message);
chatMessage.WriteNetworkMessage(msg.InnerMessage);
c.ReliableChannel.SendMessage(msg, c.Connection);
}
}
private void ReadCharacterData(NetIncomingMessage message)

4
Subsurface/Source/Networking/GameServerLogin.cs
View File

@@ -1,5 +1,4 @@
using Barotrauma.Networking.ReliableMessages;
using Lidgren.Network;
using Lidgren.Network;
using Microsoft.Xna.Framework;
using System;
using System.Collections.Generic;
@@ -161,7 +160,6 @@ namespace Barotrauma.Networking
if (existingClient != null)
{
existingClient.Connection = inc.SenderConnection;
existingClient.ReliableChannel = new ReliableChannel(server);
LogClientIn(inc);
return;
}