summaryrefslogtreecommitdiff
path: root/src/net/ea
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/ea')
-rw-r--r--src/net/ea/buysellhandler.cpp30
-rw-r--r--src/net/ea/buysellhandler.h6
-rw-r--r--src/net/ea/npchandler.cpp97
-rw-r--r--src/net/ea/npchandler.h11
-rw-r--r--src/net/ea/playerhandler.cpp10
5 files changed, 86 insertions, 68 deletions
diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp
index 9d1aac78..db282e61 100644
--- a/src/net/ea/buysellhandler.cpp
+++ b/src/net/ea/buysellhandler.cpp
@@ -51,29 +51,29 @@ BuySellHandler::BuySellHandler()
SMSG_NPC_SELL_RESPONSE,
0
};
+ mNpcId = 0;
handledMessages = _messages;
}
void BuySellHandler::handleMessage(Net::MessageIn &msg)
{
int n_items;
+
switch (msg.getId())
{
case SMSG_NPC_BUY_SELL_CHOICE:
- buyDialog->setVisible(false);
- buyDialog->reset();
- sellDialog->setVisible(false);
- sellDialog->reset();
- current_npc = msg.readInt32();
- buySellDialog->setVisible(true);
+ if (!BuySellDialog::isActive())
+ {
+ mNpcId = msg.readInt32();
+ new BuySellDialog(mNpcId);
+ }
break;
case SMSG_NPC_BUY:
msg.readInt16(); // length
n_items = (msg.getLength() - 4) / 11;
- buyDialog->reset();
- buyDialog->setMoney(player_node->getMoney());
- buyDialog->setVisible(true);
+ mBuyDialog = new BuyDialog(mNpcId);
+ mBuyDialog->setMoney(player_node->getMoney());
for (int k = 0; k < n_items; k++)
{
@@ -81,7 +81,7 @@ void BuySellHandler::handleMessage(Net::MessageIn &msg)
msg.readInt32(); // DCvalue
msg.readInt8(); // type
int itemId = msg.readInt16();
- buyDialog->addItem(itemId, 0, value);
+ mBuyDialog->addItem(itemId, 0, value);
}
break;
@@ -90,9 +90,8 @@ void BuySellHandler::handleMessage(Net::MessageIn &msg)
n_items = (msg.getLength() - 4) / 10;
if (n_items > 0)
{
- sellDialog->setMoney(player_node->getMoney());
- sellDialog->reset();
- sellDialog->setVisible(true);
+ SellDialog *dialog = new SellDialog(mNpcId);
+ dialog->setMoney(player_node->getMoney());
for (int k = 0; k < n_items; k++)
{
@@ -103,13 +102,12 @@ void BuySellHandler::handleMessage(Net::MessageIn &msg)
Item *item = player_node->getInventory()->getItem(index);
if (item && !(item->isEquipped()))
- sellDialog->addItem(item, value);
+ dialog->addItem(item, value);
}
}
else
{
localChatTab->chatLog(_("Nothing to sell."), BY_SERVER);
- current_npc = 0;
}
break;
@@ -122,7 +120,7 @@ void BuySellHandler::handleMessage(Net::MessageIn &msg)
{
// Reset player money since buy dialog already assumed purchase
// would go fine
- buyDialog->setMoney(player_node->getMoney());
+ mBuyDialog->setMoney(player_node->getMoney());
localChatTab->chatLog(_("Unable to buy."), BY_SERVER);
}
break;
diff --git a/src/net/ea/buysellhandler.h b/src/net/ea/buysellhandler.h
index 61736024..1d17905d 100644
--- a/src/net/ea/buysellhandler.h
+++ b/src/net/ea/buysellhandler.h
@@ -24,6 +24,8 @@
#include "net/ea/messagehandler.h"
+class BuyDialog;
+
namespace EAthena {
class BuySellHandler : public MessageHandler
@@ -32,6 +34,10 @@ class BuySellHandler : public MessageHandler
BuySellHandler();
virtual void handleMessage(Net::MessageIn &msg);
+
+ private:
+ int mNpcId;
+ BuyDialog *mBuyDialog;
};
} // namespace EAthena
diff --git a/src/net/ea/npchandler.cpp b/src/net/ea/npchandler.cpp
index 48cc6125..6fb719a1 100644
--- a/src/net/ea/npchandler.cpp
+++ b/src/net/ea/npchandler.cpp
@@ -57,72 +57,70 @@ NpcHandler::NpcHandler()
void NpcHandler::handleMessage(Net::MessageIn &msg)
{
- int id;
- bool resetPlayer = false;
+ bool resetPlayer = true;
+
+ if (msg.getId() == SMSG_NPC_CHOICE || msg.getId() == SMSG_NPC_MESSAGE)
+ {
+ msg.readInt16(); // length
+ }
+
+ int npcId = msg.readInt32();
+ NpcDialogs::iterator diag = mNpcDialogs.find(npcId);
+ NpcDialog *dialog;
+
+ if (diag == mNpcDialogs.end())
+ {
+ // Empty dialogs don't help
+ if (msg.getId() == SMSG_NPC_CLOSE)
+ {
+ closeDialog(npcId);
+ }
+ else if (msg.getId() == SMSG_NPC_NEXT)
+ {
+ nextDialog(npcId);
+ }
+ else
+ {
+ dialog = new NpcDialog(npcId);
+ Wrapper wrap;
+ wrap.dialog = dialog;
+ mNpcDialogs[npcId] = wrap;
+ }
+ }
+ else
+ {
+ dialog = diag->second.dialog;
+ }
switch (msg.getId())
{
case SMSG_NPC_CHOICE:
- msg.readInt16(); // length
- current_npc = msg.readInt32();
- npcDialog->setNpc(current_npc);
- npcDialog->choiceRequest();
- npcDialog->parseListItems(msg.readString(msg.getLength() - 8));
- npcDialog->setVisible(true);
- resetPlayer = true;
+ dialog->choiceRequest();
+ dialog->parseListItems(msg.readString(msg.getLength() - 8));
break;
case SMSG_NPC_MESSAGE:
- msg.readInt16(); // length
- current_npc = msg.readInt32();
- npcDialog->setNpc(current_npc);
- npcDialog->addText(msg.readString(msg.getLength() - 8));
- npcDialog->setVisible(true);
- resetPlayer = true;
+ dialog->addText(msg.readString(msg.getLength() - 8));
break;
case SMSG_NPC_CLOSE:
- id = msg.readInt32();
- // If we're talking to that NPC, show the close button
- if (id == current_npc)
- {
- npcDialog->showCloseButton();
- resetPlayer = true;
- }
- // Otherwise, move on as an empty dialog doesn't help
- else
- closeDialog(id);
+ // Show the close button
+ dialog->showCloseButton();
break;
case SMSG_NPC_NEXT:
- id = msg.readInt32();
- // If we're talking to that NPC, show the next button
- if (id == current_npc)
- {
- npcDialog->showNextButton();
- resetPlayer = true;
- }
- // Otherwise, move on as an empty dialog doesn't help
- else
- nextDialog(id);
+ // Show the next button
+ dialog->showNextButton();
break;
case SMSG_NPC_INT_INPUT:
// Request for an integer
- current_npc = msg.readInt32();
- npcDialog->setNpc(current_npc);
- npcDialog->integerRequest(0);
- npcDialog->setVisible(true);
- resetPlayer = true;
+ dialog->integerRequest(0);
break;
case SMSG_NPC_STR_INPUT:
// Request for a string
- current_npc = msg.readInt32();
- npcDialog->setNpc(current_npc);
- npcDialog->textRequest("");
- npcDialog->setVisible(true);
- resetPlayer = true;
+ dialog->textRequest("");
break;
}
@@ -147,8 +145,13 @@ void NpcHandler::closeDialog(int npcId)
{
MessageOut outMsg(CMSG_NPC_CLOSE);
outMsg.writeInt32(npcId);
- npcDialog->setText("");
- npcDialog->setVisible(false);
+
+ NpcDialogs::iterator it = mNpcDialogs.find(npcId);
+ if (it != mNpcDialogs.end())
+ {
+ (*it).second.dialog->close();
+ mNpcDialogs.erase(it);
+ }
}
void NpcHandler::listInput(int npcId, int value)
diff --git a/src/net/ea/npchandler.h b/src/net/ea/npchandler.h
index a42b88c5..072c97e3 100644
--- a/src/net/ea/npchandler.h
+++ b/src/net/ea/npchandler.h
@@ -27,6 +27,10 @@
#include "net/ea/messagehandler.h"
+#include <map>
+
+class NpcDialog;
+
namespace EAthena {
class NpcHandler : public MessageHandler, public Net::NpcHandler
@@ -62,6 +66,13 @@ class NpcHandler : public MessageHandler, public Net::NpcHandler
void sellItem(int beingId, int itemId, int amount);
void endShopping(int beingId);
+
+ private:
+ typedef struct {
+ NpcDialog* dialog;
+ } Wrapper;
+ typedef std::map<int, Wrapper> NpcDialogs;
+ NpcDialogs mNpcDialogs;
};
} // namespace EAthena
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 7fb4dab9..34e0daf4 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -80,15 +80,15 @@ namespace {
{
Net::getPlayerHandler()->respawn();
deathNotice = NULL;
- buyDialog->setVisible(false);
- sellDialog->setVisible(false);
- buySellDialog->setVisible(false);
+
+ BuyDialog::closeAll();
+ BuySellDialog::closeAll();
+ NpcDialog::closeAll();
+ SellDialog::closeAll();
if (storageWindow->isVisible())
storageWindow->close();
viewport->closePopupMenu();
- npcDialog->closeDialog();
- current_npc = 0;
}
} deathListener;
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-20 10:43:33 +0000