summaryrefslogtreecommitdiff
path: root/plugins/prospector.cpp
diff options
context:
space:
mode:
authorQuietust2012-01-21 17:54:57 -0600
committerQuietust2012-01-21 17:54:57 -0600
commitccf22bed10a78504701bbdb1f8177a16cf9ffdde (patch)
treed867a8135512c572de2cffbf1c95e63e048fe875 /plugins/prospector.cpp
parentd2c78646ea55c11429b452b83a4d7a0d7f50f835 (diff)
downloaddfhack-ccf22bed10a78504701bbdb1f8177a16cf9ffdde.tar.gz
dfhack-ccf22bed10a78504701bbdb1f8177a16cf9ffdde.tar.bz2
dfhack-ccf22bed10a78504701bbdb1f8177a16cf9ffdde.tar.xz
Replace df_plant with df::plant - this leaves the Vegetation module a bit empty, but I'll leave it in case we decide to add something new there
Diffstat (limited to 'plugins/prospector.cpp')
-rw-r--r--plugins/prospector.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/prospector.cpp b/plugins/prospector.cpp
index 00e0913b..a3d5344b 100644
--- a/plugins/prospector.cpp
+++ b/plugins/prospector.cpp
@@ -69,7 +69,7 @@ bool operator>(const matdata & q1, const matdata & q2)
typedef std::map<int16_t, matdata> MatMap;
typedef std::vector< pair<int16_t, matdata> > MatSorter;
-typedef std::vector<DFHack::df_plant *> PlantList;
+typedef std::vector<df::plant *> PlantList;
#define TO_PTR_VEC(obj_vec, ptr_vec) \
ptr_vec.clear(); \
@@ -403,12 +403,12 @@ DFhackCExport command_result prospector (DFHack::Core * c, vector <string> & par
{
for (PlantList::const_iterator it = plants->begin(); it != plants->end(); it++)
{
- const DFHack::df_plant & plant = *(*it);
- df::coord2d loc(plant.x, plant.y);
+ const df::plant & plant = *(*it);
+ df::coord2d loc(plant.pos.x, plant.pos.y);
loc = loc % 16;
if (showHidden || !b->DesignationAt(loc).bits.hidden)
{
- if(plant.is_shrub)
+ if(plant.flags.bits.is_shrub)
plantMats[plant.material].add(global_z);
else
treeMats[plant.material].add(global_z);