diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-04-21 04:44:53 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-04-21 20:37:02 +0300 |
| commit | 862e8f821789014b6167f37976b80694d6d310e3 (patch) | |
| tree | 7c4d77a370f4da3d84a649b0d10e4d0a05725e6a /src/gui/windows | |
| parent | 62fa051ace7097e78134d46505070a70c08e128f (diff) | |
| download | mv-862e8f821789014b6167f37976b80694d6d310e3.tar.gz mv-862e8f821789014b6167f37976b80694d6d310e3.tar.bz2 mv-862e8f821789014b6167f37976b80694d6d310e3.tar.xz mv-862e8f821789014b6167f37976b80694d6d310e3.zip | |
Add item options into item and get it from server.
Diffstat (limited to 'src/gui/windows')
| -rw-r--r-- | src/gui/windows/tradewindow.cpp | 5 | ||||
| -rw-r--r-- | src/gui/windows/tradewindow.h | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/windows/tradewindow.cpp b/src/gui/windows/tradewindow.cpp index 995db35eb..bab8da9c2 100644 --- a/src/gui/windows/tradewindow.cpp +++ b/src/gui/windows/tradewindow.cpp @@ -52,6 +52,7 @@ #include "resources/db/unitsdb.h" #include "resources/item/item.h" +#include "resources/item/itemoptionslist.h" #include "net/serverfeatures.h" #include "net/tradehandler.h" @@ -222,6 +223,7 @@ void TradeWindow::addItem(const int id, void TradeWindow::addItem2(const int id, const ItemTypeT type, const int *const cards, + const ItemOptionsList *const options, const int sz, const bool own, const int quantity, @@ -244,7 +246,10 @@ void TradeWindow::addItem2(const int id, equipment, Equipped_false); if (slot >= 0) + { inv->setCards(slot, cards, sz); + inv->setOptions(slot, options); + } } void TradeWindow::changeQuantity(const int index, const bool own, diff --git a/src/gui/windows/tradewindow.h b/src/gui/windows/tradewindow.h index 4cf062c76..6cfc89a3f 100644 --- a/src/gui/windows/tradewindow.h +++ b/src/gui/windows/tradewindow.h @@ -43,6 +43,8 @@ class ItemContainer; class Label; class TextField; +struct ItemOptionsList; + /** * Trade dialog. * @@ -94,6 +96,7 @@ class TradeWindow final : public Window, void addItem2(const int id, const ItemTypeT type, const int *const cards, + const ItemOptionsList *const options, const int sz, const bool own, const int quantity, |