summaryrefslogtreecommitdiff
path: root/plugins/cleanowned.cpp
diff options
context:
space:
mode:
authorPetr Mrázek2011-11-03 02:40:37 +0100
committerPetr Mrázek2011-11-03 02:40:37 +0100
commitdc629bc2519b216673b1ab2e378fd8d0055643cd (patch)
treec6476970096cac496dc2802f7f3bd0c7f1d8fb01 /plugins/cleanowned.cpp
parent4df380eb91fbcff5c97e1b1d83ae3d7a364362ef (diff)
downloaddfhack-dc629bc2519b216673b1ab2e378fd8d0055643cd.tar.gz
dfhack-dc629bc2519b216673b1ab2e378fd8d0055643cd.tar.bz2
dfhack-dc629bc2519b216673b1ab2e378fd8d0055643cd.tar.xz
Fix cleanowned plugin.
Diffstat (limited to 'plugins/cleanowned.cpp')
-rw-r--r--plugins/cleanowned.cpp22
1 files changed, 15 insertions, 7 deletions
diff --git a/plugins/cleanowned.cpp b/plugins/cleanowned.cpp
index dd79d449..cc4bee1e 100644
--- a/plugins/cleanowned.cpp
+++ b/plugins/cleanowned.cpp
@@ -148,8 +148,22 @@ DFhackCExport command_result df_cleanowned (Core * c, vector <string> & paramete
type == Items::FOOD
)
{
- c->con.print("Confiscating a dropped foodstuff/pet vermin: \t");
confiscate = true;
+ if(dump_scattered)
+ {
+ c->con.print("Dumping a dropped item: \t");
+ dump = true;
+ }
+ else
+ {
+ c->con.print("Confiscating a dropped item: \t");
+ }
+ }
+ else if(dump_scattered)
+ {
+ c->con.print("Confiscating and dumping litter: \t");
+ confiscate = true;
+ dump = true;
}
}
else if (item->getWear() >= wear_dump_level)
@@ -158,12 +172,6 @@ DFhackCExport command_result df_cleanowned (Core * c, vector <string> & paramete
confiscate = true;
dump = true;
}
- else if (dump_scattered && item->flags.on_ground)
- {
- c->con.print("Confiscating and dumping litter: \t");
- confiscate = true;
- dump = true;
- }
else if (confiscate_all)
{
c->con.print("Confiscating: \t");