From c3f7f72f37adad5103587069ff549798fc9d652d Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Wed, 18 Feb 2009 20:14:23 +0100
Subject: Introduced a toLower method and grouped string utils

The string utility methods are now grouped together in the stringutils.h
header. Also, a toLower method was added for convenience.
---
 src/net/charserverhandler.cpp | 4 ++--
 src/net/chathandler.cpp       | 3 +--
 src/net/inventoryhandler.cpp  | 2 +-
 src/net/loginhandler.cpp      | 4 ++--
 src/net/network.cpp           | 4 ++--
 src/net/playerhandler.cpp     | 2 +-
 6 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'src/net')

diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp
index 5bf45bb4..95555300 100644
--- a/src/net/charserverhandler.cpp
+++ b/src/net/charserverhandler.cpp
@@ -34,7 +34,7 @@
 #include "../gui/ok_dialog.h"
 
 #include "../utils/gettext.h"
-#include "../utils/tostring.h"
+#include "../utils/stringutils.h"
 
 CharServerHandler::CharServerHandler():
     mCharCreateDialog(0)
@@ -166,7 +166,7 @@ void CharServerHandler::handleMessage(MessageIn *msg)
             slot = mCharInfo->getPos();
             msg->skip(4); // CharID, must be the same as player_node->charID
             map_path = msg->readString(16);
-            mLoginData->hostname = iptostring(msg->readInt32());
+            mLoginData->hostname = ipToString(msg->readInt32());
             mLoginData->port = msg->readInt16();
             mCharInfo->unlock();
             mCharInfo->select(0);
diff --git a/src/net/chathandler.cpp b/src/net/chathandler.cpp
index 14566b39..6717f515 100644
--- a/src/net/chathandler.cpp
+++ b/src/net/chathandler.cpp
@@ -35,8 +35,7 @@
 #include "../gui/chat.h"
 
 #include "../utils/gettext.h"
-#include "../utils/tostring.h"
-#include "../utils/trim.h"
+#include "../utils/stringutils.h"
 
 extern Being *player_node;
 
diff --git a/src/net/inventoryhandler.cpp b/src/net/inventoryhandler.cpp
index ac5f94d3..8ea0071d 100644
--- a/src/net/inventoryhandler.cpp
+++ b/src/net/inventoryhandler.cpp
@@ -38,7 +38,7 @@
 
 #include "../utils/gettext.h"
 #include "../utils/strprintf.h"
-#include "../utils/tostring.h"
+#include "../utils/stringutils.h"
 
 InventoryHandler::InventoryHandler()
 {
diff --git a/src/net/loginhandler.cpp b/src/net/loginhandler.cpp
index e173252f..cf45dbd4 100644
--- a/src/net/loginhandler.cpp
+++ b/src/net/loginhandler.cpp
@@ -31,7 +31,7 @@
 
 #include "../utils/gettext.h"
 #include "../utils/strprintf.h"
-#include "../utils/tostring.h"
+#include "../utils/stringutils.h"
 
 extern SERVER_INFO **server_info;
 
@@ -111,7 +111,7 @@ void LoginHandler::handleMessage(MessageIn *msg)
 
                 logger->log("Network: Server: %s (%s:%d)",
                         server_info[i]->name.c_str(),
-                        iptostring(server_info[i]->address),
+                        ipToString(server_info[i]->address),
                         server_info[i]->port);
             }
             state = CHAR_SERVER_STATE;
diff --git a/src/net/network.cpp b/src/net/network.cpp
index 02d8bf4f..0126ad6d 100644
--- a/src/net/network.cpp
+++ b/src/net/network.cpp
@@ -27,7 +27,7 @@
 #include "network.h"
 
 #include "../log.h"
-#include "../utils/tostring.h"
+#include "../utils/stringutils.h"
 
 /** Warning: buffers and other variables are shared,
     so there can be only one connection active at a time */
@@ -327,7 +327,7 @@ bool Network::realConnect()
     }
 
     logger->log("Network::Started session with %s:%i",
-                iptostring(ipAddress.host), ipAddress.port);
+                ipToString(ipAddress.host), ipAddress.port);
 
     mState = CONNECTED;
 
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index 9c34cec6..bce53ae9 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -39,7 +39,7 @@
 #include "../gui/skill.h"
 #include "../gui/viewport.h"
 
-#include "../utils/tostring.h"
+#include "../utils/stringutils.h"
 #include "../utils/gettext.h"
 
 // TODO Move somewhere else
