(a00338777) v0.9.2.1

Barotrauma/BarotraumaShared/Source/Networking/NetworkMember.cs

@@ -1,5 +1,4 @@
 using Barotrauma.Items.Components;
-using Lidgren.Network;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
@@ -9,9 +8,6 @@ namespace Barotrauma.Networking
 {
     enum ClientPacketHeader
     {
-        REQUEST_AUTH,   //ask the server if a password is needed, if so we'll get nonce for encryption
-        REQUEST_STEAMAUTH, //the same as REQUEST_AUTH, but in addition we want to authenticate the player's Steam ID
-        REQUEST_INIT,   //ask the server to give you initialization
         UPDATE_LOBBY,   //update state in lobby
         UPDATE_INGAME,  //update state ingame
 
@@ -64,7 +60,9 @@ namespace Barotrauma.Networking
 
         QUERY_STARTGAME,    //ask the clients whether they're ready to start
         STARTGAME,          //start a new round
-        ENDGAME
+        ENDGAME,
+
+        TRAITOR_MESSAGE
     }
     enum ServerNetObject
     {
@@ -78,6 +76,14 @@ namespace Barotrauma.Networking
         ENTITY_EVENT_INITIAL,
     }
 
+    enum TraitorMessageType
+    {
+        Server,
+        ServerMessageBox,
+        Objective,
+        Console
+    }
+
     enum VoteType
     {
         Unknown,
@@ -94,6 +100,7 @@ namespace Barotrauma.Networking
         Banned,
         Kicked,
         ServerShutdown,
+        ServerCrashed,
         ServerFull,
         AuthenticationRequired,
         SteamAuthenticationRequired,
@@ -132,13 +139,7 @@ namespace Barotrauma.Networking
 #if DEBUG
         public Dictionary<string, long> messageCount = new Dictionary<string, long>();
 #endif
-
-        public NetPeer NetPeer
-        {
-            get;
-            protected set;
-        }
-
+        
         protected string name;
 
         protected ServerSettings serverSettings;
@@ -154,12 +155,6 @@ namespace Barotrauma.Networking
 
         public bool ShowNetStats;
 
-        public int Port
-        {
-            get;
-            set;
-        }
-
         public int TickRate
         {
             get { return serverSettings.TickRate; }
@@ -205,13 +200,7 @@ namespace Barotrauma.Networking
         {
             get { return serverSettings; }
         }
-        
-        public NetPeerConfiguration NetPeerConfiguration
-        {
-            get;
-            protected set;
-        }
-        
+
         public bool CanUseRadio(Character sender)
         {
             if (sender == null) return false;