From 208e4cfad44dd5bf1d0409d1c2227a1a5eae3a2e Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Mon, 23 Feb 2009 06:47:44 -0700
Subject: Clear text from NpcTextDialog when character dies

Also hid the integer and string dialogs
---
 src/gui/npc_text.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/gui/npc_text.cpp')

diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index e6f039a0..be67fb6e 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -73,6 +73,11 @@ void NpcTextDialog::addText(const std::string &text)
     mScrollArea->setVerticalScrollAmount(mScrollArea->getVerticalMaxScroll());
 }
 
+void NpcTextDialog::clearText()
+{
+    setText("");
+}
+
 void NpcTextDialog::showNextButton()
 {
     mButton->setCaption(_("Next"));
-- 
cgit v1.2.3-70-g09d2


From f4704ccd2a71ca222d8584aac42c80d346a0b688 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Tue, 24 Feb 2009 22:42:33 +0100
Subject: Fixed compile warnings

Order of initialization and suggested parenthesis.
---
 src/gui/npc_text.cpp    |  2 +-
 src/gui/npc_text.h      |  2 +-
 src/gui/setup_video.cpp | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/gui/npc_text.cpp')

diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index be67fb6e..f4754ef7 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -100,7 +100,7 @@ void NpcTextDialog::action(const gcn::ActionEvent &event)
             current_npc->nextDialog();
             addText("\n> Next\n");
         } else if (mState == NPC_TEXT_STATE_CLOSE ||
-                mState == NPC_TEXT_STATE_NEXT && !current_npc) {
+                (mState == NPC_TEXT_STATE_NEXT && !current_npc)) {
             setText("");
             setVisible(false);
             if (current_npc) current_npc->handleDeath();
diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index a1373830..00b11b3c 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.h
@@ -93,7 +93,7 @@ class NpcTextDialog : public Window, public gcn::ActionListener
             NPC_TEXT_STATE_NEXT,
             NPC_TEXT_STATE_CLOSE
         };
-        int mState;
+        NPCTextState mState;
 };
 
 #endif // NPC_TEXT_H
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 37197cd2..b019edb9 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -121,6 +121,10 @@ Setup_Video::Setup_Video():
     mCustomCursorCheckBox(new CheckBox(_("Custom cursor"), mCustomCursorEnabled)),
     mParticleEffectsCheckBox(new CheckBox(_("Particle effects"), mParticleEffectsEnabled)),
     mNameCheckBox(new CheckBox(_("Show name"), mNameEnabled)),
+    mPickupNotifyLabel(new gcn::Label(_("Show pickup notification"))),
+    mPickupChatCheckBox(new CheckBox(_("in chat"), mPickupChatEnabled)),
+    mPickupParticleCheckBox(new CheckBox(_("as particle"),
+                           mPickupParticleEnabled)),
     mSpeechSlider(new Slider(0, 3)),
     mSpeechLabel(new gcn::Label("")),
     mAlphaSlider(new Slider(0.2, 1.0)),
@@ -138,11 +142,7 @@ Setup_Video::Setup_Video():
     mOverlayDetailField(new gcn::Label("")),
     mParticleDetail(3 - (int) config.getValue("particleEmitterSkip", 1)),
     mParticleDetailSlider(new Slider(0, 3)),
-    mParticleDetailField(new gcn::Label("")),
-    mPickupNotifyLabel(new gcn::Label(_("Show pickup notification"))),
-    mPickupChatCheckBox(new CheckBox(_("in chat"), mPickupChatEnabled)),
-    mPickupParticleCheckBox(new CheckBox(_("as particle"),
-                           mPickupParticleEnabled))
+    mParticleDetailField(new gcn::Label(""))
 {
     setOpaque(false);
 
-- 
cgit v1.2.3-70-g09d2


From 9759b0bd0a4777c5645c695c119b4716e251add1 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Tue, 24 Feb 2009 20:01:31 -0700
Subject: Send a next dialog packet when ending interaction

Server seems to want it in some cases
---
 src/gui/npc_text.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/gui/npc_text.cpp')

diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index f4754ef7..1750cbd4 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -102,6 +102,7 @@ void NpcTextDialog::action(const gcn::ActionEvent &event)
         } else if (mState == NPC_TEXT_STATE_CLOSE ||
                 (mState == NPC_TEXT_STATE_NEXT && !current_npc)) {
             setText("");
+            if (current_npc) current_npc->nextDialog();
             setVisible(false);
             if (current_npc) current_npc->handleDeath();
         } else return;
-- 
cgit v1.2.3-70-g09d2


From a1e483913672e55704e8fbafeff5ea0ccc0c9b07 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 24 Feb 2009 23:03:31 -0700
Subject: Cleaned up some code, as well as removed redundant talk client
 requesting (which would happen from using the keyboard instead of the mouse).

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/game.cpp               | 44 ++++++++++++++++++++++++--------------------
 src/gui/npc_text.cpp       |  7 ++++++-
 src/gui/npc_text.h         |  2 ++
 src/gui/npcintegerdialog.h |  2 ++
 src/gui/npclistdialog.h    |  2 ++
 src/gui/npcstringdialog.h  |  2 ++
 src/gui/textbox.cpp        | 32 +++++++++++++-------------------
 src/gui/viewport.cpp       | 29 +++++++++++++++++++----------
 src/net/npchandler.cpp     |  7 ++-----
 src/net/playerhandler.cpp  |  9 ++++++---
 src/npc.cpp                | 12 +++++++++---
 src/npc.h                  |  2 ++
 12 files changed, 89 insertions(+), 61 deletions(-)

(limited to 'src/gui/npc_text.cpp')