-- 
cgit v1.2.3-70-g09d2


From b2eb8daa8c39bcfd5fbd3a76dbbc432b43c561a9 Mon Sep 17 00:00:00 2001
From: Majin Sniper <majinsniper@gmx.de>
Date: Fri, 20 Feb 2009 00:19:52 +0100
Subject: Added a pickup notification as particle effect. Also make a ui option
 to enable/disable this effect (default is off) and another option to disable
 the pickup notification in the chat log (default is on).

---
 src/gui/gui.cpp              |  1 +
 src/gui/gui.h                |  8 ++++++++
 src/gui/setup_video.cpp      | 41 +++++++++++++++++++++++++++++++++++------
 src/gui/setup_video.h        |  6 ++++++
 src/gui/truetypefont.cpp     |  3 ++-
 src/gui/truetypefont.h       |  2 +-
 src/localplayer.cpp          | 12 ++++++++++++
 src/localplayer.h            |  5 +++++
 src/net/inventoryhandler.cpp | 15 ++++++++++++---
 src/particle.cpp             | 11 +++++++----
 src/particle.h               |  8 +++++---
 src/textparticle.cpp         | 23 +++++++++++++++++++++--
 src/textparticle.h           |  4 +++-
 13 files changed, 118 insertions(+), 21 deletions(-)

(limited to 'src/net')

diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 4b5c375d..ed85fa8f 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -113,6 +113,7 @@ Gui::Gui(Graphics *graphics):
     {
         const int fontSize = (int)config.getValue("fontSize", 11);
         mGuiFont = new TrueTypeFont(path, fontSize);
+        mInfoParicleFont = new TrueTypeFont(path, fontSize, 1);
     }
     catch (gcn::Exception e)
     {
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 0c6529bd..e19a0a87 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -77,6 +77,13 @@ class Gui : public gcn::Gui
         gcn::Font* getFont() const
         { return mGuiFont; }
 
+        /**
+         * Return the Font used for "Info Particles", i.e. ones showing, what
+         * you picked up, etc.
+         */
+        gcn::Font* getInfoParticleFont() const
+        { return mInfoParicleFont; }
+
         /**
          * Sets whether a custom cursor should be rendered.
          */
@@ -108,6 +115,7 @@ class Gui : public gcn::Gui
     private:
         GuiConfigListener *mConfigListener;
         gcn::Font *mGuiFont;                  /**< The global GUI font */
+        gcn::Font *mInfoParicleFont;          /**< Font for Info Paricles*/
         bool mCustomCursor;                   /**< Show custom cursor */
         ImageSet *mMouseCursors;              /**< Mouse cursor images */
         float mMouseCursorAlpha;
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 8b21582e..35c58ecd 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -110,6 +110,8 @@ Setup_Video::Setup_Video():
     mCustomCursorEnabled(config.getValue("customcursor", true)),
     mParticleEffectsEnabled(config.getValue("particleeffects", true)),
     mNameEnabled(config.getValue("showownname", false)),
+    mPickupChatEnabled(config.getValue("showpickupchat", true)),
+    mPickupParticleEnabled(config.getValue("showpickupparticle", false)),
     mOpacity(config.getValue("guialpha", 0.8)),
     mFps((int) config.getValue("fpslimit", 0)),
     mSpeechMode((int) config.getValue("speech", 3)),
@@ -137,7 +139,11 @@ Setup_Video::Setup_Video():
     mOverlayDetailField(new gcn::Label("")),
     mParticleDetail(3 - (int) config.getValue("particleEmitterSkip", 1)),
     mParticleDetailSlider(new Slider(0, 3)),
-    mParticleDetailField(new gcn::Label(""))
+    mParticleDetailField(new gcn::Label("")),
+    mPickupNotifyLabel(new gcn::Label(_("Show pickup notification"))),
+    mPickupChatCheckBox(new CheckBox(_("in chat"), mPickupChatEnabled)),
+    mPickupParticleCheckBox(new CheckBox(_("as particle"),
+                           mPickupParticleEnabled))
 {
     setOpaque(false);
 
@@ -170,6 +176,8 @@ Setup_Video::Setup_Video():
     mModeList->setActionEventId("videomode");
     mCustomCursorCheckBox->setActionEventId("customcursor");
     mParticleEffectsCheckBox->setActionEventId("particleeffects");
+    mPickupChatCheckBox->setActionEventId("pickupchat");
+    mPickupParticleCheckBox->setActionEventId("pickupparticle");
     mNameCheckBox->setActionEventId("showownname");
     mAlphaSlider->setActionEventId("guialpha");
     mFpsCheckBox->setActionEventId("fpslimitcheckbox");
@@ -187,6 +195,8 @@ Setup_Video::Setup_Video():
     mModeList->addActionListener(this);
     mCustomCursorCheckBox->addActionListener(this);
     mParticleEffectsCheckBox->addActionListener(this);
+    mPickupChatCheckBox->addActionListener(this);
+    mPickupParticleCheckBox->addActionListener(this);
     mNameCheckBox->addActionListener(this);
     mAlphaSlider->addActionListener(this);
     mFpsCheckBox->addActionListener(this);
@@ -261,11 +271,14 @@ Setup_Video::Setup_Video():
     ContainerPlacer place = h.getPlacer(0, 0);
 
     place(0, 0, scrollArea, 1, 6).setPadding(2);
-    place(1, 0, mFsCheckBox, 3);
-    place(1, 1, mOpenGLCheckBox, 3);
-    place(1, 2, mCustomCursorCheckBox, 3);
-    place(1, 3, mNameCheckBox, 3);
-    place(1, 4, mParticleEffectsCheckBox, 3);
+    place(1, 0, mFsCheckBox, 2);
+    place(3, 0, mOpenGLCheckBox, 1);
+    place(1, 1, mCustomCursorCheckBox, 3);
+    place(1, 2, mNameCheckBox, 3);
+    place(1, 3, mParticleEffectsCheckBox, 3);
+    place(1, 4, mPickupNotifyLabel, 3);
+    place(1, 5, mPickupChatCheckBox, 1);
+    place(2, 5, mPickupParticleCheckBox, 2);
 
     place(0, 6, mAlphaSlider);
     place(0, 7, mFpsSlider);
@@ -355,6 +368,8 @@ void Setup_Video::apply()
     mOpacity = config.getValue("guialpha", 0.8);
     mOverlayDetail = (int) config.getValue("OverlayDetail", 2);
     mOpenGLEnabled = config.getValue("opengl", false);
+    mPickupChatEnabled = config.getValue("showpickupchat", true);
+    mPickupParticleEnabled = config.getValue("showpickupparticle", false);
 }
 
 int Setup_Video::updateSlider(gcn::Slider *slider, gcn::TextField *field,
@@ -401,6 +416,9 @@ void Setup_Video::cancel()
     config.setValue("showownname", mNameEnabled ? true : false);
     config.setValue("guialpha", mOpacity);
     config.setValue("opengl", mOpenGLEnabled ? true : false);
+    config.setValue("showpickupchat", mPickupChatEnabled ? true : false);
+    config.setValue("showpickupparticle", mPickupParticleEnabled ?
+                    true : false);
 }
 
 void Setup_Video::action(const gcn::ActionEvent &event)
@@ -434,6 +452,17 @@ void Setup_Video::action(const gcn::ActionEvent &event)
         new OkDialog(_("Particle effect settings changed"),
                      _("Restart your client or change maps for the change to take effect."));
     }
