summaryrefslogtreecommitdiff
path: root/plugins/mapexport
diff options
context:
space:
mode:
authorQuietust2012-02-13 16:56:33 -0600
committerQuietust2012-02-13 16:56:33 -0600
commitd0a8c2edd8922673d72a18bfd2214ce45126507b (patch)
treeb64220558035888a0cea2f0ee7354f4a20b27ecc /plugins/mapexport
parent9f43d61c2c4f1a9ae760158d3e57601e39ff4a24 (diff)
downloaddfhack-d0a8c2edd8922673d72a18bfd2214ce45126507b.tar.gz
dfhack-d0a8c2edd8922673d72a18bfd2214ce45126507b.tar.bz2
dfhack-d0a8c2edd8922673d72a18bfd2214ce45126507b.tar.xz
Move TileTypes to XML, part 1 - a bunch of stuff is now broken
Diffstat (limited to 'plugins/mapexport')
-rw-r--r--plugins/mapexport/mapexport.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/plugins/mapexport/mapexport.cpp b/plugins/mapexport/mapexport.cpp
index 5053a3a6..e1bcf154 100644
--- a/plugins/mapexport/mapexport.cpp
+++ b/plugins/mapexport/mapexport.cpp
@@ -206,15 +206,14 @@ DFhackCExport command_result mapexport (Core * c, std::vector <std::string> & pa
prototile->set_flow_size(des.bits.flow_size);
}
- uint16_t type = b->TileTypeAt(coord);
- const DFHack::TileRow *info = DFHack::getTileRow(type);
- prototile->set_type((dfproto::Tile::TileType)info->shape);
+ df::tiletype type = b->TileTypeAt(coord);
+ prototile->set_type((dfproto::Tile::TileType)tileShape(type));
- prototile->set_material_type((dfproto::Tile::MaterialType)info->material);
+ prototile->set_material_type((dfproto::Tile::MaterialType)tileMaterial(type));
df::coord map_pos = df::coord(b_x*16+x,b_y*16+y,z);
- switch (info->material)
+ switch (tileMaterial(type))
{
case DFHack::SOIL:
case DFHack::STONE: