mirror of
https://github.com/Mauler125/r5sdk.git
synced 2025-02-09 19:15:03 +01:00
Added request response messages on imgui
remove expire field removed ip field from gui list
This commit is contained in:
parent
f2de1412a6
commit
8b78ab729b
@ -179,6 +179,8 @@ public:
|
|||||||
////////////////////
|
////////////////////
|
||||||
std::vector<std::string> MapsList;
|
std::vector<std::string> MapsList;
|
||||||
std::string* SelectedMap = nullptr;
|
std::string* SelectedMap = nullptr;
|
||||||
|
std::string HostRequestMessage;
|
||||||
|
ImVec4 HostRequestMessageColor;
|
||||||
char ServerNameBuffer[64] = { 0 };
|
char ServerNameBuffer[64] = { 0 };
|
||||||
bool StartAsDedi;
|
bool StartAsDedi;
|
||||||
|
|
||||||
|
@ -10,9 +10,8 @@ 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, int expiry);
|
ServerListing(std::string name, std::string map, std::string ip, std::string version);
|
||||||
void Select();
|
void Select();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -413,7 +413,7 @@ void CCompanion::RefreshServerList()
|
|||||||
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"], obj["expire"])
|
new ServerListing(obj["name"], obj["map"], obj["ip"], obj["version"])
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -435,6 +435,7 @@ void CCompanion::SendHostingPostRequest(char* mapName)
|
|||||||
body["map"] = mapName;
|
body["map"] = mapName;
|
||||||
body["version"] = "1.0";
|
body["version"] = "1.0";
|
||||||
|
|
||||||
|
|
||||||
std::string body_str = body.dump();
|
std::string body_str = body.dump();
|
||||||
|
|
||||||
#ifdef DebugOverlay
|
#ifdef DebugOverlay
|
||||||
@ -446,6 +447,23 @@ void CCompanion::SendHostingPostRequest(char* mapName)
|
|||||||
if (result)
|
if (result)
|
||||||
{
|
{
|
||||||
std::cout << " [+CCompanion+] Request Result: " << result->body << "\n";
|
std::cout << " [+CCompanion+] Request Result: " << result->body << "\n";
|
||||||
|
nlohmann::json res = nlohmann::json::parse(result->body);
|
||||||
|
if (!res["success"] && !res["err"].is_null())
|
||||||
|
{
|
||||||
|
HostRequestMessage = res["err"];
|
||||||
|
HostRequestMessageColor = ImVec4(1.00f, 0.00f, 0.00f, 1.00f);
|
||||||
|
}
|
||||||
|
else if(res["success"] == true)
|
||||||
|
{
|
||||||
|
HostRequestMessage = "Hosting!";
|
||||||
|
HostRequestMessageColor = ImVec4(0.00f, 1.00f, 0.00f, 1.00f);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
HostRequestMessage = "";
|
||||||
|
HostRequestMessageColor = ImVec4(1.00f, 1.00f, 1.00f, 1.00f);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
@ -482,47 +500,34 @@ void CCompanion::ServerBrowserSection()
|
|||||||
|
|
||||||
ImGui::BeginChild("ServerListChild", { 0, 780 }, false, ImGuiWindowFlags_HorizontalScrollbar);
|
ImGui::BeginChild("ServerListChild", { 0, 780 }, false, ImGuiWindowFlags_HorizontalScrollbar);
|
||||||
{
|
{
|
||||||
ImGui::BeginTable("bumbumceau", 6);
|
ImGui::BeginTable("##ServerBrowser_ServerList", 4);
|
||||||
{
|
{
|
||||||
ImGui::TableSetupColumn("Name", 0, 35);
|
ImGui::TableSetupColumn("Name", 0, 35);
|
||||||
ImGui::TableSetupColumn("IP Address", 0, 20);
|
|
||||||
ImGui::TableSetupColumn("Map", 0, 25);
|
ImGui::TableSetupColumn("Map", 0, 25);
|
||||||
ImGui::TableSetupColumn("Version", 0, 10);
|
ImGui::TableSetupColumn("Version", 0, 10);
|
||||||
ImGui::TableSetupColumn("Expiry", 0, 10);
|
|
||||||
ImGui::TableSetupColumn("", 0, 8);
|
ImGui::TableSetupColumn("", 0, 8);
|
||||||
ImGui::TableHeadersRow();
|
ImGui::TableHeadersRow();
|
||||||
|
|
||||||
for (ServerListing* server : ServerList)
|
for (ServerListing* server : ServerList)
|
||||||
{
|
{
|
||||||
const char* name = server->name.c_str();
|
const char* name = server->name.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(map)
|
|| ServerBrowserFilter.PassFilter(map)
|
||||||
|| ServerBrowserFilter.PassFilter(version))
|
|| ServerBrowserFilter.PassFilter(version))
|
||||||
{
|
{
|
||||||
ImGui::TableNextColumn();
|
ImGui::TableNextColumn();
|
||||||
ImGui::Text(name);
|
ImGui::Text(name);
|
||||||
ImGui::TableNextColumn();
|
|
||||||
|
|
||||||
ImGui::Text(ip);
|
|
||||||
ImGui::TableNextColumn();
|
ImGui::TableNextColumn();
|
||||||
|
|
||||||
ImGui::Text(map);
|
ImGui::Text(map);
|
||||||
ImGui::TableNextColumn();
|
|
||||||
|
|
||||||
|
ImGui::TableNextColumn();
|
||||||
ImGui::Text(version);
|
ImGui::Text(version);
|
||||||
ImGui::TableNextColumn();
|
|
||||||
|
|
||||||
std::stringstream expirySS;
|
|
||||||
expirySS << expiry << " seconds left";
|
|
||||||
ImGui::Text(expirySS.str().c_str());
|
|
||||||
ImGui::TableNextColumn();
|
ImGui::TableNextColumn();
|
||||||
|
|
||||||
std::string selectButtonText = "Connect##";
|
std::string selectButtonText = "Connect##";
|
||||||
selectButtonText += (server->name + server->ip + server->map);
|
selectButtonText += (server->name + server->ip + server->map);
|
||||||
|
|
||||||
@ -572,8 +577,6 @@ void CCompanion::HostServerSection()
|
|||||||
ImGui::Separator();
|
ImGui::Separator();
|
||||||
|
|
||||||
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)))
|
||||||
{
|
|
||||||
if (strcmp(ServerNameBuffer, "") != 0)
|
|
||||||
{
|
{
|
||||||
UpdateHostingStatus();
|
UpdateHostingStatus();
|
||||||
|
|
||||||
@ -586,10 +589,8 @@ void CCompanion::HostServerSection()
|
|||||||
ToggleDevCommands();
|
ToggleDevCommands();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (strcmp(ServerNameBuffer, "") == 0)
|
ImGui::TextColored(HostRequestMessageColor, HostRequestMessage.c_str());
|
||||||
ImGui::TextColored(ImVec4(1.00f, 0.00f, 0.00f, 1.00f), "ERROR: Please specify a name for the server!");
|
|
||||||
|
|
||||||
if (StartAsDedi)
|
if (StartAsDedi)
|
||||||
{
|
{
|
||||||
|
@ -2,13 +2,12 @@
|
|||||||
#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, int expiry)
|
ServerListing::ServerListing(std::string name, std::string map, std::string ip, std::string version)
|
||||||
{
|
{
|
||||||
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;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ServerListing::Select()
|
void ServerListing::Select()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user