+    else if (event.getId() == "pickupchat")
+    {
+        config.setValue("showpickupchat", mPickupChatCheckBox->isSelected()
+                        ? true : false);
+    }
+    else if (event.getId() == "pickupparticle")
+    {
+        config.setValue("showpickupparticle",
+                        mPickupParticleCheckBox->isSelected()
+                        ? true : false);
+    }
     else if (event.getId() == "speech")
     {
         int val = (int) mSpeechSlider->getValue();
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index 525e8941..b491cf23 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -53,6 +53,8 @@ class Setup_Video : public SetupTab, public gcn::ActionListener,
         bool mCustomCursorEnabled;
         bool mParticleEffectsEnabled;
         bool mNameEnabled;
+        bool mPickupChatEnabled;
+        bool mPickupParticleEnabled;
         double mOpacity;
         int mFps;
         int mSpeechMode;
@@ -95,6 +97,10 @@ class Setup_Video : public SetupTab, public gcn::ActionListener,
         int mParticleDetail;
         gcn::Slider *mParticleDetailSlider;
         gcn::Label *mParticleDetailField;
+
+        gcn::Label *mPickupNotifyLabel;
+        gcn::CheckBox *mPickupChatCheckBox;
+        gcn::CheckBox *mPickupParticleCheckBox;
 };
 
 #endif
