1 files changed, 33 insertions, 16 deletions

diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index b6eccf95..a1373830 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.h
@@ -1,28 +1,29 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  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.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  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 The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NPC_TEXT_H
-#define _TMW_NPC_TEXT_H
+#ifndef NPC_TEXT_H
+#define NPC_TEXT_H
+
+#include <string>
 
-#include <iosfwd>
 #include <guichan/actionlistener.hpp>
 
 #include "window.h"
@@ -45,16 +46,14 @@ class NpcTextDialog : public Window, public gcn::ActionListener
         NpcTextDialog();
 
         /**
-         * Called when resizing the window.
-         *
-         * @param event The calling event
+         * Called when receiving actions from the widgets.
          */
-        void widgetResized(const gcn::Event &event);
+        void action(const gcn::ActionEvent &event);
 
         /**
-         * Called when receiving actions from the widgets.
+         * Clears the text shown in the dialog.
          */
-        void action(const gcn::ActionEvent &event);
+        void clearText();
 
         /**
          * Sets the text shows in the dialog.
@@ -71,12 +70,30 @@ class NpcTextDialog : public Window, public gcn::ActionListener
          */
         void addText(const std::string &string);
 
+        void showNextButton();
+
+        void showCloseButton();
+
+        /**
+         * Called when resizing the window.
+         *
+         * @param event The calling event
+         */
+        void widgetResized(const gcn::Event &event);
+
     private:
-        gcn::Button *okButton;
-        gcn::ScrollArea *scrollArea;
+        gcn::ScrollArea *mScrollArea;
         TextBox *mTextBox;
+        gcn::Button *mButton;
 
         std::string mText;
+
+        enum NPCTextState {
+            NPC_TEXT_STATE_WAITING,
+            NPC_TEXT_STATE_NEXT,
+            NPC_TEXT_STATE_CLOSE
+        };
+        int mState;
 };
 
-#endif // _TMW_NPC_TEXT_H
+#endif // NPC_TEXT_H