Changeset 132 for binary-improvements/7dtd-server-fixes/src/NetConnections/ConsoleOutputSeparator.cs

Timestamp:

Aug 26, 2014, 7:29:11 PM (10 years ago)

Author:

alloc

Message:

Fixes: Source cleanups

Location:

binary-improvements/7dtd-server-fixes/src/NetConnections

Files:

• . (added)
• ConsoleOutputSeparator.cs (moved) (moved from binary-improvements/7dtd-server-fixes/src/ConsoleOutputSeparator.cs ) (6 diffs)

binary-improvements/7dtd-server-fixes/src/NetConnections/ConsoleOutputSeparator.cs

@@ -4 +4 @@
 using UnityEngine;
 
-namespace AllocsFixes
+namespace AllocsFixes.NetConnections
 {
         public class ConsoleOutputSeparator
         {
-                public struct AllocsTelnetCommand
+                public struct NetCommand
                 {
                         public string command;
-                        public AllocsTelnetConnection client;
+                        public IConnection client;
 
-                        public AllocsTelnetCommand (string _cmd, AllocsTelnetConnection _client)
+                        public NetCommand (string _cmd, IConnection _client)
                         {
                                 command = _cmd;
@@ -20 +20 @@
                 }
 
-                private static List<AllocsTelnetCommand> telnetCommandQueue = new List<AllocsTelnetCommand> ();
+                private static List<NetCommand> netCommandQueue = new List<NetCommand> ();
                 private static bool isCurrentCommandFromClient = false;
-                private static AllocsTelnetConnection issuerOfCurrentTelnetCommand;
+                private static IConnection issuerOfCurrentCommand;
 
                 public static void C_ExecuteCmdFromClient (ConsoleSdtd console, NetworkPlayer _networkPlayer, string _playerID, string _command)
@@ -28 +28 @@
                         Log.Out ("Executed command \"" + _command + "\" from player \"" + _playerID + "\"");
 
-                        object obj = telnetCommandQueue;
+                        object obj = netCommandQueue;
                         Monitor.Enter (obj);
                         try {
@@ -51 +51 @@
                                 );
                         } else {
-                                if (console.telnetServer != null && issuerOfCurrentTelnetCommand != null)
-                                        AllocsNetTelnetServer.WriteToClient_Single (_line, issuerOfCurrentTelnetCommand);
+                                if (console.telnetServer != null && issuerOfCurrentCommand != null)
+                                        NetTelnetServer.WriteToClient_Single (_line, issuerOfCurrentCommand);
                                 else if (ControlPanel.IsStarted ())
                                         ControlPanel.AddTextToOutputBuffer (_line);
@@ -60 +60 @@
                 public static void C_Run (ConsoleSdtd console)
                 {
-                        if (telnetCommandQueue.Count > 0) {
-                                object obj = telnetCommandQueue;
+                        if (netCommandQueue.Count > 0) {
+                                object obj = netCommandQueue;
                                 Monitor.Enter (obj);
                                 try {
-                                        issuerOfCurrentTelnetCommand = telnetCommandQueue [0].client;
-                                        console.ExecuteRemoteCmdInternal (telnetCommandQueue [0].command, false);
-                                        telnetCommandQueue.RemoveAt (0);
-                                        issuerOfCurrentTelnetCommand = null;
+                                        issuerOfCurrentCommand = netCommandQueue [0].client;
+                                        console.ExecuteRemoteCmdInternal (netCommandQueue [0].command, false);
+                                        netCommandQueue.RemoveAt (0);
+                                        issuerOfCurrentCommand = null;
                                 } finally {
                                         Monitor.Exit (obj);
@@ -74 +74 @@
                 }
 
-                public static void QueueTelnetCommand (string _line, AllocsTelnetConnection _con)
+                public static void QueueNetCommand (string _line, IConnection _con)
                 {
-                        object obj = telnetCommandQueue;
+                        object obj = netCommandQueue;
                         Monitor.Enter (obj);
                         try {
-                                telnetCommandQueue.Add (new AllocsTelnetCommand (_line, _con));
+                                netCommandQueue.Add (new NetCommand (_line, _con));
                         } finally {
                                 Monitor.Exit (obj);