diff options
| author | Alexander Gavrilov | 2012-03-10 15:55:42 +0400 |
|---|---|---|
| committer | Alexander Gavrilov | 2012-03-10 15:55:42 +0400 |
| commit | 8cc82d5876c902cbb4f0b3fa6cf15cf268dd942b (patch) | |
| tree | 4be7625f1bbe15b81d00373316047137d3422464 /plugins/rename.cpp | |
| parent | b2737e2bed5f013a4dfbf6e19650ca60498a9afd (diff) | |
| download | dfhack-8cc82d5876c902cbb4f0b3fa6cf15cf268dd942b.tar.gz dfhack-8cc82d5876c902cbb4f0b3fa6cf15cf268dd942b.tar.bz2 dfhack-8cc82d5876c902cbb4f0b3fa6cf15cf268dd942b.tar.xz | |
Make plugins accept explicit output stream references.
This is an incompatible change to the plugin ABI.
The Console is not thread-safe unless used indirectly
via color_ostream_proxy, so everything should use their
per-thread stream.
Diffstat (limited to 'plugins/rename.cpp')
| -rw-r--r-- | plugins/rename.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/plugins/rename.cpp b/plugins/rename.cpp index 0ff9469d..1a1a8cc3 100644 --- a/plugins/rename.cpp +++ b/plugins/rename.cpp @@ -28,11 +28,11 @@ using namespace df::enums; using df::global::ui; using df::global::world; -static command_result rename(Core * c, vector <string> & parameters); +static command_result rename(color_ostream &out, vector <string> & parameters); DFHACK_PLUGIN("rename"); -DFhackCExport command_result plugin_init (Core *c, std::vector <PluginCommand> &commands) +DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands) { commands.clear(); if (world && ui) { @@ -49,7 +49,7 @@ DFhackCExport command_result plugin_init (Core *c, std::vector <PluginCommand> & return CR_OK; } -DFhackCExport command_result plugin_shutdown ( Core * c ) +DFhackCExport command_result plugin_shutdown ( color_ostream &out ) { return CR_OK; } @@ -79,9 +79,9 @@ static df::squad *getSquadByIndex(unsigned idx) return df::squad::find(entity->squads[idx]); } -static command_result rename(Core * c, vector <string> ¶meters) +static command_result rename(color_ostream &out, vector <string> ¶meters) { - CoreSuspender suspend(c); + CoreSuspender suspend; string cmd; if (!parameters.empty()) @@ -96,7 +96,7 @@ static command_result rename(Core * c, vector <string> ¶meters) df::squad *squad = getSquadByIndex(id-1); if (!squad) { - c->con.printerr("Couldn't find squad with index %d.\n", id); + out.printerr("Couldn't find squad with index %d.\n", id); return CR_WRONG_USAGE; } @@ -109,7 +109,7 @@ static command_result rename(Core * c, vector <string> ¶meters) int id = atoi(parameters[1].c_str()); if (id < 1 || id > 16) { - c->con.printerr("Invalid hotkey index\n"); + out.printerr("Invalid hotkey index\n"); return CR_WRONG_USAGE; } @@ -120,7 +120,7 @@ static command_result rename(Core * c, vector <string> ¶meters) if (parameters.size() != 2) return CR_WRONG_USAGE; - df::unit *unit = Gui::getSelectedUnit(c); + df::unit *unit = Gui::getSelectedUnit(out); if (!unit) return CR_WRONG_USAGE; @@ -153,7 +153,7 @@ static command_result rename(Core * c, vector <string> ¶meters) if (parameters.size() != 2) return CR_WRONG_USAGE; - df::unit *unit = Gui::getSelectedUnit(c); + df::unit *unit = Gui::getSelectedUnit(out); if (!unit) return CR_WRONG_USAGE; @@ -162,7 +162,7 @@ static command_result rename(Core * c, vector <string> ¶meters) else { if (!parameters.empty() && cmd != "?") - c->con.printerr("Invalid command: %s\n", cmd.c_str()); + out.printerr("Invalid command: %s\n", cmd.c_str()); return CR_WRONG_USAGE; } |