diff --git a/src/gui/truetypefont.cpp b/src/gui/truetypefont.cpp
index 24c60caf..e50fb457 100644
--- a/src/gui/truetypefont.cpp
+++ b/src/gui/truetypefont.cpp
@@ -78,7 +78,7 @@ typedef std::list<TextChunk>::iterator CacheIterator;
 
 static int fontCounter;
 
-TrueTypeFont::TrueTypeFont(const std::string& filename, int size)
+TrueTypeFont::TrueTypeFont(const std::string &filename, int size, int style)
 {
     if (fontCounter == 0 && TTF_Init() == -1)
     {
@@ -88,6 +88,7 @@ TrueTypeFont::TrueTypeFont(const std::string& filename, int size)
 
     ++fontCounter;
     mFont = TTF_OpenFont(filename.c_str(), size);
+    TTF_SetFontStyle (mFont, style);
 
     if (!mFont)
     {
diff --git a/src/gui/truetypefont.h b/src/gui/truetypefont.h
index 35e8270f..085aa226 100644
--- a/src/gui/truetypefont.h
+++ b/src/gui/truetypefont.h
@@ -49,7 +49,7 @@ class TrueTypeFont : public gcn::Font
          * @param filename  Font filename.
          * @param size      Font size.
          */
-        TrueTypeFont(const std::string& filename, int size);
+        TrueTypeFont(const std::string &filename, int size, int style = 0);
 
         /**
          * Destructor.
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 608c25b8..cbc2ec7a 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -589,6 +589,18 @@ void LocalPlayer::setXp(int xp)
     mXp = xp;
 }
 
+void LocalPlayer::pickedUp(std::string item)
+{
+    if (mMap)
+    {
+        // Show pickup notification
+        particleEngine->addTextRiseFadeOutEffect(item,
+                                                 gui->getInfoParticleFont (),
+                                                 mPx + 16, mPy - 16,
+                                                 40, 220, 40, true);
+    }
+}
+
 bool LocalPlayer::withinAttackRange(Being *target)
 {
     int dist_x = abs(target->mX - mX);
diff --git a/src/localplayer.h b/src/localplayer.h
index b368d7c1..0ae99bb0 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -202,6 +202,11 @@ class LocalPlayer : public Player
          */
         void setXp(int xp);
 
+        /**
+         * Shows item pickup effect if the player is on a map.
+         */
+        void pickedUp(std::string item);
+
         /**
          * Returns the amount of experience points.
          */
diff --git a/src/net/inventoryhandler.cpp b/src/net/inventoryhandler.cpp
index 8ea0071d..be128609 100644
--- a/src/net/inventoryhandler.cpp
+++ b/src/net/inventoryhandler.cpp
@@ -26,6 +26,7 @@
 #include "messagein.h"
 #include "protocol.h"
 
+#include "../configuration.h"
 #include "../inventory.h"
 #include "../item.h"
 #include "../itemshortcut.h"
@@ -142,13 +143,21 @@ void InventoryHandler::handleMessage(MessageIn *msg)
             itemType = msg->readInt8();
 
             if (msg->readInt8() > 0) {
-                chatWindow->chatLog(_("Unable to pick up item"), BY_SERVER);
+                if (config.getValue("showpickupchat", true)) {
+                    chatWindow->chatLog(_("Unable to pick up item"), BY_SERVER);
+                }
             } else {
                 const ItemInfo &itemInfo = ItemDB::get(itemId);
                 const std::string amountStr =
                     (amount > 1) ? toString(amount) : "a";
-                chatWindow->chatLog(strprintf(_("You picked up %s %s"),
-                        amountStr.c_str(), itemInfo.getName().c_str()), BY_SERVER);
+                if (config.getValue("showpickupchat", true)) {
+                    chatWindow->chatLog(strprintf(_("You picked up %s %s"),
+                        amountStr.c_str(), itemInfo.getName().c_str()),
+                        BY_SERVER);
+                }
+                if (config.getValue("showpickupparticle", false)) {
+                    player_node->pickedUp(itemInfo.getName());
+                }
 
                 if (Item *item = inventory->getItem(index)) {
                     item->setId(itemId);
diff --git a/src/particle.cpp b/src/particle.cpp
index 9510573f..8bc764ba 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -327,10 +327,10 @@ Particle* Particle::addEffect(const std::string &particleEffectFile,
 
 Particle *Particle::addTextSplashEffect(const std::string &text,
                                         int colorR, int colorG, int colorB,
-                                        gcn::Font *font, int x, int y)
+                                        gcn::Font *font, int x, int y, bool outline)
 {
     Particle *newParticle = new TextParticle(mMap, text, colorR, colorG, colorB,
-                                             font);
+                                             font, outline);
     newParticle->moveTo(x, y);
     newParticle->setVelocity(((rand() % 100) - 50) / 200.0f,    // X
                              ((rand() % 100) - 50) / 200.0f,    // Y
@@ -347,9 +347,12 @@ Particle *Particle::addTextSplashEffect(const std::string &text,
 
 Particle *Particle::addTextRiseFadeOutEffect(const std::string &text,
                                              gcn::Font *font,
-                                             int x, int y)
+                                             int x, int y,
+                                             int colorR, int colorG,
+                                             int colorB, bool outline)
 {
-    Particle *newParticle = new TextParticle(mMap, text, 255, 255, 255, font);
+    Particle *newParticle = new TextParticle(mMap, text, colorR, colorG, colorB,
+                                             font, outline);
     newParticle->moveTo(x, y);
     newParticle->setVelocity(0.0f, 0.0f, 0.5f);
     newParticle->setGravity(0.0015f);
diff --git a/src/particle.h b/src/particle.h
index 9c01bcdf..f03f081d 100644
--- a/src/particle.h
+++ b/src/particle.h
@@ -108,15 +108,17 @@ class Particle : public Sprite
          */
         Particle *addTextSplashEffect(const std::string &text,
                                       int colorR, int colorG, int colorB,
-                                      gcn::Font *font, int x, int y);
+                                      gcn::Font *font, int x, int y,
+                                      bool outline = false);
 
         /**
          * Creates a standalone text particle.
          */
         Particle *addTextRiseFadeOutEffect(const std::string &text,
                                            gcn::Font *font,
-                                           int x, int y);
-
+                                           int x, int y, int colorR = 255,
+                                           int colorG = 255, int colorB = 255,
+                                           bool outline = false);
         /**
          * Adds an emitter to the particle.
          */
diff --git a/src/textparticle.cpp b/src/textparticle.cpp
index 3283f9fd..8a8948f4 100644
--- a/src/textparticle.cpp
+++ b/src/textparticle.cpp
@@ -24,16 +24,18 @@
 
 #include "graphics.h"
 #include "textparticle.h"
+#include <SDL/SDL_ttf.h>
 
 TextParticle::TextParticle(Map *map, const std::string &text,
                            int colorR, int colorG, int colorB,
-                           gcn::Font *font):
+                           gcn::Font *font, bool outline):
     Particle(map),
     mText(text),
     mTextFont(font),
     mColorR(colorR),
     mColorG(colorG),
-    mColorB(colorB)
+    mColorB(colorB),
+    mOutline(outline)
 {
 }
 
@@ -60,6 +62,23 @@ void TextParticle::draw(Graphics *graphics, int offsetX, int offsetY) const
     }
 
     graphics->setFont(mTextFont);
+    if (mOutline)
+    {
+        graphics->setColor(gcn::Color(0, 0, 0, (int)(alpha/4)));
+        // Text outline
+        graphics->setColor(gcn::Color(0, 0, 0, (int)alpha));
+        graphics->drawText(mText, screenX + 1, screenY,
+                gcn::Graphics::CENTER);
+
+        graphics->drawText(mText, screenX - 1, screenY,
+                gcn::Graphics::CENTER);
+
+        graphics->drawText(mText, screenX, screenY + 1,
+                gcn::Graphics::CENTER);
+
+        graphics->drawText(mText, screenX, screenY - 1,
+                gcn::Graphics::CENTER);
+    }
     graphics->setColor(gcn::Color(mColorR, mColorG, mColorB, (int)alpha));
     graphics->drawText(mText, screenX, screenY, gcn::Graphics::CENTER);
 }
diff --git a/src/textparticle.h b/src/textparticle.h
index d847eb00..26b92a50 100644
--- a/src/textparticle.h
+++ b/src/textparticle.h
@@ -34,7 +34,7 @@ class TextParticle : public Particle
          */
         TextParticle(Map *map, const std::string &text,
                      int colorR, int colorG, int colorB,
-                     gcn::Font *font);
+                     gcn::Font *font, bool outline = false);
 
         /**
          * Draws the particle image.
@@ -49,6 +49,8 @@ class TextParticle : public Particle
         std::string mText;             /**< Text of the particle. */
         gcn::Font *mTextFont;          /**< Font used for drawing the text. */
         int mColorR, mColorG, mColorB; /**< Color used for drawing the text. */
+        bool mOutline;                 /**< Make the text readable - draw it the way
+	                                    a Text is usually drawn: with outline */
 };
 
 #endif
