pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-11 11:48:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[DevTools] Improve DevTools Toggling Options (#1161)

Browse Source 
* Improve devtools toggling

* Cleanup a few more references
This commit is contained in:
Chris Miles
2020-12-30 14:43:33 -06:00
committed by GitHub
parent a920d449ff
commit c1d7a82307
6 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/client.cpp
+12 -15
View File
@@ -350,8 +350,8 @@ Client::Client(EQStreamInterface* ieqs)
/**
* GM
*/
display_mob_info_window = true;
dev_tools_window_enabled = true;
SetDisplayMobInfoWindow(true);
SetDevToolsEnabled(true);
#ifdef BOTS
bot_owner_options[booDeathMarquee] = false;
@@ -9171,17 +9171,14 @@ void Client::SetDisplayMobInfoWindow(bool display_mob_info_window)
Client::display_mob_info_window = display_mob_info_window;
}
bool Client::IsDevToolsWindowEnabled() const
bool Client::IsDevToolsEnabled() const
{
return dev_tools_window_enabled;
return dev_tools_enabled && RuleB(World, EnableDevTools);
}
/**
* @param in_dev_tools_window_enabled
*/
void Client::SetDevToolsWindowEnabled(bool in_dev_tools_window_enabled)
void Client::SetDevToolsEnabled(bool in_dev_tools_enabled)
{
Client::dev_tools_window_enabled = in_dev_tools_window_enabled;
Client::dev_tools_enabled = in_dev_tools_enabled;
}
/**
@@ -9390,7 +9387,7 @@ void Client::ShowDevToolsMenu()
std::string menu_commands_search;
std::string menu_commands_show;
std::string reload_commands_show;
std::string window_toggle_command;
std::string devtools_toggle;
/**
* Search entity commands
@@ -9425,9 +9422,9 @@ void Client::ShowDevToolsMenu()
/**
* Show window status
*/
window_toggle_command = "Disabled [" + EQ::SayLinkEngine::GenerateQuestSaylink("#devtools enable_window", false, "Enable") + "] ";
if (IsDevToolsWindowEnabled()) {
window_toggle_command = "Enabled [" + EQ::SayLinkEngine::GenerateQuestSaylink("#devtools disable_window", false, "Disable") + "] ";
devtools_toggle = "Disabled [" + EQ::SayLinkEngine::GenerateQuestSaylink("#devtools enable", false, "Enable") + "] ";
if (IsDevToolsEnabled()) {
devtools_toggle = "Enabled [" + EQ::SayLinkEngine::GenerateQuestSaylink("#devtools disable", false, "Disable") + "] ";
}
/**
@@ -9435,8 +9432,8 @@ void Client::ShowDevToolsMenu()
*/
SendChatLineBreak();
Message(
Chat::White, "| [Devtools] Window %s Show this menu with %s | Current expansion [%s]",
window_toggle_command.c_str(),
Chat::White, "| [Devtools] %s Show this menu with %s | Current expansion [%s]",
devtools_toggle.c_str(),
EQ::SayLinkEngine::GenerateQuestSaylink("#dev", false, "#dev").c_str(),
content_service.GetCurrentExpansionName().c_str()
);