Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

This commit is contained in:
Evil Factory
2025-09-17 08:30:35 -03:00
121 changed files with 2582 additions and 635 deletions

View File

@@ -32,7 +32,8 @@ namespace Barotrauma.Networking
IsDisconnectMessage = 0x4,
IsServerMessage = 0x8,
IsHeartbeatMessage = 0x10,
IsDataFragment = 0x20
IsDataFragment = 0x20,
IsDoSProtectionMessage = 0x40,
}
public static class NetworkEnumExtensions
@@ -51,9 +52,12 @@ namespace Barotrauma.Networking
public static bool IsHeartbeatMessage(this PacketHeader h)
=> h.HasFlag(PacketHeader.IsHeartbeatMessage);
public static bool IsDataFragment(this PacketHeader h)
=> h.HasFlag(PacketHeader.IsDataFragment);
public static bool IsDoSProtectionMessage(this PacketHeader h)
=> h.HasFlag(PacketHeader.IsDoSProtectionMessage);
}
public static class NetworkMagicStrings

View File

@@ -91,7 +91,7 @@ namespace Microsoft.Xna.Framework.Graphics
Effect _spriteEffect;
readonly EffectParameter _matrixTransform;
readonly EffectPass _spritePass;
EffectPass _spritePass;
Matrix? _matrix;
private Viewport _lastViewport;
@@ -238,6 +238,7 @@ namespace Microsoft.Xna.Framework.Graphics
else
_matrixTransform.SetValue(_projection);
_spritePass = _spriteEffect.CurrentTechnique.Passes[0];
_spritePass.Apply();
}