From 74e709ec197ab8c65a754e7e7146ad0eab284ead Mon Sep 17 00:00:00 2001
From: Eric Wald <eswald@gmail.com>
Date: Sun, 7 Sep 2014 14:52:08 -0600
Subject: [PATCH] Adding getStockpileContents to the Lua API.

---
 Lua API.html       | 4 ++++
 Lua API.rst        | 5 +++++
 library/LuaApi.cpp | 9 +++++++++
 3 files changed, 18 insertions(+)

diff --git a/Lua API.html b/Lua API.html
index 1a2888eb0..7d99228bf 100644
--- a/Lua API.html	
+++ b/Lua API.html	
@@ -1586,6 +1586,10 @@ are removed from extents. If <tt class="docutils literal">allow_occupied</tt>, t
 <p>Checks if a bridge constructed at specified position would have
 support from terrain, and thus won't collapse if retracted.</p>
 </li>
+<li><p class="first"><tt class="docutils literal">dfhack.buildings.getStockpileContents(stockpile)</tt></p>
+<p>Returns a list of items stored on the given stockpile.
+Ignores empty bins, barrels, and wheelbarrows assigned as storage and transport for that stockpile.</p>
+</li>
 </ul>
 <p>Low-level building creation functions;</p>
 <ul>
diff --git a/Lua API.rst b/Lua API.rst
index 7283f196f..d770271ae 100644
--- a/Lua API.rst	
+++ b/Lua API.rst	
@@ -1394,6 +1394,11 @@ Buildings module
   Checks if a bridge constructed at specified position would have
   support from terrain, and thus won't collapse if retracted.
 
+* ``dfhack.buildings.getStockpileContents(stockpile)``
+
+  Returns a list of items stored on the given stockpile.
+  Ignores empty bins, barrels, and wheelbarrows assigned as storage and transport for that stockpile.
+
 Low-level building creation functions;
 
 * ``dfhack.buildings.allocInstance(pos, type, subtype, custom)``
diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index 3fd18a8d6..f2693363a 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -1744,11 +1744,20 @@ int buildings_setSize(lua_State *state)
 
 }
 
+static int buildings_getStockpileContents(lua_State *state)
+{
+    std::vector<df::item*> pvec;
+    Buildings::getStockpileContents(Lua::CheckDFObject<df::building_stockpilest>(state,1),&pvec);
+    Lua::PushVector(state, pvec);
+    return 1;
+}
+
 static const luaL_Reg dfhack_buildings_funcs[] = {
     { "findAtTile", buildings_findAtTile },
     { "findCivzonesAt", buildings_findCivzonesAt },
     { "getCorrectSize", buildings_getCorrectSize },
     { "setSize", &Lua::CallWithCatchWrapper<buildings_setSize> },
+    { "getStockpileContents", buildings_getStockpileContents},
     { NULL, NULL }
 };