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/fixveins.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/fixveins.cpp')
| -rw-r--r-- | plugins/fixveins.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/plugins/fixveins.cpp b/plugins/fixveins.cpp index e86bb01d..339bb773 100644 --- a/plugins/fixveins.cpp +++ b/plugins/fixveins.cpp @@ -22,10 +22,10 @@ using namespace df::enums; using df::global::world; -bool setTileMaterial(int16_t &tile, const TileMaterial mat) +bool setTileMaterial(df::tiletype &tile, const df::tiletype_material mat) { - int16_t newTile = findTileType(tileShape(tile), mat, tileVariant(tile), tileSpecial(tile), tileDirection(tile)); - if (newTile == -1) + df::tiletype newTile = findTileType(tileShape(tile), mat, tileVariant(tile), tileSpecial(tile), tileDirection(tile)); + if (newTile == tiletype::Void) return false; if (newTile != tile) { @@ -77,16 +77,16 @@ DFhackCExport command_result df_fixveins (Core * c, vector <string> & parameters bool has_vein = has_mineral[y] & (1 << x); if (has_feature) has_vein = false; - int16_t oldT = block->tiletype[x][y]; - TileMaterial mat = tileMaterial(oldT); - if ((mat == VEIN) && !has_vein) - mineral_removed += setTileMaterial(block->tiletype[x][y], STONE); - if ((mat == STONE) && has_vein) - mineral_added += setTileMaterial(block->tiletype[x][y], VEIN); - if ((mat == FEATSTONE) && !has_feature) - feature_removed += setTileMaterial(block->tiletype[x][y], STONE); - if ((mat == STONE) && has_feature) - feature_added += setTileMaterial(block->tiletype[x][y], FEATSTONE); + df::tiletype oldT = block->tiletype[x][y]; + df::tiletype_material mat = tileMaterial(oldT); + if ((mat == tiletype_material::MINERAL) && !has_vein) + mineral_removed += setTileMaterial(block->tiletype[x][y], tiletype_material::STONE); + if ((mat == tiletype_material::STONE) && has_vein) + mineral_added += setTileMaterial(block->tiletype[x][y], tiletype_material::MINERAL); + if ((mat == tiletype_material::FEATURE) && !has_feature) + feature_removed += setTileMaterial(block->tiletype[x][y], tiletype_material::STONE); + if ((mat == tiletype_material::STONE) && has_feature) + feature_added += setTileMaterial(block->tiletype[x][y], tiletype_material::FEATURE); } } } |
