From 164c61b6383d704a9a5cc52ed482e79ede5cd515 Mon Sep 17 00:00:00 2001 From: Alexander Gavrilov Date: Thu, 27 Sep 2012 10:43:42 +0400 Subject: [PATCH] Forbid stuff from bins in siege-engine, if forbid ammo standing order set. --- library/include/DataDefs.h | 3 +++ plugins/siege-engine.cpp | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/library/include/DataDefs.h b/library/include/DataDefs.h index 61d5dec41..0966c7f31 100644 --- a/library/include/DataDefs.h +++ b/library/include/DataDefs.h @@ -707,6 +707,9 @@ namespace DFHack { // Global object pointers #include "df/global_objects.h" +#define DF_GLOBAL_VALUE(name,defval) (df::global::name ? *df::global::name : defval) +#define DF_GLOBAL_FIELD(name,fname,defval) (df::global::name ? df::global::name->fname : defval) + // A couple of headers that have to be included at once #include "df/coord2d.h" #include "df/coord.h" diff --git a/plugins/siege-engine.cpp b/plugins/siege-engine.cpp index 2e362afec..7c880351e 100644 --- a/plugins/siege-engine.cpp +++ b/plugins/siege-engine.cpp @@ -1573,6 +1573,8 @@ struct projectile_hook : df::proj_itemst { if (next_pos.z == cur_pos.z && !isPassableTile(next_pos)) start_z = 49000; + bool forbid_ammo = DF_GLOBAL_VALUE(standing_orders_forbid_used_ammo, false); + MapExtras::MapCache mc; std::vector contents; Items::getContainedItems(item, &contents); @@ -1581,6 +1583,9 @@ struct projectile_hook : df::proj_itemst { { auto child = contents[i]; + if (forbid_ammo) + child->flags.bits.forbid = true; + // Liquids are vaporized so that they cover nearby units if (child->isLiquid()) {