R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15 from r-ex/master

Browse Source 
replaced version with port on server browser
This commit is contained in:
PixieCore 2021-07-23 00:30:44 +02:00 committed by GitHub
commit 53383fc5a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
r5dev/include/gameclasses.h
View File

@ -517,6 +517,14 @@ public:
}
};
struct CVValue_t
{
char* m_pszString;
__int64 m_StringLength;
float m_fValue;
int m_nValue;
};
/////////////////////////////////////////////////////////////////////////////
// Initialize Game Globals

4
r5dev/include/serverlisting.h
View File

@ -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;
};

28
r5dev/src/overlay.cpp
View File

@ -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##";

2
r5dev/src/serverlisting.cpp
View File

@ -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());
}