diff options
| author | Quietust | 2012-01-21 18:31:15 -0600 |
|---|---|---|
| committer | Quietust | 2012-01-21 18:31:15 -0600 |
| commit | 2cc6bcf0e97dbdf60492067cd71dc79432a35687 (patch) | |
| tree | e893504d15ef59e8803573f6f4483d2e3ec9ca34 /plugins/probe.cpp | |
| parent | ccf22bed10a78504701bbdb1f8177a16cf9ffdde (diff) | |
| download | dfhack-2cc6bcf0e97dbdf60492067cd71dc79432a35687.tar.gz dfhack-2cc6bcf0e97dbdf60492067cd71dc79432a35687.tar.bz2 dfhack-2cc6bcf0e97dbdf60492067cd71dc79432a35687.tar.xz | |
Use CoreSuspender and namespace df::enums
Diffstat (limited to 'plugins/probe.cpp')
| -rw-r--r-- | plugins/probe.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/plugins/probe.cpp b/plugins/probe.cpp index 43c6f057..8d588f28 100644 --- a/plugins/probe.cpp +++ b/plugins/probe.cpp @@ -24,6 +24,7 @@ using namespace std; using std::vector; using std::string; using namespace DFHack; +using namespace df::enums; DFhackCExport command_result df_probe (Core * c, vector <string> & parameters); DFhackCExport command_result df_cprobe (Core * c, vector <string> & parameters); @@ -53,7 +54,7 @@ DFhackCExport command_result plugin_shutdown ( Core * c ) DFhackCExport command_result df_cprobe (Core * c, vector <string> & parameters) { Console & con = c->con; - c->Suspend(); + CoreSuspender suspend(c); DFHack::Gui *Gui = c->getGui(); DFHack::Units * cr = c->getUnits(); int32_t cursorX, cursorY, cursorZ; @@ -76,7 +77,6 @@ DFhackCExport command_result df_cprobe (Core * c, vector <string> & parameters) } } } - c->Resume(); return CR_OK; } @@ -93,8 +93,7 @@ DFhackCExport command_result df_probe (Core * c, vector <string> & parameters) } */ - BEGIN_PROBE: - c->Suspend(); + CoreSuspender suspend(c); DFHack::Gui *Gui = c->getGui(); DFHack::Materials *Materials = c->getMaterials(); @@ -105,7 +104,6 @@ DFhackCExport command_result df_probe (Core * c, vector <string> & parameters) if (!Maps::IsValid()) { c->con.printerr("Map is not available!\n"); - c->Resume(); return CR_FAILURE; } MapExtras::MapCache mc; @@ -118,7 +116,6 @@ DFhackCExport command_result df_probe (Core * c, vector <string> & parameters) if(cursorX == -30000) { con.printerr("No cursor; place cursor over tile to probe.\n"); - c->Resume(); return CR_FAILURE; } DFCoord cursor (cursorX,cursorY,cursorZ); @@ -132,7 +129,6 @@ DFhackCExport command_result df_probe (Core * c, vector <string> & parameters) if(!b && !b->valid) { con.printerr("No data.\n"); - c->Resume(); return CR_OK; } mapblock40d & block = b->raw; @@ -220,7 +216,7 @@ DFhackCExport command_result df_probe (Core * c, vector <string> & parameters) // liquids if(des.bits.flow_size) { - if(des.bits.liquid_type == df::tile_liquid::Magma) + if(des.bits.liquid_type == tile_liquid::Magma) con <<"magma: "; else con <<"water: "; con << des.bits.flow_size << std::endl; @@ -275,6 +271,5 @@ DFhackCExport command_result df_probe (Core * c, vector <string> & parameters) << endl; con << "mystery: " << block.mystery << endl; con << std::endl; - c->Resume(); return CR_OK; } |
