diff options
| author | Quietust | 2012-03-03 14:13:51 -0600 |
|---|---|---|
| committer | Quietust | 2012-03-03 14:13:51 -0600 |
| commit | e43a87b13b70e11b518eac450cc5f789d04badcb (patch) | |
| tree | 3f663945c07558b0389c7eae6338aedc39a5b2b4 /plugins/probe.cpp | |
| parent | 5d4114f5b797f302b903116d1439e6d94fa6d7f5 (diff) | |
| parent | 7fe8762852c11caeaeb486e9b76f024f5cbaf0d6 (diff) | |
| download | dfhack-e43a87b13b70e11b518eac450cc5f789d04badcb.tar.gz dfhack-e43a87b13b70e11b518eac450cc5f789d04badcb.tar.bz2 dfhack-e43a87b13b70e11b518eac450cc5f789d04badcb.tar.xz | |
Merge branch 'master' of git://github.com/peterix/dfhack
Diffstat (limited to 'plugins/probe.cpp')
| -rw-r--r-- | plugins/probe.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/plugins/probe.cpp b/plugins/probe.cpp index 7849c33b..ea3dd85e 100644 --- a/plugins/probe.cpp +++ b/plugins/probe.cpp @@ -29,7 +29,6 @@ using namespace std; using std::vector; using std::string; using namespace DFHack; -using namespace DFHack::Simple; using namespace df::enums; using df::global::world; using df::global::cursor; @@ -64,9 +63,8 @@ command_result df_cprobe (Core * c, vector <string> & parameters) { Console & con = c->con; CoreSuspender suspend(c); - DFHack::Gui *Gui = c->getGui(); int32_t cursorX, cursorY, cursorZ; - Gui->getCursorCoords(cursorX,cursorY,cursorZ); + Gui::getCursorCoords(cursorX,cursorY,cursorZ); if(cursorX == -30000) { con.printerr("No cursor; place cursor over creature to probe.\n"); @@ -101,7 +99,6 @@ command_result df_probe (Core * c, vector <string> & parameters) CoreSuspender suspend(c); - DFHack::Gui *Gui = c->getGui(); DFHack::Materials *Materials = c->getMaterials(); DFHack::VersionInfo* mem = c->vinfo; std::vector<t_matglossInorganic> inorganic; @@ -118,7 +115,7 @@ command_result df_probe (Core * c, vector <string> & parameters) Maps::getPosition(regionX,regionY,regionZ); int32_t cursorX, cursorY, cursorZ; - Gui->getCursorCoords(cursorX,cursorY,cursorZ); + Gui::getCursorCoords(cursorX,cursorY,cursorZ); if(cursorX == -30000) { con.printerr("No cursor; place cursor over tile to probe.\n"); |
