summaryrefslogtreecommitdiff
path: root/plugins/mapexport
diff options
context:
space:
mode:
authorPetr Mrázek2012-02-14 09:59:33 +0100
committerPetr Mrázek2012-02-14 09:59:33 +0100
commit448e27042144a80b5addb4c0135442d1847d2cb7 (patch)
tree943ded2bccdb27803bff23185ba2bd87bd560a37 /plugins/mapexport
parentbdbfbf59885fece5745b7551ddc2218cd37f476b (diff)
parent091bf62aa8dc4f27ab48e2072be65e9b6741e304 (diff)
downloaddfhack-448e27042144a80b5addb4c0135442d1847d2cb7.tar.gz
dfhack-448e27042144a80b5addb4c0135442d1847d2cb7.tar.bz2
dfhack-448e27042144a80b5addb4c0135442d1847d2cb7.tar.xz
Merge https://github.com/quietust/dfhack
Conflicts: plugins/mapexport/mapexport.cpp
Diffstat (limited to 'plugins/mapexport')
-rw-r--r--plugins/mapexport/mapexport.cpp27
1 files changed, 13 insertions, 14 deletions
diff --git a/plugins/mapexport/mapexport.cpp b/plugins/mapexport/mapexport.cpp
index cf851ca5..4733c195 100644
--- a/plugins/mapexport/mapexport.cpp
+++ b/plugins/mapexport/mapexport.cpp
@@ -23,7 +23,7 @@ using df::global::world;
typedef std::vector<df::plant *> PlantList;
-DFhackCExport command_result mapexport (Core * c, std::vector <std::string> & parameters);
+command_result mapexport (Core * c, std::vector <std::string> & parameters);
DFhackCExport const char * plugin_name ( void )
{
@@ -44,7 +44,7 @@ DFhackCExport command_result plugin_shutdown ( Core * c )
return CR_OK;
}
-DFhackCExport command_result mapexport (Core * c, std::vector <std::string> & parameters)
+command_result mapexport (Core * c, std::vector <std::string> & parameters)
{
bool showHidden = false;
@@ -206,36 +206,35 @@ 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_tile_material((dfproto::Tile::TileMaterialType)info->material);
+ prototile->set_material_type((dfproto::Tile::TileMaterialType)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:
+ case tiletype_material::SOIL:
+ case tiletype_material::STONE:
prototile->set_material_type(0);
prototile->set_material_index(b->baseMaterialAt(coord));
break;
- case DFHack::VEIN:
+ case tiletype_material::MINERAL:
prototile->set_material_type(0);
prototile->set_material_index(b->veinMaterialAt(coord));
break;
- case DFHack::FEATSTONE:
+ case tiletype_material::FEATURE:
if (blockFeatureLocal.type != -1 && des.bits.feature_local)
{
- if (blockFeatureLocal.type == df::feature_type::deep_special_tube
+ if (blockFeatureLocal.type == feature_type::deep_special_tube
&& blockFeatureLocal.main_material == 0) // stone
{
prototile->set_material_type(0);
prototile->set_material_index(blockFeatureLocal.sub_material);
}
if (blockFeatureGlobal.type != -1 && des.bits.feature_global
- && blockFeatureGlobal.type == df::feature_type::feature_underworld_from_layer
+ && blockFeatureGlobal.type == feature_type::feature_underworld_from_layer
&& blockFeatureGlobal.main_material == 0) // stone
{
prototile->set_material_type(0);
@@ -243,7 +242,7 @@ DFhackCExport command_result mapexport (Core * c, std::vector <std::string> & pa
}
}
break;
- case DFHack::CONSTRUCTED:
+ case tiletype_material::CONSTRUCTION:
if (constructionMaterials.find(map_pos) != constructionMaterials.end())
{
prototile->set_material_index(constructionMaterials[map_pos].first);