summaryrefslogtreecommitdiff
path: root/src/gui/npcstringdialog.cpp
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-04-05 19:17:33 -0600
committerJared Adams <jaxad0127@gmail.com>2009-04-05 19:17:33 -0600
commita0c7d1f61783e77e552896824855377e4bb43f8d (patch)
treee952181b83482abeffbd8ad9c62789b8f72e42e5 /src/gui/npcstringdialog.cpp
parent9113afb868f6c1da5911437d3ddabdcf169cbec2 (diff)
downloadmana-a0c7d1f61783e77e552896824855377e4bb43f8d.tar.gz
mana-a0c7d1f61783e77e552896824855377e4bb43f8d.tar.bz2
mana-a0c7d1f61783e77e552896824855377e4bb43f8d.tar.xz
mana-a0c7d1f61783e77e552896824855377e4bb43f8d.zip
Implement TMWServ's NpcHandler
Diffstat (limited to 'src/gui/npcstringdialog.cpp')
-rw-r--r--src/gui/npcstringdialog.cpp27
1 files changed, 12 insertions, 15 deletions
diff --git a/src/gui/npcstringdialog.cpp b/src/gui/npcstringdialog.cpp
index 8d45e332..7ce4060c 100644
--- a/src/gui/npcstringdialog.cpp
+++ b/src/gui/npcstringdialog.cpp
@@ -19,21 +19,21 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "button.h"
-#include "npc_text.h"
-#include "npcstringdialog.h"
-#include "textfield.h"
+#include "gui/npc_text.h"
-#include "widgets/layout.h"
+#include "gui/button.h"
+#include "gui/npcstringdialog.h"
+#include "gui/textfield.h"
-#include "../npc.h"
+#include "gui/widgets/layout.h"
-#ifdef EATHENA_SUPPORT
-#include "../net/ea/npchandler.h"
-#endif
+#include "npc.h"
-#include "../utils/gettext.h"
-#include "../utils/strprintf.h"
+#include "net/net.h"
+#include "net/npchandler.h"
+
+#include "utils/gettext.h"
+#include "utils/strprintf.h"
NpcStringDialog::NpcStringDialog()
: Window(_("NPC Text Request"))
@@ -86,10 +86,7 @@ void NpcStringDialog::action(const gcn::ActionEvent &event)
std::string text = mValueField->getText();
mValueField->setText("");
- // Net::getNpcHandler()->stringInput(current_npc, text);
-#ifdef EATHENA_SUPPORT
- npcHandler->stringInput(current_npc, text);
-#endif
+ Net::getNpcHandler()->stringInput(current_npc, text);
}
bool NpcStringDialog::isInputFocused()