-- 
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/net')

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 d8bc3a6418c5027d7f6c42ce8f8dceca8dee8971 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 25 Feb 2009 00:50:33 -0700
Subject: Fixed up NPC list dialogs to be navigatable by keyboard (scrolling
 through the list requires the use of the mouse wheel at the moment), fixed
 wrapping behavior for wrapping around lists to actually wrap around lists
 properly, and placed a few checks for current_npc where they were assumed
 before which could cause the client to hang or crash in case the NPC is no
 longer around.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/game.cpp                 |  2 +-
 src/gui/listbox.cpp          | 85 ++++++++++++++++++++++++++++++++++++++++++++
 src/gui/listbox.h            | 19 ++++++++++
 src/gui/npcintegerdialog.cpp | 11 +++---
 src/gui/npclistdialog.cpp    | 16 +++++++--
 src/gui/npclistdialog.h      |  5 +++
 src/gui/npcstringdialog.cpp  |  5 ++-
 src/gui/table.cpp            |  6 +---
 src/net/npchandler.cpp       |  2 +-
 9 files changed, 136 insertions(+), 15 deletions(-)

(limited to 'src/net')

diff --git a/src/game.cpp b/src/game.cpp
index e5f7b22b..16790cac 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -490,7 +490,7 @@ void Game::handleInput()
             gcn::Window *requestedWindow = NULL;
 
             if (setupWindow->isVisible() &&
-                    keyboard.getNewKeyIndex() > keyboard.KEY_NO_VALUE)
+                keyboard.getNewKeyIndex() > keyboard.KEY_NO_VALUE)
             {
                 keyboard.setNewKey((int) event.key.keysym.sym);
                 keyboard.callbackNewKey();
diff --git a/src/gui/listbox.cpp b/src/gui/listbox.cpp
index f16857ce..8ae68e09 100644
--- a/src/gui/listbox.cpp
+++ b/src/gui/listbox.cpp
@@ -22,6 +22,7 @@
 
 #include <guichan/font.hpp>
 #include <guichan/graphics.hpp>
+#include <guichan/key.hpp>
 #include <guichan/listmodel.hpp>
 
 #include "color.h"
@@ -69,6 +70,90 @@ void ListBox::draw(gcn::Graphics *graphics)
     }
 }
 
