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

Turn static var into member

Browse Source
This commit is contained in:
Kawe Mazidjatari 2022-08-29 02:38:19 +02:00
parent 0f488c685c
commit e174cb2b1d
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
r5dev/gameui/IBrowser.cpp
View File

@ -388,7 +388,6 @@ void CBrowser::HiddenServersModal(void)
void CBrowser::HostPanel(void)
{
#ifndef CLIENT_DLL
static string svServerNameErr = ""; // Member?
std::lock_guard<std::mutex> l(g_pServerListManager->m_Mutex);
ImGui::InputTextWithHint("##ServerHost_ServerName", "Server Name (Required)", &g_pServerListManager->m_Server.m_svHostName);
@ -445,7 +444,7 @@ void CBrowser::HostPanel(void)
{
if (ImGui::Button("Start Server", ImVec2((ImGui::GetWindowSize().x - 10), 32)))
{
svServerNameErr.clear();
m_svHostInvalidCriteria.clear();
if (!g_pServerListManager->m_Server.m_svHostName.empty() && !g_pServerListManager->m_Server.m_svPlaylist.empty() && !g_pServerListManager->m_Server.m_svHostMap.empty())
{
g_pServerListManager->LaunchServer(); // Launch server.
@ -454,15 +453,15 @@ void CBrowser::HostPanel(void)
{
if (g_pServerListManager->m_Server.m_svHostName.empty())
{
svServerNameErr = "Server name is required.";
m_svHostInvalidCriteria = "Server name is required.";
}
else if (g_pServerListManager->m_Server.m_svPlaylist.empty())
{
svServerNameErr = "Playlist is required.";
m_svHostInvalidCriteria = "Playlist is required.";
}
else if (g_pServerListManager->m_Server.m_svHostMap.empty())
{
svServerNameErr = "Level name is required.";
m_svHostInvalidCriteria = "Level name is required.";
}
}
}
@ -470,7 +469,7 @@ void CBrowser::HostPanel(void)
if (ImGui::Button("Force Start", ImVec2((ImGui::GetWindowSize().x - 10), 32)))
{
svServerNameErr.clear();
m_svHostInvalidCriteria.clear();
if (!g_pServerListManager->m_Server.m_svPlaylist.empty() && !g_pServerListManager->m_Server.m_svHostMap.empty())
{
g_pServerListManager->LaunchServer(); // Launch server.
@ -479,17 +478,18 @@ void CBrowser::HostPanel(void)
{
if (g_pServerListManager->m_Server.m_svPlaylist.empty())
{
svServerNameErr = "Playlist is required.";
m_svHostInvalidCriteria = "Playlist is required.";
}
else if (g_pServerListManager->m_Server.m_svHostMap.empty())
{
svServerNameErr = "Level name is required.";
m_svHostInvalidCriteria = "Level name is required.";
}
}
}
ImGui::TextColored(ImVec4(1.00f, 0.00f, 0.00f, 1.00f), svServerNameErr.c_str());
ImGui::TextColored(ImVec4(1.00f, 0.00f, 0.00f, 1.00f), m_svHostInvalidCriteria.c_str());
ImGui::TextColored(m_HostRequestMessageColor, m_svHostRequestMessage.c_str());
if (!m_svHostToken.empty())
{
ImGui::InputText("##ServerHost_HostToken", &m_svHostToken, ImGuiInputTextFlags_ReadOnly);
@ -511,7 +511,7 @@ void CBrowser::HostPanel(void)
}
else
{
svServerNameErr = "Failed to change level: 'levelname' was empty.";
m_svHostInvalidCriteria = "Failed to change level: 'levelname' was empty.";
}
}

1
r5dev/gameui/IBrowser.h
View File

@ -61,6 +61,7 @@ private:
////////////////////
// Host Server //
////////////////////
string m_svHostInvalidCriteria;
string m_svHostRequestMessage;
string m_svHostToken;
ImVec4 m_HostRequestMessageColor = ImVec4(1.00f, 1.00f, 1.00f, 1.00f);