diff options
| author | Mike Stewart | 2012-02-20 19:32:58 -0800 |
|---|---|---|
| committer | Mike Stewart | 2012-02-20 19:32:58 -0800 |
| commit | 2524f81ae0da5668fe46ff0319772cd01edbad3f (patch) | |
| tree | b3fcb6d08776f2eefe3a1ba6fea9da0ac80049a3 /plugins/mapexport | |
| parent | 931121e5fd121647bba0080751076ef2b433a1be (diff) | |
| download | dfhack-2524f81ae0da5668fe46ff0319772cd01edbad3f.tar.gz dfhack-2524f81ae0da5668fe46ff0319772cd01edbad3f.tar.bz2 dfhack-2524f81ae0da5668fe46ff0319772cd01edbad3f.tar.xz | |
Fix tile materials in mapexport.
Diffstat (limited to 'plugins/mapexport')
| -rw-r--r-- | plugins/mapexport/mapexport.cpp | 5 | ||||
| -rw-r--r-- | plugins/mapexport/proto/Tile.proto | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/plugins/mapexport/mapexport.cpp b/plugins/mapexport/mapexport.cpp index 4733c195..004937fd 100644 --- a/plugins/mapexport/mapexport.cpp +++ b/plugins/mapexport/mapexport.cpp @@ -208,8 +208,7 @@ command_result mapexport (Core * c, std::vector <std::string> & parameters) df::tiletype type = b->TileTypeAt(coord); prototile->set_type((dfproto::Tile::TileType)tileShape(type)); - - prototile->set_material_type((dfproto::Tile::TileMaterialType)tileMaterial(type)); + prototile->set_tile_material((dfproto::Tile::TileMaterialType)tileMaterial(type)); df::coord map_pos = df::coord(b_x*16+x,b_y*16+y,z); @@ -249,6 +248,8 @@ command_result mapexport (Core * c, std::vector <std::string> & parameters) prototile->set_material_type(constructionMaterials[map_pos].second); } break; + default: + break; } } } diff --git a/plugins/mapexport/proto/Tile.proto b/plugins/mapexport/proto/Tile.proto index 57c8ef04..b7f8fcb4 100644 --- a/plugins/mapexport/proto/Tile.proto +++ b/plugins/mapexport/proto/Tile.proto @@ -36,7 +36,7 @@ message Tile FEATURE = 3; LAVA_STONE = 4; MINERAL = 5; - FROZE_LIQUID = 6; + FROZEN_LIQUID = 6; CONSTRUCTION = 7; GRASS_LIGHT = 8; GRASS_DARK = 9; |
