From 42e21bf946772f986de978b944c09e8858221057 Mon Sep 17 00:00:00 2001 From: Kelly Kinkade Date: Mon, 20 Mar 2023 11:00:25 -0500 Subject: [PATCH] reenable prospector in fort mode fort mode prospect works. embark mode prospect doesn't crash but generates nonsense data, so that code has been disabled for now --- docs/changelog.txt | 1 + plugins/CMakeLists.txt | 2 +- plugins/prospector.cpp | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/changelog.txt b/docs/changelog.txt index b565f533f..73e2709b1 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -34,6 +34,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: # Future ## New Plugins +- `prospector`: prospector tool in fort mode is now available. embark prospect is not yet available and is disabled at this time. ## Fixes diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 477e83436..8fac3d467 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -140,7 +140,7 @@ dfhack_plugin(pathable pathable.cpp LINK_LIBRARIES lua) #dfhack_plugin(petcapRemover petcapRemover.cpp) #dfhack_plugin(plants plants.cpp) dfhack_plugin(probe probe.cpp) -#dfhack_plugin(prospector prospector.cpp LINK_LIBRARIES lua) +dfhack_plugin(prospector prospector.cpp LINK_LIBRARIES lua) #dfhack_plugin(power-meter power-meter.cpp LINK_LIBRARIES lua) dfhack_plugin(regrass regrass.cpp) add_subdirectory(remotefortressreader) diff --git a/plugins/prospector.cpp b/plugins/prospector.cpp index e75c967dc..86d77e643 100644 --- a/plugins/prospector.cpp +++ b/plugins/prospector.cpp @@ -565,6 +565,10 @@ static command_result embark_prospector(color_ostream &out, df::viewscreen_choose_start_sitest *screen, const prospect_options &options) { + out.printerr("prospector at embark is not currently available.\n"); + return CR_FAILURE; + +/* if (!world || !world->world_data) { out.printerr("World data is not available.\n"); @@ -621,6 +625,7 @@ static command_result embark_prospector(color_ostream &out, out << std::endl << "Warning: the above data is only a very rough estimate." << std::endl; return CR_OK; +*/ } static command_result map_prospector(color_ostream &con,