diff --git a/src/game.cpp b/src/game.cpp
index e4b6e54d..e5f7b22b 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -145,9 +145,9 @@ namespace {
     {
         void action(const gcn::ActionEvent &event)
         {
-            if (event.getId() == "yes" || event.getId() == "ok") {
+            if (event.getId() == "yes" || event.getId() == "ok")
                 done = true;
-            }
+
             exitConfirm = NULL;
             disconnectedDialog = NULL;
         }
@@ -178,13 +178,9 @@ Uint32 nextSecond(Uint32 interval, void *param)
 int get_elapsed_time(int start_time)
 {
     if (start_time <= tick_time)
-    {
         return (tick_time - start_time) * 10;
-    }
     else
-    {
         return (tick_time + (MAX_TIME - start_time)) * 10;
-    }
 }
 
 /**
@@ -213,8 +209,10 @@ void createGuiWindows(Network *network)
     tradeWindow = new TradeWindow(network);
     helpWindow = new HelpWindow();
     debugWindow = new DebugWindow();
-    itemShortcutWindow = new ShortcutWindow("ItemShortcut",new ItemShortcutContainer);
-    emoteShortcutWindow = new ShortcutWindow("emoteShortcut",new EmoteShortcutContainer);
+    itemShortcutWindow = new ShortcutWindow("ItemShortcut",
+                                            new ItemShortcutContainer);
+    emoteShortcutWindow = new ShortcutWindow("emoteShortcut",
+                                             new EmoteShortcutContainer);
 
     // Set initial window visibility
     chatWindow->setVisible((bool) config.getValue(
@@ -465,7 +463,9 @@ void Game::logic()
             if (!disconnectedDialog)
             {
                 disconnectedDialog = new OkDialog(_("Network Error"),
-                        _("The connection to the server was lost, the program will now quit"));
+                                                  _("The connection to the "
+                                                    "server was lost, the "
+                                                    "program will now quit"));
                 disconnectedDialog->addActionListener(&exitListener);
                 disconnectedDialog->requestMoveToTop();
             }
@@ -853,9 +853,11 @@ void Game::handleInput()
                 }
 
                 // Attack priorioty is: Monster, Player, auto target
-                target = beingManager->findBeing(targetX, targetY, Being::MONSTER);
+                target = beingManager->findBeing(targetX, targetY,
+                         Being::MONSTER);
                 if (!target)
-                    target = beingManager->findBeing(targetX, targetY, Being::PLAYER);
+                    target = beingManager->findBeing(targetX, targetY,
+                             Being::PLAYER);
             }
 
             player_node->attack(target, newTarget);
@@ -863,30 +865,31 @@ void Game::handleInput()
 
         // Target the nearest player if 'q' is pressed
         if ( keyboard.isKeyActive(keyboard.KEY_TARGET_PLAYER) &&
-                !keyboard.isKeyActive(keyboard.KEY_TARGET) )
+            !keyboard.isKeyActive(keyboard.KEY_TARGET) )
         {
-            Being *target = beingManager->findNearestLivingBeing(player_node, 20, Being::PLAYER);
+            Being *target = beingManager->findNearestLivingBeing(player_node,
+                            20, Being::PLAYER);
 
             player_node->setTarget(target);
         }
 
         // Target the nearest monster if 'a' pressed
         if ((keyboard.isKeyActive(keyboard.KEY_TARGET_CLOSEST) ||
-                    (joystick && joystick->buttonPressed(3))) &&
-                !keyboard.isKeyActive(keyboard.KEY_TARGET))
+            (joystick && joystick->buttonPressed(3))) &&
+            !keyboard.isKeyActive(keyboard.KEY_TARGET))
         {
             Being *target = beingManager->findNearestLivingBeing(
-                    x, y, 20, Being::MONSTER);
+                            x, y, 20, Being::MONSTER);
 
             player_node->setTarget(target);
         }
 
         // Target the nearest npc if 'n' pressed
         if ( keyboard.isKeyActive(keyboard.KEY_TARGET_NPC) &&
-                !keyboard.isKeyActive(keyboard.KEY_TARGET) )
+            !keyboard.isKeyActive(keyboard.KEY_TARGET) )
         {
             Being *target = beingManager->findNearestLivingBeing(
-                    x, y, 20, Being::NPC);
+                            x, y, 20, Being::NPC);
 
             player_node->setTarget(target);
         }
@@ -894,14 +897,15 @@ void Game::handleInput()
         // Talk to the nearest NPC if 't' pressed
         if ( keyboard.isKeyActive(keyboard.KEY_TALK) )
         {
-            if (!npcTextDialog->isVisible() && !npcListDialog->isVisible())
+            if (!npcTextDialog->isVisible()   && !npcListDialog->isVisible() &&
+                !npcStringDialog->isVisible() && !npcIntegerDialog->isVisible())
             {
                 Being *target = player_node->getTarget();
 
                 if (!target)
                 {
                     target = beingManager->findNearestLivingBeing(
-                            x, y, 20, Being::NPC);
+                             x, y, 20, Being::NPC);
                 }
 
                 if (target)
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index ed75b76e..0b7592c7 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -73,11 +73,16 @@ void NpcTextDialog::addText(const std::string &text)
     setText(mText + text + "\n");
 }
 
+void NpcTextDialog::clearText()
+{
+    setText("");
+}
+
 void NpcTextDialog::action(const gcn::ActionEvent &event)
 {
     if (event.getId() == "ok")
     {
-        setText("");
+        clearText();
         setVisible(false);
 
         if (current_npc)
diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index 5e2ff118..63d41cd6 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.h
@@ -87,4 +87,6 @@ class NpcTextDialog : public Window, public gcn::ActionListener
         std::string mText;
 };
 
+extern NpcTextDialog *npcTextDialog;
+
 #endif // NPC_TEXT_H
diff --git a/src/gui/npcintegerdialog.h b/src/gui/npcintegerdialog.h
index 858bce5b..a4ca33cf 100644
--- a/src/gui/npcintegerdialog.h
+++ b/src/gui/npcintegerdialog.h
@@ -81,4 +81,6 @@ class NpcIntegerDialog : public Window, public gcn::ActionListener
         gcn::Button *resetButton;
 };
 
+extern NpcIntegerDialog *npcIntegerDialog;
+
 #endif // GUI_NPCINTEGERDIALOG_H
diff --git a/src/gui/npclistdialog.h b/src/gui/npclistdialog.h
index 8d8b6545..a30bec28 100644
--- a/src/gui/npclistdialog.h
+++ b/src/gui/npclistdialog.h
@@ -82,4 +82,6 @@ class NpcListDialog : public Window, public gcn::ActionListener,
         std::vector<std::string> mItems;
 };
 
+extern NpcListDialog *npcListDialog;
+
 #endif // GUI_NPCLISTDIALOG_H
diff --git a/src/gui/npcstringdialog.h b/src/gui/npcstringdialog.h
index 71d1f15c..c8871184 100644
--- a/src/gui/npcstringdialog.h
+++ b/src/gui/npcstringdialog.h
@@ -75,4 +75,6 @@ class NpcStringDialog : public Window, public gcn::ActionListener
         gcn::Button *cancelButton;
 };
 
+extern NpcStringDialog *npcStringDialog;
+
 #endif // GUI_NPCSTRINGDIALOG_H
diff --git a/src/gui/textbox.cpp b/src/gui/textbox.cpp
index dc94ead2..589986cd 100644
--- a/src/gui/textbox.cpp
+++ b/src/gui/textbox.cpp
@@ -38,52 +38,46 @@ void TextBox::setTextWrapped(const std::string &text, int minDimension)
 {
     // Make sure parent scroll area sets width of this widget
     if (getParent())
-    {
         getParent()->logic();
-    }
 
     // Take the supplied minimum dimension as a starting point and try to beat it
     mMinWidth = minDimension;
 
     std::stringstream wrappedStream;
-    std::string::size_type newlinePos, lastNewlinePos = 0;
+    std::string::size_type spacePos, newlinePos, lastNewlinePos = 0;
     int minWidth = 0;
     int xpos;
 
+    spacePos = text.rfind(" ", text.size());
+
+    if (spacePos != std::string::npos)
+    {
+        const std::string word = text.substr(spacePos + 1);
+        const int length = getFont()->getWidth(word);
+
+        if (length > mMinWidth)
+            mMinWidth = length;
+    }
+
     do
     {
         // Determine next piece of string to wrap
         newlinePos = text.find("\n", lastNewlinePos);
 
         if (newlinePos == std::string::npos)
-        {
             newlinePos = text.size();
-        }
 
         std::string line =
             text.substr(lastNewlinePos, newlinePos - lastNewlinePos);
-        std::string::size_type spacePos, lastSpacePos = 0;
+        std::string::size_type lastSpacePos = 0;
         xpos = 0;
 
-        spacePos = text.rfind(" ", text.size());
-
-        if (spacePos != std::string::npos)
-        {
-            const std::string word = text.substr(spacePos + 1);
-            const int length = getFont()->getWidth(word);
-
-            if (length > mMinWidth)
-                mMinWidth = length;
-        }
-
         do
         {
             spacePos = line.find(" ", lastSpacePos);
 
             if (spacePos == std::string::npos)
-            {
                 spacePos = line.size();
-            }
 
             std::string word =
                 line.substr(lastSpacePos, spacePos - lastSpacePos);
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 9a7f6173..f655888c 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -111,19 +111,23 @@ void Viewport::draw(gcn::Graphics *gcnGraphics)
     {
         if (player_x > mPixelViewX + mScrollRadius)
         {
-            mPixelViewX += (player_x - mPixelViewX - mScrollRadius) / mScrollLaziness;
+            mPixelViewX += (player_x - mPixelViewX - mScrollRadius) /
+                            mScrollLaziness;
         }
         if (player_x < mPixelViewX - mScrollRadius)
         {
-            mPixelViewX += (player_x - mPixelViewX + mScrollRadius) / mScrollLaziness;
+            mPixelViewX += (player_x - mPixelViewX + mScrollRadius) /
+                            mScrollLaziness;
         }
         if (player_y > mPixelViewY + mScrollRadius)
         {
-            mPixelViewY += (player_y - mPixelViewY - mScrollRadius) / mScrollLaziness;
+            mPixelViewY += (player_y - mPixelViewY - mScrollRadius) /
+                            mScrollLaziness;
         }
         if (player_y < mPixelViewY - mScrollRadius)
         {
-            mPixelViewY += (player_y - mPixelViewY + mScrollRadius) / mScrollLaziness;
+            mPixelViewY += (player_y - mPixelViewY + mScrollRadius) /
+                            mScrollLaziness;
         }
         lastTick++;
     }
@@ -166,8 +170,8 @@ void Viewport::draw(gcn::Graphics *gcnGraphics)
     {
         mMap->draw(graphics, (int) mPixelViewX, (int) mPixelViewY);
 
-        // Find a path from the player to the mouse, and draw it. This is for debug
-        // purposes.
+        // Find a path from the player to the mouse, and draw it. This is for
+        // debug purposes.
         if (mShowDebugPath)
         {
             // Get the current mouse position
@@ -177,7 +181,8 @@ void Viewport::draw(gcn::Graphics *gcnGraphics)
             int mouseTileX = mouseX / 32 + mTileViewX;
             int mouseTileY = mouseY / 32 + mTileViewY;
 
-            Path debugPath = mMap->findPath(player_node->mX, player_node->mY, mouseTileX, mouseTileY);
+            Path debugPath = mMap->findPath(player_node->mX, player_node->mY,
+                                            mouseTileX, mouseTileY);
 
             graphics->setColor(gcn::Color(255, 0, 0));
             for (PathIterator i = debugPath.begin(); i != debugPath.end(); i++)
@@ -186,7 +191,9 @@ void Viewport::draw(gcn::Graphics *gcnGraphics)
                 int squareY = i->y * 32 - (int) mPixelViewY + 12;
 
                 graphics->fillRectangle(gcn::Rectangle(squareX, squareY, 8, 8));
-                graphics->drawText(toString(mMap->getMetaTile(i->x, i->y)->Gcost), squareX + 4, squareY + 12, gcn::Graphics::CENTER);
+                graphics->drawText(toString(mMap->getMetaTile(i->x, i->y)->Gcost),
+                                   squareX + 4, squareY + 12,
+                                   gcn::Graphics::CENTER);
             }
         }
     }
@@ -300,10 +307,12 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
                     if (being->mAction == Being::DEAD)
                         break;
 
-                    if (player_node->withinAttackRange(being) || keyboard.isKeyActive(keyboard.KEY_ATTACK))
+                    if (player_node->withinAttackRange(being) ||
+                        keyboard.isKeyActive(keyboard.KEY_ATTACK))
                     {
                         player_node->setGotoTarget(being);
-                        player_node->attack(being, !keyboard.isKeyActive(keyboard.KEY_TARGET));
+                        player_node->attack(being,
+                            !keyboard.isKeyActive(keyboard.KEY_TARGET));
                     }
                     else
                     {
diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp
index 8425a215..94e145b4 100644
--- a/src/net/npchandler.cpp
+++ b/src/net/npchandler.cpp
@@ -33,11 +33,6 @@
 #include "../gui/npclistdialog.h"
 #include "../gui/npcstringdialog.h"
 
-extern NpcIntegerDialog *npcIntegerDialog;
-extern NpcListDialog *npcListDialog;
-extern NpcTextDialog *npcTextDialog;
-extern NpcStringDialog *npcStringDialog;
-
 NPCHandler::NPCHandler()
 {
     static const Uint16 _messages[] = {
@@ -81,10 +76,12 @@ void NPCHandler::handleMessage(MessageIn *msg)
             id = msg->readInt32();
             if (current_npc == dynamic_cast<NPC*>(beingManager->findBeing(id)))
                 current_npc = NULL;
+            NPC::mTalking = false;
             break;
 
         case SMSG_NPC_NEXT:
             // Next button in NPC dialog, currently unused
+            NPC::mTalking = false;
             break;
 
         case SMSG_NPC_INT_INPUT:
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index bce53ae9..c1e0d033 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -32,8 +32,10 @@
 #include "../gui/buy.h"
 #include "../gui/chat.h"
 #include "../gui/gui.h"
-#include "../gui/npclistdialog.h"
 #include "../gui/npc_text.h"
+#include "../gui/npcintegerdialog.h"
+#include "../gui/npclistdialog.h"
+#include "../gui/npcstringdialog.h"
 #include "../gui/ok_dialog.h"
 #include "../gui/sell.h"
 #include "../gui/skill.h"
@@ -46,8 +48,6 @@
 OkDialog *weightNotice = NULL;
 OkDialog *deathNotice = NULL;
 
-extern NpcListDialog *npcListDialog;
-extern NpcTextDialog *npcTextDialog;
 extern BuyDialog *buyDialog;
 extern SellDialog *sellDialog;
 extern Window *buySellDialog;
@@ -81,7 +81,10 @@ namespace {
         {
             player_node->revive();
             deathNotice = NULL;
+            npcIntegerDialog->setVisible(false);
             npcListDialog->setVisible(false);
+            npcStringDialog->setVisible(false);
+            npcTextDialog->clearText();
             npcTextDialog->setVisible(false);
             buyDialog->setVisible(false);
             sellDialog->setVisible(false);
diff --git a/src/npc.cpp b/src/npc.cpp
index dbd7a990..eaf6b78b 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -25,12 +25,15 @@
 #include "particle.h"
 #include "text.h"
 
+#include "gui/npc_text.h"
+
 #include "net/messageout.h"
 #include "net/protocol.h"
 
 #include "resources/npcdb.h"
 
 NPC *current_npc = 0;
+bool NPC::mTalking = false;
 
 static const int NAME_X_OFFSET = 15;
 static const int NAME_Y_OFFSET = 30;
@@ -46,7 +49,8 @@ NPC::NPC(Uint32 id, Uint16 job, Map *map, Network *network):
          i != info.sprites.end();
          i++)
     {
-        if (c == VECTOREND_SPRITE) break;
+        if (c == VECTOREND_SPRITE)
+            break;
 
         std::string file = "graphics/sprites/" + (*i)->sprite;
         int variant = (*i)->variant;
@@ -103,6 +107,10 @@ Being::Type NPC::getType() const
 
 void NPC::talk()
 {
+    if (mTalking)
+        return;
+
+    mTalking = true;
     MessageOut outMsg(mNetwork);
     outMsg.writeInt16(CMSG_NPC_TALK);
     outMsg.writeInt32(mId);
@@ -165,7 +173,5 @@ void NPC::sell()
 void NPC::updateCoords()
 {
     if (mName)
-    {
         mName->adviseXY(mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET);
-    }
 }
diff --git a/src/npc.h b/src/npc.h
index f8aaad7f..0dc9c742 100644
--- a/src/npc.h
+++ b/src/npc.h
@@ -51,6 +51,8 @@ class NPC : public Player
         void buy();
         void sell();
 
+        static bool mTalking;
+
     protected:
         Network *mNetwork;
         void updateCoords();
-- 
cgit v1.2.3-70-g09d2


From 543166b9d50ebf06bfc83a32fb2bab3b366eb871 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 25 Feb 2009 10:29:34 -0700
Subject: Make sure that all dialogs are cleared on player death, not just the
 NPC text dialog.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/npc_text.cpp         | 1 +
 src/gui/npcintegerdialog.cpp | 5 +++++
 src/gui/npcintegerdialog.h   | 5 +++++
 src/gui/npclistdialog.cpp    | 1 +
 src/net/npchandler.cpp       | 2 --
 src/net/playerhandler.cpp    | 4 +++-
 6 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'src/gui/npc_text.cpp')

diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index 0b7592c7..c28f1403 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -75,6 +75,7 @@ void NpcTextDialog::addText(const std::string &text)
 
 void NpcTextDialog::clearText()
 {
+    NPC::mTalking = false;
     setText("");
 }
 
diff --git a/src/gui/npcintegerdialog.cpp b/src/gui/npcintegerdialog.cpp
index d0a7c7be..9c49a630 100644
--- a/src/gui/npcintegerdialog.cpp
+++ b/src/gui/npcintegerdialog.cpp
@@ -70,6 +70,11 @@ int NpcIntegerDialog::getValue()
     return mValueField->getValue();
 }
 
+void NpcIntegerDialog::reset()
+{
+    mValueField->reset();
+}
+
 void NpcIntegerDialog::action(const gcn::ActionEvent &event)
 {
     bool finish = false;
diff --git a/src/gui/npcintegerdialog.h b/src/gui/npcintegerdialog.h
index a4ca33cf..cca8cb32 100644
--- a/src/gui/npcintegerdialog.h
+++ b/src/gui/npcintegerdialog.h
@@ -54,6 +54,11 @@ class NpcIntegerDialog : public Window, public gcn::ActionListener
          */
         int getValue();
 
+        /**
+         * Resets the integer input field.
+         */
+        void reset();
+
         /**
          * Prepares the NPC dialog.
          *
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index f3bb949a..2c4dfc04 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -86,6 +86,7 @@ void NpcListDialog::parseItems(const std::string &itemString)
 
 void NpcListDialog::reset()
 {
+    mItemList->setSelected(-1);
     mItems.clear();
 }
 
diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp
index 26250d9e..a59ee814 100644
--- a/src/net/npchandler.cpp
+++ b/src/net/npchandler.cpp
@@ -76,12 +76,10 @@ void NPCHandler::handleMessage(MessageIn *msg)
             id = msg->readInt32();
             if (current_npc == dynamic_cast<NPC*>(beingManager->findBeing(id)))
                 current_npc = NULL;
-            NPC::mTalking = false;
             break;
 
         case SMSG_NPC_NEXT:
             // Next button in NPC dialog, currently unused
-            NPC::mTalking = false;
             break;
 
         case SMSG_NPC_INT_INPUT:
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index c1e0d033..0637d784 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -82,14 +82,16 @@ namespace {
             player_node->revive();
             deathNotice = NULL;
             npcIntegerDialog->setVisible(false);
+            npcListDialog->reset();
             npcListDialog->setVisible(false);
+            npcStringDialog->setValue("");
             npcStringDialog->setVisible(false);
             npcTextDialog->clearText();
             npcTextDialog->setVisible(false);
             buyDialog->setVisible(false);
             sellDialog->setVisible(false);
             buySellDialog->setVisible(false);
-            current_npc = 0;
+            current_npc = NULL;
         }
     } deathListener;
 }
-- 
cgit v1.2.3-70-g09d2


From f04a8713ffc83db8b3dc4a472b28aad25a2b2bd1 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Wed, 25 Feb 2009 13:38:55 -0700
Subject: Fix NPC handling to not need a handle on the NPC

The Being ID is used instead, as that is all that was ever really
needed.
---
 src/beingmanager.cpp         | 21 +++++++-------
 src/beingmanager.h           | 10 ++++++-
 src/game.cpp                 | 10 +++----
 src/gui/buy.cpp              |  2 +-
 src/gui/buysell.cpp          | 22 +++++++++++----
 src/gui/buysell.h            |  7 ++++-
 src/gui/npc_text.cpp         | 21 ++++++++++----
 src/gui/npc_text.h           |  8 +++++-
 src/gui/npcintegerdialog.cpp | 14 +++++++--
 src/gui/npcintegerdialog.h   |  4 ++-
 src/gui/npclistdialog.cpp    | 12 ++++++--
 src/gui/npclistdialog.h      |  5 +++-
 src/gui/npcstringdialog.cpp  | 16 +++++++++--
 src/gui/npcstringdialog.h    |  5 +++-
 src/gui/sell.cpp             |  2 +-
 src/net/beinghandler.cpp     | 14 ++++++---
 src/net/buysellhandler.cpp   |  4 +--
 src/net/npchandler.cpp       | 27 ++++++++----------
 src/net/playerhandler.cpp    |  4 +--
 src/npc.cpp                  | 67 ++------------------------------------------
 src/npc.h                    | 15 +---------
 21 files changed, 142 insertions(+), 148 deletions(-)

(limited to 'src/gui/npc_text.cpp')

diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp
index 3b73d29f..273436bf 100644
--- a/src/beingmanager.cpp
+++ b/src/beingmanager.cpp
@@ -96,10 +96,7 @@ Being* BeingManager::createBeing(Uint32 id, Uint16 job)
 void BeingManager::destroyBeing(Being *being)
 {
     mBeings.remove(being);
-    if (being == current_npc)
-        current_npc->handleDeath();
-    else
-        delete being;
+    delete being;
 }
 
 Being* BeingManager::findBeing(Uint32 id)
@@ -196,12 +193,6 @@ void BeingManager::clear()
         mBeings.remove(player_node);
     }
 
-    if (current_npc)
-    {
-        mBeings.remove(current_npc);
-        current_npc->handleDeath();
-    }
-
     delete_all(mBeings);
     mBeings.clear();
 
@@ -264,3 +255,13 @@ Being* BeingManager::findNearestLivingBeing(Being *aroundBeing, int maxdist,
 
     return (maxdist >= dist) ? closestBeing : NULL;
 }
+
+bool BeingManager::hasBeing(Being *being)
+{
+    for (BeingIterator i = mBeings.begin(); i != mBeings.end(); i++)
+    {
+        if (being == *i) return true;
+    }
+
+    return false;
+}
diff --git a/src/beingmanager.h b/src/beingmanager.h
index 11721709..02c83725 100644
--- a/src/beingmanager.h
+++ b/src/beingmanager.h
@@ -98,13 +98,21 @@ class BeingManager
          */
         Beings& getAll();
 
+        /**
+         * Returns true if the given being is in the manager's list, false
+         * otherwise.
+         *
+         * \param being the being to search for
+         */
+        bool hasBeing(Being *being);
+
         /**
          * Logic.
          */
         void logic();
 
         /**
-         * Destroys all beings except the local player
+         * Destroys all beings except the local player and current NPC (if any)
          */
         void clear();
 
diff --git a/src/game.cpp b/src/game.cpp
index cb85fc5c..6f9dbb88 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -198,13 +198,13 @@ void createGuiWindows(Network *network)
     miniStatusWindow = new MiniStatusWindow;
     buyDialog = new BuyDialog(network);
     sellDialog = new SellDialog(network);
-    buySellDialog = new BuySellDialog;
+    buySellDialog = new BuySellDialog(network);
     inventoryWindow = new InventoryWindow;
     emoteWindow = new EmoteWindow;
-    npcTextDialog = new NpcTextDialog;
-    npcIntegerDialog = new NpcIntegerDialog;
-    npcListDialog = new NpcListDialog;
-    npcStringDialog = new NpcStringDialog;
+    npcTextDialog = new NpcTextDialog(network);
+    npcIntegerDialog = new NpcIntegerDialog(network);
+    npcListDialog = new NpcListDialog(network);
+    npcStringDialog = new NpcStringDialog(network);
     skillDialog = new SkillDialog;
     setupWindow = new Setup;
     minimap = new Minimap;
diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index c084c7c2..cad21ab5 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -132,7 +132,7 @@ void BuyDialog::action(const gcn::ActionEvent &event)
     if (event.getId() == "quit")
     {
         setVisible(false);
-        if (current_npc) current_npc->handleDeath();
+        current_npc = 0;
         return;
     }
 
diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp
index 8bf5f1f4..c1c934d1 100644
--- a/src/gui/buysell.cpp
+++ b/src/gui/buysell.cpp
@@ -24,10 +24,13 @@
 
 #include "../npc.h"
 
+#include "../net/messageout.h"
+#include "../net/protocol.h"
+
 #include "../utils/gettext.h"
 
-BuySellDialog::BuySellDialog():
-    Window(_("Shop"))
+BuySellDialog::BuySellDialog(Network *network):
+    Window(_("Shop")), mNetwork(network)
 {
     Button *buyButton = 0;
     static const char *buttonNames[] = {
@@ -60,12 +63,19 @@ void BuySellDialog::logic()
 
 void BuySellDialog::action(const gcn::ActionEvent &event)
 {
+    setVisible(false);
+    int action;
     if (event.getId() == "Buy") {
-        current_npc->buy();
+        action = 0;
     } else if (event.getId() == "Sell") {
-        current_npc->sell();
+        action = 1;
     } else if (event.getId() == "Cancel") {
-        if (current_npc) current_npc->handleDeath();
+        current_npc = 0;
+        return;
     }
-    setVisible(false);
+
+    MessageOut outMsg(mNetwork);
+    outMsg.writeInt16(CMSG_NPC_BUY_SELL_REQUEST);
+    outMsg.writeInt32(current_npc);
+    outMsg.writeInt8(action);
 }
diff --git a/src/gui/buysell.h b/src/gui/buysell.h
index 754bb551..197c1a2b 100644
--- a/src/gui/buysell.h
+++ b/src/gui/buysell.h
@@ -26,6 +26,8 @@
 
 #include "window.h"
 
+class Network;
+
 /**
  * A dialog to choose between buying or selling at a shop.
  *
@@ -40,7 +42,7 @@ class BuySellDialog : public Window, public gcn::ActionListener
          *
          * @see Window::Window
          */
-        BuySellDialog();
+        BuySellDialog(Network *network);
 
         /**
          * Check for current NPC
@@ -51,6 +53,9 @@ class BuySellDialog : public Window, public gcn::ActionListener
          * Called when receiving actions from the widgets.
          */
         void action(const gcn::ActionEvent &event);
+
+    private:
+        Network *mNetwork;
 };
 
 #endif
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index 1750cbd4..db0015e9 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -28,10 +28,13 @@
 
 #include "../npc.h"
 
+#include "../net/messageout.h"
+#include "../net/protocol.h"
+
 #include "../utils/gettext.h"
 
-NpcTextDialog::NpcTextDialog():
-    Window(_("NPC")),
+NpcTextDialog::NpcTextDialog(Network *network):
+    Window(_("NPC")), mNetwork(network),
     mState(NPC_TEXT_STATE_WAITING)
 {
     setResizable(true);
@@ -97,14 +100,14 @@ void NpcTextDialog::action(const gcn::ActionEvent &event)
     if (event.getId() == "ok")
     {
         if (mState == NPC_TEXT_STATE_NEXT && current_npc) {
-            current_npc->nextDialog();
+            nextDialog();
             addText("\n> Next\n");
         } else if (mState == NPC_TEXT_STATE_CLOSE ||
                 (mState == NPC_TEXT_STATE_NEXT && !current_npc)) {
             setText("");
-            if (current_npc) current_npc->nextDialog();
+            if (current_npc) nextDialog();
             setVisible(false);
-            if (current_npc) current_npc->handleDeath();
+            current_npc = 0;
         } else return;
     }
     else return;
@@ -114,10 +117,16 @@ void NpcTextDialog::action(const gcn::ActionEvent &event)
     mState = NPC_TEXT_STATE_WAITING;
 }
 
+void NpcTextDialog::nextDialog(int npcID)
+{
+    MessageOut outMsg(mNetwork);
+    outMsg.writeInt16(CMSG_NPC_NEXT_REQUEST);
+    outMsg.writeInt32(npcID);
+}
+
 void NpcTextDialog::widgetResized(const gcn::Event &event)
 {
     Window::widgetResized(event);
 
     setText(mText);
 }
-
diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index 00b11b3c..62486fff 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.h
@@ -28,6 +28,9 @@
 
 #include "window.h"
 
+#include "../npc.h"
+
+class Network;
 class TextBox;
 
 /**
@@ -43,7 +46,7 @@ class NpcTextDialog : public Window, public gcn::ActionListener
          *
          * @see Window::Window
          */
-        NpcTextDialog();
+        NpcTextDialog(Network *network);
 
         /**
          * Called when receiving actions from the widgets.
@@ -74,6 +77,8 @@ class NpcTextDialog : public Window, public gcn::ActionListener
 
         void showCloseButton();
 
+        void nextDialog(int npcID = current_npc);
+
         /**
          * Called when resizing the window.
          *
@@ -82,6 +87,7 @@ class NpcTextDialog : public Window, public gcn::ActionListener
         void widgetResized(const gcn::Event &event);
 
     private:
+        Network *mNetwork;
         gcn::ScrollArea *mScrollArea;
         TextBox *mTextBox;
         gcn::Button *mButton;
diff --git a/src/gui/npcintegerdialog.cpp b/src/gui/npcintegerdialog.cpp
index f91b42da..f6d788df 100644
--- a/src/gui/npcintegerdialog.cpp
+++ b/src/gui/npcintegerdialog.cpp
@@ -28,13 +28,16 @@
 
 #include "../npc.h"
 
+#include "../net/messageout.h"
+#include "../net/protocol.h"
+
 #include "../utils/gettext.h"
 #include "../utils/strprintf.h"
 
 extern NpcTextDialog *npcTextDialog;
 
-NpcIntegerDialog::NpcIntegerDialog():
-    Window(_("NPC Number Request"))
+NpcIntegerDialog::NpcIntegerDialog(Network *network):
+    Window(_("NPC Number Request")), mNetwork(network)
 {
     mValueField = new IntTextField;
 
@@ -104,7 +107,12 @@ void NpcIntegerDialog::action(const gcn::ActionEvent &event)
     if (finish)
     {
         setVisible(false);
-        current_npc->integerInput(mValueField->getValue());
+
+        MessageOut outMsg(mNetwork);
+        outMsg.writeInt16(CMSG_NPC_INT_RESPONSE);
+        outMsg.writeInt32(current_npc);
+        outMsg.writeInt32(mValueField->getValue());
+
         mValueField->reset();
     }
 }
diff --git a/src/gui/npcintegerdialog.h b/src/gui/npcintegerdialog.h
index 6083338c..80a21848 100644
--- a/src/gui/npcintegerdialog.h
+++ b/src/gui/npcintegerdialog.h
@@ -26,6 +26,7 @@
 
 #include "window.h"
 
+class Network;
 class IntTextField;
 
 /**
@@ -41,7 +42,7 @@ class NpcIntegerDialog : public Window, public gcn::ActionListener
          *
          * @see Window::Window
          */
-        NpcIntegerDialog();
+        NpcIntegerDialog(Network *network);
 
         /**
          * Called when receiving actions from the widgets.
@@ -81,6 +82,7 @@ class NpcIntegerDialog : public Window, public gcn::ActionListener
         void setVisible(bool visible);
 
     private:
+        Network *mNetwork;
         gcn::Button *mDecButton;
         gcn::Button *mIncButton;
         IntTextField *mValueField;
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index 8349cb4a..fc7d2979 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -31,13 +31,16 @@
 
 #include "../npc.h"
 
+#include "../net/messageout.h"
+#include "../net/protocol.h"
+
 #include "../utils/gettext.h"
 #include "../utils/strprintf.h"
 
 extern NpcTextDialog *npcTextDialog;
 
-NpcListDialog::NpcListDialog():
-    Window(_("NPC"))
+NpcListDialog::NpcListDialog(Network *network):
+    Window(_("NPC")), mNetwork(network)
 {
     setResizable(true);
 
@@ -115,7 +118,10 @@ void NpcListDialog::action(const gcn::ActionEvent &event)
     {
         setVisible(false);
         reset();
-        current_npc->dialogChoice(choice);
+        MessageOut outMsg(mNetwork);
+        outMsg.writeInt16(CMSG_NPC_LIST_CHOICE);
+        outMsg.writeInt32(current_npc);
+        outMsg.writeInt8(choice);
     }
 }
 
diff --git a/src/gui/npclistdialog.h b/src/gui/npclistdialog.h
index e7e2f9a9..a7b49506 100644
--- a/src/gui/npclistdialog.h
+++ b/src/gui/npclistdialog.h
@@ -29,6 +29,8 @@
 
 #include <vector>
 
+class Network;
+
 /**
  * The npc list dialog.
  *
@@ -43,7 +45,7 @@ class NpcListDialog : public Window, public gcn::ActionListener,
          *
          * @see Window::Window
          */
-        NpcListDialog();
+        NpcListDialog(Network *network);
 
         /**
          * Called when receiving actions from the widgets.
@@ -75,6 +77,7 @@ class NpcListDialog : public Window, public gcn::ActionListener,
         void setVisible(bool visible);
 
     private:
+        Network *mNetwork;
         gcn::ListBox *mItemList;
 
         std::vector<std::string> mItems;
diff --git a/src/gui/npcstringdialog.cpp b/src/gui/npcstringdialog.cpp
index 679c93e5..7ed05288 100644
--- a/src/gui/npcstringdialog.cpp
+++ b/src/gui/npcstringdialog.cpp
@@ -28,13 +28,16 @@
 
 #include "../npc.h"
 
+#include "../net/messageout.h"
+#include "../net/protocol.h"
+
 #include "../utils/gettext.h"
 #include "../utils/strprintf.h"
 
 extern NpcTextDialog *npcTextDialog;
 
-NpcStringDialog::NpcStringDialog():
-    Window(_("NPC Text Request"))
+NpcStringDialog::NpcStringDialog(Network *network):
+    Window(_("NPC Text Request")), mNetwork(network)
 {
     mValueField = new TextField("");
 
@@ -74,8 +77,15 @@ void NpcStringDialog::action(const gcn::ActionEvent &event)
     }
 
     setVisible(false);
-    current_npc->stringInput(mValueField->getText());
+    std::string text = mValueField->getText();
     mValueField->setText("");
+
+    MessageOut outMsg(mNetwork);
+    outMsg.writeInt16(CMSG_NPC_STR_RESPONSE);
+    outMsg.writeInt16(text.length() + 9);
+    outMsg.writeInt32(current_npc);
+    outMsg.writeString(text, text.length());
+    outMsg.writeInt8(0);
 }
 
 bool NpcStringDialog::isInputFocused()
diff --git a/src/gui/npcstringdialog.h b/src/gui/npcstringdialog.h
index 31f9c9a0..43283219 100644
--- a/src/gui/npcstringdialog.h
+++ b/src/gui/npcstringdialog.h
@@ -26,6 +26,8 @@
 
 #include <guichan/actionlistener.hpp>
 
+class Network;
+
 /**
  * The npc integer input dialog.
  *
@@ -39,7 +41,7 @@ class NpcStringDialog : public Window, public gcn::ActionListener
          *
          * @see Window::Window
          */
-        NpcStringDialog();
+        NpcStringDialog(Network *network);
 
         /**
          * Called when receiving actions from the widgets.
@@ -71,6 +73,7 @@ class NpcStringDialog : public Window, public gcn::ActionListener
         void setVisible(bool visible);
 
     private:
+        Network *mNetwork;
         gcn::TextField *mValueField;
         std::string mDefault;
 };
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index 14620aa6..51fc8f9f 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -133,7 +133,7 @@ void SellDialog::action(const gcn::ActionEvent &event)
     if (event.getId() == "quit")
     {
         setVisible(false);
-        if (current_npc) current_npc->handleDeath();
+        current_npc = 0;
         return;
     }
 
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index 3e746eb5..982667d1 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -35,6 +35,10 @@
 #include "../npc.h"
 #include "../player_relations.h"
 
+#include "../gui/npc_text.h"
+
+extern NpcTextDialog *npcTextDialog;
+
 const int EMOTION_TIME = 150;    /**< Duration of emotion icon */
 
 BeingHandler::BeingHandler(bool enableSync):
@@ -204,7 +208,12 @@ void BeingHandler::handleMessage(MessageIn *msg)
 
         case SMSG_BEING_REMOVE:
             // A being should be removed or has died
-            dstBeing = beingManager->findBeing(msg->readInt32());
+            id = msg->readInt32();
+
+            if (id == current_npc)
+                    npcTextDialog->showCloseButton();
+
+            dstBeing = beingManager->findBeing(id);
 
             if (!dstBeing)
                 break;
@@ -213,9 +222,6 @@ void BeingHandler::handleMessage(MessageIn *msg)
             if (dstBeing == player_node->getTarget())
                 player_node->stopAttack();
 
-            if (dstBeing == current_npc)
-                    current_npc->handleDeath();
-
             if (msg->readInt8() == 1)
                 dstBeing->setAction(Being::DEAD);
             else
diff --git a/src/net/buysellhandler.cpp b/src/net/buysellhandler.cpp
index a2442d70..714bc0ea 100644
--- a/src/net/buysellhandler.cpp
+++ b/src/net/buysellhandler.cpp
@@ -65,7 +65,7 @@ void BuySellHandler::handleMessage(MessageIn *msg)
             sellDialog->setVisible(false);
             sellDialog->reset();
             buySellDialog->setVisible(true);
-            current_npc = dynamic_cast<NPC*>(beingManager->findBeing(msg->readInt32()));
+            current_npc = msg->readInt32();
             break;
 
         case SMSG_NPC_BUY:
@@ -107,7 +107,7 @@ void BuySellHandler::handleMessage(MessageIn *msg)
             }
             else {
                 chatWindow->chatLog(_("Nothing to sell"), BY_SERVER);
-                if (current_npc) current_npc->handleDeath();
+                current_npc = 0;
             }
             break;
 
diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp
index ae521bd5..405217bb 100644
--- a/src/net/npchandler.cpp
+++ b/src/net/npchandler.cpp
@@ -54,24 +54,21 @@ NPCHandler::NPCHandler()
 void NPCHandler::handleMessage(MessageIn *msg)
 {
     int id;
-    NPC *temporaryNPC;
 
     switch (msg->getId())
     {
         case SMSG_NPC_CHOICE:
             msg->readInt16();  // length
-            id = msg->readInt32();
+            current_npc = msg->readInt32();
             player_node->setAction(LocalPlayer::STAND);
-            current_npc = dynamic_cast<NPC*>(beingManager->findBeing(id));
             npcListDialog->parseItems(msg->readString(msg->getLength() - 8));
             npcListDialog->setVisible(true);
             break;
 
         case SMSG_NPC_MESSAGE:
             msg->readInt16();  // length
-            id = msg->readInt32();
+            current_npc = msg->readInt32();
             player_node->setAction(LocalPlayer::STAND);
-            current_npc = dynamic_cast<NPC*>(beingManager->findBeing(id));
             npcTextDialog->addText(msg->readString(msg->getLength() - 8));
             npcListDialog->setVisible(false);
             npcTextDialog->setVisible(true);
@@ -79,30 +76,28 @@ void NPCHandler::handleMessage(MessageIn *msg)
 
          case SMSG_NPC_CLOSE:
             id = msg->readInt32();
-            temporaryNPC = dynamic_cast<NPC*>(beingManager->findBeing(id));
             // If we're talking to that NPC, show the close button
-            if (temporaryNPC == current_npc)
+            if (id == current_npc)
                 npcTextDialog->showCloseButton();
             // Otherwise, move on as an empty dialog doesn't help
             else
-                temporaryNPC->nextDialog();
+                npcTextDialog->nextDialog(id);
             break;
 
         case SMSG_NPC_NEXT:
             id = msg->readInt32();
-            temporaryNPC = dynamic_cast<NPC*>(beingManager->findBeing(id));
             // If we're talking to that NPC, show the next button
-            if (temporaryNPC == current_npc)
+            if (id == current_npc)
                 npcTextDialog->showNextButton();
-            else if (temporaryNPC)
             // Otherwise, move on as an empty dialog doesn't help
-                temporaryNPC->nextDialog();
+            else
+                npcTextDialog->nextDialog(id);
             break;
 
         case SMSG_NPC_INT_INPUT:
             // Request for an integer
-            id = msg->readInt32();
-            current_npc = dynamic_cast<NPC*>(beingManager->findBeing(id));
+            current_npc = msg->readInt32();
+            player_node->setAction(LocalPlayer::STAND);
             npcIntegerDialog->setRange(0, 2147483647);
             npcIntegerDialog->setDefaultValue(0);
             npcIntegerDialog->setVisible(true);
@@ -111,8 +106,8 @@ void NPCHandler::handleMessage(MessageIn *msg)
 
         case SMSG_NPC_STR_INPUT:
             // Request for a string
-            id = msg->readInt32();
-            current_npc = dynamic_cast<NPC*>(beingManager->findBeing(id));
+            current_npc = msg->readInt32();
+            player_node->setAction(LocalPlayer::STAND);
             npcStringDialog->setValue("");
             npcStringDialog->setVisible(true);
             npcStringDialog->requestFocus();
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index ee1b2fd9..550753b7 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -93,7 +93,7 @@ namespace {
             buyDialog->setVisible(false);
             sellDialog->setVisible(false);
             buySellDialog->setVisible(false);
-            if (current_npc) current_npc->handleDeath();
+            current_npc = 0;
         }
     } deathListener;
 }
@@ -147,8 +147,6 @@ void PlayerHandler::handleMessage(MessageIn *msg)
                 // Switch the actual map, deleting the previous one if necessary
                 engine->changeMap(mapPath);
 
-                if (current_npc) current_npc->handleDeath();
-
                 float scrollOffsetX = 0.0f;
                 float scrollOffsetY = 0.0f;
 
diff --git a/src/npc.cpp b/src/npc.cpp
index ecac2509..8fd8a86b 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "animatedsprite.h"
+#include "beingmanager.h"
 #include "npc.h"
 #include "particle.h"
 #include "text.h"
@@ -33,7 +34,7 @@
 
 extern NpcTextDialog *npcTextDialog;
 
-NPC *current_npc = NULL;
+int current_npc = NULL;
 
 static const int NAME_X_OFFSET = 15;
 static const int NAME_Y_OFFSET = 30;
@@ -113,60 +114,6 @@ void NPC::talk()
     outMsg.writeInt8(0);
 }
 
-void NPC::nextDialog()
-{
-    if (!this || !mNetwork) return;
-    MessageOut outMsg(mNetwork);
-    outMsg.writeInt16(CMSG_NPC_NEXT_REQUEST);
-    outMsg.writeInt32(mId);
-}
-
-void NPC::dialogChoice(char choice)
-{
-    MessageOut outMsg(mNetwork);
-    outMsg.writeInt16(CMSG_NPC_LIST_CHOICE);
-    outMsg.writeInt32(mId);
-    outMsg.writeInt8(choice);
-}
-
-void NPC::integerInput(int value)
-{
-    MessageOut outMsg(mNetwork);
-    outMsg.writeInt16(CMSG_NPC_INT_RESPONSE);
-    outMsg.writeInt32(mId);
-    outMsg.writeInt32(value);
-}
-
-void NPC::stringInput(const std::string &value)
-{
-    MessageOut outMsg(mNetwork);
-    outMsg.writeInt16(CMSG_NPC_STR_RESPONSE);
-    outMsg.writeInt16(value.length() + 9);
-    outMsg.writeInt32(mId);
-    outMsg.writeString(value, value.length());
-    outMsg.writeInt8(0);
-}
-
-/*
- * TODO Unify the buy() and sell() methods, without sacrificing readability of
- * the code calling the method. buy(bool buySell) would be bad...
- */
-void NPC::buy()
-{
-    MessageOut outMsg(mNetwork);
-    outMsg.writeInt16(CMSG_NPC_BUY_SELL_REQUEST);
-    outMsg.writeInt32(mId);
-    outMsg.writeInt8(0);
-}
-
-void NPC::sell()
-{
-    MessageOut outMsg(mNetwork);
-    outMsg.writeInt16(CMSG_NPC_BUY_SELL_REQUEST);
-    outMsg.writeInt32(mId);
-    outMsg.writeInt8(1);
-}
-
 void NPC::updateCoords()
 {
     if (mName)
@@ -174,13 +121,3 @@ void NPC::updateCoords()
         mName->adviseXY(mPx + NAME_X_OFFSET, mPy + NAME_Y_OFFSET);
     }
 }
