From 827dd121d856e3e720c8dbcfe8a09262c79301ed Mon Sep 17 00:00:00 2001
From: Alexander Gavrilov <angavrilov@gmail.com>
Date: Mon, 24 Mar 2014 19:35:34 +0400
Subject: [PATCH] Make createitem default to the controlled unit in adventure
 mode.

---
 NEWS                   |  1 +
 plugins/createitem.cpp | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 28dca6098..f18ee8e67 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@ DFHack future
     - digfort: improved csv parsing, add start() comment handling
     - exterminate: allow specifying a caste (exterminate gob:male)
     - siege-engine: engine quality and distance to target now affect accuracy.
+    - createitem: in adventure mode it now defaults to the controlled unit as maker.
 
 DFHack v0.34.11-r4
 
diff --git a/plugins/createitem.cpp b/plugins/createitem.cpp
index 42f242074..6442e818a 100644
--- a/plugins/createitem.cpp
+++ b/plugins/createitem.cpp
@@ -344,8 +344,16 @@ command_result df_createitem (color_ostream &out, vector <string> & parameters)
     df::unit *unit = Gui::getSelectedUnit(out, true);
     if (!unit)
     {
-        out.printerr("No unit selected!\n");
-        return CR_FAILURE;
+        if (*gametype == game_type::ADVENTURE_ARENA || *gametype == game_type::ADVENTURE_MAIN)
+        {
+            // Use the adventurer unit
+            unit = world->units.active[0];
+        }
+        else
+        {
+            out.printerr("No unit selected!\n");
+            return CR_FAILURE;
+        }
     }
     if (!Maps::IsValid())
     {