incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix proxy block events option

Browse Source
This commit is contained in:
Martin Michelsen
2022-12-17 01:15:35 -08:00
parent 889913400a
commit d288fca087
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Client.cc
-1
View File
@@ -36,7 +36,6 @@ ClientOptions::ClientOptions()
override_random_seed(-1),
save_files(false),
enable_chat_filter(true),
block_events(false),
suppress_remote_login(false),
zero_remote_guild_card(false),
function_call_return_value(-1) { }
src/Client.hh
-1
View File
@@ -38,7 +38,6 @@ struct ClientOptions {
// Options used only on proxy server
bool save_files;
bool enable_chat_filter;
bool block_events;
bool suppress_remote_login;
bool zero_remote_guild_card;
int64_t function_call_return_value; // -1 = don't block function calls
src/ReceiveCommands.cc
+6 -2
View File
@@ -102,7 +102,7 @@ static vector<MenuItem> proxy_options_menu_for_client(
c->options.switch_assist ? u"Switch assist ON" : u"Switch assist OFF", u"", 0);
}
ret.emplace_back(ProxyOptionsMenuItemID::BLOCK_EVENTS,
c->options.block_events ? u"Block events ON" : u"Block events OFF", u"", 0);
(c->options.override_lobby_event >= 0) ? u"Block events ON" : u"Block events OFF", u"", 0);
ret.emplace_back(ProxyOptionsMenuItemID::BLOCK_PATCHES,
(c->options.function_call_return_value >= 0) ? u"Block patches ON" : u"Block patches OFF", u"", 0);
if (s->proxy_allow_save_files) {
@@ -1763,7 +1763,11 @@ static void on_menu_selection(shared_ptr<ServerState> s, shared_ptr<Client> c,
c->options.switch_assist = !c->options.switch_assist;
goto resend_proxy_options_menu;
case ProxyOptionsMenuItemID::BLOCK_EVENTS:
c->options.block_events = !c->options.block_events;
if (c->options.override_lobby_event >= 0) {
c->options.override_lobby_event = -1;
} else {
c->options.override_lobby_event = 0;
}
goto resend_proxy_options_menu;
case ProxyOptionsMenuItemID::BLOCK_PATCHES:
if (c->options.function_call_return_value >= 0) {