-
-void NPC::handleDeath()
-{
-    if (this != current_npc) return;
-
-    if (npcTextDialog->isVisible())
-        npcTextDialog->showCloseButton();
-    else
-        current_npc = NULL;
-}
diff --git a/src/npc.h b/src/npc.h
index 81b6d51e..ef9fdc7d 100644
--- a/src/npc.h
+++ b/src/npc.h
@@ -42,19 +42,6 @@ class NPC : public Player
         virtual Type getType() const;
 
         void talk();
-        void nextDialog();
-        void dialogChoice(char choice);
-        void integerInput(int value);
-        void stringInput(const std::string &value);
-
-        void buy();
-        void sell();
-
-        /**
-         * Call this to ease clean up of the current NPC, without causing
-         * interface problems
-         */
-        void handleDeath();
     protected:
         Network *mNetwork;
         void updateCoords();
@@ -62,6 +49,6 @@ class NPC : public Player
         Text *mName;
 };
 
-extern NPC *current_npc;
+extern int current_npc;
 
 #endif
-- 
cgit v1.2.3-70-g09d2


From 3ad6ac47d4967870a54fddd66aa9996724115b94 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Wed, 25 Feb 2009 13:50:47 -0700
Subject: Prevent duplicate NPC talking when using keyboard

Based on commit a1e483913672e55704e8fbafeff5ea0ccc0c9b07 from Aethyra.
---
 src/gui/npc_text.cpp | 1 +
 src/npc.cpp          | 7 +++++--
 src/npc.h            | 2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/gui/npc_text.cpp')

diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index db0015e9..520efad4 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -108,6 +108,7 @@ void NpcTextDialog::action(const gcn::ActionEvent &event)
             if (current_npc) nextDialog();
             setVisible(false);
             current_npc = 0;
+            NPC::isTalking = false;
         } else return;
     }
     else return;
