diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-03-18 14:20:14 -0600 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2009-03-18 19:55:11 -0600 |
| commit | 6f0d88e781c8b1a75858c769b3641aa8cd477314 (patch) | |
| tree | 98891d219272074e437cd58087a7aaafc463c40a /src/net | |
| parent | 74fa304602e0e7ad845e606db8868b32f1d10864 (diff) | |
| download | mana-6f0d88e781c8b1a75858c769b3641aa8cd477314.tar.gz mana-6f0d88e781c8b1a75858c769b3641aa8cd477314.tar.bz2 mana-6f0d88e781c8b1a75858c769b3641aa8cd477314.tar.xz mana-6f0d88e781c8b1a75858c769b3641aa8cd477314.zip | |
Fix up the NPC interraction widnows a bit
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/buysellhandler.cpp | 7 | ||||
| -rw-r--r-- | src/net/playerhandler.cpp | 5 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/net/buysellhandler.cpp b/src/net/buysellhandler.cpp index 5b8f0b68..287e5400 100644 --- a/src/net/buysellhandler.cpp +++ b/src/net/buysellhandler.cpp @@ -33,15 +33,12 @@ #include "../npc.h" #include "../gui/buy.h" +#include "../gui/buysell.h" #include "../gui/chat.h" #include "../gui/sell.h" #include "../utils/gettext.h" -extern BuyDialog *buyDialog; -extern Window *buySellDialog; -extern SellDialog *sellDialog; - BuySellHandler::BuySellHandler() { static const Uint16 _messages[] = { @@ -65,8 +62,8 @@ void BuySellHandler::handleMessage(MessageIn *msg) buyDialog->reset(); sellDialog->setVisible(false); sellDialog->reset(); - buySellDialog->setVisible(true); current_npc = msg->readInt32(); + buySellDialog->setVisible(true); break; case SMSG_NPC_BUY: diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp index 6533ac1e..60d58a37 100644 --- a/src/net/playerhandler.cpp +++ b/src/net/playerhandler.cpp @@ -30,6 +30,7 @@ #include "../npc.h" #include "../gui/buy.h" +#include "../gui/buysell.h" #include "../gui/chat.h" #include "../gui/gui.h" #include "../gui/npc_text.h" @@ -49,10 +50,6 @@ OkDialog *weightNotice = NULL; OkDialog *deathNotice = NULL; -extern BuyDialog *buyDialog; -extern SellDialog *sellDialog; -extern Window *buySellDialog; - // Max. distance we are willing to scroll after a teleport; // everything beyond will reset the port hard. static const int MAP_TELEPORT_SCROLL_DISTANCE = 8; |