MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use new getCursorCoord call and move suspender up

develop
myk002 2021-05-15 12:05:32 -07:00
parent aff5c9bf35
commit 07e29bdc3a
No known key found for this signature in database
GPG Key ID: 8A39CA0FA0C16E78
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/blueprint.cpp
Unescape Escape View File

@ -722,6 +722,8 @@ static void print_help()
command_result blueprint(color_ostream &out, vector<string> &parameters) command_result blueprint(color_ostream &out, vector<string> &parameters)
{ {
CoreSuspender suspend;
if (parameters.size() >= 1 && parameters[0] == "gui") if (parameters.size() >= 1 && parameters[0] == "gui")
{ {
std::ostringstream command; std::ostringstream command;
@ -744,7 +746,6 @@ command_result blueprint(color_ostream &out, vector<string> &parameters)
return options.help ? CR_OK : CR_FAILURE; return options.help ? CR_OK : CR_FAILURE;
} }
CoreSuspender suspend;
if (!Maps::IsValid()) if (!Maps::IsValid())
{ {
out.printerr("Map is not available!\n"); out.printerr("Map is not available!\n");
@ -755,16 +756,12 @@ command_result blueprint(color_ostream &out, vector<string> &parameters)
DFCoord start(options.start); DFCoord start(options.start);
if (options.start.x == -30000) if (options.start.x == -30000)
{ {
int32_t x, y, z; if (!Gui::getCursorCoords(options.start))
if (!Gui::getCursorCoords(x, y, z))
{ {
out.printerr("Can't get cursor coords! Make sure you specify the" out.printerr("Can't get cursor coords! Make sure you specify the"
" --cursor parameter or have an active cursor in DF.\n"); " --cursor parameter or have an active cursor in DF.\n");
return CR_FAILURE; return CR_FAILURE;
} }
start.x = x;
start.y = y;
start.z = z;
} }
if (!Maps::isValidTilePos(start)) if (!Maps::isValidTilePos(start))
{ {