summaryrefslogtreecommitdiff
path: root/plugins/liquids.cpp
diff options
context:
space:
mode:
authorQuietust2012-01-19 21:44:17 -0600
committerQuietust2012-01-19 21:44:17 -0600
commite7ecda143413105d9e780bd9888ee17b095d9fe8 (patch)
tree0ba9272f91f9fac61589e2ce470e02fc968a4be2 /plugins/liquids.cpp
parente7dcd4c66ab78ca0dfbd3236fd6a5e808a557124 (diff)
downloaddfhack-e7ecda143413105d9e780bd9888ee17b095d9fe8.tar.gz
dfhack-e7ecda143413105d9e780bd9888ee17b095d9fe8.tar.bz2
dfhack-e7ecda143413105d9e780bd9888ee17b095d9fe8.tar.xz
Kill the Maps module
Diffstat (limited to 'plugins/liquids.cpp')
-rw-r--r--plugins/liquids.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/plugins/liquids.cpp b/plugins/liquids.cpp
index 0b7904db..d0170fce 100644
--- a/plugins/liquids.cpp
+++ b/plugins/liquids.cpp
@@ -169,7 +169,6 @@ DFhackCExport command_result df_liquids (Core * c, vector <string> & parameters)
int32_t x,y,z;
uint32_t x_max,y_max,z_max;
- DFHack::Maps * Maps;
DFHack::Gui * Position;
for(int i = 0; i < parameters.size();i++)
{
@@ -360,16 +359,14 @@ DFhackCExport command_result df_liquids (Core * c, vector <string> & parameters)
else if(command.empty())
{
c->Suspend();
- Maps = c->getMaps();
- Maps->Start();
- Maps->getSize(x_max,y_max,z_max);
+ Maps::getSize(x_max,y_max,z_max);
Position = c->getGui();
do
{
- if(!Maps->Start())
+ if (!Maps::IsValid())
{
c->con << "Can't see any DF map loaded." << endl;
- break;
+ break;;
}
if(!Position->getCursorCoords(x,y,z))
{
@@ -377,7 +374,7 @@ DFhackCExport command_result df_liquids (Core * c, vector <string> & parameters)
break;
}
c->con << "cursor coords: " << x << "/" << y << "/" << z << endl;
- MapCache mcache(Maps);
+ MapCache mcache;
DFHack::DFCoord cursor(x,y,z);
coord_vec all_tiles = brush->points(mcache,cursor);
c->con << "working..." << endl;
@@ -530,7 +527,6 @@ DFhackCExport command_result df_liquids (Core * c, vector <string> & parameters)
c->con << "OK" << endl;
else
c->con << "Something failed horribly! RUN!" << endl;
- Maps->Finish();
} while (0);
c->Resume();
}