diff options
| author | Quietust | 2012-02-13 16:56:33 -0600 |
|---|---|---|
| committer | Quietust | 2012-02-13 16:56:33 -0600 |
| commit | d0a8c2edd8922673d72a18bfd2214ce45126507b (patch) | |
| tree | b64220558035888a0cea2f0ee7354f4a20b27ecc /plugins/tubefill.cpp | |
| parent | 9f43d61c2c4f1a9ae760158d3e57601e39ff4a24 (diff) | |
| download | dfhack-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/tubefill.cpp')
| -rw-r--r-- | plugins/tubefill.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/tubefill.cpp b/plugins/tubefill.cpp index 3bb84aa4..0785b5aa 100644 --- a/plugins/tubefill.cpp +++ b/plugins/tubefill.cpp @@ -79,7 +79,7 @@ DFhackCExport command_result tubefill(DFHack::Core * c, std::vector<std::string> continue; // Is the tile already a wall? - if (tileShape(block->tiletype[x][y]) == WALL) + if (tileShape(block->tiletype[x][y]) == tiletype_shape::WALL) continue; // Does the tile contain liquid? @@ -92,16 +92,16 @@ DFhackCExport command_result tubefill(DFHack::Core * c, std::vector<std::string> // Check the tile above this one, in case we need to add a floor if (above) { - if ((tileShape(above->tiletype[x][y]) == EMPTY) || (tileShape(above->tiletype[x][y]) == RAMP_TOP)) + if ((tileShape(above->tiletype[x][y]) == tiletype_shape::EMPTY) || (tileShape(above->tiletype[x][y]) == tiletype_shape::RAMP_TOP)) { // if this tile isn't a local feature, it's likely the tile underneath was originally just a floor // it's also possible there was just solid non-feature stone above, but we don't care enough to check if (!above->designation[x][y].bits.feature_local) continue; - above->tiletype[x][y] = findTileType(FLOOR, FEATSTONE, tilevariant_invalid, TILE_NORMAL, TileDirection()); + above->tiletype[x][y] = findRandomVariant(tiletype::FeatureFloor1); } } - block->tiletype[x][y] = findTileType(WALL, FEATSTONE, tilevariant_invalid, TILE_NORMAL, TileDirection()); + block->tiletype[x][y] = tiletype::FeatureWall; ++count; } } |