diff --git a/src/npc.cpp b/src/npc.cpp
index 8fd8a86b..5132e0dc 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -34,7 +34,8 @@
 
 extern NpcTextDialog *npcTextDialog;
 
-int current_npc = NULL;
+int current_npc = 0;
+bool NPC::isTalking = false;
 
 static const int NAME_X_OFFSET = 15;
 static const int NAME_Y_OFFSET = 30;
@@ -107,7 +108,9 @@ Being::Type NPC::getType() const
 
 void NPC::talk()
 {
-    if (!this || !mNetwork) return;
+    if (isTalking || !this || !mNetwork) return;
+
+    isTalking = true;
     MessageOut outMsg(mNetwork);
     outMsg.writeInt16(CMSG_NPC_TALK);
     outMsg.writeInt32(mId);
diff --git a/src/npc.h b/src/npc.h
index ef9fdc7d..182da3e5 100644
--- a/src/npc.h
+++ b/src/npc.h
@@ -42,6 +42,8 @@ class NPC : public Player
         virtual Type getType() const;
 
         void talk();
+
+        static bool isTalking;
     protected:
         Network *mNetwork;
         void updateCoords();
-- 
cgit v1.2.3-70-g09d2


From 0dde31c3db09113639fa443142995b6efcff6646 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 25 Feb 2009 19:04:39 -0700
Subject: Fix NPC handling to not need a handle on the NPC

Loosely based on TMW commit f04a8713ffc83db8b3dc4a472b28aad25a2b2bd1

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/beingmanager.cpp         | 10 +++++++
 src/beingmanager.h           | 10 ++++++-
 src/game.cpp                 | 10 +++----
 src/gui/buysell.cpp          | 34 +++++++++++++++++------
 src/gui/buysell.h            |  7 ++++-
 src/gui/npc_text.cpp         | 18 +++++++++---
 src/gui/npc_text.h           |  9 ++++--
 src/gui/npcintegerdialog.cpp | 16 +++++++----
 src/gui/npcintegerdialog.h   |  4 ++-
 src/gui/npclistdialog.cpp    | 16 +++++++----
 src/gui/npclistdialog.h      |  5 +++-
 src/gui/npcstringdialog.cpp  | 22 +++++++++++----
 src/gui/npcstringdialog.h    |  5 +++-
 src/net/beinghandler.cpp     | 13 ++++-----
 src/net/buysellhandler.cpp   | 25 ++++++++++-------
 src/net/npchandler.cpp       | 22 +++++++--------
 src/net/playerhandler.cpp    |  2 +-
 src/npc.cpp                  | 65 ++------------------------------------------
 src/npc.h                    | 13 +++------
 19 files changed, 165 insertions(+), 141 deletions(-)

(limited to 'src/gui/npc_text.cpp')

diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp
index b4ffa76c..d63e0dc5 100644
--- a/src/beingmanager.cpp
+++ b/src/beingmanager.cpp
@@ -253,3 +253,13 @@ Being* BeingManager::findNearestLivingBeing(Being *aroundBeing, int maxdist,
 
     return (maxdist >= dist) ? closestBeing : NULL;
 }
+
+bool BeingManager::hasBeing(Being *being)
+{
+    for (BeingIterator i = mBeings.begin(); i != mBeings.end(); i++)
+    {
+        if (being == *i) return true;
+    }
+
+    return false;
+}
diff --git a/src/beingmanager.h b/src/beingmanager.h
index 59a7c76a..32ba6242 100644
--- a/src/beingmanager.h
+++ b/src/beingmanager.h
@@ -99,13 +99,21 @@ class BeingManager
          */
         Beings& getAll();
 
+        /**
+         * Returns true if the given being is in the manager's list, false
+         * otherwise.
+         *
+         * \param being the being to search for
+         */
+        bool hasBeing(Being *being);
+
         /**
          * Logic.
          */
         void logic();
 
         /**
-         * Destroys all beings except the local player
+         * Destroys all beings except the local player and current NPC (if any)
          */
         void clear();
 
diff --git a/src/game.cpp b/src/game.cpp
index 16790cac..110b75cc 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -195,13 +195,13 @@ void createGuiWindows(Network *network)
     miniStatusWindow = new MiniStatusWindow();
     buyDialog = new BuyDialog(network);
     sellDialog = new SellDialog(network);
-    buySellDialog = new BuySellDialog();
+    buySellDialog = new BuySellDialog(network);
     inventoryWindow = new InventoryWindow();
     emoteWindow = new EmoteWindow();
-    npcTextDialog = new NpcTextDialog();
-    npcIntegerDialog = new NpcIntegerDialog();
-    npcListDialog = new NpcListDialog();
-    npcStringDialog = new NpcStringDialog();
+    npcTextDialog = new NpcTextDialog(network);
+    npcIntegerDialog = new NpcIntegerDialog(network);
+    npcListDialog = new NpcListDialog(network);
+    npcStringDialog = new NpcStringDialog(network);
     skillDialog = new SkillDialog();
     setupWindow = new Setup();
     minimap = new Minimap();
diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp
index 7d63f184..dc7deef6 100644
--- a/src/gui/buysell.cpp
+++ b/src/gui/buysell.cpp
@@ -25,10 +25,13 @@
 
 #include "../npc.h"
 
+#include "../net/messageout.h"
+#include "../net/protocol.h"
+
 #include "../utils/gettext.h"
 
-BuySellDialog::BuySellDialog():
-    Window(_("Shop"))
+BuySellDialog::BuySellDialog(Network *network):
+    Window(_("Shop")), mNetwork(network)
 {
     Button *buyButton = 0;
     static const char *buttonNames[] = {
@@ -54,12 +57,27 @@ BuySellDialog::BuySellDialog():
 
 void BuySellDialog::action(const gcn::ActionEvent &event)
 {
-    if (event.getId() == "Buy") {
-        current_npc->buy();
-    } else if (event.getId() == "Sell") {
-        current_npc->sell();
-    } else if (event.getId() == "Cancel") {
+    setVisible(false);
+    int action = 0;
+
+    NPC::mTalking = false;
+
+    if (event.getId() == "Buy")
+    {
+        action = 0;
+    }
+    else if (event.getId() == "Sell")
+    {
+        action = 1;
+    }
+    else if (event.getId() == "Cancel")
+    {
         current_npc = 0;
+        return;
     }
-    setVisible(false);
+
+    MessageOut outMsg(mNetwork);
+    outMsg.writeInt16(CMSG_NPC_BUY_SELL_REQUEST);
+    outMsg.writeInt32(current_npc);
+    outMsg.writeInt8(action);
 }
diff --git a/src/gui/buysell.h b/src/gui/buysell.h
index c12e3c9b..747066a7 100644
--- a/src/gui/buysell.h
+++ b/src/gui/buysell.h
@@ -27,6 +27,8 @@
 
 #include "window.h"
 
+class Network;
+
 /**
  * A dialog to choose between buying or selling at a shop.
  *
@@ -41,12 +43,15 @@ class BuySellDialog : public Window, public gcn::ActionListener
          *
          * @see Window::Window
          */
-        BuySellDialog();
+        BuySellDialog(Network *network);
 
         /**
          * Called when receiving actions from the widgets.
          */
         void action(const gcn::ActionEvent &event);
+
+    private:
+        Network *mNetwork;
 };
 
 #endif
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index c28f1403..b94e8aa4 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -29,10 +29,13 @@
 
 #include "../npc.h"
 
+#include "../net/messageout.h"
+#include "../net/protocol.h"
+
 #include "../utils/gettext.h"
 
-NpcTextDialog::NpcTextDialog():
-    Window(_("NPC"))
+NpcTextDialog::NpcTextDialog(Network *network):
+    Window(_("NPC")), mNetwork(network)
 {
     setResizable(true);
 
@@ -87,12 +90,19 @@ void NpcTextDialog::action(const gcn::ActionEvent &event)
         setVisible(false);
 
         if (current_npc)
-            current_npc->nextDialog();
+            nextDialog();
 
-        current_npc = NULL;
+        current_npc = 0;
     }
 }
 
+void NpcTextDialog::nextDialog(int npcID)
+{
+    MessageOut outMsg(mNetwork);
+    outMsg.writeInt16(CMSG_NPC_NEXT_REQUEST);
+    outMsg.writeInt32(npcID);
+}
+
 void NpcTextDialog::widgetResized(const gcn::Event &event)
 {
     Window::widgetResized(event);
diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index 63d41cd6..a72de5d0 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.h
@@ -29,6 +29,9 @@
 
 #include "window.h"
 
+#include "../npc.h"
+
+class Network;
 class TextBox;
 
 /**
@@ -44,7 +47,7 @@ class NpcTextDialog : public Window, public gcn::ActionListener
          *
          * @see Window::Window
          */
-        NpcTextDialog();
+        NpcTextDialog(Network *network);
 
         /**
          * Called when receiving actions from the widgets.
@@ -71,6 +74,8 @@ class NpcTextDialog : public Window, public gcn::ActionListener
          */
         void addText(const std::string &string);
 
+        void nextDialog(int npcID = current_npc);
+
         /**
          * Called when resizing the window.
          *
@@ -79,7 +84,7 @@ class NpcTextDialog : public Window, public gcn::ActionListener
         void widgetResized(const gcn::Event &event);
 
     private:
-        gcn::Button *okButton;
+        Network *mNetwork;
         gcn::ScrollArea *mScrollArea;
         TextBox *mTextBox;
         gcn::Button *mButton;
diff --git a/src/gui/npcintegerdialog.cpp b/src/gui/npcintegerdialog.cpp
index 9c49a630..132a7608 100644
--- a/src/gui/npcintegerdialog.cpp
+++ b/src/gui/npcintegerdialog.cpp
@@ -28,10 +28,13 @@
 
 #include "../npc.h"
 
+#include "../net/messageout.h"
+#include "../net/protocol.h"
+
 #include "../utils/gettext.h"
 
-NpcIntegerDialog::NpcIntegerDialog():
-    Window(_("NPC Number Request"))
+NpcIntegerDialog::NpcIntegerDialog(Network *network):
+    Window(_("NPC Number Request")), mNetwork(network)
 {
     mValueField = new IntTextField();
 
@@ -104,11 +107,14 @@ void NpcIntegerDialog::action(const gcn::ActionEvent &event)
     if (finish)
     {
         setVisible(false);
+        NPC::mTalking = false;
 
-        if (current_npc)
-            current_npc->integerInput(mValueField->getValue());
+        MessageOut outMsg(mNetwork);
+        outMsg.writeInt16(CMSG_NPC_INT_RESPONSE);
+        outMsg.writeInt32(current_npc);
+        outMsg.writeInt32(mValueField->getValue());
 
-        current_npc = NULL;
+        current_npc = 0;
         mValueField->reset();
     }
 }
diff --git a/src/gui/npcintegerdialog.h b/src/gui/npcintegerdialog.h
index cca8cb32..15bdee48 100644
--- a/src/gui/npcintegerdialog.h
+++ b/src/gui/npcintegerdialog.h
@@ -27,6 +27,7 @@
 
 #include "window.h"
 
+class Network;
 class IntTextField;
 
 /**
@@ -42,7 +43,7 @@ class NpcIntegerDialog : public Window, public gcn::ActionListener
          *
          * @see Window::Window
          */
-        NpcIntegerDialog();
+        NpcIntegerDialog(Network *network);
 
         /**
          * Called when receiving actions from the widgets.
@@ -78,6 +79,7 @@ class NpcIntegerDialog : public Window, public gcn::ActionListener
         void requestFocus();
 
     private:
+        Network *mNetwork;
         gcn::Button *mDecButton;
         gcn::Button *mIncButton;
         IntTextField *mValueField;
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index 2c4dfc04..73b00239 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -31,10 +31,13 @@
 
 #include "../npc.h"
 
+#include "../net/messageout.h"
+#include "../net/protocol.h"
+
 #include "../utils/gettext.h"
 
-NpcListDialog::NpcListDialog():
-    Window(_("NPC"))
+NpcListDialog::NpcListDialog(Network *network):
+    Window(_("NPC")), mNetwork(network)
 {
     setResizable(true);
 
@@ -86,6 +89,7 @@ void NpcListDialog::parseItems(const std::string &itemString)
 
 void NpcListDialog::reset()
 {
+    NPC::mTalking = false;
     mItemList->setSelected(-1);
     mItems.clear();
 }
@@ -112,10 +116,12 @@ void NpcListDialog::action(const gcn::ActionEvent &event)
         setVisible(false);
         reset();
 
-        if (current_npc)
-            current_npc->dialogChoice(choice);
+        MessageOut outMsg(mNetwork);
+        outMsg.writeInt16(CMSG_NPC_LIST_CHOICE);
+        outMsg.writeInt32(current_npc);
+        outMsg.writeInt8(choice);
 
-        current_npc = NULL;
+        current_npc = 0;
     }
 }
 
diff --git a/src/gui/npclistdialog.h b/src/gui/npclistdialog.h
index de3a7a77..0a0e9813 100644
--- a/src/gui/npclistdialog.h
+++ b/src/gui/npclistdialog.h
@@ -30,6 +30,8 @@
 
 #include "window.h"
 
+class Network;
+
 /**
  * The npc list dialog.
  *
@@ -44,7 +46,7 @@ class NpcListDialog : public Window, public gcn::ActionListener,
          *
          * @see Window::Window
          */
-        NpcListDialog();
+        NpcListDialog(Network *network);
 
         /**
          * Called when receiving actions from the widgets.
@@ -79,6 +81,7 @@ class NpcListDialog : public Window, public gcn::ActionListener,
         void requestFocus();
 
     private:
+        Network *mNetwork;
         gcn::ListBox *mItemList;
         gcn::ScrollArea *scrollArea;
         gcn::Button *okButton;
diff --git a/src/gui/npcstringdialog.cpp b/src/gui/npcstringdialog.cpp
index 140ca40f..f2c7434c 100644
--- a/src/gui/npcstringdialog.cpp
+++ b/src/gui/npcstringdialog.cpp
@@ -28,10 +28,13 @@
 
 #include "../npc.h"
 
+#include "../net/messageout.h"
+#include "../net/protocol.h"
+
 #include "../utils/gettext.h"
 
-NpcStringDialog::NpcStringDialog():
-    Window(_("NPC Text Request"))
+NpcStringDialog::NpcStringDialog(Network *network):
+    Window(_("NPC Text Request")), mNetwork(network)
 {
     mValueField = new TextField("");
 
@@ -64,12 +67,19 @@ void NpcStringDialog::action(const gcn::ActionEvent &event)
     }
 
     setVisible(false);
+    NPC::mTalking = false;
 
-    if (current_npc)
-        current_npc->stringInput(mValueField->getText());
-
-    current_npc = NULL;
+    std::string text = mValueField->getText();
     mValueField->setText("");
+
+    MessageOut outMsg(mNetwork);
+    outMsg.writeInt16(CMSG_NPC_STR_RESPONSE);
+    outMsg.writeInt16(text.length() + 9);
+    outMsg.writeInt32(current_npc);
+    outMsg.writeString(text, text.length());
+    outMsg.writeInt8(0);
+
+    current_npc = 0;
 }
 
 bool NpcStringDialog::isInputFocused()
diff --git a/src/gui/npcstringdialog.h b/src/gui/npcstringdialog.h
index c8871184..ee620daf 100644
--- a/src/gui/npcstringdialog.h
+++ b/src/gui/npcstringdialog.h
@@ -27,6 +27,8 @@
 
 #include "window.h"
 
+class Network;
+
 /**
  * The npc integer input dialog.
  *
@@ -40,7 +42,7 @@ class NpcStringDialog : public Window, public gcn::ActionListener
          *
          * @see Window::Window
          */
-        NpcStringDialog();
+        NpcStringDialog(Network *network);
 
         /**
          * Called when receiving actions from the widgets.
@@ -70,6 +72,7 @@ class NpcStringDialog : public Window, public gcn::ActionListener
         void requestFocus();
 
     private:
+        Network *mNetwork;
         gcn::TextField *mValueField;
         gcn::Button *okButton;
         gcn::Button *cancelButton;
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index c11d22e7..bae14a05 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -196,7 +196,11 @@ void BeingHandler::handleMessage(MessageIn *msg)
 
         case SMSG_BEING_REMOVE:
             // A being should be removed or has died
-            dstBeing = beingManager->findBeing(msg->readInt32());
+            id = msg->readInt32();
+            dstBeing = beingManager->findBeing(id);
+
+            if (id == current_npc)
+                current_npc = 0;
 
             if (!dstBeing)
                 break;
@@ -205,12 +209,7 @@ void BeingHandler::handleMessage(MessageIn *msg)
             if (dstBeing == player_node->getTarget())
                 player_node->stopAttack();
 
-            if (dstBeing == current_npc)
-                current_npc = NULL;
-
-            if (msg->readInt8() == 1)
-                dstBeing->setAction(Being::DEAD);
-            else
+            if (!(msg->readInt8() == 1))
                 beingManager->destroyBeing(dstBeing);
 
             break;
diff --git a/src/net/buysellhandler.cpp b/src/net/buysellhandler.cpp
index 245b8a50..e9255540 100644
--- a/src/net/buysellhandler.cpp
+++ b/src/net/buysellhandler.cpp
@@ -66,7 +66,7 @@ void BuySellHandler::handleMessage(MessageIn *msg)
             sellDialog->setVisible(false);
             sellDialog->reset();
             buySellDialog->setVisible(true);
-            current_npc = dynamic_cast<NPC*>(beingManager->findBeing(msg->readInt32()));
+            current_npc = msg->readInt32();
             break;
 
         case SMSG_NPC_BUY:
@@ -89,7 +89,8 @@ void BuySellHandler::handleMessage(MessageIn *msg)
         case SMSG_NPC_SELL:
             msg->readInt16();  // length
             n_items = (msg->getLength() - 4) / 10;
-            if (n_items > 0) {
+            if (n_items > 0)
+            {
                 sellDialog->setMoney(player_node->mGp);
                 sellDialog->reset();
                 sellDialog->setVisible(true);
@@ -101,21 +102,25 @@ void BuySellHandler::handleMessage(MessageIn *msg)
                     msg->readInt32();  // OCvalue
 
                     Item *item = player_node->getInventory()->getItem(index);
-                    if (item && !(item->isEquipped())) {
+
+                    if (item && !(item->isEquipped()))
                         sellDialog->addItem(item, value);
-                    }
                 }
             }
-            else {
+            else
+            {
                 chatWindow->chatLog(_("Nothing to sell"), BY_SERVER);
                 current_npc = 0;
             }
             break;
 
         case SMSG_NPC_BUY_RESPONSE:
-            if (msg->readInt8() == 0) {
+            if (msg->readInt8() == 0)
+            {
                 chatWindow->chatLog(_("Thanks for buying"), BY_SERVER);
-            } else {
+            }
+            else
+            {
                 // Reset player money since buy dialog already assumed purchase
                 // would go fine
                 buyDialog->setMoney(player_node->mGp);
@@ -124,11 +129,11 @@ void BuySellHandler::handleMessage(MessageIn *msg)
             break;
 
         case SMSG_NPC_SELL_RESPONSE:
-            if (msg->readInt8() == 0) {
+            if (msg->readInt8() == 0)
                 chatWindow->chatLog(_("Thanks for selling"), BY_SERVER);
-            } else {
+            else
                 chatWindow->chatLog(_("Unable to sell"), BY_SERVER);
-            }
+
             break;
     }
 }
diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp
index a59ee814..1067a57e 100644
--- a/src/net/npchandler.cpp
+++ b/src/net/npchandler.cpp
@@ -20,6 +20,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <SDL_types.h>
+
 #include "messagein.h"
 #include "npchandler.h"
 #include "protocol.h"
@@ -49,15 +51,14 @@ NPCHandler::NPCHandler()
 
 void NPCHandler::handleMessage(MessageIn *msg)
 {
-    int id;
+    Uint32 id;
 
     switch (msg->getId())
     {
         case SMSG_NPC_CHOICE:
             msg->readInt16();  // length
-            id = msg->readInt32();
+            current_npc = msg->readInt32();
             player_node->setAction(LocalPlayer::STAND);
-            current_npc = dynamic_cast<NPC*>(beingManager->findBeing(id));
             npcListDialog->parseItems(msg->readString(msg->getLength() - 8));
             npcListDialog->setVisible(true);
             npcListDialog->requestFocus();
@@ -65,17 +66,16 @@ void NPCHandler::handleMessage(MessageIn *msg)
 
         case SMSG_NPC_MESSAGE:
             msg->readInt16();  // length
-            id = msg->readInt32();
+            current_npc = msg->readInt32();
             player_node->setAction(LocalPlayer::STAND);
-            current_npc = dynamic_cast<NPC*>(beingManager->findBeing(id));
             npcTextDialog->addText(msg->readString(msg->getLength() - 8));
             npcTextDialog->setVisible(true);
             break;
 
          case SMSG_NPC_CLOSE:
             id = msg->readInt32();
-            if (current_npc == dynamic_cast<NPC*>(beingManager->findBeing(id)))
-                current_npc = NULL;
+            if (current_npc == id)
+                current_npc = 0;
             break;
 
         case SMSG_NPC_NEXT:
@@ -84,8 +84,8 @@ void NPCHandler::handleMessage(MessageIn *msg)
 
         case SMSG_NPC_INT_INPUT:
             // Request for an integer
-            id = msg->readInt32();
-            current_npc = dynamic_cast<NPC*>(beingManager->findBeing(id));
+            current_npc = msg->readInt32();
+            player_node->setAction(LocalPlayer::STAND);
             npcIntegerDialog->setRange(0, 2147483647);
             npcIntegerDialog->setVisible(true);
             npcIntegerDialog->requestFocus();
@@ -93,8 +93,8 @@ void NPCHandler::handleMessage(MessageIn *msg)
 
         case SMSG_NPC_STR_INPUT:
             // Request for a string
-            id = msg->readInt32();
-            current_npc = dynamic_cast<NPC*>(beingManager->findBeing(id));
+            current_npc = msg->readInt32();
+            player_node->setAction(LocalPlayer::STAND);
             npcStringDialog->setValue("");
             npcStringDialog->setVisible(true);
             npcStringDialog->requestFocus();
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index f18c5d82..ffeb3fab 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -92,7 +92,7 @@ namespace {
             buyDialog->setVisible(false);
             sellDialog->setVisible(false);
             buySellDialog->setVisible(false);
-            current_npc = NULL;
+            current_npc = 0;
         }
     } deathListener;
 }
diff --git a/src/npc.cpp b/src/npc.cpp
index 832e6926..92ef4d82 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "animatedsprite.h"
+#include "beingmanager.h"
 #include "npc.h"
 #include "particle.h"
 #include "text.h"
@@ -32,8 +33,8 @@
 
 #include "resources/npcdb.h"
 
-NPC *current_npc = 0;
 bool NPC::mTalking = false;
+Uint32 current_npc = 0;
 
 static const int NAME_X_OFFSET = 15;
 static const int NAME_Y_OFFSET = 30;
@@ -117,68 +118,6 @@ void NPC::talk()
     outMsg.writeInt8(0);
 }
 
-void NPC::nextDialog()
-{
-    if (!mNetwork)
-        return;
-
-    MessageOut outMsg(mNetwork);
-    outMsg.writeInt16(CMSG_NPC_NEXT_REQUEST);
-    outMsg.writeInt32(mId);
-}
-
-void NPC::dialogChoice(char choice)
-{
-    MessageOut outMsg(mNetwork);
-    outMsg.writeInt16(CMSG_NPC_LIST_CHOICE);
-    outMsg.writeInt32(mId);
-    outMsg.writeInt8(choice);
-}
-
-void NPC::integerInput(int value)
-{
-    MessageOut outMsg(mNetwork);
-    outMsg.writeInt16(CMSG_NPC_INT_RESPONSE);
-    outMsg.writeInt32(mId);
-    outMsg.writeInt32(value);
-}
-
-void NPC::stringInput(const std::string &value)
-{
-    MessageOut outMsg(mNetwork);
-    outMsg.writeInt16(CMSG_NPC_STR_RESPONSE);
-    outMsg.writeInt16(value.length() + 9);
-    outMsg.writeInt32(mId);
-    outMsg.writeString(value, value.length());
-    outMsg.writeInt8(0);
-}
-
-/*
- * TODO Unify the buy() and sell() methods, without sacrificing readability of
- * the code calling the method. buy(bool buySell) would be bad...
- */
-void NPC::buy()
-{
-    if (!mNetwork)
-        return;
-
-    MessageOut outMsg(mNetwork);
-    outMsg.writeInt16(CMSG_NPC_BUY_SELL_REQUEST);
-    outMsg.writeInt32(mId);
-    outMsg.writeInt8(0);
-}
-
-void NPC::sell()
-{
-    if (!mNetwork)
-        return;
-
-    MessageOut outMsg(mNetwork);
-    outMsg.writeInt16(CMSG_NPC_BUY_SELL_REQUEST);
-    outMsg.writeInt32(mId);
-    outMsg.writeInt8(1);
-}
-
 void NPC::updateCoords()
 {
     if (mName)
diff --git a/src/npc.h b/src/npc.h
index 0dc9c742..e1bf9737 100644
--- a/src/npc.h
+++ b/src/npc.h
@@ -23,6 +23,8 @@
 #ifndef NPC_H
 #define NPC_H
 
+#include <SDL_types.h>
+
 #include "player.h"
 
 class Network;
@@ -42,14 +44,7 @@ class NPC : public Player
 
         virtual Type getType() const;
 
-        void talk();
-        void nextDialog();
-        void dialogChoice(char choice);
-        void integerInput(int value);
-        void stringInput(const std::string &value);
-
-        void buy();
-        void sell();
+        void talk();;
 
         static bool mTalking;
 
@@ -60,6 +55,6 @@ class NPC : public Player
         Text *mName;
 };
 
-extern NPC *current_npc;
+extern Uint32 current_npc;
 
 #endif
-- 
cgit v1.2.3-70-g09d2


From d605691a3fe219cde175eb68239bea91ae2d91fd Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Mon, 9 Mar 2009 13:26:59 -0600
Subject: Send the correct packet for the NPC close button

Both packets do the same, but we should be explicit anyways. Also,
seperate out NPC client packets.
---
 src/gui/npc_text.cpp   |  7 +++++++
 src/gui/npc_text.h     |  2 ++
 src/net/npchandler.cpp |  2 +-
 src/net/protocol.h     | 18 ++++++++++--------
 4 files changed, 20 insertions(+), 9 deletions(-)

(limited to 'src/gui/npc_text.cpp')

diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index 954f22d8..61f3e510 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -126,6 +126,13 @@ void NpcTextDialog::nextDialog(int npcID)
     outMsg.writeInt32(npcID);
 }
 
+void NpcTextDialog::closeDialog(int npcID)
+{
+    MessageOut outMsg(mNetwork);
+    outMsg.writeInt16(CMSG_NPC_CLOSE);
+    outMsg.writeInt32(npcID);
+}
+
 void NpcTextDialog::widgetResized(const gcn::Event &event)
 {
     Window::widgetResized(event);
diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index 019c22a5..f030115b 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.h
@@ -79,6 +79,8 @@ class NpcTextDialog : public Window, public gcn::ActionListener
 
         void nextDialog(int npcID = current_npc);
 
+        void closeDialog(int npcID = current_npc);
+
         /**
          * Called when resizing the window.
          *
diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp
index 487b358f..08ea8506 100644
--- a/src/net/npchandler.cpp
+++ b/src/net/npchandler.cpp
@@ -78,7 +78,7 @@ void NPCHandler::handleMessage(MessageIn *msg)
                 npcTextDialog->showCloseButton();
             // Otherwise, move on as an empty dialog doesn't help
             else
-                npcTextDialog->nextDialog(id);
+                npcTextDialog->closeDialog(id);
             break;
 
         case SMSG_NPC_NEXT:
diff --git a/src/net/protocol.h b/src/net/protocol.h
index e9053451..4b470d12 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.h
@@ -121,30 +121,32 @@
 #define CMSG_TRADE_RESPONSE          0x00e6
 #define CMSG_ITEM_PICKUP             0x009f
 #define CMSG_MAP_LOADED              0x007d
-#define CMSG_NPC_BUY_REQUEST         0x00c8
-#define CMSG_NPC_BUY_SELL_REQUEST    0x00c5
 #define CMSG_CHAT_MESSAGE            0x008c
 #define CMSG_CHAT_WHISPER            0x0096
 #define CMSG_CHAT_ANNOUNCE           0x0099
 #define CMSG_CHAT_WHO                0x00c1
-#define CMSG_NPC_LIST_CHOICE         0x00b8
-#define CMSG_NPC_NEXT_REQUEST        0x00b9
-#define CMSG_NPC_SELL_REQUEST        0x00c9
-#define CMSG_NPC_INT_RESPONSE        0x0143
-#define CMSG_NPC_STR_RESPONSE        0x01d5
 #define CMSG_SKILL_LEVELUP_REQUEST   0x0112
 #define CMSG_STAT_UPDATE_REQUEST     0x00bb
 #define CMSG_TRADE_ITEM_ADD_REQUEST  0x00e8
 #define CMSG_TRADE_CANCEL_REQUEST    0x00ed
 #define CMSG_TRADE_ADD_COMPLETE      0x00eb
 #define CMSG_TRADE_OK                0x00ef
-#define CMSG_NPC_TALK                0x0090
 #define CMSG_TRADE_REQUEST           0x00e4
 #define CMSG_PLAYER_INVENTORY_USE    0x00a7
 #define CMSG_PLAYER_INVENTORY_DROP   0x00a2
 #define CMSG_PLAYER_EQUIP            0x00a9
 #define CMSG_PLAYER_UNEQUIP          0x00ab
 
+#define CMSG_NPC_TALK                0x0090
+#define CMSG_NPC_NEXT_REQUEST        0x00b9
+#define CMSG_NPC_CLOSE               0x0146
+#define CMSG_NPC_LIST_CHOICE         0x00b8
+#define CMSG_NPC_INT_RESPONSE        0x0143
+#define CMSG_NPC_STR_RESPONSE        0x01d5
+#define CMSG_NPC_BUY_SELL_REQUEST    0x00c5
+#define CMSG_NPC_BUY_REQUEST         0x00c8
+#define CMSG_NPC_SELL_REQUEST        0x00c9
+
 #define CMSG_PARTY_CREATE            0x00f9
 #define CMSG_PARTY_INVITE            0x00fc
 #define CMSG_PARTY_INVITED           0x00ff
-- 
cgit v1.2.3-70-g09d2


From 4463387e133b0cd238ebb1ff89b8362fc2adbe75 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Mon, 9 Mar 2009 13:26:59 -0600
Subject: Send the correct packet for the NPC close button

Both packets do the same, but we should be explicit anyways. Also,
seperate out NPC client packets.
---
 src/gui/npc_text.cpp      |  8 ++++++++
 src/gui/npc_text.h        |  2 ++
 src/gui/npclistdialog.cpp |  4 ++--
 src/net/npchandler.cpp    |  1 +
 src/net/protocol.h        | 18 ++++++++++--------
 5 files changed, 23 insertions(+), 10 deletions(-)

(limited to 'src/gui/npc_text.cpp')

diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index b94e8aa4..ec8a4b6e 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -38,6 +38,7 @@ NpcTextDialog::NpcTextDialog(Network *network):
     Window(_("NPC")), mNetwork(network)
 {
     setResizable(true);
+    setCloseButton(true);
 
     setMinWidth(200);
     setMinHeight(150);
@@ -103,6 +104,13 @@ void NpcTextDialog::nextDialog(int npcID)
     outMsg.writeInt32(npcID);
 }
 
+void NpcTextDialog::closeDialog(int npcID)
+{
+    MessageOut outMsg(mNetwork);
+    outMsg.writeInt16(CMSG_NPC_CLOSE);
+    outMsg.writeInt32(npcID);
+}
+
 void NpcTextDialog::widgetResized(const gcn::Event &event)
 {
     Window::widgetResized(event);
diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index a72de5d0..615902db 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.h
@@ -76,6 +76,8 @@ class NpcTextDialog : public Window, public gcn::ActionListener
 
         void nextDialog(int npcID = current_npc);
 
+        void closeDialog(int npcID = current_npc);
+
         /**
          * Called when resizing the window.
          *
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index 73b00239..c639411d 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -58,8 +58,8 @@ NpcListDialog::NpcListDialog(Network *network):
     scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
 
     place(0, 0, scrollArea, 5).setPadding(3);
-    place(3, 1, okButton);
-    place(4, 1, cancelButton);
+    place(3, 1, cancelButton);
+    place(4, 1, okButton);
 
     Layout &layout = getLayout();
     layout.setRowHeight(0, Layout::AUTO_SET);
diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp
index 1161bc36..41af4467 100644
--- a/src/net/npchandler.cpp
+++ b/src/net/npchandler.cpp
@@ -76,6 +76,7 @@ void NPCHandler::handleMessage(MessageIn *msg)
             id = msg->readInt32();
             if (current_npc == id)
                 current_npc = 0;
+            npcTextDialog->closeDialog(id);
             break;
 
         case SMSG_NPC_NEXT:
diff --git a/src/net/protocol.h b/src/net/protocol.h
index 081f8873..645d667f 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.h
@@ -122,30 +122,32 @@
 #define CMSG_TRADE_RESPONSE          0x00e6
 #define CMSG_ITEM_PICKUP             0x009f
 #define CMSG_MAP_LOADED              0x007d
-#define CMSG_NPC_BUY_REQUEST         0x00c8
-#define CMSG_NPC_BUY_SELL_REQUEST    0x00c5
 #define CMSG_CHAT_MESSAGE            0x008c
 #define CMSG_CHAT_WHISPER            0x0096
 #define CMSG_CHAT_ANNOUNCE           0x0099
 #define CMSG_CHAT_WHO                0x00c1
-#define CMSG_NPC_LIST_CHOICE         0x00b8
-#define CMSG_NPC_NEXT_REQUEST        0x00b9
-#define CMSG_NPC_SELL_REQUEST        0x00c9
-#define CMSG_NPC_INT_RESPONSE        0x0143
-#define CMSG_NPC_STR_RESPONSE        0x01d5
 #define CMSG_SKILL_LEVELUP_REQUEST   0x0112
 #define CMSG_STAT_UPDATE_REQUEST     0x00bb
 #define CMSG_TRADE_ITEM_ADD_REQUEST  0x00e8
 #define CMSG_TRADE_CANCEL_REQUEST    0x00ed
 #define CMSG_TRADE_ADD_COMPLETE      0x00eb
 #define CMSG_TRADE_OK                0x00ef
-#define CMSG_NPC_TALK                0x0090
 #define CMSG_TRADE_REQUEST           0x00e4
 #define CMSG_PLAYER_INVENTORY_USE    0x00a7
 #define CMSG_PLAYER_INVENTORY_DROP   0x00a2
 #define CMSG_PLAYER_EQUIP            0x00a9
 #define CMSG_PLAYER_UNEQUIP          0x00ab
 
+#define CMSG_NPC_TALK                0x0090
+#define CMSG_NPC_NEXT_REQUEST        0x00b9
+#define CMSG_NPC_CLOSE               0x0146
+#define CMSG_NPC_LIST_CHOICE         0x00b8
+#define CMSG_NPC_INT_RESPONSE        0x0143
+#define CMSG_NPC_STR_RESPONSE        0x01d5
+#define CMSG_NPC_BUY_SELL_REQUEST    0x00c5
+#define CMSG_NPC_BUY_REQUEST         0x00c8
+#define CMSG_NPC_SELL_REQUEST        0x00c9
+
 #define CMSG_PARTY_CREATE            0x00f9
 #define CMSG_PARTY_INVITE            0x00fc
 #define CMSG_PARTY_INVITED           0x00ff
-- 
cgit v1.2.3-70-g09d2


From 443a10db52e909c4c2a33543795ec8837547e973 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 10 Mar 2009 08:11:48 -0600
Subject: Made it so that when windows load previous states, they are never
 smaller than the minimum width and height (a check that should have been
 enforced in the first place), as well as modified the NPC list and text
 dialogs to remember where they were when they were moved or resized last.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/gui/npc_text.cpp      | 11 +++++++++--
 src/gui/npc_text.h        | 13 +++++++++++++
 src/gui/npclistdialog.cpp |  6 +++++-
 src/gui/npclistdialog.h   |  3 ++-
 src/gui/window.cpp        | 41 +++++++++++++++++++++++++----------------
 src/gui/window.h          |  6 ++++++
 src/net/npchandler.cpp    |  3 +--
 7 files changed, 61 insertions(+), 22 deletions(-)

(limited to 'src/gui/npc_text.cpp')

diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index ec8a4b6e..58aa0c5e 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -35,10 +35,10 @@
 #include "../utils/gettext.h"
 
 NpcTextDialog::NpcTextDialog(Network *network):
-    Window(_("NPC")), mNetwork(network)
+    Window("NPC"), mNetwork(network)
 {
+    setWindowName(_("NPC"));
     setResizable(true);
-    setCloseButton(true);
 
     setMinWidth(200);
     setMinHeight(150);
@@ -89,6 +89,7 @@ void NpcTextDialog::action(const gcn::ActionEvent &event)
     {
         clearText();
         setVisible(false);
+        saveWindowState();
 
         if (current_npc)
             nextDialog();
@@ -118,3 +119,9 @@ void NpcTextDialog::widgetResized(const gcn::Event &event)
     setText(mText);
 }
 
+void NpcTextDialog::requestFocus()
+{
+    loadWindowState();
+    setVisible(true);
+}
+
diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index 615902db..f01e3602 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.h
@@ -74,10 +74,23 @@ class NpcTextDialog : public Window, public gcn::ActionListener
          */
         void addText(const std::string &string);
 
+        /**
+         * Notifies the server that the client has performed a next action.
+         */
         void nextDialog(int npcID = current_npc);
 
+        /**
+         * Notifies the server that the client has performed a close action.
+         */
         void closeDialog(int npcID = current_npc);
 
+        /**
+         * Initializes window width to the last known setting. Since the dialog
+         * doesn't need any extra focus outside of what it's given in the Game
+         * class, this is all it does for now.
+         */
+        void requestFocus();
+
         /**
          * Called when resizing the window.
          *
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index c639411d..f049cba7 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -37,8 +37,9 @@
 #include "../utils/gettext.h"
 
 NpcListDialog::NpcListDialog(Network *network):
-    Window(_("NPC")), mNetwork(network)
+    Window("NPC"), mNetwork(network)
 {
+    setWindowName(_("NPC"));
     setResizable(true);
 
     setMinWidth(200);
@@ -114,6 +115,7 @@ void NpcListDialog::action(const gcn::ActionEvent &event)
     if (choice)
     {
         setVisible(false);
+        saveWindowState();
         reset();
 
         MessageOut outMsg(mNetwork);
@@ -129,4 +131,6 @@ void NpcListDialog::requestFocus()
 {
     mItemList->requestFocus();
     mItemList->setSelected(0);
+    loadWindowState();
+    setVisible(true);
 }
diff --git a/src/gui/npclistdialog.h b/src/gui/npclistdialog.h
index 0a0e9813..e3cf375b 100644
--- a/src/gui/npclistdialog.h
+++ b/src/gui/npclistdialog.h
@@ -76,7 +76,8 @@ class NpcListDialog : public Window, public gcn::ActionListener,
         void reset();
 
         /**
-         * Requests the listbox to take focus for input.
+         * Requests the listbox to take focus for input and sets window width
+         * to the last known setting.
          */
         void requestFocus();
 
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 2b422f86..8faf63a0 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -118,21 +118,8 @@ Window::Window(const std::string& caption, bool modal, Window *parent, const std
 Window::~Window()
 {
     logger->log("Window::~Window(\"%s\")", getCaption().c_str());
-    const std::string &name = mWindowName;
 
-    // Saving X, Y and Width and Height for resizables in the config
-    if (!name.empty())
-    {
-        config.setValue(name + "WinX", getX());
-        config.setValue(name + "WinY", getY());
-        config.setValue(name + "Visible", isVisible());
-
-        if (mGrip)
-        {
-            config.setValue(name + "WinWidth", getWidth());
-            config.setValue(name + "WinHeight", getHeight());
-        }
-    }
+    saveWindowState();
 
     delete mLayout;
 
@@ -478,8 +465,13 @@ void Window::loadWindowState()
 
     if (mGrip)
     {
-        setSize((int) config.getValue(name + "WinWidth", mDefaultWidth),
-                (int) config.getValue(name + "WinHeight", mDefaultHeight));
+        const int width = (int) config.getValue(name + "WinWidth",
+                                                mDefaultWidth);
+        const int height = (int) config.getValue(name + "WinHeight",
+                                                 mDefaultHeight);
+
+        setSize(width < getMinWidth() ? getMinWidth() : width,
+                height < getMinHeight() ? getMinHeight() : height);
     }
     else
     {
@@ -487,6 +479,23 @@ void Window::loadWindowState()
     }
 }
 
+void Window::saveWindowState()
+{
+    // Saving X, Y and Width and Height for resizables in the config
+    if (!mWindowName.empty())
+    {
+        config.setValue(mWindowName + "WinX", getX());
+        config.setValue(mWindowName + "WinY", getY());
+        config.setValue(mWindowName + "Visible", isVisible());
+
+        if (mGrip)
+        {
+            config.setValue(mWindowName + "WinWidth", getWidth());
+            config.setValue(mWindowName + "WinHeight", getHeight());
+        }
+    }
+}
+
 void Window::setDefaultSize(int defaultX, int defaultY,
                             int defaultWidth, int defaultHeight)
 {
diff --git a/src/gui/window.h b/src/gui/window.h
index 3a92ac17..bf15dedb 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -233,6 +233,12 @@ class Window : public gcn::Window, gcn::WidgetListener
          */
         void loadWindowState();
 
+        /**
+         * Saves the window state so that when the window is reloaded, it'll
+         * maintain its previous state and location.
+         */
+        void saveWindowState();
+
         /**
          * Set the default win pos and size.
          * (which can be different of the actual ones.)
diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp
index 41af4467..60a77af1 100644
--- a/src/net/npchandler.cpp
+++ b/src/net/npchandler.cpp
@@ -60,7 +60,6 @@ void NPCHandler::handleMessage(MessageIn *msg)
             current_npc = msg->readInt32();
             player_node->setAction(LocalPlayer::STAND);
             npcListDialog->parseItems(msg->readString(msg->getLength() - 8));
-            npcListDialog->setVisible(true);
             npcListDialog->requestFocus();
             break;
 
@@ -69,7 +68,7 @@ void NPCHandler::handleMessage(MessageIn *msg)
             current_npc = msg->readInt32();
             player_node->setAction(LocalPlayer::STAND);
             npcTextDialog->addText(msg->readString(msg->getLength() - 8));
-            npcTextDialog->setVisible(true);
+            npcTextDialog->requestFocus();
             break;
 
          case SMSG_NPC_CLOSE:
-- 
cgit v1.2.3-70-g09d2


From 343d290f639646b9a3a90c9402dfc8e76989bdcb Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Tue, 10 Mar 2009 09:29:15 -0600
Subject: Don't center the NPC interraction dialogs

Use the last location the user gave instead. Also, do the same for the
inventory dialog.
---
 src/gui/buy.cpp              | 1 -
 src/gui/buysell.cpp          | 1 -
 src/gui/inventorywindow.cpp  | 1 -
 src/gui/npc_text.cpp         | 2 +-
 src/gui/npcintegerdialog.cpp | 3 +--
 src/gui/npclistdialog.cpp    | 2 +-
 src/gui/npcstringdialog.cpp  | 3 +--
 src/gui/sell.cpp             | 1 -
 src/gui/storagewindow.cpp    | 1 -
 9 files changed, 4 insertions(+), 11 deletions(-)

(limited to 'src/gui/npc_text.cpp')

diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index 768dab4d..d267e5ad 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -91,7 +91,6 @@ BuyDialog::BuyDialog(Network *network):
     layout.setRowHeight(0, Layout::AUTO_SET);
 
     loadWindowState();
-    setLocationRelativeTo(getParent());
 }
 
 BuyDialog::~BuyDialog()
diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp
index 818413c2..0550a822 100644
--- a/src/gui/buysell.cpp
+++ b/src/gui/buysell.cpp
@@ -49,7 +49,6 @@ BuySellDialog::BuySellDialog(Network *network):
     buyButton->requestFocus();
 
     setContentSize(x, 2 * y + buyButton->getHeight());
-    setLocationRelativeTo(getParent());
 
     requestFocus();
 }
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index e5450748..80017d28 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -103,7 +103,6 @@ InventoryWindow::InventoryWindow(int invSize):
     layout.setRowHeight(0, mDropButton->getHeight());
 
     loadWindowState();
-    setLocationRelativeTo(getParent());
 }
 
 InventoryWindow::~InventoryWindow()
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index 61f3e510..53c64a54 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -37,6 +37,7 @@ NpcTextDialog::NpcTextDialog(Network *network):
     Window(_("NPC")), mNetwork(network),
     mState(NPC_TEXT_STATE_WAITING)
 {
+    setWindowName("NPCText");
     setResizable(true);
 
     setMinWidth(200);
@@ -61,7 +62,6 @@ NpcTextDialog::NpcTextDialog(Network *network):
     layout.setRowHeight(0, Layout::AUTO_SET);
 
     loadWindowState();
-    setLocationRelativeTo(getParent());
 }
 
 void NpcTextDialog::clearText()
diff --git a/src/gui/npcintegerdialog.cpp b/src/gui/npcintegerdialog.cpp
index 9778d790..ea06ca8d 100644
--- a/src/gui/npcintegerdialog.cpp
+++ b/src/gui/npcintegerdialog.cpp
@@ -39,6 +39,7 @@ extern NpcTextDialog *npcTextDialog;
 NpcIntegerDialog::NpcIntegerDialog(Network *network):
     Window(_("NPC Number Request")), mNetwork(network)
 {
+    setWindowName("NPCInteger");
     mValueField = new IntTextField;
 
     mDecButton = new Button("-", "decvalue", this);
@@ -62,8 +63,6 @@ NpcIntegerDialog::NpcIntegerDialog(Network *network):
     place(2, 0, cancelButton);
     place(3, 0, okButton);
     reflowLayout(175, 0);
-
-    setLocationRelativeTo(getParent());
 }
 
 void NpcIntegerDialog::setRange(int min, int max)
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index 66c2d9a0..c1493afd 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -42,6 +42,7 @@ extern NpcTextDialog *npcTextDialog;
 NpcListDialog::NpcListDialog(Network *network):
     Window(_("NPC")), mNetwork(network)
 {
+    setWindowName("NPCList");
     setResizable(true);
 
     setMinWidth(200);
@@ -69,7 +70,6 @@ NpcListDialog::NpcListDialog(Network *network):
 
     loadWindowState();
     resetToDefaultSize();
-    setLocationRelativeTo(getParent());
 }
 
 int NpcListDialog::getNumberOfElements()
diff --git a/src/gui/npcstringdialog.cpp b/src/gui/npcstringdialog.cpp
index aec30826..525a73a0 100644
--- a/src/gui/npcstringdialog.cpp
+++ b/src/gui/npcstringdialog.cpp
@@ -39,6 +39,7 @@ extern NpcTextDialog *npcTextDialog;
 NpcStringDialog::NpcStringDialog(Network *network):
     Window(_("NPC Text Request")), mNetwork(network)
 {
+    setWindowName("NPCList");
     mValueField = new TextField("");
 
     gcn::Button *okButton = new Button(_("OK"), "ok", this);
@@ -48,8 +49,6 @@ NpcStringDialog::NpcStringDialog(Network *network):
     place(1, 1, cancelButton);
     place(2, 1, okButton);
     reflowLayout(175, 0);
-
-    setLocationRelativeTo(getParent());
 }
 
 std::string NpcStringDialog::getValue()
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index 1aa0e2d3..b53a23c1 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -94,7 +94,6 @@ SellDialog::SellDialog(Network *network):
     layout.setRowHeight(0, Layout::AUTO_SET);
 
     loadWindowState();
-    setLocationRelativeTo(getParent());
 }
 
 SellDialog::~SellDialog()
diff --git a/src/gui/storagewindow.cpp b/src/gui/storagewindow.cpp
index 9cdc2da7..2b8ab8f3 100644
--- a/src/gui/storagewindow.cpp
+++ b/src/gui/storagewindow.cpp
@@ -93,7 +93,6 @@ StorageWindow::StorageWindow(Network *network, int invSize):
     layout.setRowHeight(0, mStoreButton->getHeight());
 
     loadWindowState();
-    setLocationRelativeTo(getParent());
 }
 
 StorageWindow::~StorageWindow()
-- 
cgit v1.2.3-70-g09d2


From 58ee835c3763e7bf088fa6c7e31dda1d687589cc Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Tue, 10 Mar 2009 11:50:27 -0600
Subject: Extended window layout to take relative positions, as well as offsets
 to that position. This makes it so that when resolutions are changed, the
 default locations stay relative to the window's position, and not the 800x600
 screen resolution.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/graphics.cpp             | 30 ++++++--------
 src/graphics.h               | 13 ++++++
 src/gui/buy.cpp              |  3 +-
 src/gui/buysell.cpp          |  1 -
 src/gui/chat.cpp             |  2 +-
 src/gui/debugwindow.cpp      |  2 +-
 src/gui/emotewindow.cpp      |  2 +-
 src/gui/equipmentwindow.cpp  |  2 +-
 src/gui/inventorywindow.cpp  |  3 +-
 src/gui/npc_text.cpp         |  3 +-
 src/gui/npcintegerdialog.cpp |  7 +++-
 src/gui/npclistdialog.cpp    |  3 +-
 src/gui/npcstringdialog.cpp  |  7 +++-
 src/gui/recorder.cpp         |  8 ++--
 src/gui/sell.cpp             |  3 +-
 src/gui/shortcutwindow.cpp   | 13 ++----
 src/gui/skill.cpp            |  2 +-
 src/gui/status.cpp           |  3 +-
 src/gui/storagewindow.cpp    |  3 +-
 src/gui/trade.cpp            |  2 +-
 src/gui/window.cpp           | 99 ++++++++++++++++++++++++++++++++++++++++++++
 src/gui/window.h             | 16 ++++++-
 src/openglgraphics.cpp       | 42 ++++++++++---------
 23 files changed, 194 insertions(+), 75 deletions(-)

(limited to 'src/gui/npc_text.cpp')

diff --git a/src/graphics.cpp b/src/graphics.cpp
index 3c507f4b..48fd1340 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -50,30 +50,25 @@ bool Graphics::setVideoMode(int w, int h, int bpp, bool fs, bool hwaccel)
     mFullscreen = fs;
     mHWAccel = hwaccel;
 
-    if (fs) {
+    if (fs)
         displayFlags |= SDL_FULLSCREEN;
-    }
 
-    if (hwaccel) {
+    if (hwaccel)
         displayFlags |= SDL_HWSURFACE | SDL_DOUBLEBUF;
-    } else {
+    else
         displayFlags |= SDL_SWSURFACE;
-    }
 
     mScreen = SDL_SetVideoMode(w, h, bpp, displayFlags);
 
-    if (!mScreen) {
+    if (!mScreen)
         return false;
-    }
 
     char videoDriverName[64];
 
-    if (SDL_VideoDriverName(videoDriverName, 64)) {
+    if (SDL_VideoDriverName(videoDriverName, 64))
         logger->log("Using video driver: %s", videoDriverName);
-    }
-    else {
+    else
         logger->log("Using video driver: unknown");
-    }
 
     const SDL_VideoInfo *vi = SDL_GetVideoInfo();
 
@@ -104,9 +99,8 @@ bool Graphics::setVideoMode(int w, int h, int bpp, bool fs, bool hwaccel)
 
 bool Graphics::setFullscreen(bool fs)
 {
-    if (mFullscreen == fs) {
+    if (mFullscreen == fs)
         return true;
-    }
 
     return setVideoMode(mScreen->w, mScreen->h,
             mScreen->format->BitsPerPixel, fs, mHWAccel);
@@ -128,7 +122,7 @@ bool Graphics::drawImage(Image *image, int x, int y)
 }
 
 bool Graphics::drawImage(Image *image, int srcX, int srcY, int dstX, int dstY,
-        int width, int height, bool)
+                         int width, int height, bool)
 {
     // Check that preconditions for blitting are met.
     if (!mScreen || !image || !image->mImage) return false;
@@ -150,7 +144,7 @@ bool Graphics::drawImage(Image *image, int srcX, int srcY, int dstX, int dstY,
 }
 
 void Graphics::drawImage(gcn::Image const *image, int srcX, int srcY,
-               int dstX, int dstY, int width, int height)
+                         int dstX, int dstY, int width, int height)
 {
     ProxyImage const *srcImage =
         dynamic_cast< ProxyImage const * >(image);
@@ -167,8 +161,10 @@ void Graphics::drawImagePattern(Image *image, int x, int y, int w, int h)
     int px = 0;                       // X position on pattern plane
     int py = 0;                       // Y position on pattern plane
 
-    while (py < h) {
-        while (px < w) {
+    while (py < h)
+    {
+        while (px < w)
+        {
             int dw = (px + iw >= w) ? w - px : iw;
             int dh = (py + ih >= h) ? h - py : ih;
             drawImage(image, 0, 0, x + px, y + py, dw, dh);
diff --git a/src/graphics.h b/src/graphics.h
index 3ad3b85c..ec0b5e9c 100644
--- a/src/graphics.h
+++ b/src/graphics.h
@@ -49,6 +49,19 @@ struct SDL_Surface;
  */
 struct ImageRect
 {
+    enum ImagePosition
+    {
+        UPPER_LEFT = 0,
+        UPPER_CENTER = 1,
+        UPPER_RIGHT = 2,
+        LEFT = 3,
+        CENTER = 4,
+        RIGHT = 5,
+        LOWER_LEFT = 6,
+        LOWER_CENTER = 7,
+        LOWER_RIGHT = 8,
+    };
+
     Image *grid[9];
 };
 
diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index 5a57dcc6..2b5aeeb7 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -47,7 +47,7 @@ BuyDialog::BuyDialog(Network *network):
     setResizable(true);
     setMinWidth(260);
     setMinHeight(230);
-    setDefaultSize(0, 0, 260, 230);
+    setDefaultSize(260, 230, ImageRect::CENTER);
 
     mShopItems = new ShopItems;
 
@@ -90,7 +90,6 @@ BuyDialog::BuyDialog(Network *network):
     layout.setRowHeight(0, Layout::AUTO_SET);
 
     loadWindowState();
-    setLocationRelativeTo(getParent());
 }
 
 BuyDialog::~BuyDialog()
diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp
index dc7deef6..f7684670 100644
--- a/src/gui/buysell.cpp
+++ b/src/gui/buysell.cpp
@@ -50,7 +50,6 @@ BuySellDialog::BuySellDialog(Network *network):
     buyButton->requestFocus();
 
     setContentSize(x, 2 * y + buyButton->getHeight());
-    setLocationRelativeTo(getParent());
 
     requestFocus();
 }
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 5cf8b739..098d4e46 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -55,7 +55,7 @@ Window(""), mNetwork(network), mTmpVisible(false)
     setWindowName(_("Chat"));
 
     setResizable(true);
-    setDefaultSize(0, windowContainer->getHeight() - 123, 600, 123);
+    setDefaultSize(600, 123, ImageRect::LOWER_LEFT);
     setMinWidth(150);
     setMinHeight(90);
 
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index dafd604a..71855977 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -41,7 +41,7 @@ DebugWindow::DebugWindow():
 
     setResizable(true);
     setCloseButton(true);
-    setDefaultSize(0, 0, 400, 60);
+    setDefaultSize(400, 60, ImageRect::CENTER);
 
     mFPSLabel = new gcn::Label("0 FPS");
     mMusicFileLabel = new gcn::Label("Music: ");
diff --git a/src/gui/emotewindow.cpp b/src/gui/emotewindow.cpp
index 30129941..77168993 100644
--- a/src/gui/emotewindow.cpp
+++ b/src/gui/emotewindow.cpp
@@ -40,7 +40,7 @@ EmoteWindow::EmoteWindow():
     setCloseButton(true);
     setMinWidth(80);
     setMinHeight(130);
-    setDefaultSize(115, 25, 322, 200);
+    setDefaultSize(322, 200, ImageRect::CENTER);
 
     mUseButton = new Button(_("Use"), "use", this);
 
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 27ea38ff..0d2097f8 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -71,7 +71,7 @@ EquipmentWindow::EquipmentWindow():
 
     setWindowName("Equipment");
     setCloseButton(true);
-    setDefaultSize(5, 195, 180, 300);
+    setDefaultSize(180, 300, ImageRect::CENTER);
     loadWindowState();
 
     mUnequip = new Button(_("Unequip"), "unequip", this);
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 226b3178..7e75411e 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -57,7 +57,7 @@ InventoryWindow::InventoryWindow(int invSize):
     setCloseButton(true);
 
     // If you adjust these defaults, don't forget to adjust the trade window's.
-    setDefaultSize(115, 25, 375, 300);
+    setDefaultSize(375, 300, ImageRect::CENTER);
 
     std::string longestUseString = getFont()->getWidth(_("Equip")) >
                                    getFont()->getWidth(_("Use")) ?
@@ -103,7 +103,6 @@ InventoryWindow::InventoryWindow(int invSize):
     layout.setRowHeight(0,  mDropButton->getHeight());
 
     loadWindowState();
-    setLocationRelativeTo(getParent());
 }
 
 InventoryWindow::~InventoryWindow()
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index 58aa0c5e..f524f8ea 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -43,7 +43,7 @@ NpcTextDialog::NpcTextDialog(Network *network):
     setMinWidth(200);
     setMinHeight(150);
 
-    setDefaultSize(0, 0, 260, 200);
+    setDefaultSize(260, 200, ImageRect::CENTER);
 
     mTextBox = new TextBox;
     mTextBox->setEditable(false);
@@ -63,7 +63,6 @@ NpcTextDialog::NpcTextDialog(Network *network):
     layout.setRowHeight(0, Layout::AUTO_SET);
 
     loadWindowState();
-    setLocationRelativeTo(getParent());
 }
 
 void NpcTextDialog::setText(const std::string &text)
diff --git a/src/gui/npcintegerdialog.cpp b/src/gui/npcintegerdialog.cpp
index 132a7608..5b3e05aa 100644
--- a/src/gui/npcintegerdialog.cpp
+++ b/src/gui/npcintegerdialog.cpp
@@ -37,6 +37,9 @@ NpcIntegerDialog::NpcIntegerDialog(Network *network):
     Window(_("NPC Number Request")), mNetwork(network)
 {
     mValueField = new IntTextField();
+    setWindowName("NPCInput");
+
+    setDefaultSize(175, 75, ImageRect::CENTER);
 
     mDecButton = new Button("-", "decvalue", this);
     mIncButton = new Button("+", "incvalue", this);
@@ -58,9 +61,9 @@ NpcIntegerDialog::NpcIntegerDialog(Network *network):
     place(0, 0, resetButton);
     place(2, 0, cancelButton);
     place(3, 0, okButton);
-    reflowLayout(175, 0);
+    //reflowLayout(175, 0);
 
-    setLocationRelativeTo(getParent());
+    loadWindowState();
 }
 
 void NpcIntegerDialog::setRange(const int min, const int max)
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index f049cba7..505912ac 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -45,7 +45,7 @@ NpcListDialog::NpcListDialog(Network *network):
     setMinWidth(200);
     setMinHeight(150);
 
-    setDefaultSize(0, 0, 260, 200);
+    setDefaultSize(260, 200, ImageRect::CENTER);
 
     mItemList = new ListBox(this);
     mItemList->setWrappingEnabled(true);
@@ -66,7 +66,6 @@ NpcListDialog::NpcListDialog(Network *network):
     layout.setRowHeight(0, Layout::AUTO_SET);
 
     loadWindowState();
-    setLocationRelativeTo(getParent());
 }
 
 int NpcListDialog::getNumberOfElements()
