diff --git a/src/Menu.hh b/src/Menu.hh index bd4a5c67..7bfb68c0 100644 --- a/src/Menu.hh +++ b/src/Menu.hh @@ -98,7 +98,7 @@ struct MenuItem { enum Flag { // For menu items to be visible on DC NTE, they must not have either of the // following two flags. (The INVISIBLE_ON_GC_NTE flag behaves similarly.) - INVISIBLE_ON_DC_NTE = 0x001, + INVISIBLE_ON_DC_PROTOS = 0x001, INVISIBLE_ON_DC = 0x002, INVISIBLE_ON_PC_NTE = 0x004, INVISIBLE_ON_PC = 0x008, diff --git a/src/ReceiveCommands.cc b/src/ReceiveCommands.cc index d96139e6..380e50cf 100644 --- a/src/ReceiveCommands.cc +++ b/src/ReceiveCommands.cc @@ -220,13 +220,13 @@ static void send_main_menu(shared_ptr c) { }, 0); main_menu->items.emplace_back(MainMenuItemID::INFORMATION, "Information", - "View server\ninformation", MenuItem::Flag::INVISIBLE_ON_DC_NTE | MenuItem::Flag::REQUIRES_MESSAGE_BOXES); + "View server\ninformation", MenuItem::Flag::INVISIBLE_ON_DC_PROTOS | MenuItem::Flag::REQUIRES_MESSAGE_BOXES); uint32_t proxy_destinations_menu_item_flags = // DC NTE and the 11/2000 prototype don't support multiple ship select // menus without changing servers via a 19 command apparently (the client // sends nothing when the player makes a choice in the second menu) - MenuItem::Flag::INVISIBLE_ON_DC_NTE | + MenuItem::Flag::INVISIBLE_ON_DC_PROTOS | MenuItem::Flag::INVISIBLE_ON_PC_NTE | (s->proxy_destinations_dc.empty() ? MenuItem::Flag::INVISIBLE_ON_DC : 0) | (s->proxy_destinations_pc.empty() ? MenuItem::Flag::INVISIBLE_ON_PC : 0) | (s->proxy_destinations_gc.empty() ? MenuItem::Flag::INVISIBLE_ON_GC : 0) | @@ -236,7 +236,7 @@ static void send_main_menu(shared_ptr c) { "Connect to another\nserver through the\nproxy", proxy_destinations_menu_item_flags); main_menu->items.emplace_back(MainMenuItemID::DOWNLOAD_QUESTS, "Download quests", - "Download quests", MenuItem::Flag::INVISIBLE_ON_DC_NTE | MenuItem::Flag::INVISIBLE_ON_PC_NTE | MenuItem::Flag::INVISIBLE_ON_BB); + "Download quests", MenuItem::Flag::INVISIBLE_ON_DC_PROTOS | MenuItem::Flag::INVISIBLE_ON_PC_NTE | MenuItem::Flag::INVISIBLE_ON_BB); if (!s->is_replay) { if (!s->function_code_index->patch_menu_empty(c->config.specific_version)) { main_menu->items.emplace_back(MainMenuItemID::PATCHES, "Patches", @@ -251,7 +251,7 @@ static void send_main_menu(shared_ptr c) { "Disconnect", 0); main_menu->items.emplace_back(MainMenuItemID::CLEAR_LICENSE, "Clear license", "Disconnect with an\ninvalid license error\nso you can enter a\ndifferent serial\nnumber, access key,\nor password", - MenuItem::Flag::INVISIBLE_ON_DC_NTE | MenuItem::Flag::INVISIBLE_ON_PC_NTE | MenuItem::Flag::INVISIBLE_ON_XB | MenuItem::Flag::INVISIBLE_ON_BB); + MenuItem::Flag::INVISIBLE_ON_DC_PROTOS | MenuItem::Flag::INVISIBLE_ON_PC_NTE | MenuItem::Flag::INVISIBLE_ON_XB | MenuItem::Flag::INVISIBLE_ON_BB); send_menu(c, main_menu); } diff --git a/src/SendCommands.cc b/src/SendCommands.cc index 93c6194a..90f9bc4f 100644 --- a/src/SendCommands.cc +++ b/src/SendCommands.cc @@ -1267,7 +1267,7 @@ void send_menu_t(shared_ptr c, shared_ptr menu, bool is_info switch (c->version()) { case Version::DC_NTE: case Version::DC_V1_11_2000_PROTOTYPE: - is_visible &= !(item.flags & MenuItem::Flag::INVISIBLE_ON_DC_NTE); + is_visible &= !(item.flags & MenuItem::Flag::INVISIBLE_ON_DC_PROTOS); [[fallthrough]]; case Version::DC_V1: case Version::DC_V2: