Use 'sam_strGameName' in Query directly instead of the shell command.

Author: DreamyCecil

Query/DarkPlacesQuery.cpp

@@ -41,7 +41,7 @@ void DarkPlaces_BuildQCStatus(CTString &strStatus)
 {
   INDEX ctFreeSlots = _pNetwork->ga_sesSessionState.ses_ctMaxPlayers - GetClientCount();
 
-  strStatus.PrintF("%s:%s:P%d:S%d:F%d:M%s::score!!", _getCurrentGameTypeName(), "0.8.2", 0, ctFreeSlots, 0, _pShell->GetString("sam_strGameName"));
+  strStatus.PrintF("%s:%s:P%d:S%d:F%d:M%s::score!!", _getCurrentGameTypeName(), "0.8.2", 0, ctFreeSlots, 0, sam_strGameName);
 }
 
 // Builds status string.
@@ -62,7 +62,7 @@ void DarkPlaces_BuildStatusResponse(const char* challenge, CTString &strPacket,
             "%s",
             bFullStatus ? "statusResponse" : "infoResponse",
             // [Cecil] "$version" -> _SE_VER_STRING
-            _pShell->GetString("sam_strGameName"), "", _SE_VER_STRING, ctMaxPlayers,
+            sam_strGameName, "", _SE_VER_STRING, ctMaxPlayers,
             GetClientCount(), 0, _pNetwork->ga_World.wo_strName, _pPatchAPI->GetSessionName(), DP_NET_PROTOCOL_VERSION,
             "\\qcstatus\\", strStatus,
             challenge ? "\\challenge\\" : "", challenge ? challenge : "",
@@ -395,7 +395,7 @@ void CDarkPlacesQuery::EnumTrigger(BOOL bInternet)
   _bInitialized = TRUE;
 
   CTString strPacket;
-  strPacket.PrintF("\xFF\xFF\xFF\xFFgetservers %s %u empty full", _pShell->GetString("sam_strGameName"), DP_NET_PROTOCOL_VERSION);
+  strPacket.PrintF("\xFF\xFF\xFF\xFFgetservers %s %u empty full", sam_strGameName, DP_NET_PROTOCOL_VERSION);
   _sendPacket(strPacket); // Send enumeration packet to masterserver.
 
   _setStatus(".");

Query/GameAgentQuery.cpp

@@ -37,7 +37,7 @@ void CGameAgentQuery::BuildHearthbeatPacket(CTString &strPacket, INDEX iChalleng
       _pNetwork->ga_World.wo_strName,
       _getCurrentGameTypeName(),
       _SE_VER_STRING,
-      _pShell->GetString("sam_strGameName"));
+      sam_strGameName);
 }
 
 void CGameAgentQuery::ServerParsePacket(INDEX iLength)
@@ -63,7 +63,7 @@ void CGameAgentQuery::ServerParsePacket(INDEX iLength)
         _pNetwork->ga_World.wo_strName,
         _getCurrentGameTypeName(),
         _SE_VER_STRING,
-        _pShell->GetString("sam_strGameName"),
+        sam_strGameName,
         _pPatchAPI->GetSessionName());
       _sendPacketTo(strPacket, &_sinFrom);
       break;

Query/LegacyServerQuery.cpp

@@ -110,7 +110,7 @@ void CLegacyQuery::ServerParsePacket(INDEX iLength)
     }
 
     strPacket.PrintF( PCKQUERY,
-      _pShell->GetString("sam_strGameName"),
+      sam_strGameName,
       _SE_VER_STRING,
       //_pShell->GetString("net_strLocalHost"),
       strLocation,
@@ -183,7 +183,7 @@ void CLegacyQuery::ServerParsePacket(INDEX iLength)
       strLocation = "Heartland";
     }
     strPacket.PrintF( PCKBASIC,
-      _pShell->GetString("sam_strGameName"),
+      sam_strGameName,
       _SE_VER_STRING,
       //_pShell->GetString("net_strLocalHost"));
       strLocation);

Query/QueryMgr.h

@@ -19,6 +19,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
+// [Cecil] Get game name directly
+extern CTString sam_strGameName;
+
 extern CTString ms_strGameAgentMS;
 extern CTString ms_strMSLegacy;
 extern CTString ms_strDarkPlacesMS;