Merge pull request #3055 from ab9rf/prospect

reenable prospector in fort mode
develop
Myk 2023-03-21 22:00:57 -07:00 committed by GitHub
commit e259b548a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions

@ -34,6 +34,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
# Future # Future
## New Plugins ## New Plugins
- `prospector`: prospector tool in fort mode is now available. embark prospect is not yet available and is disabled at this time.
## Fixes ## Fixes

@ -140,7 +140,7 @@ dfhack_plugin(pathable pathable.cpp LINK_LIBRARIES lua)
#dfhack_plugin(petcapRemover petcapRemover.cpp) #dfhack_plugin(petcapRemover petcapRemover.cpp)
#dfhack_plugin(plants plants.cpp) #dfhack_plugin(plants plants.cpp)
dfhack_plugin(probe probe.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(power-meter power-meter.cpp LINK_LIBRARIES lua)
dfhack_plugin(regrass regrass.cpp) dfhack_plugin(regrass regrass.cpp)
add_subdirectory(remotefortressreader) add_subdirectory(remotefortressreader)

@ -565,6 +565,10 @@ static command_result embark_prospector(color_ostream &out,
df::viewscreen_choose_start_sitest *screen, df::viewscreen_choose_start_sitest *screen,
const prospect_options &options) const prospect_options &options)
{ {
out.printerr("prospector at embark is not currently available.\n");
return CR_FAILURE;
/*
if (!world || !world->world_data) if (!world || !world->world_data)
{ {
out.printerr("World data is not available.\n"); 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; out << std::endl << "Warning: the above data is only a very rough estimate." << std::endl;
return CR_OK; return CR_OK;
*/
} }
static command_result map_prospector(color_ostream &con, static command_result map_prospector(color_ostream &con,