+void ListBox::setSelected(int selected)
+{
+    if (!mListModel)
+    {
+        mSelected = -1;
+    }
+    else
+    {
+        if (selected < 0 && !mWrappingEnabled)
+        {
+            mSelected = -1;
+        }
+        else if (selected >= mListModel->getNumberOfElements() &&
+                 mWrappingEnabled)
+        {
+            mSelected = 0;
+        }
+        else if ((selected >= mListModel->getNumberOfElements() &&
+                 !mWrappingEnabled) || (selected < 0 && mWrappingEnabled))
+        {
+            mSelected = mListModel->getNumberOfElements() - 1;
+        }
+        else
+        {
+            mSelected = selected;
+        }
+    }
+}
+
+// -- KeyListener notifications
+void ListBox::keyPressed(gcn::KeyEvent& keyEvent)
+{
+    gcn::Key key = keyEvent.getKey();
+
+    if (key.getValue() == gcn::Key::ENTER || key.getValue() == gcn::Key::SPACE)
+    {
+        distributeActionEvent();
+        keyEvent.consume();
+    }
+    else if (key.getValue() == gcn::Key::UP)
+    {
+        setSelected(mSelected - 1);      
+        keyEvent.consume();
+    }
+    else if (key.getValue() == gcn::Key::DOWN)
+    {
+        setSelected(mSelected + 1);
+        keyEvent.consume();
+    }
+    else if (key.getValue() == gcn::Key::HOME)
+    {
+        setSelected(0);
+        keyEvent.consume();
+    }
+    else if (key.getValue() == gcn::Key::END)
+    {
+        setSelected(getListModel()->getNumberOfElements() - 1);
+        keyEvent.consume();
+    }
+}
+
+void ListBox::mouseWheelMovedUp(gcn::MouseEvent& mouseEvent)
+{
+    if (isFocused())
+    {
+        if (getSelected() > 0 || (getSelected() == 0 && mWrappingEnabled))
+        {
+            setSelected(getSelected() - 1);
+        }
+
+        mouseEvent.consume();
+    }
+}
+
+void ListBox::mouseWheelMovedDown(gcn::MouseEvent& mouseEvent)
+{
+    if (isFocused())
+    {
+        setSelected(getSelected() + 1);
+
+        mouseEvent.consume();
+    }
+}
+
 void ListBox::mouseDragged(gcn::MouseEvent &event)
 {
     // Pretend mouse is pressed continuously while dragged. Causes list
diff --git a/src/gui/listbox.h b/src/gui/listbox.h
index e783083f..a6392a94 100644
--- a/src/gui/listbox.h
+++ b/src/gui/listbox.h
@@ -49,6 +49,25 @@ class ListBox : public gcn::ListBox
 
         void mouseDragged(gcn::MouseEvent &event);
 
+        // Inherited from KeyListener
+
+        virtual void keyPressed(gcn::KeyEvent& keyEvent);
+
+        // Inherited from MouseListener
+
+        virtual void mouseWheelMovedUp(gcn::MouseEvent& mouseEvent);
+
+        virtual void mouseWheelMovedDown(gcn::MouseEvent& mouseEvent);
+
+         /**
+         * Sets the selected item. The selected item is represented by
+         * an index from the list model.
+         *
+         * @param selected the selected item as an index from the list model.
+         * @see getSelected
+         */
+        void setSelected(int selected);
+
     private:
         static float mAlpha;
 };
