- added DayZ and Arma3 as games

- simplified GetGameCaption from enum values
PredatH0r · May 25, 2015 · 49bb530 · 49bb530
1 parent 6d11acc
commit 49bb530
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 36 deletions.
diff --git a/QueryMaster/QueryMaster/Enums.cs b/QueryMaster/QueryMaster/Enums.cs
@@ -212,7 +212,11 @@ public enum Game
 
         Toxikk = 324810,
         Reflex = 328070,
-        QuakeLiveTesting = 344320
+        QuakeLive_Testing = 344320,
+        DayZ = 221100,
+        Arma_3 = 107410,
+        Arma_3_dedicated_server = 233780,
+
     }
 
     /// <summary>

diff --git a/ServerBrowser/ServerBrowserForm.Designer.cs b/ServerBrowser/ServerBrowserForm.Designer.cs
diff --git a/ServerBrowser/ServerBrowserForm.cs b/ServerBrowser/ServerBrowserForm.cs
@@ -6,7 +6,6 @@
 using System.IO;
 using System.Net;
 using System.Reflection;
-using System.Text;
 using System.Threading;
 using System.Windows.Forms;
 using DevExpress.LookAndFeel;
@@ -136,7 +135,7 @@ private void InitGameInfoExtenders()
     {
       extenders.Add(Game.Toxikk, new Toxikk());
       extenders.Add(Game.Reflex, new Reflex());
-      extenders.Add(Game.QuakeLiveTesting, new QuakeLive());
+      extenders.Add(Game.QuakeLive_Testing, new QuakeLive());
     }
 
     #endregion
@@ -239,30 +238,7 @@ private void InitFavGameRadioButtons()
     #region GetGameCaption()
     private string GetGameCaption(Game game)
     {
-      string rawName = game.ToString();
-      var sb = new StringBuilder();
-      bool prevWasUpper = true;
-      foreach (char c in rawName)
-      {
-        if (c == '_')
-        {
-          sb.Append(" ");
-          prevWasUpper = true;
-          continue;
-        }
-
-        if (Char.IsUpper(c))
-        {
-          if (!prevWasUpper)
-            sb.Append(" ");
-          prevWasUpper = true;
-        }
-        else
-          prevWasUpper = false;
-
-        sb.Append(c);
-      }
-      return sb.ToString();
+      return game.ToString().Replace("_", " ");
     }
     #endregion
 
@@ -413,15 +389,14 @@ private void UpdateServerDetails(ServerRow row, int requestId, Action callback =
       using (Server server = ServerQuery.GetServerInstance(EngineType.Source, row.EndPoint, false, 500, 500))
       {
         row.Retries = 0;
-        row.Status = "updating";
-        this.serverListUpdateNeeded = true;
         server.Retries = 3;
-        status =
-          UpdateServerInfo(row, server, requestId) &&
-          UpdatePlayers(row, server, requestId) &&
-          UpdateRules(row, server, requestId)
-            ? "ok"
-            : "timeout";
+        status = "timeout";
+        if (this.UpdateServerInfo(row, server, requestId))
+        {
+          this.UpdatePlayers(row, server, requestId);
+          this.UpdateRules(row, server, requestId);
+          status = "ok";
+        }
       }
 
       if (requestId != this.currentRequestId) // status might have changed