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

Disabled networkevent

Browse Source 
Changing the way each item handles its own network updating
This commit is contained in:
juanjp600
2016-08-30 19:28:32 -03:00
parent 6e83ef7626
commit 37ffd64490
5 changed files with 1404 additions and 1419 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Barotrauma.csproj
+1393 -1395
View File
File diff suppressed because it is too large Load Diff
Subsurface/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.5.1.1")] [assembly: AssemblyVersion("0.5.1.600")]
[assembly: AssemblyFileVersion("0.5.1.1")] [assembly: AssemblyFileVersion("0.5.1.600")]
Subsurface/Source/Networking/GameClient.cs
+4 -6
View File
@@ -167,9 +167,9 @@ namespace Barotrauma.Networking
} }
String sendPw = ""; String sendPw = "";
if (password.Length>0) if (password.Length>0)
{ {
sendPw = Encoding.UTF8.GetString(NetUtility.ComputeSHAHash(Encoding.UTF8.GetBytes(password))); sendPw = Encoding.UTF8.GetString(NetUtility.ComputeSHAHash(Encoding.UTF8.GetBytes(password)));
} }
CoroutineManager.StartCoroutine(WaitForStartingInfo(sendPw)); CoroutineManager.StartCoroutine(WaitForStartingInfo(sendPw));
@@ -822,9 +822,7 @@ namespace Barotrauma.Networking
{ {
GameMain.GameSession.CrewManager.characters.Add(character); GameMain.GameSession.CrewManager.characters.Add(character);
} }
Item.Spawner.ReadNetworkData(inc);
if (ownerId == myID) if (ownerId == myID)
{ {
myCharacter = character; myCharacter = character;
Subsurface/Source/Networking/GameServer.cs
+3 -14
View File
@@ -353,7 +353,7 @@ namespace Barotrauma.Networking
{ {
if (c.FileStreamSender != null) UpdateFileTransfer(c, deltaTime); if (c.FileStreamSender != null) UpdateFileTransfer(c, deltaTime);
c.ReliableChannel.Update(deltaTime); //c.ReliableChannel.Update(deltaTime);
//slowly reset spam timers //slowly reset spam timers
c.ChatSpamTimer = Math.Max(0.0f, c.ChatSpamTimer - deltaTime); c.ChatSpamTimer = Math.Max(0.0f, c.ChatSpamTimer - deltaTime);
@@ -1509,12 +1509,7 @@ namespace Barotrauma.Networking
foreach (Client c in recipients) foreach (Client c in recipients)
{ {
ReliableMessage msg = c.ReliableChannel.CreateMessage();
msg.InnerMessage.Write((byte)PacketTypes.Chatmessage);
message.WriteNetworkMessage(msg.InnerMessage);
c.ReliableChannel.SendMessage(msg, c.Connection);
} }
} }
@@ -1577,12 +1572,7 @@ namespace Barotrauma.Networking
public void SendChatMessage(ChatMessage chatMessage, Client recipient) public void SendChatMessage(ChatMessage chatMessage, Client recipient)
{ {
ReliableMessage msg = recipient.ReliableChannel.CreateMessage();
msg.InnerMessage.Write((byte)PacketTypes.Chatmessage);
chatMessage.WriteNetworkMessage(msg.InnerMessage);
recipient.ReliableChannel.SendMessage(msg, recipient.Connection);
} }
public void SendChatMessage(ChatMessage chatMessage, List<Client> recipients) public void SendChatMessage(ChatMessage chatMessage, List<Client> recipients)
@@ -1668,7 +1658,6 @@ namespace Barotrauma.Networking
msg.Write((byte)c.Info.HeadSpriteId); msg.Write((byte)c.Info.HeadSpriteId);
msg.Write(c.Info.Job == null ? "" : c.Info.Job.Name); msg.Write(c.Info.Job == null ? "" : c.Info.Job.Name);
Item.Spawner.FillNetworkData(msg, c.SpawnItems);
} }
} }
Subsurface/Source/Networking/NetworkEvent.cs → Subsurface/Source/Networking/disabled/NetworkEvent.cs
+2 -2
View File
@@ -237,11 +237,11 @@ namespace Barotrauma.Networking
return false; return false;
} }
if (resend) /*if (resend)
{ {
var resendEvent = new NetworkEvent(eventType, id, false, data); var resendEvent = new NetworkEvent(eventType, id, false, data);
resendEvent.SenderConnection = message.SenderConnection; resendEvent.SenderConnection = message.SenderConnection;
} }*/
return true; return true;
} }