diff --git a/src/gui/npcintegerdialog.cpp b/src/gui/npcintegerdialog.cpp
index ea3398c9..d0a7c7be 100644
--- a/src/gui/npcintegerdialog.cpp
+++ b/src/gui/npcintegerdialog.cpp
@@ -72,15 +72,15 @@ int NpcIntegerDialog::getValue()
 
 void NpcIntegerDialog::action(const gcn::ActionEvent &event)
 {
-    int finish = 0;
+    bool finish = false;
 
     if (event.getId() == "ok")
     {
-        finish = 1;
+        finish = true;
     }
     else if (event.getId() == "cancel")
     {
-        finish = 1;
+        finish = true;
         mValueField->reset();
     }
     else if (event.getId() == "decvalue")
@@ -99,7 +99,10 @@ void NpcIntegerDialog::action(const gcn::ActionEvent &event)
     if (finish)
     {
         setVisible(false);
-        current_npc->integerInput(mValueField->getValue());
+
+        if (current_npc)
+            current_npc->integerInput(mValueField->getValue());
+
         current_npc = NULL;
         mValueField->reset();
     }
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index 81c33049..f3bb949a 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -45,7 +45,9 @@ NpcListDialog::NpcListDialog():
 
     mItemList = new ListBox(this);
     mItemList->setWrappingEnabled(true);
+
     scrollArea = new ScrollArea(mItemList);
+
     okButton = new Button(_("OK"), "ok", this);
     cancelButton = new Button(_("Cancel"), "cancel", this);
 
@@ -95,10 +97,9 @@ void NpcListDialog::action(const gcn::ActionEvent &event)
     {
         // Send the selected index back to the server
         int selectedIndex = mItemList->getSelected();
+
         if (selectedIndex > -1)
-        {
             choice = selectedIndex + 1;
-        }
     }
     else if (event.getId() == "cancel")
     {
@@ -109,7 +110,16 @@ void NpcListDialog::action(const gcn::ActionEvent &event)
     {
         setVisible(false);
         reset();
-        current_npc->dialogChoice(choice);
+
+        if (current_npc)
+            current_npc->dialogChoice(choice);
+
         current_npc = NULL;
     }
 }
+
+void NpcListDialog::requestFocus()
+{
+    mItemList->requestFocus();
+    mItemList->setSelected(0);
+}
diff --git a/src/gui/npclistdialog.h b/src/gui/npclistdialog.h
index a30bec28..de3a7a77 100644
--- a/src/gui/npclistdialog.h
+++ b/src/gui/npclistdialog.h
@@ -73,6 +73,11 @@ class NpcListDialog : public Window, public gcn::ActionListener,
          */
         void reset();
 
+        /**
+         * Requests the listbox to take focus for input.
+         */
+        void requestFocus();
+
     private:
         gcn::ListBox *mItemList;
         gcn::ScrollArea *scrollArea;
diff --git a/src/gui/npcstringdialog.cpp b/src/gui/npcstringdialog.cpp
index ef2de73a..140ca40f 100644
--- a/src/gui/npcstringdialog.cpp
+++ b/src/gui/npcstringdialog.cpp
@@ -64,7 +64,10 @@ void NpcStringDialog::action(const gcn::ActionEvent &event)
     }
 
     setVisible(false);
