add ability to give more than one item to npc. (evol only)

2 files changed, 30 insertions, 8 deletions

diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp
index 1c2a6cc1d..36f7bedc8 100644
--- a/src/gui/windows/npcdialog.cpp
+++ b/src/gui/windows/npcdialog.cpp
@@ -360,16 +360,38 @@ void NpcDialog::action(const gcn::ActionEvent &event)
                     if (!client->limitPackets(PACKET_NPC_INPUT))
                         return;
 
-                    const Item *const item = mInventory->getItem(0);
                     std::string str;
-                    if (item)
+                    const int sz = mInventory->getNumberOfSlotsUsed();
+                    if (sz == 0)
                     {
-                        str = strprintf("%d,%d", item->getId(),
-                            item->getColor());
+                        str = "0,0";
                     }
                     else
                     {
-                        str = "0,0";
+                        const Item *item = mInventory->getItem(0);
+                        if (item)
+                        {
+                            str = strprintf("%d,%d", item->getId(),
+                                item->getColor());
+                        }
+                        else
+                        {
+                            str = "0,0";
+                        }
+                        for (int f = 1; f < sz; f ++)
+                        {
+                            str.append(";");
+                            item = mInventory->getItem(f);
+                            if (item)
+                            {
+                                str.append(strprintf("%d,%d", item->getId(),
+                                    item->getColor()));
+                            }
+                            else
+                            {
+                                str.append("0,0");
+                            }
+                        }
                     }
 
                     // need send selected item
@@ -597,11 +619,11 @@ void NpcDialog::integerRequest(const int defaultValue, const int min,
     buildLayout();
 }
 
-void NpcDialog::itemRequest()
+void NpcDialog::itemRequest(const int size)
 {
     mActionState = NPC_ACTION_INPUT;
     mInputState = NPC_INPUT_ITEM;
-
+    mInventory->resize(size);
     buildLayout();
 }
 
diff --git a/src/gui/windows/npcdialog.h b/src/gui/windows/npcdialog.h
index 27efcee2f..1736f5567 100644
--- a/src/gui/windows/npcdialog.h
+++ b/src/gui/windows/npcdialog.h
@@ -164,7 +164,7 @@ class NpcDialog final : public Window,
         void integerRequest(const int defaultValue = 0, const int min = 0,
                             const int max = 2147483647);
 
-        void itemRequest();
+        void itemRequest(const int size);
 
         void move(const int amount);