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

(a00338777) v0.9.2.1

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-08-26 19:58:19 +03:00
parent 0f63da27b2
commit 80698b58b0
311 changed files with 11763 additions and 4507 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Map/Hull.cs
+3 -4
View File
@@ -1,7 +1,6 @@
using Barotrauma.Networking;
using Barotrauma.Particles;
using Barotrauma.Sounds;
using Lidgren.Network;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Microsoft.Xna.Framework.Input;
@@ -528,14 +527,14 @@ namespace Barotrauma
}
}
public void ClientWrite(NetBuffer msg, object[] extraData = null)
public void ClientWrite(IWriteMessage msg, object[] extraData = null)
{
msg.WriteRangedSingle(MathHelper.Clamp(waterVolume / Volume, 0.0f, 1.5f), 0.0f, 1.5f, 8);
msg.Write(FireSources.Count > 0);
if (FireSources.Count > 0)
{
msg.WriteRangedInteger(0, 16, Math.Min(FireSources.Count, 16));
msg.WriteRangedIntegerDeprecated(0, 16, Math.Min(FireSources.Count, 16));
for (int i = 0; i < Math.Min(FireSources.Count, 16); i++)
{
var fireSource = FireSources[i];
@@ -550,7 +549,7 @@ namespace Barotrauma
}
}
public void ClientRead(ServerNetObject type, NetBuffer message, float sendingTime)
public void ClientRead(ServerNetObject type, IReadMessage message, float sendingTime)
{
remoteWaterVolume = message.ReadRangedSingle(0.0f, 1.5f, 8) * Volume;
remoteOxygenPercentage = message.ReadRangedSingle(0.0f, 100.0f, 8);
Barotrauma/BarotraumaClient/Source/Map/Levels/Level.cs
+1 -2
View File
@@ -1,5 +1,4 @@
using Barotrauma.Networking;
using Lidgren.Network;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using FarseerPhysics.Dynamics;
@@ -95,7 +94,7 @@ namespace Barotrauma
renderer.DrawBackground(spriteBatch, cam, levelObjectManager, backgroundCreatureManager);
}
public void ClientRead(ServerNetObject type, NetBuffer msg, float sendingTime)
public void ClientRead(ServerNetObject type, IReadMessage msg, float sendingTime)
{
foreach (LevelWall levelWall in extraWalls)
{
Barotrauma/BarotraumaClient/Source/Map/Levels/LevelObjects/LevelObject.cs
+2 -2
View File
@@ -1,12 +1,12 @@
using Barotrauma.Lights;
using Barotrauma.Particles;
using Barotrauma.Sounds;
using Barotrauma.Networking;
using Microsoft.Xna.Framework;
using System;
using System.Collections.Generic;
using System.Xml.Linq;
using Barotrauma.SpriteDeformations;
using Lidgren.Network;
using System.Linq;
using FarseerPhysics.Dynamics;
@@ -267,7 +267,7 @@ namespace Barotrauma
}
}
public void ClientRead(NetBuffer msg)
public void ClientRead(IReadMessage msg)
{
for (int i = 0; i < Triggers.Count; i++)
{
Barotrauma/BarotraumaClient/Source/Map/Levels/LevelObjects/LevelObjectManager.cs
+1 -2
View File
@@ -1,5 +1,4 @@
using Barotrauma.Networking;
using Lidgren.Network;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using System;
@@ -165,7 +164,7 @@ namespace Barotrauma
}
}
public void ClientRead(ServerNetObject type, NetBuffer msg, float sendingTime)
public void ClientRead(ServerNetObject type, IReadMessage msg, float sendingTime)
{
int objIndex = msg.ReadRangedInteger(0, objects.Count);
objects[objIndex].ClientRead(msg);
Barotrauma/BarotraumaClient/Source/Map/Levels/LevelObjects/LevelTrigger.cs
+2 -2
View File
@@ -1,10 +1,10 @@
using Lidgren.Network;
using Barotrauma.Networking;
namespace Barotrauma
{
partial class LevelTrigger
{
public void ClientRead(NetBuffer msg)
public void ClientRead(IReadMessage msg)
{
if (ForceFluctuationStrength > 0.0f)
{
Barotrauma/BarotraumaClient/Source/Map/MapEntity.cs
+1 -1
View File
@@ -382,7 +382,7 @@ namespace Barotrauma
}
else
{
selectedList = newSelection;
selectedList = new List<MapEntity>(newSelection);
//selectedList.Clear();
//newSelection.ForEach(e => AddSelection(e));
foreach (var entity in newSelection)
Barotrauma/BarotraumaClient/Source/Map/Structure.cs
+14 -4
View File
@@ -4,7 +4,6 @@ using Barotrauma.Networking;
using FarseerPhysics;
using FarseerPhysics.Dynamics;
using FarseerPhysics.Dynamics.Contacts;
using Lidgren.Network;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using System;
@@ -346,12 +345,23 @@ namespace Barotrauma
}
}
public void ClientRead(ServerNetObject type, NetBuffer msg, float sendingTime)
public void ClientRead(ServerNetObject type, IReadMessage msg, float sendingTime)
{
for (int i = 0; i < Sections.Length; i++)
byte sectionCount = msg.ReadByte();
if (sectionCount != Sections.Length)
{
string errorMsg = $"Error while reading a network event for the structure \"{Name}\". Section count does not match (server: {sectionCount} client: {Sections.Length})";
DebugConsole.NewMessage(errorMsg, Color.Red);
GameAnalyticsManager.AddErrorEventOnce("Structure.ClientRead:SectionCountMismatch", GameAnalyticsSDK.Net.EGAErrorSeverity.Error, errorMsg);
}
for (int i = 0; i < sectionCount; i++)
{
float damage = msg.ReadRangedSingle(0.0f, 1.0f, 8) * Health;
SetDamage(i, damage);
if (i < Sections.Length)
{
SetDamage(i, damage);
}
}
}
}
Barotrauma/BarotraumaClient/Source/Map/Submarine.cs
+1 -2
View File
@@ -2,7 +2,6 @@
using Barotrauma.RuinGeneration;
using Barotrauma.Sounds;
using FarseerPhysics;
using Lidgren.Network;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using System;
@@ -514,7 +513,7 @@ namespace Barotrauma
}
}
public void ClientRead(ServerNetObject type, NetBuffer msg, float sendingTime)
public void ClientRead(ServerNetObject type, IReadMessage msg, float sendingTime)
{
var posInfo = PhysicsBody.ClientRead(type, msg, sendingTime, parentDebugName: Name);
msg.ReadPadBits();