diff --git a/SS14.Client/Player/PlayerManager.cs b/SS14.Client/Player/PlayerManager.cs index 6d9e73e17..03fe867ef 100644 --- a/SS14.Client/Player/PlayerManager.cs +++ b/SS14.Client/Player/PlayerManager.cs @@ -24,8 +24,6 @@ namespace SS14.Client.Player /// public class PlayerManager : IPlayerManager { - //private readonly List _effects = new List(); - [Dependency] private readonly IClientNetManager _network; @@ -69,10 +67,7 @@ namespace SS14.Client.Player _config.RegisterCVar("player.name", "Joe Genero", CVar.ARCHIVE); _network.RegisterNetMessage(MsgPlayerListReq.NAME); - _network.RegisterNetMessage(MsgPlayerList.NAME, HandlePlayerList); - - _network.RegisterNetMessage(MsgSession.NAME, HandleSessionMessage); } /// @@ -88,10 +83,7 @@ namespace SS14.Client.Player /// public void Update(float frameTime) { - //foreach (var e in _effects.ToArray()) - //{ - // e.Update(frameTime); - //} + // Uh, nothing anymore I guess. } /// @@ -101,17 +93,6 @@ namespace SS14.Client.Player _sessions.Clear(); } - /* - /// - public void ApplyEffects(RenderImage image) - { - foreach (var e in _effects) - { - e.ProcessImage(image); - } - } - */ - /// public void ApplyPlayerStates(IEnumerable list) { @@ -135,23 +116,6 @@ namespace SS14.Client.Player UpdatePlayerList(list); } - /// - /// Handles an incoming session NetMsg from the server. - /// - private void HandleSessionMessage(MsgSession msg) - { - switch (msg.MsgType) - { - case PlayerSessionMessage.AttachToEntity: - break; - case PlayerSessionMessage.JoinLobby: - break; - case PlayerSessionMessage.AddPostProcessingEffect: - //AddEffect(msg.PpType, msg.PpDuration); - break; - } - } - /// /// Compares the server sessionStatus to the client one, and updates if needed. /// @@ -235,7 +199,7 @@ namespace SS14.Client.Player foreach (var existing in hitSet) { // clear slot, player left - if (!_sessions.TryGetValue(existing, out var local)) + if (!_sessions.ContainsKey(existing)) { DebugTools.Assert(LocalPlayer.SessionId != existing, "I'm still connected to the server, but i left?"); _sessions.Remove(existing); diff --git a/SS14.Server/Interfaces/Player/IPlayerManager.cs b/SS14.Server/Interfaces/Player/IPlayerManager.cs index 866ed52e4..a3802733f 100644 --- a/SS14.Server/Interfaces/Player/IPlayerManager.cs +++ b/SS14.Server/Interfaces/Player/IPlayerManager.cs @@ -37,7 +37,6 @@ namespace SS14.Server.Interfaces.Player /// /// Initializes the manager. /// - /// The server that instantiated this manager. /// Maximum number of players that can connect to this server at one time. void Initialize(int maxPlayers); diff --git a/SS14.Server/Interfaces/Player/IPlayerSession.cs b/SS14.Server/Interfaces/Player/IPlayerSession.cs index d5462ebfa..5df900e07 100644 --- a/SS14.Server/Interfaces/Player/IPlayerSession.cs +++ b/SS14.Server/Interfaces/Player/IPlayerSession.cs @@ -1,6 +1,5 @@ using System; using SS14.Server.Player; -using SS14.Shared.Enums; using SS14.Shared.GameObjects; using SS14.Shared.Interfaces.GameObjects; using SS14.Shared.Interfaces.Network; @@ -35,10 +34,9 @@ namespace SS14.Server.Interfaces.Player void DetachFromEntity(); void OnConnect(); void OnDisconnect(); - void AddPostProcessingEffect(PostProcessingEffectType type, float duration); /// - /// Persistant data for this player. + /// Persistent data for this player. /// IPlayerData Data { get; } } diff --git a/SS14.Server/Player/PlayerManager.cs b/SS14.Server/Player/PlayerManager.cs index 686b8ed95..a4c2d0f0f 100644 --- a/SS14.Server/Player/PlayerManager.cs +++ b/SS14.Server/Player/PlayerManager.cs @@ -80,7 +80,6 @@ namespace SS14.Server.Player _sessions = new Dictionary(maxPlayers); _playerData = new Dictionary(maxPlayers); - _network.RegisterNetMessage(MsgSession.NAME); _network.RegisterNetMessage(MsgServerInfoReq.NAME, HandleWelcomeMessageReq); _network.RegisterNetMessage(MsgServerInfo.NAME); _network.RegisterNetMessage(MsgPlayerListReq.NAME, HandlePlayerListReq); diff --git a/SS14.Server/Player/PlayerSession.cs b/SS14.Server/Player/PlayerSession.cs index d2fbcc8e1..73cb95ba1 100644 --- a/SS14.Server/Player/PlayerSession.cs +++ b/SS14.Server/Player/PlayerSession.cs @@ -9,7 +9,6 @@ using SS14.Server.Interfaces; using SS14.Shared.Enums; using SS14.Shared.GameObjects; using SS14.Shared.Interfaces.Network; -using SS14.Shared.Network.Messages; using SS14.Shared.Network; using SS14.Shared.ViewVariables; @@ -107,7 +106,6 @@ namespace SS14.Server.Player AttachedEntity = a; a.SendMessage(actorComponent, new PlayerAttachedMsg(this)); - SendAttachMessage(); SetAttachedEntityName(); UpdatePlayerState(); } @@ -144,33 +142,6 @@ namespace SS14.Server.Player UpdatePlayerState(); } - /// - public void AddPostProcessingEffect(PostProcessingEffectType type, float duration) - { - var net = IoCManager.Resolve(); - var message = net.CreateNetMessage(); - - message.MsgType = PlayerSessionMessage.AddPostProcessingEffect; - message.PpType = type; - message.PpDuration = duration; - - net.ServerSendMessage(message, ConnectedClient); - } - - private void SendAttachMessage() - { - if (AttachedEntity == null) - throw new Exception("Cannot attach player session to entity: No entity attached."); - - var net = IoCManager.Resolve(); - var message = net.CreateNetMessage(); - - message.MsgType = PlayerSessionMessage.AttachToEntity; - message.Uid = AttachedEntity.Uid; - - net.ServerSendMessage(message, ConnectedClient); - } - private void SetAttachedEntityName() { if (Name != null && AttachedEntity != null) diff --git a/SS14.Shared/Enums/NetworkEnums.cs b/SS14.Shared/Enums/NetworkEnums.cs index 5206f89d1..df08c743a 100644 --- a/SS14.Shared/Enums/NetworkEnums.cs +++ b/SS14.Shared/Enums/NetworkEnums.cs @@ -20,13 +20,6 @@ DeleteMap } - public enum PlayerSessionMessage - { - AttachToEntity, - JoinLobby, - AddPostProcessingEffect - } - public enum SessionStatus : byte { Zombie = 0, @@ -53,12 +46,4 @@ d_string, d_byteArray } - - public enum PostProcessingEffectType - { - Blur, - Death, - Perlin, - Acid - } } diff --git a/SS14.Shared/GameObjects/ComponentEnums.cs b/SS14.Shared/GameObjects/ComponentEnums.cs index 63106012d..734f2266d 100644 --- a/SS14.Shared/GameObjects/ComponentEnums.cs +++ b/SS14.Shared/GameObjects/ComponentEnums.cs @@ -1,16 +1,5 @@ namespace SS14.Shared.GameObjects { - public enum ComponentMessageType - { - Null, - Empty, - BoundKeyChange, // U - BoundKeyRepeat, // U - SpriteChanged, // U - Bumped, // U - EntitySaidSomething, // U - } - public enum DrawDepth { /// diff --git a/SS14.Shared/GameObjects/ComponentReplyMessage.cs b/SS14.Shared/GameObjects/ComponentReplyMessage.cs deleted file mode 100644 index 588ec264f..000000000 --- a/SS14.Shared/GameObjects/ComponentReplyMessage.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Collections.Generic; -using System.Linq; - -namespace SS14.Shared.GameObjects -{ - public struct ComponentReplyMessage - { - private static ComponentReplyMessage empty = new ComponentReplyMessage(ComponentMessageType.Empty); - - public ComponentReplyMessage(ComponentMessageType messageType, params object[] paramsList) : this() - { - ParamsList = paramsList != null ? paramsList.ToList() : new List(); - MessageType = messageType; - } - - public static ComponentReplyMessage Empty { get; set; } - public ComponentMessageType MessageType { get; set; } - public List ParamsList { get; set; } - } -} diff --git a/SS14.Shared/Network/Messages/MsgSession.cs b/SS14.Shared/Network/Messages/MsgSession.cs deleted file mode 100644 index ec7effcbb..000000000 --- a/SS14.Shared/Network/Messages/MsgSession.cs +++ /dev/null @@ -1,52 +0,0 @@ -using Lidgren.Network; -using SS14.Shared.Enums; -using SS14.Shared.GameObjects; -using SS14.Shared.Interfaces.Network; - -namespace SS14.Shared.Network.Messages -{ - public class MsgSession : NetMessage - { - #region REQUIRED - public static readonly MsgGroups GROUP = MsgGroups.Core; - public static readonly string NAME = nameof(MsgSession); - public MsgSession(INetChannel channel) : base(NAME, GROUP) { } - #endregion - - public PlayerSessionMessage MsgType { get; set; } - public EntityUid Uid { get; set; } - public PostProcessingEffectType PpType { get; set; } - public float PpDuration { get; set; } - - public override void ReadFromBuffer(NetIncomingMessage buffer) - { - MsgType = (PlayerSessionMessage) buffer.ReadByte(); - - switch (MsgType) - { - case PlayerSessionMessage.AttachToEntity: - Uid = new EntityUid(buffer.ReadInt32()); - break; - case PlayerSessionMessage.AddPostProcessingEffect: - PpType = (PostProcessingEffectType) buffer.ReadInt32(); - PpDuration = buffer.ReadFloat(); - break; - } - } - - public override void WriteToBuffer(NetOutgoingMessage buffer) - { - buffer.Write((byte)MsgType); - switch (MsgType) - { - case PlayerSessionMessage.AttachToEntity: - buffer.Write((int)Uid); - break; - case PlayerSessionMessage.AddPostProcessingEffect: - buffer.Write((int)PpType); - buffer.Write(PpDuration); - break; - } - } - } -} diff --git a/SS14.Shared/SS14.Shared.csproj b/SS14.Shared/SS14.Shared.csproj index 49697cb60..b7c105786 100644 --- a/SS14.Shared/SS14.Shared.csproj +++ b/SS14.Shared/SS14.Shared.csproj @@ -215,7 +215,6 @@ - @@ -253,7 +252,6 @@ - @@ -284,7 +282,6 @@ - diff --git a/SS14.Shared/Utility/PlatformTools.cs b/SS14.Shared/Utility/PlatformTools.cs deleted file mode 100644 index 5020275f9..000000000 --- a/SS14.Shared/Utility/PlatformTools.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.IO; - -namespace SS14.Shared.Utility -{ - public class PlatformTools - { - public static string SanePath(String pathname) - { - // sanitize the pathname in config.xml for the current OS - // N.B.: You cannot use Path.DirectorySeparatorChar and - // Path.AltDirectorySeparatorChar here, because on some platforms - // they are the same. Mono/linux has both as '/', for example. - // Hardcode the only platforms we care about. - - var separators = new char[] { '/', '\\' }; - string newpath = ""; - foreach (string tmp in pathname.Split(separators)) - newpath = Path.Combine(newpath, tmp); - return newpath; - } - } -}