diff --git a/src/gui/npcstringdialog.cpp b/src/gui/npcstringdialog.cpp
index f2c7434c..58a5c0c8 100644
--- a/src/gui/npcstringdialog.cpp
+++ b/src/gui/npcstringdialog.cpp
@@ -36,17 +36,20 @@
 NpcStringDialog::NpcStringDialog(Network *network):
     Window(_("NPC Text Request")), mNetwork(network)
 {
+    setWindowName("NPCInput");
     mValueField = new TextField("");
 
+    setDefaultSize(175, 75, ImageRect::CENTER);
+
     okButton = new Button(_("OK"), "ok", this);
     cancelButton = new Button(_("Cancel"), "cancel", this);
 
     place(0, 0, mValueField, 3);
     place(1, 1, cancelButton);
     place(2, 1, okButton);
-    reflowLayout(175, 0);
+    //reflowLayout(175, 0);
 
-    setLocationRelativeTo(getParent());
+    loadWindowState();
 }
 
 std::string NpcStringDialog::getValue()
diff --git a/src/gui/recorder.cpp b/src/gui/recorder.cpp
index ff8825ef..9320e020 100644
--- a/src/gui/recorder.cpp
+++ b/src/gui/recorder.cpp
@@ -40,9 +40,11 @@ Recorder::Recorder(ChatWindow *chat, const std::string &title,
 
     mChat = chat;
     Button *button = new Button(buttonTxt, "activate", this);
-    setDefaultSize(0, windowContainer->getHeight() - 123 - button->getHeight() -
-                   offsetY,  button->getWidth() + offsetX, button->getHeight() +
-                   offsetY);
+
+    // 123 is the default chat window height. If you change this in Chat, please
+    // change it here as well
+    setDefaultSize(button->getWidth() + offsetX, button->getHeight() +
+                   offsetY, ImageRect::LOWER_LEFT, 0, 123);
 
     place(0, 0, button);
 
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index 154d1a57..397e29a6 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -48,7 +48,7 @@ SellDialog::SellDialog(Network *network):
     setResizable(true);
     setMinWidth(260);
     setMinHeight(230);
-    setDefaultSize(0, 0, 260, 230);
+    setDefaultSize(260, 230, ImageRect::CENTER);
 
     // Create a ShopItems instance, that is aware of duplicate entries.
     mShopItems = new ShopItems(true);
@@ -94,7 +94,6 @@ SellDialog::SellDialog(Network *network):
     layout.setRowHeight(0, Layout::AUTO_SET);
 
     loadWindowState();
-    setLocationRelativeTo(getParent());
 }
 
 SellDialog::~SellDialog()
