Merge the NPC dialogs into one

Also add support for the new TMWServ NPC packets

1 files changed, 0 insertions, 110 deletions

diff --git a/src/gui/npcstringdialog.cpp b/src/gui/npcstringdialog.cpp
deleted file mode 100644
index e5767c5f..00000000
--- a/src/gui/npcstringdialog.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- *  The Mana World
- *  Copyright (C) 2004  The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "gui/npcstringdialog.h"
-
-#include "gui/npctextdialog.h"
-
-#include "gui/widgets/button.h"
-#include "gui/widgets/layout.h"
-#include "gui/widgets/textfield.h"
-
-#include "npc.h"
-
-#include "net/net.h"
-#include "net/npchandler.h"
-
-#include "utils/gettext.h"
-#include "utils/strprintf.h"
-
-NpcStringDialog::NpcStringDialog()
-    : Window(_("NPC Text Request"))
-{
-    setWindowName("NPCString");
-    mValueField = new TextField("");
-
-    setDefaultSize(175, 75, ImageRect::CENTER);
-
-    gcn::Button *okButton = new Button(_("OK"), "ok", this);
-    gcn::Button *cancelButton = new Button(_("Cancel"), "cancel", this);
-
-    place(0, 0, mValueField, 3);
-    place(1, 1, cancelButton);
-    place(2, 1, okButton);
-    reflowLayout(175, 0);
-
-    center();
-    setDefaultSize();
-    loadWindowState();
-}
-
-std::string NpcStringDialog::getValue()
-{
-    return mValueField->getText();
-}
-
-void NpcStringDialog::setValue(const std::string &value)
-{
-    mValueField->setText(value);
-    mDefault = value;
-}
-
-void NpcStringDialog::action(const gcn::ActionEvent &event)
-{
-    if (event.getId() == "cancel")
-    {
-        mValueField->setText(mDefault);
-        npcTextDialog->addText(_("\n> Cancel\n"));
-    }
-    else
-    {
-        npcTextDialog->addText(strprintf("\n> \"%s\"\n",
-                                          mValueField->getText().c_str()));
-    }
-
-    setVisible(false);
-    NPC::isTalking = false;
-
-    std::string text = mValueField->getText();
-    mValueField->setText("");
-
-    Net::getNpcHandler()->stringInput(current_npc, text);
-}
-
-bool NpcStringDialog::isInputFocused()
-{
-    return mValueField->isFocused();
-}
-
-void NpcStringDialog::requestFocus()
-{
-    mValueField->requestFocus();
-}
-
-void NpcStringDialog::setVisible(bool visible)
-{
-    if (visible) {
-        npcTextDialog->setVisible(true);
-        requestFocus();
-    }
-
-    Window::setVisible(visible);
-}