diff --git a/plugins/remotefortressreader/adventure_control.cpp b/plugins/remotefortressreader/adventure_control.cpp index 2dbf2abc1..0d2e97f68 100644 --- a/plugins/remotefortressreader/adventure_control.cpp +++ b/plugins/remotefortressreader/adventure_control.cpp @@ -39,6 +39,7 @@ void SetCoord(df::coord in, RemoteFortressReader::Coord *out) command_result MoveCommand(DFHack::color_ostream &stream, const MoveCommandParams *in) { +/* Removed for v50 which has no adventure mode. auto viewScreen = getCurViewscreen(); if (!in->has_direction()) return CR_WRONG_USAGE; @@ -186,12 +187,13 @@ command_result MoveCommand(DFHack::color_ostream &stream, const MoveCommandParam } break; } - return CR_OK; +*/ return CR_OK; } command_result JumpCommand(DFHack::color_ostream &stream, const MoveCommandParams *in) { - if (!in->has_direction()) +/* Removed for v50 which has no adventure mode. + if (!in->has_direction()) return CR_WRONG_USAGE; if (!df::global::adventure->menu == ui_advmode_menu::Default) return CR_OK; @@ -228,12 +230,14 @@ command_result JumpCommand(DFHack::color_ostream &stream, const MoveCommandParam } } keyQueue.push(interface_key::SELECT); +*/ return CR_OK; } command_result MenuQuery(DFHack::color_ostream &stream, const EmptyMessage *in, MenuContents *out) { - auto advUi = df::global::adventure; +/* Removed for v50 which has no adventure mode. + auto advUi = df::global::adventure; if (advUi == NULL) return CR_FAILURE; @@ -272,12 +276,13 @@ command_result MenuQuery(DFHack::color_ostream &stream, const EmptyMessage *in, default: break; } - +*/ return CR_OK; } command_result MovementSelectCommand(DFHack::color_ostream &stream, const dfproto::IntMessage *in) { + /* Removed for v50 which has no adventure mode. if (!(df::global::adventure->menu == ui_advmode_menu::MoveCarefully)) return CR_OK; int choice = in->value(); @@ -288,12 +293,14 @@ command_result MovementSelectCommand(DFHack::color_ostream &stream, const dfprot keyQueue.push(interface_key::SECONDSCROLL_PAGEDOWN); } keyQueue.push((interface_key::interface_key)(interface_key::OPTION1 + select)); +*/ return CR_OK; } command_result MiscMoveCommand(DFHack::color_ostream &stream, const MiscMoveParams *in) { - if (!df::global::adventure->menu == ui_advmode_menu::Default) + /* Removed for v50 which has no adventure mode. + if (!df::global::adventure->menu == ui_advmode_menu::Default) return CR_OK; auto type = in->type(); @@ -312,6 +319,6 @@ command_result MiscMoveCommand(DFHack::color_ostream &stream, const MiscMovePara default: break; } - +*/ return CR_OK; } diff --git a/plugins/remotefortressreader/dwarf_control.cpp b/plugins/remotefortressreader/dwarf_control.cpp index f0147670f..5b8f2b282 100644 --- a/plugins/remotefortressreader/dwarf_control.cpp +++ b/plugins/remotefortressreader/dwarf_control.cpp @@ -233,6 +233,7 @@ command_result SetPauseState(color_ostream &stream, const SingleBool *in) void CopyBuildMenu(DwarfControl::SidebarState * out) { + /* Removed in v50 because the new menu is completely changed and we may not even want to do it the same way anymore. auto menus = df::global::game; auto build_selector = df::global::ui_build_selector; if (build_selector->building_type == -1) @@ -299,10 +300,12 @@ void CopyBuildMenu(DwarfControl::SidebarState * out) send_selector->add_tiles(build_selector->tiles[x][y]); } } + */ } command_result GetSideMenu(DFHack::color_ostream &stream, const dfproto::EmptyMessage *in, DwarfControl::SidebarState *out) { + /* Removed in v50 because the new menu is completely changed and we may not even want to do it the same way anymore. auto plotinfo = df::global::plotinfo; out->set_mode((proto::enums::ui_sidebar_mode::ui_sidebar_mode)plotinfo->main.mode); auto mode = plotinfo->main.mode; @@ -422,11 +425,13 @@ command_result GetSideMenu(DFHack::color_ostream &stream, const dfproto::EmptyMe default: break; } + */ return CR_OK; } command_result SetSideMenu(DFHack::color_ostream &stream, const DwarfControl::SidebarCommand *in) { + /* Removed in v50 because the new menu is completely changed and we may not even want to do it the same way anymore. auto plotinfo = df::global::plotinfo; if (in->has_mode()) { @@ -489,5 +494,6 @@ command_result SetSideMenu(DFHack::color_ostream &stream, const DwarfControl::Si break; } } + */ return CR_OK; }