diff --git a/src/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp
index ee32ca70..c2df1f9c 100644
--- a/src/gui/shortcutwindow.cpp
+++ b/src/gui/shortcutwindow.cpp
@@ -40,22 +40,17 @@ ShortcutWindow::ShortcutWindow(const char *title, ShortcutContainer *content)
 
     mItems = content;
 
-    mInstances++;
-
     const int border = SCROLL_PADDING * 2 + getPadding() * 2;
     setMinWidth(mItems->getBoxWidth() + border);
     setMinHeight(mItems->getBoxHeight() + border);
     setMaxWidth(mItems->getBoxWidth() * mItems->getMaxItems() + border);
     setMaxHeight(mItems->getBoxHeight() * mItems->getMaxItems() + border);
 
-    const int width = (int) config.getValue("screenwidth", 800);
-    const int height = (int) config.getValue("screenheight", 600);
+    setDefaultSize(mItems->getBoxWidth() + border, (mItems->getBoxHeight() *
+                   mItems->getMaxItems()) + border, ImageRect::LOWER_RIGHT,
+                   mInstances * mItems->getBoxWidth(), 0);
 
-    setDefaultSize(width - (mInstances * mItems->getBoxWidth()) -
-                   (mInstances * border),  height - (mItems->getBoxHeight() *
-                   mItems->getMaxItems()) - border, mItems->getBoxWidth() +
-                   border, (mItems->getBoxHeight() * mItems->getMaxItems()) +
-                   border);
+    mInstances++;
 
     mScrollArea = new ScrollArea(mItems);
     mScrollArea->setPosition(SCROLL_PADDING, SCROLL_PADDING);
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 42ac4d86..a8250fce 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -135,7 +135,7 @@ SkillDialog::SkillDialog():
 
     setWindowName(_("Skills"));
     setCloseButton(true);
