Changeset 107 for binary-improvements/7dtd-server-fixes/src/TelnetCommands

Timestamp:

Jul 26, 2014, 4:41:11 PM (10 years ago)

Author:

alloc

Message:

fixes

Location:

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

Files:

• GetGamePrefs.cs (modified) (1 diff)
• GetTime.cs (modified) (1 diff)
• ListPlayersExtended.cs (modified) (2 diffs)
• SayToPlayer.cs (modified) (3 diffs)
• SetTimeReal.cs (modified) (3 diffs)
• ShowInventory.cs (modified) (2 diffs)

binary-improvements/7dtd-server-fixes/src/TelnetCommands/GetGamePrefs.cs

@@ -65 +65 @@
                                 }
                                 foreach (string s in sortedList.Keys) {
-                                        m_Console.md000a (sortedList [s]);
+                                        m_Console.SendResult (sortedList [s]);
                                 }
                         } else {
                                 if (prefAccessAllowed (enumGamePrefs))
-                                        m_Console.md000a (string.Format ("{0} = {1}", enumGamePrefs, GamePrefs.GetObject (enumGamePrefs)));
+                                        m_Console.SendResult (string.Format ("{0} = {1}", enumGamePrefs, GamePrefs.GetObject (enumGamePrefs)));
                                 else
-                                        m_Console.md000a ("Access to requested preference is forbidden");
+                                        m_Console.SendResult ("Access to requested preference is forbidden");
                         }
                 } catch (Exception e) {

binary-improvements/7dtd-server-fixes/src/TelnetCommands/GetTime.cs

@@ -28 +28 @@
                         }
                         int min = (int)(time % 1000) * 60 / 1000;
-                        m_Console.md000a (String.Format ("Day {0}, {1:00}:{2:00} ", day, hour, min));
+                        m_Console.SendResult (String.Format ("Day {0}, {1:00}:{2:00} ", day, hour, min));
                 } catch (Exception e) {
                         Log.Out ("Error in GetTime.Run: " + e);

binary-improvements/7dtd-server-fixes/src/TelnetCommands/ListPlayersExtended.cs

@@ -29 +29 @@
                                         ip = ci.networkPlayer.ipAddress;
                                 }
-                                m_Console.md000a (string.Concat (new object[]
+                                m_Console.SendResult (string.Concat (new object[]
                         {
                                 string.Empty,
@@ -63 +63 @@
                                 );
                         }
-                        m_Console.md000a ("Total of " + w.playerEntities.list.Count + " in the game");
+                        m_Console.SendResult ("Total of " + w.playerEntities.list.Count + " in the game");
                 } catch (Exception e) {
                         Log.Out ("Error in ListPlayersExtended.Run: " + e);

binary-improvements/7dtd-server-fixes/src/TelnetCommands/SayToPlayer.cs

@@ -23 +23 @@
                                 new object[] { _message, -1, _sender + " (PM)", true    });
                 string receiverName = CommonMappingFunctions.GetPlayerName (_receiver);
-                m_Console.md000a ("Message to player " + (receiverName != null ? "\"" + receiverName + "\"" : "unknownName") + " sent with sender \"" + _sender + "\"");
+                m_Console.SendResult ("Message to player " + (receiverName != null ? "\"" + receiverName + "\"" : "unknownName") + " sent with sender \"" + _sender + "\"");
         }
 
@@ -29 +29 @@
         {
                 if (_params.Length < 2) {
-                        m_Console.md000a ("Usage: sayplayer <playername|entityid> <message>");
+                        m_Console.SendResult ("Usage: sayplayer <playername|entityid> <message>");
                         return;
                 }
@@ -42 +42 @@
                         SendMessage (ci, _sender, message);
                 } else {
-                        m_Console.md000a ("Playername or entity ID not found.");
+                        m_Console.SendResult ("Playername or entity ID not found.");
                 }
         }

binary-improvements/7dtd-server-fixes/src/TelnetCommands/SetTimeReal.cs

