summaryrefslogtreecommitdiff
path: root/plugins/tiletypes.cpp
diff options
context:
space:
mode:
authorPetr Mrázek2012-03-03 14:38:24 +0100
committerPetr Mrázek2012-03-03 14:38:24 +0100
commit7fe8762852c11caeaeb486e9b76f024f5cbaf0d6 (patch)
tree161c80a0738fa1d4d1b8fed845c59f29bd3abf9e /plugins/tiletypes.cpp
parent022822277d80152ca6ba4fad6102d68df35a7adc (diff)
downloaddfhack-7fe8762852c11caeaeb486e9b76f024f5cbaf0d6.tar.gz
dfhack-7fe8762852c11caeaeb486e9b76f024f5cbaf0d6.tar.bz2
dfhack-7fe8762852c11caeaeb486e9b76f024f5cbaf0d6.tar.xz
Get rid of Simple namespace, Gui module is now a namespace.
Diffstat (limited to 'plugins/tiletypes.cpp')
-rw-r--r--plugins/tiletypes.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/plugins/tiletypes.cpp b/plugins/tiletypes.cpp
index cad4f066..5b322e95 100644
--- a/plugins/tiletypes.cpp
+++ b/plugins/tiletypes.cpp
@@ -656,7 +656,6 @@ command_result df_tiletypes (Core * c, vector <string> & parameters)
uint32_t x_max = 0, y_max = 0, z_max = 0;
int32_t x = 0, y = 0, z = 0;
- DFHack::Gui *gui;
for(size_t i = 0; i < parameters.size();i++)
{
if(parameters[i] == "help" || parameters[i] == "?")
@@ -769,7 +768,6 @@ command_result df_tiletypes (Core * c, vector <string> & parameters)
}
CoreSuspender suspend(c);
- gui = c->getGui();
if (!Maps::IsValid())
{
c->con.printerr("Map is not available!\n");
@@ -777,7 +775,7 @@ command_result df_tiletypes (Core * c, vector <string> & parameters)
}
Maps::getSize(x_max, y_max, z_max);
- if (!(gui->Start() && gui->getCursorCoords(x,y,z)))
+ if (!Gui::getCursorCoords(x,y,z))
{
c->con.printerr("Can't get cursor coords! Make sure you have a cursor active in DF.\n");
return CR_FAILURE;
@@ -798,7 +796,7 @@ command_result df_tiletypes (Core * c, vector <string> & parameters)
|| (filter.material > -1 && filter.material != tileMaterial(source))
|| (filter.special > -1 && filter.special != tileSpecial(source))
|| (filter.variant > -1 && filter.variant != tileVariant(source))
- || (filter.dig > -1 && (filter.dig != 0) != (des.bits.dig != tile_dig_designation::No))
+ || (filter.dig > -1 && (filter.dig != 0) != (des.bits.dig != tile_dig_designation::No))
)
{
continue;