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/getplants.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/getplants.cpp')
| -rw-r--r-- | plugins/getplants.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/plugins/getplants.cpp b/plugins/getplants.cpp index b8f607c8..334923f1 100644 --- a/plugins/getplants.cpp +++ b/plugins/getplants.cpp @@ -105,10 +105,11 @@ DFhackCExport command_result df_getplants (Core * c, vector <string> & parameter if (!exclude) continue; } - TileShape shape = tileShape(cur->tiletype[x][y]); - if (plant->flags.bits.is_shrub && (treesonly || shape != SHRUB_OK)) + df::tiletype_shape shape = tileShape(cur->tiletype[x][y]); + df::tiletype_special special = tileSpecial(cur->tiletype[x][y]); + if (plant->flags.bits.is_shrub && (treesonly || (shape != tiletype_shape::SHRUB && special != tiletype_special::DEAD))) continue; - if (!plant->flags.bits.is_shrub && (shrubsonly || (shape != TREE_OK && shape != TREE_DEAD))) + if (!plant->flags.bits.is_shrub && (shrubsonly || shape != tiletype_shape::TREE)) continue; if (cur->designation[x][y].bits.hidden) continue; |
