summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-08-25 02:55:51 +0300
committerAndrei Karas <akaras@inbox.ru>2016-08-25 02:55:51 +0300
commit1ad3e55c431b61e6fe6638ee0afc5e8f4c14496c (patch)
treec198baa8b7c57b2a4b118e6d740961a126d0e528 /src/net
parent290ae8ba45bb706f32da15978459022e633aa626 (diff)
downloadplus-1ad3e55c431b61e6fe6638ee0afc5e8f4c14496c.tar.gz
plus-1ad3e55c431b61e6fe6638ee0afc5e8f4c14496c.tar.bz2
plus-1ad3e55c431b61e6fe6638ee0afc5e8f4c14496c.tar.xz
plus-1ad3e55c431b61e6fe6638ee0afc5e8f4c14496c.zip
Allow buy more than one item at vending shop at once.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/eathena/vendinghandler.cpp35
-rw-r--r--src/net/eathena/vendinghandler.h4
-rw-r--r--src/net/eathena/vendingrecv.cpp2
-rw-r--r--src/net/tmwa/vendinghandler.cpp6
-rw-r--r--src/net/tmwa/vendinghandler.h4
-rw-r--r--src/net/vendinghandler.h3
6 files changed, 53 insertions, 1 deletions
diff --git a/src/net/eathena/vendinghandler.cpp b/src/net/eathena/vendinghandler.cpp
index 739f39acd..35e77f954 100644
--- a/src/net/eathena/vendinghandler.cpp
+++ b/src/net/eathena/vendinghandler.cpp
@@ -73,6 +73,41 @@ void VendingHandler::buy(const Being *const being,
outMsg.writeInt16(CAST_S16(index), "index");
}
+void VendingHandler::buyItems(const Being *const being,
+ const std::vector<ShopItem*> &items) const
+{
+ int cnt = 0;
+ const int pairSize = 4;
+
+ FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items)
+ {
+ ShopItem *const item = *it;
+ const int usedQuantity = item->getUsedQuantity();
+ if (!usedQuantity)
+ continue;
+ cnt ++;
+ }
+
+ if (cnt > 100)
+ return;
+
+ createOutPacket(CMSG_VENDING_BUY);
+ outMsg.writeInt16(CAST_S16(4 + 4 + pairSize * cnt), "len");
+ outMsg.writeBeingId(being->getId(), "account id");
+ FOR_EACH (std::vector<ShopItem*>::const_iterator, it, items)
+ {
+ ShopItem *const item = *it;
+ const int usedQuantity = item->getUsedQuantity();
+ if (!usedQuantity)
+ continue;
+ item->increaseQuantity(usedQuantity);
+ item->increaseUsedQuantity(-usedQuantity);
+ item->update();
+ outMsg.writeInt16(CAST_S16(usedQuantity), "amount");
+ outMsg.writeInt16(CAST_S16(item->getInvIndex()), "index");
+ }
+}
+
void VendingHandler::buy2(const Being *const being,
const int vendId,
const int index,
diff --git a/src/net/eathena/vendinghandler.h b/src/net/eathena/vendinghandler.h
index b824a8d8e..307c93ad9 100644
--- a/src/net/eathena/vendinghandler.h
+++ b/src/net/eathena/vendinghandler.h
@@ -45,6 +45,10 @@ class VendingHandler final : public Net::VendingHandler
const int index,
const int amount) const override final;
+ void buyItems(const Being *const being,
+ const std::vector<ShopItem*> &items) const
+ override final;
+
void createShop(const std::string &name,
const bool flag,
const std::vector<ShopItem*> &items) const
diff --git a/src/net/eathena/vendingrecv.cpp b/src/net/eathena/vendingrecv.cpp
index 468143dfd..d3b625159 100644
--- a/src/net/eathena/vendingrecv.cpp
+++ b/src/net/eathena/vendingrecv.cpp
@@ -98,7 +98,7 @@ void VendingRecv::processItemsList(Net::MessageIn &msg)
if (!being)
return;
int cards[maxCards];
- CREATEWIDGETV(mBuyDialog, BuyDialog, being->getName());
+ CREATEWIDGETV(mBuyDialog, BuyDialog, being);
mBuyDialog->setMoney(PlayerInfo::getAttribute(Attributes::MONEY));
if (msg.getVersion() >= 20100105)
msg.readInt32("vender id");
diff --git a/src/net/tmwa/vendinghandler.cpp b/src/net/tmwa/vendinghandler.cpp
index b2da37855..6bddd659f 100644
--- a/src/net/tmwa/vendinghandler.cpp
+++ b/src/net/tmwa/vendinghandler.cpp
@@ -46,6 +46,12 @@ void VendingHandler::buy(const Being *const being A_UNUSED,
{
}
+void VendingHandler::buyItems(const Being *const being A_UNUSED,
+ const std::vector<ShopItem*> &items A_UNUSED)
+ const
+{
+}
+
void VendingHandler::buy2(const Being *const being A_UNUSED,
const int vendId A_UNUSED,
const int index A_UNUSED,
diff --git a/src/net/tmwa/vendinghandler.h b/src/net/tmwa/vendinghandler.h
index 47a99c7b4..d8023fb1c 100644
--- a/src/net/tmwa/vendinghandler.h
+++ b/src/net/tmwa/vendinghandler.h
@@ -41,6 +41,10 @@ class VendingHandler final : public Net::VendingHandler
const int index,
const int amount) const override final A_CONST;
+ void buyItems(const Being *const being,
+ const std::vector<ShopItem*> &items) const
+ override final A_CONST;
+
void buy2(const Being *const being,
const int vendId,
const int index,
diff --git a/src/net/vendinghandler.h b/src/net/vendinghandler.h
index dbabbef7a..2e5d2dffe 100644
--- a/src/net/vendinghandler.h
+++ b/src/net/vendinghandler.h
@@ -46,6 +46,9 @@ class VendingHandler notfinal
const int index,
const int amount) const = 0;
+ virtual void buyItems(const Being *const being,
+ const std::vector<ShopItem*> &items) const = 0;
+
virtual void buy2(const Being *const being,
const int vendId,
const int index,