From 764bf635b6dcdba4e8c7824f6a36e3520dd2e91c Mon Sep 17 00:00:00 2001
From: rexx <67599507+r-ex@users.noreply.github.com>
Date: Thu, 22 Jul 2021 13:01:47 +0100
Subject: [PATCH] replaced version with port on server browser

---
 r5dev/include/gameclasses.h   |  8 ++++++++
 r5dev/include/serverlisting.h |  4 ++--
 r5dev/src/overlay.cpp         | 28 ++++++++++++++++------------
 r5dev/src/serverlisting.cpp   |  2 +-
 4 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/r5dev/include/gameclasses.h b/r5dev/include/gameclasses.h
index eac74e2a..dccd107e 100644
--- a/r5dev/include/gameclasses.h
+++ b/r5dev/include/gameclasses.h
@@ -517,6 +517,14 @@ public:
 	}
 };
 
+struct CVValue_t
+{
+	char* m_pszString;
+	__int64 m_StringLength;
+	float m_fValue;
+	int m_nValue;
+};
+
 /////////////////////////////////////////////////////////////////////////////
 // Initialize Game Globals
 
diff --git a/r5dev/include/serverlisting.h b/r5dev/include/serverlisting.h
index 80af9b82..b49e7fa3 100644
--- a/r5dev/include/serverlisting.h
+++ b/r5dev/include/serverlisting.h
@@ -3,7 +3,7 @@
 class ServerListing
 {
 public:
-	ServerListing(std::string name, std::string map, std::string ip, std::string version) : name(name), map(map), ip(ip), version(version)
+	ServerListing(std::string name, std::string map, std::string ip, std::string port) : name(name), map(map), ip(ip), port(port)
 	{
 		// for future constructor use.
 	}
@@ -13,6 +13,6 @@ public:
 	std::string name;
 	std::string map;
 	std::string ip;
-	std::string version;
+	std::string port;
 };
 
diff --git a/r5dev/src/overlay.cpp b/r5dev/src/overlay.cpp
index 4d1d30e5..4deb27c9 100644
--- a/r5dev/src/overlay.cpp
+++ b/r5dev/src/overlay.cpp
@@ -6,7 +6,7 @@
 #include "patterns.h"
 #include "gameclasses.h"
 
-#define DebugOverlay
+#define OVERLAY_DEBUG
 
 CGameConsole* g_GameConsole = nullptr;
 CCompanion* g_ServerBrowser = nullptr;
@@ -391,8 +391,8 @@ void CCompanion::RefreshServerList()
     {
         std::thread t([this]()
         {
-#ifdef DebugOverlay
-            std::cout << " [+CCompanion+] Refreshing server list with string" << MatchmakingServerStringBuffer << "\n";
+#ifdef OVERLAY_DEBUG
+            std::cout << " [+CCompanion+] Refreshing server list with string " << MatchmakingServerStringBuffer << "\n";
 #endif
             bThreadLocked = true;
             httplib::Client client(MatchmakingServerStringBuffer);
@@ -404,7 +404,7 @@ void CCompanion::RefreshServerList()
                 for (auto obj : root["servers"])
                 {
                     ServerList.push_back(
-                        new ServerListing(obj["name"], obj["map"], obj["ip"], obj["version"])
+                        new ServerListing(obj["name"], obj["map"], obj["ip"], obj["port"])
                     );
                 }
             }
@@ -424,17 +424,21 @@ void CCompanion::SendHostingPostRequest(char* mapName)
     nlohmann::json body = nlohmann::json::object();
     body["name"] = ServerNameBuffer;
     body["map"] = mapName;
-    body["version"] = "1.0";
 
+    CVValue_t* hostport_value = (CVValue_t*)(0x141734DD0 + 0x58);
+
+    body["port"] = hostport_value->m_pszString;
 
     std::string body_str = body.dump();
 
-#ifdef DebugOverlay
-    std::cout << " [+CCompanion+] Sending request now, Body:" << body_str << "\n";
+    
+
+#ifdef OVERLAY_DEBUG
+    std::cout << " [+CCompanion+] Sending request now, Body: " << body_str << "\n";
 #endif 
 
     httplib::Result result = client.Post("/servers/add", body_str.c_str(), body_str.length(), "application/json");
-#ifdef DebugOverlay
+#ifdef OVERLAY_DEBUG
     if (result)
     {
         std::cout << " [+CCompanion+] Request Result: " << result->body << "\n";
@@ -495,7 +499,7 @@ void CCompanion::ServerBrowserSection()
     {
         ImGui::TableSetupColumn("Name", 0, 35);
         ImGui::TableSetupColumn("Map", 0, 25);
-        ImGui::TableSetupColumn("Version", 0, 10);
+        ImGui::TableSetupColumn("Port", 0, 10);
         ImGui::TableSetupColumn("", 0, 8);
         ImGui::TableHeadersRow();
 
@@ -503,11 +507,11 @@ void CCompanion::ServerBrowserSection()
         {
             const char* name = server->name.c_str();
             const char* map = server->map.c_str();
-            const char* version = server->version.c_str();
+            const char* port = server->port.c_str();
 
             if (ServerBrowserFilter.PassFilter(name)
                 || ServerBrowserFilter.PassFilter(map)
-                || ServerBrowserFilter.PassFilter(version))
+                || ServerBrowserFilter.PassFilter(port))
             {
                 ImGui::TableNextColumn();
                 ImGui::Text(name);
@@ -516,7 +520,7 @@ void CCompanion::ServerBrowserSection()
                 ImGui::Text(map);
 
                 ImGui::TableNextColumn();
-                ImGui::Text(version);
+                ImGui::Text(port);
 
                 ImGui::TableNextColumn();
                 std::string selectButtonText = "Connect##";
diff --git a/r5dev/src/serverlisting.cpp b/r5dev/src/serverlisting.cpp
index 0b50bf14..3334a7d0 100644
--- a/r5dev/src/serverlisting.cpp
+++ b/r5dev/src/serverlisting.cpp
@@ -5,6 +5,6 @@
 void ServerListing::Select()
 {
 	std::stringstream cmd;
-	cmd << "connect " << this->ip;
+	cmd << "connect " << this->ip << ":" << this->port;
 	g_ServerBrowser->ProcessCommand(cmd.str().c_str());
 }
\ No newline at end of file