@@ -21 +21 @@
                 try {
                         if (_params.Length != 3) {
-                                m_Console.md000a ("Usage: settimereal <day> <hour> <min>");
+                                m_Console.SendResult ("Usage: settimereal <day> <hour> <min>");
                                 return;
                         }
@@ -27 +27 @@
                         int day, hour, min;
                         if (!int.TryParse (_params [0], out day)) {
-                                m_Console.md000a ("Could not parse day number \"" + _params [0] + "\"");
+                                m_Console.SendResult ("Could not parse day number \"" + _params [0] + "\"");
                                 return;
                         }
                         if (day < 1) {
-                                m_Console.md000a ("Day must be >= 1");
+                                m_Console.SendResult ("Day must be >= 1");
                                 return;
                         }
                         if (!int.TryParse (_params [1], out hour)) {
-                                m_Console.md000a ("Could not parse hour \"" + _params [1] + "\"");
+                                m_Console.SendResult ("Could not parse hour \"" + _params [1] + "\"");
                                 return;
                         }
                         if (hour > 23) {
-                                m_Console.md000a ("Hour must be <= 23");
+                                m_Console.SendResult ("Hour must be <= 23");
                                 return;
                         }
                         if (!int.TryParse (_params [2], out min)) {
-                                m_Console.md000a ("Could not parse minute \"" + _params [2] + "\"");
+                                m_Console.SendResult ("Could not parse minute \"" + _params [2] + "\"");
                                 return;
                         }
                         if (min > 59) {
-                                m_Console.md000a ("Minute must be <= 59");
+                                m_Console.SendResult ("Minute must be <= 59");
                                 return;
                         }
                         if ((day < 1) || (hour < 8 && day < 1)) {
-                                m_Console.md000a ("Time may not be prior to day 1, 8:00");
+                                m_Console.SendResult ("Time may not be prior to day 1, 8:00");
                                 return;
                         }
@@ -57 +57 @@
                         ulong time = ((ulong)(day - 1) * 24000) + ((ulong)hour * 1000) + ((ulong)min * 1000 / 60) - 8000;
                         m_Console.gameManager.World.gameTime = time;
-                        m_Console.md000a (String.Format ("Set time to Day {0}, {1:00}:{2:00} = {3}", day, hour, min, time));
+                        m_Console.SendResult (String.Format ("Set time to Day {0}, {1:00}:{2:00} = {3}", day, hour, min, time));
                 } catch (Exception e) {
                         Log.Out ("Error in SetTimeReal.Run: " + e);

binary-improvements/7dtd-server-fixes/src/TelnetCommands/ShowInventory.cs

@@ -25 +25 @@
                 try {
                         if (_params.Length < 1) {
-                                m_Console.md000a ("Usage: showinventory <playername|entityid>");
+                                m_Console.SendResult ("Usage: showinventory <playername|entityid>");
                                 return;
                         }
@@ -47 +47 @@
 
                         if (items == null) {
-                                m_Console.md000a ("Playername or entity id not found or no inventory saved (first saved after a player has been online for 30s).");
+                                m_Console.SendResult ("Playername or entity id not found or no inventory saved (first saved after a player has been online for 30s).");
                                 return;
                         }
 
-                        m_Console.md000a ("Belt of player:");
+                        m_Console.SendResult ("Belt of player:");
                         foreach (KeyValuePair<string, int> kvp in items.belt) {
-                                m_Console.md000a (string.Format ("    {0:000} * {1}", kvp.Value, kvp.Key));
+                                m_Console.SendResult (string.Format ("    {0:000} * {1}", kvp.Value, kvp.Key));
                         }
-                        m_Console.md000a (string.Empty);
-                        m_Console.md000a ("Bagpack of player:");
+                        m_Console.SendResult (string.Empty);
+                        m_Console.SendResult ("Bagpack of player:");
                         foreach (KeyValuePair<string, int> kvp in items.bag) {
-                                m_Console.md000a (string.Format ("    {0:000} * {1}", kvp.Value, kvp.Key));
+                                m_Console.SendResult (string.Format ("    {0:000} * {1}", kvp.Value, kvp.Key));
                         }
-                        m_Console.md000a (string.Empty);
+                        m_Console.SendResult (string.Empty);
                 } catch (Exception e) {
                         Log.Out ("Error in ShowInventory.Run: " + e);