Merge branch 'develop' into myk_seedwatch

docs/about/Authors.rst

@@ -26,6 +26,7 @@ Ariphaos                Ariphaos
 arzyu                   arzyu
 Atkana                  Atkana
 AtomicChicken           AtomicChicken
+Batt Mush               hobotron-df
 Bearskie                Bearskie
 belal                   jimhester
 Ben Lubar               BenLubar

docs/changelog.txt

@@ -39,6 +39,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 -@ `nestboxes`: fixed bug causing nestboxes themselves to be forbidden, which prevented citizens from using them to lay eggs. Now only eggs are forbidden.
 - `autobutcher`: implemented work-around for Dwarf Fortress not setting nicknames properly, so that nicknames created in the in-game interface are detected & protect animals from being butchered properly. Note that nicknames for unnamed units are not currently saved by dwarf fortress - use ``enable fix/protect-nicks`` to fix any nicknames created/removed within dwarf fortress so they can be saved/reloaded when you reload the game.
 - `seedwatch`: fix saving and loading of seed stock targets
+- `autodump`: changed behaviour to only change ``dump`` and ``forbid`` flags if an item is successfully dumped.
 
 ## Misc Improvements
 

library/xml

@@ -1 +1 @@
-Subproject commit ad8d87989b796b453b0707963e30ef9dfff10c2e
+Subproject commit 785ffbd4086a15cfd1716b8944cb62ca0ed6ed32

plugins/autodump.cpp

@@ -396,20 +396,24 @@ static command_result autodump_main(color_ostream &out, vector <string> & parame
         if (!need_forbidden && itm->flags.bits.forbid)
             continue;
 
-        if(!destroy) // move to cursor
+        if (!destroy) // move to cursor
+        {
+            // Don't move items if they're already at the cursor
+            if (pos_cursor != pos_item)
+            {
+                if (Items::moveToGround(MC, itm, pos_cursor))
                 {
                     // Change flags to indicate the dump was completed, as if by super-dwarfs
                     itm->flags.bits.dump = false;
                     itm->flags.bits.forbid = true;
-
+                }
-            // Don't move items if they're already at the cursor
+                else
-            if (pos_cursor != pos_item)
                 {
-                if (!Items::moveToGround(MC, itm, pos_cursor))
                     out.print("Could not move item: %s\n",
                         Items::getDescription(itm, 0, true).c_str());
                 }
             }
+        }
         else // destroy
         {
             if (here && pos_item != pos_cursor)

scripts

@@ -1 +1 @@
-Subproject commit 3caa35156baa75ee804eaf64de445bfa8f6301b2
+Subproject commit 9401e9e43d44c04842c36530f97ecc00c12e6c9e