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

used passed-in out param instead of the console

develop
myk002 2021-06-01 02:16:48 -07:00
parent 1b1b4245c9
commit ce6a2d2974
No known key found for this signature in database
GPG Key ID: 8A39CA0FA0C16E78
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/blueprint.cpp
Unescape Escape View File

@ -685,11 +685,11 @@ static bool do_transform(const DFCoord &start, const DFCoord &end,
return true; return true;
} }
static bool get_options(blueprint_options &opts, static bool get_options(color_ostream &out,
blueprint_options &opts,
const vector<string> &parameters) const vector<string> &parameters)
{ {
auto L = Lua::Core::State; auto L = Lua::Core::State;
color_ostream_proxy out(Core::getInstance().getConsole());
Lua::StackUnwinder top(L); Lua::StackUnwinder top(L);
if (!lua_checkstack(L, parameters.size() + 2) || if (!lua_checkstack(L, parameters.size() + 2) ||
@ -711,10 +711,9 @@ static bool get_options(blueprint_options &opts,
return true; return true;
} }
static void print_help() static void print_help(color_ostream &out)
{ {
auto L = Lua::Core::State; auto L = Lua::Core::State;
color_ostream_proxy out(Core::getInstance().getConsole());
Lua::StackUnwinder top(L); Lua::StackUnwinder top(L);
if (!lua_checkstack(L, 1) || if (!lua_checkstack(L, 1) ||
@ -749,9 +748,9 @@ static bool do_blueprint(color_ostream &out,
} }
blueprint_options options; blueprint_options options;
if (!get_options(options, parameters) || options.help) if (!get_options(out, options, parameters) || options.help)
{ {
print_help(); print_help(out);
return options.help; return options.help;
} }
@ -821,7 +820,10 @@ static int run(lua_State *L)
} }
vector<string> files; vector<string> files;
if (do_blueprint(Core::getInstance().getConsole(), argv, files)) color_ostream *out = Lua::GetOutput(L);
if (!out)
out = &Core::getInstance().getConsole();
if (do_blueprint(*out, argv, files))
{ {
Lua::PushVector(L, files); Lua::PushVector(L, files);
return 1; return 1;
@ -833,7 +835,7 @@ static int run(lua_State *L)
command_result blueprint(color_ostream &out, vector<string> &parameters) command_result blueprint(color_ostream &out, vector<string> &parameters)
{ {
vector<string> files; vector<string> files;
if (do_blueprint(Core::getInstance().getConsole(), parameters, files)) if (do_blueprint(out, parameters, files))
{ {
out.print("Generated blueprint file(s):\n"); out.print("Generated blueprint file(s):\n");
for (string &fname : files) for (string &fname : files)