#15 add ability to change master server

Author: Polarhigh

CMakeLists.txt

@@ -35,11 +35,12 @@ set(CPR_ENABLE_CURL_HTTP_ONLY OFF)
 set(CPR_ENABLE_SSL ON)
 
 # external dependencies
-add_subdirectory(dep/data_encoding)
 add_subdirectory(dep/cpr)
+add_subdirectory(dep/easyloggingpp)
 
 # NextClient sub-projects
 add_subdirectory(dep/NclNitroApi)
+add_subdirectory(nextclient/packages)
 add_subdirectory(nextclient/launcher)
 add_subdirectory(nextclient/engine_mini)
 add_subdirectory(nextclient/filesystem_proxy)

assets/platform/config/MasterServer.vdf

@@ -0,0 +1,20 @@
+"MasterServer"
+{
+	"Selected"		"1"
+	"CacheServers"		"false"
+	"Servers"
+	{
+		"Steam"
+		{
+			"address"		"hl1master.steampowered.com:27011"
+			"site"		""
+			"region"		"0x03" // see region codes here https://developer.valvesoftware.com/wiki/Master_Server_Query_Protocol#Region_codes
+		}
+		"Tsarvar"
+		{
+			"address"		"ms.tsarvar.com:27010"
+			"site"		"https://tsarvar.com/"
+			"region"		"0xFF"
+		}
+	}
+}

dep/NclNitroApi

@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 3.20)
+project(easyloggingpp)
+
+add_library(${PROJECT_NAME} INTERFACE)
+add_library(easyloggingpp::easyloggingpp ALIAS ${PROJECT_NAME})
+
+target_include_directories(${PROJECT_NAME} INTERFACE
+        ${CMAKE_CURRENT_SOURCE_DIR}/src
+)
+
+target_sources(${PROJECT_NAME} INTERFACE
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/easylogging++.cc
+)

dep/easyloggingpp/CMakeLists.txt

@@ -109,6 +109,8 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE
         LOG_TAG="game"
         USE_OPTICK=$<BOOL:${USE_PROFILER}>
         _HAS_STATIC_RTTI=0 #disable rtti things in stl
+        #easyloggingpp options
+        ELPP_WINSOCK2
 )
 
 if (WIN32)
@@ -119,6 +121,7 @@ if (WIN32)
             WINVER=0x0600
             NOMINMAX
             _UNICODE
+            WIN32_LEAN_AND_MEAN
     )
 endif()
 

…r/dep/easyloggingpp/src/easylogging++.cc dep/easyloggingpp/src/easylogging++.ccnextclient/launcher/dep/easyloggingpp/src/easylogging++.cc renamed to dep/easyloggingpp/src/easylogging++.cc nextclient/launcher/dep/easyloggingpp/src/easylogging++.cc renamed to dep/easyloggingpp/src/easylogging++.cc

@@ -71,6 +71,11 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
         nitro_api::nitro_api
         NextClient::gameui
         NextClient::filesystem_proxy
+        data_encoding::data_encoding
+        data_types::data_types
+        TaskCoro::TaskCoro
+        SafeResult::SafeResult
+        easyloggingpp::easyloggingpp
         cpr::cpr
         optic::optic
         OpenSSL::SSL
@@ -109,6 +114,10 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE
         USE_OPTICK=$<BOOL:${USE_PROFILER}>
         _HAS_STATIC_RTTI=0 #disable rtti things in stl
         BREADCRUMBS_TAG="[${PROJECT_NAME}]"
+        #easyloggingpp options
+        ELPP_WINSOCK2
+        ELPP_NO_DEFAULT_LOG_FILE
+        ELPP_DEFAULT_LOGGER="engine_mini"
 )
 
 if (WIN32)
@@ -119,6 +128,7 @@ if (WIN32)
             WINVER=0x0600
             NOMINMAX
             _UNICODE
+            WIN32_LEAN_AND_MEAN
     )
 endif()
 

…er/dep/easyloggingpp/src/easylogging++.h dep/easyloggingpp/src/easylogging++.hnextclient/launcher/dep/easyloggingpp/src/easylogging++.h renamed to dep/easyloggingpp/src/easylogging++.h nextclient/launcher/dep/easyloggingpp/src/easylogging++.h renamed to dep/easyloggingpp/src/easylogging++.h

@@ -5,4 +5,18 @@ struct NextClientVersion
     int major{};
     int minor{};
     int patch{};
+    char prerelease[128]{};
 };
+
+inline std::string BuildNextClientVersionString(const NextClientVersion& version)
+{
+    std::stringstream ss;
+    ss << version.major << "." << version.minor << "." << version.patch;
+
+    if (version.prerelease[0] != '\0')
+    {
+        ss << "-" << version.prerelease;
+    }
+
+    return ss.str();
+}

nextclient/client_mini/CMakeLists.txt

@@ -15,6 +15,8 @@ namespace nitroapi
 }
 #endif
 
+class ISteamMatchmakingServers;
+
 class EngineMiniInterface : public IBaseInterface
 {
 public:
@@ -28,7 +30,9 @@ class EngineMiniInterface : public IBaseInterface
 
     virtual bool AddCmdLogger(CommandLoggerInterface* logger) = 0;
     virtual bool RemoveCmdLogger(CommandLoggerInterface* logger) = 0;
+
+    virtual ISteamMatchmakingServers* GetSteamMatchmakingServers() = 0;
 };
 
-#define ENGINE_MINI_INTERFACE_VERSION "EngineMini005"
+#define ENGINE_MINI_INTERFACE_VERSION "EngineMini006"