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

Various

Browse Source
This commit is contained in:
alexsandulescu 2021-07-14 12:51:25 +03:00
parent 1dc25a193e
commit d9fe7effe5
3 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
r5dev/include/serverlisting.h
View File

@ -11,8 +11,9 @@ public:
std::string map; std::string map;
std::string ip; std::string ip;
std::string version; std::string version;
int expiry;
ServerListing(std::string name, std::string map, std::string ip, std::string version); ServerListing(std::string name, std::string map, std::string ip, std::string version, int expiry);
bool Select(); bool Select();
}; };

45
r5dev/src/overlay.cpp
View File

@ -189,8 +189,6 @@ public:
ThemeSet = true; ThemeSet = true;
} }
ImGui::ShowStyleEditor();
ImGui::SetNextWindowSize(ImVec2(840, 600), ImGuiCond_FirstUseEver); ImGui::SetNextWindowSize(ImVec2(840, 600), ImGuiCond_FirstUseEver);
ImGui::SetWindowPos(ImVec2(-1000, 50), ImGuiCond_FirstUseEver); ImGui::SetWindowPos(ImVec2(-1000, 50), ImGuiCond_FirstUseEver);
@ -497,8 +495,7 @@ public:
memset(ServerConnStringBuffer, 0, sizeof(ServerConnStringBuffer)); memset(ServerConnStringBuffer, 0, sizeof(ServerConnStringBuffer));
strcpy_s(MatchmakingServerStringBuffer, "localhost"); strcpy_s(MatchmakingServerStringBuffer, "r5a-comp-sv.herokuapp.com");
std::string path = "stbsp"; std::string path = "stbsp";
@ -525,7 +522,7 @@ public:
if (!bThreadLocked) { if (!bThreadLocked) {
std::thread t([this]() { std::thread t([this]() {
std::cout << "Refreshing server list..." << std::endl; std::cout << "Refreshing server list with string" << MatchmakingServerStringBuffer << std::endl;
bThreadLocked = true; bThreadLocked = true;
httplib::Client client(MatchmakingServerStringBuffer); httplib::Client client(MatchmakingServerStringBuffer);
client.set_connection_timeout(10); client.set_connection_timeout(10);
@ -536,7 +533,7 @@ public:
for (auto obj : root["servers"]) for (auto obj : root["servers"])
{ {
ServerList.push_back( ServerList.push_back(
new ServerListing(obj["name"], obj["map"], obj["ip"], obj["version"]) new ServerListing(obj["name"], obj["map"], obj["ip"], obj["version"], obj["expire"])
); );
} }
} }
@ -612,13 +609,14 @@ public:
ImGui::BeginChild("ServerListChild", { 0, 780 }, false, ImGuiWindowFlags_HorizontalScrollbar); ImGui::BeginChild("ServerListChild", { 0, 780 }, false, ImGuiWindowFlags_HorizontalScrollbar);
ImGui::BeginTable("bumbumceau", 5); ImGui::BeginTable("bumbumceau", 6);
ImGui::TableSetupColumn("Name", 0, 40); ImGui::TableSetupColumn("Name", 0, 35);
ImGui::TableSetupColumn("IP Address", 0, 20); ImGui::TableSetupColumn("IP Address", 0, 20);
ImGui::TableSetupColumn("Map", 0, 20); ImGui::TableSetupColumn("Map", 0, 25);
ImGui::TableSetupColumn("Version", 0, 10); ImGui::TableSetupColumn("Version", 0, 10);
ImGui::TableSetupColumn("", 0, 10); ImGui::TableSetupColumn("Expiry", 0, 10);
ImGui::TableSetupColumn("", 0, 8);
ImGui::TableHeadersRow(); ImGui::TableHeadersRow();
for (ServerListing* server : ServerList) for (ServerListing* server : ServerList)
@ -627,7 +625,7 @@ public:
const char* ip = server->ip.c_str(); const char* ip = server->ip.c_str();
const char* map = server->map.c_str(); const char* map = server->map.c_str();
const char* version = server->version.c_str(); const char* version = server->version.c_str();
int expiry = server->expiry;
if (ServerBrowserFilter.PassFilter(name) if (ServerBrowserFilter.PassFilter(name)
|| ServerBrowserFilter.PassFilter(ip) || ServerBrowserFilter.PassFilter(ip)
@ -646,6 +644,12 @@ public:
ImGui::Text(version); ImGui::Text(version);
ImGui::TableNextColumn(); ImGui::TableNextColumn();
std::stringstream expirySS;
expirySS << expiry << " seconds left";
ImGui::Text(expirySS.str().c_str());
ImGui::TableNextColumn();
std::string selectButtonText = "Connect##"; std::string selectButtonText = "Connect##";
selectButtonText += (server->name + server->ip + server->map); selectButtonText += (server->name + server->ip + server->map);
@ -674,7 +678,7 @@ public:
void HostServerSection() void HostServerSection()
{ {
ImGui::InputText("Server Name##ServerHost_ServerName", ServerNameBuffer, IM_ARRAYSIZE(ServerNameBuffer)); ImGui::InputTextWithHint("Server Name##ServerHost_ServerName", "Required Field", ServerNameBuffer, IM_ARRAYSIZE(ServerNameBuffer));
ImGui::Spacing(); ImGui::Spacing();
if (ImGui::BeginCombo("Map##ServerHost_MapListBox", SelectedMap->c_str())) if (ImGui::BeginCombo("Map##ServerHost_MapListBox", SelectedMap->c_str()))
{ {
@ -695,16 +699,19 @@ public:
if (ImGui::Button("Start The Server##ServerHost_StartServerButton", ImVec2(ImGui::GetWindowSize().x, 32))) if (ImGui::Button("Start The Server##ServerHost_StartServerButton", ImVec2(ImGui::GetWindowSize().x, 32)))
{ {
std::stringstream cmd; if (strcmp(ServerNameBuffer, "") != 0)
cmd << "map " << SelectedMap->c_str();
RunConsoleCommand(cmd.str());
if (StartAsDedi)
{ {
ToggleDevCommands(); std::stringstream cmd;
cmd << "map " << SelectedMap->c_str();
RunConsoleCommand(cmd.str());
if (StartAsDedi)
{
ToggleDevCommands();
}
SendHostingPostRequest();
} }
SendHostingPostRequest();
} }
if (strcmp(ServerNameBuffer, "") == 0) ImGui::TextColored(ImVec4(1.00f, 0.00f, 0.00f, 1.00f), "ERROR: Please specify a name for the server!");
if (StartAsDedi) if (StartAsDedi)
{ {
if (ImGui::Button("Reload Scripts##ServerHost_ReloadServerButton", ImVec2(ImGui::GetWindowSize().x, 32))) if (ImGui::Button("Reload Scripts##ServerHost_ReloadServerButton", ImVec2(ImGui::GetWindowSize().x, 32)))

3
r5dev/src/serverlisting.cpp
View File

@ -2,12 +2,13 @@
#include "overlay.h" #include "overlay.h"
#include "httplib.h" #include "httplib.h"
ServerListing::ServerListing(std::string name, std::string map, std::string ip, std::string version) ServerListing::ServerListing(std::string name, std::string map, std::string ip, std::string version, int expiry)
{ {
this->name = name; this->name = name;
this->map = map; this->map = map;
this->ip = ip; this->ip = ip;
this->version = version; this->version = version;
this->expiry = expiry;
} }
bool ServerListing::Select() bool ServerListing::Select()