-    current_npc->stringInput(mValueField->getText());
+
+    if (current_npc)
+        current_npc->stringInput(mValueField->getText());
+
     current_npc = NULL;
     mValueField->setText("");
 }
diff --git a/src/gui/table.cpp b/src/gui/table.cpp
index 8acbc4f4..29a33b7a 100644
--- a/src/gui/table.cpp
+++ b/src/gui/table.cpp
@@ -402,25 +402,21 @@ void GuiTable::keyPressed(gcn::KeyEvent& keyEvent)
     else if (key.getValue() == gcn::Key::UP)
     {
         setSelectedRow(mSelectedRow - 1);
-            
         keyEvent.consume();
     }
     else if (key.getValue() == gcn::Key::DOWN)
     {
         setSelectedRow(mSelectedRow + 1);
-            
         keyEvent.consume();
     }
     else if (key.getValue() == gcn::Key::LEFT)
     {
         setSelectedColumn(mSelectedColumn - 1);
-            
         keyEvent.consume();
     }
     else if (key.getValue() == gcn::Key::RIGHT)
     {
         setSelectedColumn(mSelectedColumn + 1);
-            
         keyEvent.consume();
     }
     else if (key.getValue() == gcn::Key::HOME)
@@ -460,7 +456,7 @@ void GuiTable::mouseWheelMovedUp(gcn::MouseEvent& mouseEvent)
 {
     if (isFocused())
     {
-        if (getSelectedRow() >= 0 )
+        if (getSelectedRow() > 0 || (getSelectedRow() == 0 && mWrappingEnabled))
         {
             setSelectedRow(getSelectedRow() - 1);
         }
diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp
index 94e145b4..26250d9e 100644
--- a/src/net/npchandler.cpp
+++ b/src/net/npchandler.cpp
@@ -60,6 +60,7 @@ void NPCHandler::handleMessage(MessageIn *msg)
             current_npc = dynamic_cast<NPC*>(beingManager->findBeing(id));
             npcListDialog->parseItems(msg->readString(msg->getLength() - 8));
             npcListDialog->setVisible(true);
+            npcListDialog->requestFocus();
             break;
 
         case SMSG_NPC_MESSAGE:
@@ -68,7 +69,6 @@ void NPCHandler::handleMessage(MessageIn *msg)
             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);
             break;
 
-- 
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/net')

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 6cd131052c78af04e794409189a0d7e16dcc0c51 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 25 Feb 2009 10:32:49 -0700
Subject: Added method for resetting npc integer dialogs in the last commit,
 but forgot to use it.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/net/playerhandler.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/net')

diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index 0637d784..f18c5d82 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -81,6 +81,7 @@ namespace {
         {
             player_node->revive();
             deathNotice = NULL;
+            npcIntegerDialog->reset();
             npcIntegerDialog->setVisible(false);
             npcListDialog->reset();
             npcListDialog->setVisible(false);
-- 
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/net')

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 4c0259fc06f9147fa1c7e55db26659d1dade0f45 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Thu, 26 Feb 2009 09:24:51 -0700
Subject: Fixed showing being deaths. I removed the wrong pointless death
 animation (case 1 is NOT death, but actually idle in SMSG_PLAYER_UPDATE_1)

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 src/net/beinghandler.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/net')

diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index bae14a05..71369031 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -209,7 +209,9 @@ void BeingHandler::handleMessage(MessageIn *msg)
             if (dstBeing == player_node->getTarget())
                 player_node->stopAttack();
 
-            if (!(msg->readInt8() == 1))
+            if (msg->readInt8() == 1)
+                dstBeing->setAction(Being::DEAD);
+            else
                 beingManager->destroyBeing(dstBeing);
 
             break;
@@ -443,11 +445,6 @@ void BeingHandler::handleMessage(MessageIn *msg)
             {
                 switch (msg->readInt8())
                 {
-                    case 1:
-                        if (dstBeing->getType() != Being::NPC)
-                            dstBeing->setAction(Being::DEAD);
-                        break;
-
                     case 2:
                         dstBeing->setAction(Being::SIT);
                         break;
-- 
cgit v1.2.3-70-g09d2