-    setDefaultSize(windowContainer->getWidth() - 260, 25, 255, 260);
+    setDefaultSize(255, 260, ImageRect::CENTER);
 
     setMinHeight(50 + mTableModel->getHeight());
     setMinWidth(200);
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index 6419eabb..e534edb8 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -41,8 +41,7 @@ StatusWindow::StatusWindow(LocalPlayer *player):
 {
     setWindowName(_("Status"));
     setCloseButton(true);
-    setDefaultSize((windowContainer->getWidth() - 365) / 2,
-                   (windowContainer->getHeight() - 255) / 2, 400, 345);
+    setDefaultSize(400, 345, ImageRect::CENTER);
 
     // ----------------------
     // Status Part
diff --git a/src/gui/storagewindow.cpp b/src/gui/storagewindow.cpp
index d3bc7ef8..ca7a547f 100644
--- a/src/gui/storagewindow.cpp
+++ b/src/gui/storagewindow.cpp
@@ -62,7 +62,7 @@ StorageWindow::StorageWindow(Network *network, int invSize):
     setCloseButton(true);
 
     // If you adjust these defaults, don't forget to adjust the trade window's.
-    setDefaultSize(115, 25, 375, 300);
+    setDefaultSize(375, 300, ImageRect::CENTER);
 
     mStoreButton = new Button(_("Store"), "store", this);
     mRetrieveButton = new Button(_("Retrieve"), "retrieve", this);
@@ -92,7 +92,6 @@ StorageWindow::StorageWindow(Network *network, int invSize):
     layout.setRowHeight(0, mStoreButton->getHeight());
 
     loadWindowState();
-    setLocationRelativeTo(getParent());
 }
 
 StorageWindow::~StorageWindow()
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index 76795688..a28ff0f9 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -53,7 +53,7 @@ TradeWindow::TradeWindow(Network *network):
     mPartnerInventory(new Inventory(INVENTORY_SIZE, 2))
 {
     setWindowName(_("Trade"));
-    setDefaultSize(115, 227, 342, 209);
+    setDefaultSize(342, 209, ImageRect::CENTER);
     setResizable(true);
 
     setMinWidth(342);
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 5253dd2e..f1316b4c 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -220,6 +220,53 @@ void Window::setLocationRelativeTo(gcn::Widget *widget)
                 getY() + (wy + (widget->getHeight() - getHeight()) / 2 - y));
 }
 
