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

don't use information menu command on GC

Browse Source
This commit is contained in:
Martin Michelsen
2022-06-01 22:22:29 -07:00
parent e16a79c3d8
commit af1b92969e
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ReceiveCommands.cc
+9 -10
View File
@@ -113,7 +113,7 @@ void process_login_complete(shared_ptr<ServerState> s, shared_ptr<Client> c) {
(c->flags & Client::Flag::NO_MESSAGE_BOX_CLOSE_CONFIRMATION) || (c->flags & Client::Flag::NO_MESSAGE_BOX_CLOSE_CONFIRMATION) ||
!(c->flags & Client::Flag::AT_WELCOME_MESSAGE)) { !(c->flags & Client::Flag::AT_WELCOME_MESSAGE)) {
c->flags &= ~Client::Flag::AT_WELCOME_MESSAGE; c->flags &= ~Client::Flag::AT_WELCOME_MESSAGE;
send_menu(c, s->name.c_str(), MenuID::MAIN, s->main_menu, false); send_menu(c, s->name.c_str(), MenuID::MAIN, s->main_menu);
} else { } else {
send_message_box(c, s->welcome_message.c_str()); send_message_box(c, s->welcome_message.c_str());
} }
@@ -556,9 +556,9 @@ void process_message_box_closed(shared_ptr<ServerState> s, shared_ptr<Client> c,
check_size_v(data.size(), 0); check_size_v(data.size(), 0);
if (c->flags & Client::Flag::IN_INFORMATION_MENU) { if (c->flags & Client::Flag::IN_INFORMATION_MENU) {
send_menu(c, u"Information", MenuID::INFORMATION, send_menu(c, u"Information", MenuID::INFORMATION,
*s->information_menu_for_version(c->version), false); *s->information_menu_for_version(c->version));
} else if (c->flags & Client::Flag::AT_WELCOME_MESSAGE) { } else if (c->flags & Client::Flag::AT_WELCOME_MESSAGE) {
send_menu(c, s->name.c_str(), MenuID::MAIN, s->main_menu, false); send_menu(c, s->name.c_str(), MenuID::MAIN, s->main_menu);
c->flags &= ~Client::Flag::AT_WELCOME_MESSAGE; c->flags &= ~Client::Flag::AT_WELCOME_MESSAGE;
send_update_client_config(c); send_update_client_config(c);
} }
@@ -743,13 +743,13 @@ void process_menu_selection(shared_ptr<ServerState> s, shared_ptr<Client> c,
case MainMenuItemID::INFORMATION: case MainMenuItemID::INFORMATION:
send_menu(c, u"Information", MenuID::INFORMATION, send_menu(c, u"Information", MenuID::INFORMATION,
*s->information_menu_for_version(c->version), true); *s->information_menu_for_version(c->version));
c->flags |= Client::Flag::IN_INFORMATION_MENU; c->flags |= Client::Flag::IN_INFORMATION_MENU;
break; break;
case MainMenuItemID::PROXY_DESTINATIONS: case MainMenuItemID::PROXY_DESTINATIONS:
send_menu(c, u"Proxy server", MenuID::PROXY_DESTINATIONS, send_menu(c, u"Proxy server", MenuID::PROXY_DESTINATIONS,
s->proxy_destinations_menu_for_version(c->version), false); s->proxy_destinations_menu_for_version(c->version));
break; break;
case MainMenuItemID::DOWNLOAD_QUESTS: case MainMenuItemID::DOWNLOAD_QUESTS:
@@ -776,8 +776,7 @@ void process_menu_selection(shared_ptr<ServerState> s, shared_ptr<Client> c,
break; break;
case MainMenuItemID::PROGRAMS: case MainMenuItemID::PROGRAMS:
send_menu(c, u"Programs", MenuID::PROGRAMS, send_menu(c, u"Programs", MenuID::PROGRAMS, s->dol_file_index->menu());
s->dol_file_index->menu(), false);
break; break;
case MainMenuItemID::DISCONNECT: case MainMenuItemID::DISCONNECT:
@@ -794,7 +793,7 @@ void process_menu_selection(shared_ptr<ServerState> s, shared_ptr<Client> c,
case MenuID::INFORMATION: { case MenuID::INFORMATION: {
if (cmd.item_id == InformationMenuItemID::GO_BACK) { if (cmd.item_id == InformationMenuItemID::GO_BACK) {
c->flags &= ~Client::Flag::IN_INFORMATION_MENU; c->flags &= ~Client::Flag::IN_INFORMATION_MENU;
send_menu(c, s->name.c_str(), MenuID::MAIN, s->main_menu, false); send_menu(c, s->name.c_str(), MenuID::MAIN, s->main_menu);
} else { } else {
try { try {
@@ -808,7 +807,7 @@ void process_menu_selection(shared_ptr<ServerState> s, shared_ptr<Client> c,
case MenuID::PROXY_DESTINATIONS: { case MenuID::PROXY_DESTINATIONS: {
if (cmd.item_id == ProxyDestinationsMenuItemID::GO_BACK) { if (cmd.item_id == ProxyDestinationsMenuItemID::GO_BACK) {
send_menu(c, s->name.c_str(), MenuID::MAIN, s->main_menu, false); send_menu(c, s->name.c_str(), MenuID::MAIN, s->main_menu);
} else { } else {
const pair<string, uint16_t>* dest = nullptr; const pair<string, uint16_t>* dest = nullptr;
@@ -1028,7 +1027,7 @@ void process_menu_selection(shared_ptr<ServerState> s, shared_ptr<Client> c,
case MenuID::PROGRAMS: case MenuID::PROGRAMS:
if (cmd.item_id == ProgramsMenuItemID::GO_BACK) { if (cmd.item_id == ProgramsMenuItemID::GO_BACK) {
send_menu(c, s->name.c_str(), MenuID::MAIN, s->main_menu, false); send_menu(c, s->name.c_str(), MenuID::MAIN, s->main_menu);
} else { } else {
if (c->flags & Client::Flag::DOES_NOT_SUPPORT_SEND_FUNCTION_CALL) { if (c->flags & Client::Flag::DOES_NOT_SUPPORT_SEND_FUNCTION_CALL) {
src/SendCommands.hh
+1 -1
View File
@@ -166,7 +166,7 @@ void send_card_search_result(
void send_guild_card(std::shared_ptr<Client> c, std::shared_ptr<Client> source); void send_guild_card(std::shared_ptr<Client> c, std::shared_ptr<Client> source);
void send_menu(std::shared_ptr<Client> c, const std::u16string& menu_name, void send_menu(std::shared_ptr<Client> c, const std::u16string& menu_name,
uint32_t menu_id, const std::vector<MenuItem>& items, bool is_info_menu); uint32_t menu_id, const std::vector<MenuItem>& items, bool is_info_menu = false);
void send_game_menu(std::shared_ptr<Client> c, std::shared_ptr<ServerState> s); void send_game_menu(std::shared_ptr<Client> c, std::shared_ptr<ServerState> s);
void send_quest_menu(std::shared_ptr<Client> c, uint32_t menu_id, void send_quest_menu(std::shared_ptr<Client> c, uint32_t menu_id,
const std::vector<std::shared_ptr<const Quest>>& quests, bool is_download_menu); const std::vector<std::shared_ptr<const Quest>>& quests, bool is_download_menu);