diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-08-23 18:42:30 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-08-23 20:55:58 +0300 |
commit | bfdee54a34531631a021f9f112186504cebde4c7 (patch) | |
tree | e49dfa982d7724497c8a7a433285e833410a0bb1 /src/gui/windows | |
parent | 79864826790a33a3583819fe02893eed010381d9 (diff) | |
download | manaverse-bfdee54a34531631a021f9f112186504cebde4c7.tar.gz manaverse-bfdee54a34531631a021f9f112186504cebde4c7.tar.bz2 manaverse-bfdee54a34531631a021f9f112186504cebde4c7.tar.xz manaverse-bfdee54a34531631a021f9f112186504cebde4c7.zip |
Add partial adding items into new mail message.
Diffstat (limited to 'src/gui/windows')
-rw-r--r-- | src/gui/windows/itemamountwindow.cpp | 11 | ||||
-rw-r--r-- | src/gui/windows/maileditwindow.cpp | 8 | ||||
-rw-r--r-- | src/gui/windows/maileditwindow.h | 1 |
3 files changed, 17 insertions, 3 deletions
diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp index d31e263c4..100ad748a 100644 --- a/src/gui/windows/itemamountwindow.cpp +++ b/src/gui/windows/itemamountwindow.cpp @@ -22,6 +22,8 @@ #include "gui/windows/itemamountwindow.h" +#include "settings.h" + #include "being/playerinfo.h" #include "input/keyboardconfig.h" @@ -47,6 +49,7 @@ #include "gui/widgets/slider.h" #include "net/inventoryhandler.h" +#include "net/mail2handler.h" #include "net/npchandler.h" #include "resources/item/item.h" @@ -104,8 +107,14 @@ void ItemAmountWindow::finish(Item *const item, item->getInvIndex(), amount, InventoryType::Inventory); break; case ItemAmountWindowUsage::MailAdd: - if (mailEditWindow != nullptr) + if (settings.enableNewMailSystem) + { + mail2Handler->addItem(item, amount); + } + else if (mailEditWindow != nullptr) + { mailEditWindow->addItem(item, amount); + } break; case ItemAmountWindowUsage::CraftAdd: { diff --git a/src/gui/windows/maileditwindow.cpp b/src/gui/windows/maileditwindow.cpp index a2f7fe6c8..5f7426a76 100644 --- a/src/gui/windows/maileditwindow.cpp +++ b/src/gui/windows/maileditwindow.cpp @@ -20,6 +20,8 @@ #include "gui/windows/maileditwindow.h" +#include "settings.h" + #include "being/playerinfo.h" #include "gui/windows/inventorywindow.h" @@ -67,11 +69,13 @@ MailEditWindow::MailEditWindow() : mSubjectField(new TextField(this)), mMoneyField(new IntTextField(this, 0, 0, 10000000)), mMessageField(new TextField(this)), - mInventory(new Inventory(InventoryType::Mail, 1)), + mInventory(new Inventory(InventoryType::Mail, + settings.enableNewMailSystem ? -1 : 1)), mItemContainer(new ItemContainer(this, mInventory)), mItemScrollArea(new ScrollArea(this, mItemContainer, fromBool(getOptionBool("showitemsbackground"), Opaque), - "mailedit_listbackground.xml")) + "mailedit_listbackground.xml")), + mUseMail2(settings.enableNewMailSystem) { setWindowName("MailEdit"); setCloseButton(true); diff --git a/src/gui/windows/maileditwindow.h b/src/gui/windows/maileditwindow.h index a4184fdd6..e25fb8f4f 100644 --- a/src/gui/windows/maileditwindow.h +++ b/src/gui/windows/maileditwindow.h @@ -72,6 +72,7 @@ class MailEditWindow final : public Window, Inventory *mInventory; ItemContainer *mItemContainer; ScrollArea *mItemScrollArea; + bool mUseMail2; }; extern MailEditWindow *mailEditWindow; |