+void Window::setLocationRelativeTo(ImageRect::ImagePosition position)
+{
+    int x = 0, y = 0;
+
+    if (position == ImageRect::UPPER_LEFT)
+    {
+    }
+    else if (position == ImageRect::UPPER_CENTER)
+    {
+        x = (windowContainer->getWidth() - getWidth()) / 2;
+    }
+    else if (position == ImageRect::UPPER_RIGHT)
+    {
+        x = windowContainer->getWidth() - getWidth();
+    }
+    else if (position == ImageRect::LEFT)
+    {
+        y = (windowContainer->getHeight() - getHeight()) / 2;
+    }
+    else if (position == ImageRect::CENTER)
+    {
+        x = (windowContainer->getWidth() - getWidth()) / 2;
+        y = (windowContainer->getHeight() - getHeight()) / 2;
+    }
+    else if (position == ImageRect::RIGHT)
+    {
+        x = windowContainer->getWidth() - getWidth();
+        y = (windowContainer->getHeight() - getHeight()) / 2;
+    }
+    else if (position == ImageRect::LOWER_LEFT)
+    {
+        y = windowContainer->getHeight() - getHeight();
+    }
+    else if (position == ImageRect::LOWER_CENTER)
+    {
+        x = (windowContainer->getWidth() - getWidth()) / 2;
+        y = windowContainer->getHeight() - getHeight();
+    }
+    else if (position == ImageRect::LOWER_RIGHT)
+    {
+        x = windowContainer->getWidth() - getWidth();
+        y = windowContainer->getHeight() - getHeight();
+    }
+
+    setPosition(x, y);
+}
+
 void Window::setMinWidth(unsigned int width)
 {
     mMinWinWidth = width;
@@ -540,6 +587,58 @@ void Window::setDefaultSize(int defaultX, int defaultY,
     mDefaultHeight = defaultHeight;
 }
 
+void Window::setDefaultSize(int defaultWidth, int defaultHeight,
+                            ImageRect::ImagePosition position,
+                            int offsetX, int offsetY)
+{
+    int x = 0, y = 0;
+
+    if (position == ImageRect::UPPER_LEFT)
+    {
+    }
+    else if (position == ImageRect::UPPER_CENTER)
+    {
+        x = (windowContainer->getWidth() - defaultWidth) / 2;
+    }
+    else if (position == ImageRect::UPPER_RIGHT)
+    {
+        x = windowContainer->getWidth() - defaultWidth;
+    }
+    else if (position == ImageRect::LEFT)
+    {
+        y = (windowContainer->getHeight() - defaultHeight) / 2;
+    }
+    else if (position == ImageRect::CENTER)
+    {
+        x = (windowContainer->getWidth() - defaultWidth) / 2;
+        y = (windowContainer->getHeight() - defaultHeight) / 2;
+    }
+    else if (position == ImageRect::RIGHT)
+    {
+        x = windowContainer->getWidth() - defaultWidth;
+        y = (windowContainer->getHeight() - defaultHeight) / 2;
+    }
+    else if (position == ImageRect::LOWER_LEFT)
+    {
+        y = windowContainer->getHeight() - defaultHeight;
+    }
+    else if (position == ImageRect::LOWER_CENTER)
+    {
+        x = (windowContainer->getWidth() - defaultWidth) / 2;
+        y = windowContainer->getHeight() - defaultHeight;
+    }
+    else if (position == ImageRect::LOWER_RIGHT)
+    {
+        x = windowContainer->getWidth() - defaultWidth;
+        y = windowContainer->getHeight() - defaultHeight;
+    }
+
+    mDefaultX = x - offsetX;
+    mDefaultY = y - offsetY;
+    mDefaultWidth = defaultWidth;
+    mDefaultHeight = defaultHeight;
+}
+
 void Window::resetToDefaultSize()
 {
     setPosition(mDefaultX, mDefaultY);
diff --git a/src/gui/window.h b/src/gui/window.h
index bf15dedb..c24bde76 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -34,7 +34,6 @@ class ConfigListener;
 class GCContainer;
 class ContainerPlacer;
 class Image;
-class ImageRect;
 class Layout;
 class LayoutCell;
 class ResizeGrip;
@@ -90,6 +89,11 @@ class Window : public gcn::Window, gcn::WidgetListener
          */
         void setLocationRelativeTo(gcn::Widget *widget);
 
+        /**
+         * Sets the location relative to the given enumerated position.
+         */
+        void setLocationRelativeTo(ImageRect::ImagePosition position);
+
         /**
          * Sets whether or not the window can be resized.
          */
@@ -246,6 +250,16 @@ class Window : public gcn::Window, gcn::WidgetListener
         void setDefaultSize(int defaultX, int defaultY,
                             int defaultWidth, int defaultHeight);
 
+        /**
+         * Set the default win pos and size.
+         * (which can be different of the actual ones.)
+         * This version of setDefaultSize sets the window's position based
+         * on a relative enumerated position, rather than a coordinate position.
+         */
+        void setDefaultSize(int defaultWidth, int defaultHeight,
+                            ImageRect::ImagePosition position,
+                            int offsetx = 0, int offsetY = 0);
+
         /**
          * Reset the win pos and size to default. Don't forget to set defaults
          * first.
diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp
index 71ab2fe3..9bd3ab2f 100644
--- a/src/openglgraphics.cpp
+++ b/src/openglgraphics.cpp
@@ -63,18 +63,17 @@ bool OpenGLGraphics::setVideoMode(int w, int h, int bpp, bool fs, bool hwaccel)
     mFullscreen = fs;
     mHWAccel = hwaccel;
 
-    if (fs) {
+    if (fs)
         displayFlags |= SDL_FULLSCREEN;
-    }
 
     SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
 
-    if (!(mScreen = SDL_SetVideoMode(w, h, bpp, displayFlags))) {
+    if (!(mScreen = SDL_SetVideoMode(w, h, bpp, displayFlags)))
         return false;
-    }
 
 #ifdef __APPLE__
-    if (mSync) {
+    if (mSync)
+    {
         const GLint VBL = 1;
         CGLSetParameter(CGLGetCurrentContext(), kCGLCPSwapInterval, &VBL);
     }
@@ -158,9 +157,7 @@ bool OpenGLGraphics::drawImage(Image *image, int srcX, int srcY,
     glEnd();
 
     if (!useColor)
-    {
         glColor4ub(mColor.r, mColor.g, mColor.b, mColor.a);
-    }
 
     return true;
 }
@@ -206,9 +203,8 @@ SDL_Surface* OpenGLGraphics::getScreenshot()
             w, h, 24,
             0xff0000, 0x00ff00, 0x0000ff, 0x000000);
 
-    if (SDL_MUSTLOCK(screenshot)) {
+    if (SDL_MUSTLOCK(screenshot))
         SDL_LockSurface(screenshot);
-    }
 
     // Grap the pixel buffer and write it to the SDL surface
     glPixelStorei(GL_PACK_ALIGNMENT, 1);
@@ -230,9 +226,8 @@ SDL_Surface* OpenGLGraphics::getScreenshot()
 
     free(buf);
 
-    if (SDL_MUSTLOCK(screenshot)) {
+    if (SDL_MUSTLOCK(screenshot))
         SDL_UnlockSurface(screenshot);
-    }
 
     return screenshot;
 }
@@ -242,7 +237,8 @@ bool OpenGLGraphics::pushClipArea(gcn::Rectangle area)
     int transX = 0;
     int transY = 0;
 
-    if (!mClipStack.empty()) {
+    if (!mClipStack.empty())
+    {
         transX = -mClipStack.top().xOffset;
         transY = -mClipStack.top().yOffset;
     }
@@ -267,9 +263,7 @@ void OpenGLGraphics::popClipArea()
     gcn::Graphics::popClipArea();
 
     if (mClipStack.empty())
-    {
         return;
-    }
 
     glPopMatrix();
     glScissor(mClipStack.top().x,
@@ -325,8 +319,10 @@ void OpenGLGraphics::setTargetPlane(int width, int height)
 
 void OpenGLGraphics::setTexturingAndBlending(bool enable)
 {
-    if (enable) {
-        if (!mTexture) {
+    if (enable)
+    {
+        if (!mTexture)
+        {
             glEnable(Image::mTextureType);
             mTexture = true;
         }
@@ -336,16 +332,22 @@ void OpenGLGraphics::setTexturingAndBlending(bool enable)
             glEnable(GL_BLEND);
             mAlpha = true;
         }
-    } else {
-        if (mAlpha && !mColorAlpha) {
+    }
+    else
+    {
+        if (mAlpha && !mColorAlpha)
+        {
             glDisable(GL_BLEND);
             mAlpha = false;
-        } else if (!mAlpha && mColorAlpha) {
+        }
+        else if (!mAlpha && mColorAlpha)
+        {
             glEnable(GL_BLEND);
             mAlpha = true;
         }
 
-        if (mTexture) {
+        if (mTexture)
+        {
             glDisable(Image::mTextureType);
             mTexture = false;
         }
-- 
cgit v1.2.3-70-g09d2


From 61f4e3b9838ac7a0e06cd066ea07224670f1b851 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Thu, 19 Mar 2009 16:27:51 -0600
Subject: Make sure positionable dialogs start out centered

---
 src/gui/buy.cpp              |  1 +
 src/gui/buysell.cpp          |  6 ++++--
 src/gui/char_select.cpp      |  4 ++--
 src/gui/char_server.cpp      |  2 +-
 src/gui/confirm_dialog.cpp   |  2 +-
 src/gui/connection.cpp       |  2 +-
 src/gui/help.cpp             |  2 +-
 src/gui/itempopup.cpp        |  2 +-
 src/gui/login.cpp            |  2 +-
 src/gui/npc_text.cpp         |  1 +
 src/gui/npcintegerdialog.cpp |  4 ++++
 src/gui/npclistdialog.cpp    |  1 +
 src/gui/npcstringdialog.cpp  |  4 ++++
 src/gui/ok_dialog.cpp        |  2 +-
 src/gui/register.cpp         |  2 +-
 src/gui/sell.cpp             |  1 +
 src/gui/setup.cpp            |  2 +-
 src/gui/skill.cpp            |  2 +-
 src/gui/speechbubble.cpp     |  2 +-
 src/gui/storagewindow.cpp    |  1 +
 src/gui/updatewindow.cpp     |  2 +-
 src/gui/window.cpp           | 20 ++++++++++++++++----
 src/gui/window.h             | 10 ++++++++++
 23 files changed, 57 insertions(+), 20 deletions(-)

(limited to 'src/gui/npc_text.cpp')

diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index 3107c529..7e03c591 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -90,6 +90,7 @@ BuyDialog::BuyDialog(Network *network):
     Layout &layout = getLayout();
     layout.setRowHeight(0, Layout::AUTO_SET);
 
+    center();
     loadWindowState();
 }
 
diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp
index 75c49b1f..e6dc7c1f 100644
--- a/src/gui/buysell.cpp
+++ b/src/gui/buysell.cpp
@@ -49,9 +49,11 @@ BuySellDialog::BuySellDialog(Network *network):
     }
     buyButton->requestFocus();
 
-    loadWindowState();
-
     setContentSize(x, 2 * y + buyButton->getHeight());
+
+    center();
+    setDefaultSize();
+    loadWindowState();
 }
 
 void BuySellDialog::logic()
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 6d5e082a..709988a3 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -127,7 +127,7 @@ CharSelectDialog::CharSelectDialog(Network *network,
 
     reflowLayout(250, 0);
 
-    setLocationRelativeTo(getParent());
+    center();
     setVisible(true);
     mSelectButton->requestFocus();
     updatePlayerInfo();
@@ -306,7 +306,7 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot, Network *network,
 
     reflowLayout(225, 0);
 
-    setLocationRelativeTo(getParent());
+    center();
     setVisible(true);
     mNameField->requestFocus();
 }
diff --git a/src/gui/char_server.cpp b/src/gui/char_server.cpp
index 89bfa93a..22b0e7aa 100644
--- a/src/gui/char_server.cpp
+++ b/src/gui/char_server.cpp
@@ -85,7 +85,7 @@ ServerSelectDialog::ServerSelectDialog(LoginData *loginData, int nextState):
         // Select first server
         mServerList->setSelected(1);
 
-    setLocationRelativeTo(getParent());
+    center();
     setVisible(true);
     mOkButton->requestFocus();
 }
diff --git a/src/gui/confirm_dialog.cpp b/src/gui/confirm_dialog.cpp
index 0d41525a..a40593e3 100644
--- a/src/gui/confirm_dialog.cpp
+++ b/src/gui/confirm_dialog.cpp
@@ -85,7 +85,7 @@ ConfirmDialog::ConfirmDialog(const std::string &title, const std::string &msg,
 
     if (getParent())
     {
-        setLocationRelativeTo(getParent());
+        center();
         getParent()->moveToTop(this);
     }
     setVisible(true);
diff --git a/src/gui/connection.cpp b/src/gui/connection.cpp
index a69698e9..981100f9 100644
--- a/src/gui/connection.cpp
+++ b/src/gui/connection.cpp
@@ -56,7 +56,7 @@ ConnectionDialog::ConnectionDialog():
     add(cancelButton);
     add(mProgressBar);
 
-    setLocationRelativeTo(getParent());
+    center();
     setVisible(true);
 }
 
diff --git a/src/gui/help.cpp b/src/gui/help.cpp
index 30c6a9c4..78b3c93a 100644
--- a/src/gui/help.cpp
+++ b/src/gui/help.cpp
@@ -58,7 +58,7 @@ HelpWindow::HelpWindow():
     Layout &layout = getLayout();
     layout.setRowHeight(0, Layout::AUTO_SET);
 
-    setLocationRelativeTo(getParent());
+    center();
 }
 
 void HelpWindow::action(const gcn::ActionEvent &event)
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index 0e0dd9e6..efbee6b0 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -89,7 +89,7 @@ ItemPopup::ItemPopup():
     add(mItemEffectScroll);
     add(mItemWeightScroll);
 
-    setLocationRelativeTo(getParent());
+    center();
 }
 
 ItemPopup::~ItemPopup()
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index e91f7616..414de40e 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -110,7 +110,7 @@ LoginDialog::LoginDialog(LoginData *loginData):
     place(3, 6, mOkButton);
     reflowLayout(250, 0);
 
-    setLocationRelativeTo(getParent());
+    center();
     setVisible(true);
 
     if (mUserField->getText().empty()) {
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index 53c64a54..5bc654b8 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -61,6 +61,7 @@ NpcTextDialog::NpcTextDialog(Network *network):
     Layout &layout = getLayout();
     layout.setRowHeight(0, Layout::AUTO_SET);
 
+    center();
     loadWindowState();
 }
 
diff --git a/src/gui/npcintegerdialog.cpp b/src/gui/npcintegerdialog.cpp
index c1460f8d..643a7ef8 100644
--- a/src/gui/npcintegerdialog.cpp
+++ b/src/gui/npcintegerdialog.cpp
@@ -61,6 +61,10 @@ NpcIntegerDialog::NpcIntegerDialog(Network *network):
     place(2, 0, cancelButton);
     place(3, 0, okButton);
     reflowLayout(175, 0);
+
+    center();
+    setDefaultSize();
+    loadWindowState();
 }
 
 void NpcIntegerDialog::setRange(int min, int max)
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index 3960cb21..d280a982 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -66,6 +66,7 @@ NpcListDialog::NpcListDialog(Network *network):
     Layout &layout = getLayout();
     layout.setRowHeight(0, Layout::AUTO_SET);
 
+    center();
     loadWindowState();
 }
 
diff --git a/src/gui/npcstringdialog.cpp b/src/gui/npcstringdialog.cpp
index 4d170208..7ae2d5ed 100644
--- a/src/gui/npcstringdialog.cpp
+++ b/src/gui/npcstringdialog.cpp
@@ -47,6 +47,10 @@ NpcStringDialog::NpcStringDialog(Network *network):
     place(1, 1, cancelButton);
     place(2, 1, okButton);
     reflowLayout(175, 0);
+
+    center();
+    setDefaultSize();
+    loadWindowState();
 }
 
 std::string NpcStringDialog::getValue()
diff --git a/src/gui/ok_dialog.cpp b/src/gui/ok_dialog.cpp
index 4f4f1117..f1a97b49 100644
--- a/src/gui/ok_dialog.cpp
+++ b/src/gui/ok_dialog.cpp
@@ -74,7 +74,7 @@ OkDialog::OkDialog(const std::string &title, const std::string &msg,
     add(mTextArea);
     add(okButton);
 
-    setLocationRelativeTo(getParent());
+    center();
     setVisible(true);
     okButton->requestFocus();
 }
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index c2190501..25c97713 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -130,7 +130,7 @@ RegisterDialog::RegisterDialog(LoginData *loginData):
     mServerField->addActionListener(this);
     mPortField->addActionListener(this);
 
-    setLocationRelativeTo(getParent());
+    center();
     setVisible(true);
     mUserField->requestFocus();
     mUserField->setCaretPosition(mUserField->getText().length());
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index 4cdabe68..e1b15bac 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -93,6 +93,7 @@ SellDialog::SellDialog(Network *network):
     Layout &layout = getLayout();
     layout.setRowHeight(0, Layout::AUTO_SET);
 
+    center();
     loadWindowState();
 }
 
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 68bc3a4b..872596b0 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -101,7 +101,7 @@ Setup::Setup():
 
     add(panel);
 
-    setLocationRelativeTo(getParent());
+    center();
 
     setInGame(false);
 }
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 6112f0e3..ed374a31 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -157,7 +157,7 @@ SkillDialog::SkillDialog():
     Layout &layout = getLayout();
     layout.setRowHeight(0, Layout::AUTO_SET);
 
-    setLocationRelativeTo(getParent());
+    center();
     loadWindowState();
 }
 
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index 5f05971d..fb0d7684 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -58,7 +58,7 @@ SpeechBubble::SpeechBubble():
     add(mCaption);
     add(mSpeechArea);
 
-    setLocationRelativeTo(getParent());
+    center();
 }
 
 void SpeechBubble::setCaption(const std::string &name, const gcn::Color *color)
diff --git a/src/gui/storagewindow.cpp b/src/gui/storagewindow.cpp
index 5981f121..663ad784 100644
--- a/src/gui/storagewindow.cpp
+++ b/src/gui/storagewindow.cpp
@@ -92,6 +92,7 @@ StorageWindow::StorageWindow(Network *network, int invSize):
     Layout &layout = getLayout();
     layout.setRowHeight(0, mStoreButton->getHeight());
 
+    center();
     loadWindowState();
 }
 
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 6ec62337..df0a1f80 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -131,7 +131,7 @@ UpdaterWindow::UpdaterWindow(const std::string &updateHost,
     Layout &layout = getLayout();
     layout.setRowHeight(0, Layout::AUTO_SET);
 
-    setLocationRelativeTo(getParent());
+    center();
     setVisible(true);
     mCancelButton->requestFocus();
 
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 4bc0e4d0..d4665427 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -67,10 +67,9 @@ Window::Window(const std::string& caption, bool modal, Window *parent, const std
     mModal(modal),
     mCloseButton(false),
     mSticky(false),
-    mMinWinWidth(100),
-    mMinWinHeight(40),
-    mMaxWinWidth(INT_MAX),
-    mMaxWinHeight(INT_MAX),
+    mMinWinWidth(100), mDefaultWidth(100), mMaxWinWidth(INT_MAX),
+    mMinWinHeight(40), mDefaultHeight(40), mMaxWinHeight(INT_MAX),
+    mDefaultX(100), mDefaultY(100),
     mSkin(skin)
 {
     logger->log("Window::Window(\"%s\")", caption.c_str());
@@ -492,6 +491,14 @@ void Window::setDefaultSize(int defaultX, int defaultY,
     mDefaultHeight = defaultHeight;
 }
 
+void Window::setDefaultSize()
+{
+    mDefaultX = getX();
+    mDefaultY = getY();
+    mDefaultWidth = getWidth();
+    mDefaultHeight = getHeight();
+}
+
 void Window::resetToDefaultSize(bool changePosition)
 {
     if (changePosition) setPosition(mDefaultX, mDefaultY);
@@ -733,3 +740,8 @@ void Window::reflowLayout(int w, int h)
     mLayout = NULL;
     setContentSize(w, h);
 }
+
+void Window::center()
+{
+    setLocationRelativeTo(getParent());
+}
diff --git a/src/gui/window.h b/src/gui/window.h
index 9977aff4..95fe2174 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -239,6 +239,11 @@ class Window : public gcn::Window, gcn::WidgetListener
         void setDefaultSize(int defaultX, int defaultY,
                             int defaultWidth, int defaultHeight);
 
+        /**
+         * Set the default win pos and size tot he current ones.
+         */
+        void setDefaultSize();
+
         /**
          * Reset the win pos and size to default. Don't forget to set defaults
          * first.
@@ -275,6 +280,11 @@ class Window : public gcn::Window, gcn::WidgetListener
          */
         ContainerPlacer getPlacer(int x, int y);
 
+        /**
+         * Positions the window in the center of it's parent.
+         */
+        void center();
+
     protected:
         /** The window container windows add themselves to. */
         static WindowContainer *windowContainer;
-- 
cgit v1.2.3-70-g09d2