Merge branch 'master' into statuseffects

10 files changed, 187 insertions, 136 deletions

diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index 840fb1e8..203a82af 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.cpp
@@ -56,7 +56,8 @@ AnimatedSprite *AnimatedSprite::load(const std::string& filename, int variant)
 {
     ResourceManager *resman = ResourceManager::getInstance();
     SpriteDef *s = resman->getSprite(filename, variant);
-    if (!s) return NULL;
+    if (!s)
+        return NULL;
     AnimatedSprite *as = new AnimatedSprite(s);
     s->decRef();
     return as;
@@ -67,22 +68,18 @@ AnimatedSprite::~AnimatedSprite()
     mSprite->decRef();
 }
 
-void
-AnimatedSprite::reset()
+void AnimatedSprite::reset()
 {
     mFrameIndex = 0;
     mFrameTime = 0;
     mLastTime = 0;
 }
 
-void
-AnimatedSprite::play(SpriteAction spriteAction)
+void AnimatedSprite::play(SpriteAction spriteAction)
 {
     Action *action = mSprite->getAction(spriteAction);
     if (!action)
-    {
         return;
-    }
 
     mAction = action;
     Animation *animation = mAction->getAnimation(mDirection);
@@ -96,20 +93,15 @@ AnimatedSprite::play(SpriteAction spriteAction)
     }
 }
 
-void
-AnimatedSprite::update(int time)
+void AnimatedSprite::update(int time)
 {
     // Avoid freaking out at first frame or when tick_time overflows
     if (time < mLastTime || mLastTime == 0)
-    {
         mLastTime = time;
-    }
 
     // If not enough time has passed yet, do nothing
     if (time <= mLastTime || !mAnimation)
-    {
         return;
-    }
 
     unsigned int dt = time - mLastTime;
     mLastTime = time;
@@ -121,13 +113,10 @@ AnimatedSprite::update(int time)
     }
 }
 
-bool
-AnimatedSprite::updateCurrentAnimation(unsigned int time)
+bool AnimatedSprite::updateCurrentAnimation(unsigned int time)
 {
     if (!mFrame || Animation::isTerminator(*mFrame))
-    {
         return false;
-    }
 
     mFrameTime += time;
 
@@ -137,9 +126,7 @@ AnimatedSprite::updateCurrentAnimation(unsigned int time)
         mFrameIndex++;
 
         if (mFrameIndex == mAnimation->getLength())
-        {
             mFrameIndex = 0;
-        }
 
         mFrame = mAnimation->getFrame(mFrameIndex);
 
@@ -154,30 +141,24 @@ AnimatedSprite::updateCurrentAnimation(unsigned int time)
     return true;
 }
 
-bool
-AnimatedSprite::draw(Graphics* graphics, int posX, int posY) const
+bool AnimatedSprite::draw(Graphics* graphics, int posX, int posY) const
 {
     if (!mFrame || !mFrame->image)
-    {
         return false;
-    }
 
     return graphics->drawImage(mFrame->image,
                                posX + mFrame->offsetX,
                                posY + mFrame->offsetY);
 }
 
-void
-AnimatedSprite::setDirection(SpriteDirection direction)
+void AnimatedSprite::setDirection(SpriteDirection direction)
 {
     if (mDirection != direction)
     {
         mDirection = direction;
 
         if (!mAction)
-        {
             return;
-        }
 
         Animation *animation = mAction->getAnimation(mDirection);
 
@@ -190,26 +171,12 @@ AnimatedSprite::setDirection(SpriteDirection direction)
     }
 }
 
-int
-AnimatedSprite::getWidth() const
+int AnimatedSprite::getWidth() const
 {
-    if (mFrame)
-    {
-        return mFrame->image->getWidth();
-    }
-    else {
-        return 0;
-    }
+    return mFrame ? mFrame->image->getWidth() : 0;
 }
 
-int
-AnimatedSprite::getHeight() const
+int AnimatedSprite::getHeight() const
 {
-    if (mFrame)
-    {
-        return mFrame->image->getHeight();
-    }
-    else {
-        return 0;
-    }
+    return mFrame ? mFrame->image->getHeight() : 0;
 }
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 71d36e97..1e22772b 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -247,6 +247,38 @@ ChatWindow::isInputFocused()
 }
 
 void
+ChatWindow::whisper(const std::string &nick, std::string msg, int prefixlen)
+{
+    std::string recvnick = "";
+    msg.erase(0, prefixlen + 1);
+
+    if (msg.substr(0,1) == "\"")
+    {
+        const std::string::size_type pos = msg.find('"', 1);
+        if (pos != std::string::npos) {
+            recvnick = msg.substr(1, pos - 1);
+            msg.erase(0, pos + 2);
+        }
+    }
+    else
+    {
+        const std::string::size_type pos = msg.find(" ");
+        if (pos != std::string::npos) {
+            recvnick = msg.substr(0, pos);
+            msg.erase(0, pos + 1);
+        }
+    }
+
+    MessageOut outMsg(mNetwork);
+    outMsg.writeInt16(CMSG_CHAT_WHISPER);
+    outMsg.writeInt16(msg.length() + 28);
+    outMsg.writeString(recvnick, 24);
+    outMsg.writeString(msg, msg.length());
+
+    chatLog("Whispering to " + recvnick + " : " + msg, BY_PLAYER);
+}
+
+void
 ChatWindow::chatSend(const std::string &nick, std::string msg)
 {
     /* Some messages are managed client side, while others
@@ -295,7 +327,10 @@ ChatWindow::chatSend(const std::string &nick, std::string msg)
     }
     else if (msg.substr(0, IS_WHERE_LENGTH) == IS_WHERE)
     {
-        chatLog(map_path, BY_SERVER);
+        // Display the current map, X, and Y
+        std::ostringstream where;
+        where << map_path << " " << player_node->mX << "," << player_node->mY;
+        chatLog(where.str(), BY_SERVER);
     }
     else if (msg.substr(0, IS_WHO_LENGTH) == IS_WHO)
     {
@@ -307,35 +342,9 @@ ChatWindow::chatSend(const std::string &nick, std::string msg)
         mTextOutput->clearRows();
     }
     else if (msg.substr(0, IS_WHISPER_LENGTH) == IS_WHISPER)
-    {
-        std::string recvnick = "";
-        msg.erase(0, IS_WHISPER_LENGTH + 1);
-
-        if (msg.substr(0,1) == "\"")
-        {
-            const std::string::size_type pos = msg.find('"', 1);
-            if (pos != std::string::npos) {
-                recvnick = msg.substr(1, pos - 1);
-                msg.erase(0, pos + 2);
-            }
-        }
-        else
-        {
-            const std::string::size_type pos = msg.find(" ");
-            if (pos != std::string::npos) {
-                recvnick = msg.substr(0, pos);
-                msg.erase(0, pos + 1);
-            }
-        }
-
-        MessageOut outMsg(mNetwork);
-        outMsg.writeInt16(CMSG_CHAT_WHISPER);
-        outMsg.writeInt16(msg.length() + 28);
-        outMsg.writeString(recvnick, 24);
-        outMsg.writeString(msg, msg.length());
-
-        chatLog("Whispering to " + recvnick + " : " + msg, BY_PLAYER);
-    }
+        whisper(nick, msg, IS_WHISPER_LENGTH);
+    else if (msg.substr(0, IS_SHORT_WHISPER_LENGTH) == IS_SHORT_WHISPER)
+        whisper(nick, msg, IS_SHORT_WHISPER_LENGTH);
     else
     {
         chatLog("Unknown command", BY_SERVER);
@@ -490,6 +499,7 @@ void ChatWindow::help(const std::string &msg1, const std::string &msg2)
         chatLog("/where: Display map name", BY_SERVER);
         chatLog("/whisper <nick> <message>: Sends a private <message>"
                 " to <nick>", BY_SERVER);
+        chatLog("/w <nick> <message>: Short form for /whisper", BY_SERVER);
         chatLog("/who: Display number of online users", BY_SERVER);
         chatLog("For more information, type /help <command>", BY_SERVER);
         return;
@@ -525,10 +535,11 @@ void ChatWindow::help(const std::string &msg1, const std::string &msg2)
                 BY_SERVER);
         return;
     }
-    if (msg1 == "whisper")
+    if (msg1 == "whisper" || msg1 == "w")
     {
         chatLog("Command: /whisper <nick> <msg>", BY_SERVER);
-        chatLog("This command sends the message <msg> to <nick.", BY_SERVER);
+        chatLog("Command: /w <nick> <msg>", BY_SERVER);
+        chatLog("This command sends the message <msg> to <nick>.", BY_SERVER);
         chatLog("If the <nick> has spaces in it, enclose it in "
                 "double quotes (\").", BY_SERVER);
         return;
diff --git a/src/gui/chat.h b/src/gui/chat.h
index 6e412bf6..76a8146c 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.h
@@ -46,18 +46,20 @@ class ScrollArea;
 
 #define BY_LOGGER     6
 
-#define IS_ANNOUNCE         "/announce "
-#define IS_ANNOUNCE_LENGTH  10
-#define IS_HELP             "/help"
-#define IS_HELP_LENGTH      5
-#define IS_WHERE            "/where"
-#define IS_WHERE_LENGTH     6
-#define IS_WHO              "/who"
-#define IS_WHO_LENGTH       4
-#define IS_CLEAR            "/clear"
-#define IS_CLEAR_LENGTH     6
-#define IS_WHISPER          "/whisper"
-#define IS_WHISPER_LENGTH   8
+#define IS_ANNOUNCE               "/announce "
+#define IS_ANNOUNCE_LENGTH        10
+#define IS_HELP                   "/help"
+#define IS_HELP_LENGTH            5
+#define IS_WHERE                  "/where"
+#define IS_WHERE_LENGTH           6
+#define IS_WHO                    "/who"
+#define IS_WHO_LENGTH             4
+#define IS_CLEAR                  "/clear"
+#define IS_CLEAR_LENGTH           6
+#define IS_WHISPER                "/whisper"
+#define IS_WHISPER_LENGTH         8
+#define IS_SHORT_WHISPER          "/w"
+#define IS_SHORT_WHISPER_LENGTH   2
 
 /**
  * gets in between usernick and message text depending on
@@ -219,6 +221,9 @@ class ChatWindow : public Window, public gcn::ActionListener,
         Network *mNetwork;
         bool mTmpVisible;
 
+        void
+        whisper(const std::string &nick, std::string msg, int prefixlen);
+
         /** One item in the chat log */
         struct CHATLOG
         {
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index 3c4beaf3..34c9cce1 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -32,10 +32,16 @@
 NpcTextDialog::NpcTextDialog():
     Window("NPC")
 {
+    setResizable(true);
+
+    setMinWidth(200);
+    setMinHeight(150);
+
     mTextBox = new TextBox;
     mTextBox->setEditable(false);
-    gcn::ScrollArea *scrollArea = new ScrollArea(mTextBox);
-    Button *okButton = new Button("OK", "ok", this);
+
+    scrollArea = new ScrollArea(mTextBox);
+    okButton = new Button("OK", "ok", this);
 
     setContentSize(260, 175);
     scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
@@ -52,20 +58,36 @@ NpcTextDialog::NpcTextDialog():
     setLocationRelativeTo(getParent());
 }
 
-void
-NpcTextDialog::setText(const std::string &text)
+void NpcTextDialog::setText(const std::string &text)
+{
+    mText = text;
+    mTextBox->setTextWrapped(mText);
+}
+
+void NpcTextDialog::addText(const std::string &text)
 {
-    mTextBox->setTextWrapped(text);
+    setText(mText + text + "\n");
 }
 
-void
-NpcTextDialog::addText(const std::string &text)
+void NpcTextDialog::widgetResized(const gcn::Event &event)
 {
-    mTextBox->setTextWrapped(mTextBox->getText() + text + "\n");
+    Window::widgetResized(event);
+
+    const gcn::Rectangle &area = getChildrenArea();
+    const int width = area.width;
+    const int height = area.height;
+
+    scrollArea->setDimension(gcn::Rectangle(
+                5, 5, width - 10, height - 15 - okButton->getHeight()));
+    okButton->setPosition(
+            width - 5 - okButton->getWidth(),
+            height - 5 - okButton->getHeight());
+
+    // Set the text again so that it gets wrapped according to the new size
+    mTextBox->setTextWrapped(mText);
 }
 
-void
-NpcTextDialog::action(const gcn::ActionEvent &event)
+void NpcTextDialog::action(const gcn::ActionEvent &event)
 {
     if (event.getId() == "ok")
     {
diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index 2c9771d3..76161f88 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.h
@@ -45,18 +45,23 @@ class NpcTextDialog : public Window, public gcn::ActionListener
         NpcTextDialog();
 
         /**
+         * Called when resizing the window
+         *
+         * @param event The calling event
+         */
+        void widgetResized(const gcn::Event &event);
+
+        /**
          * Called when receiving actions from the widgets.
          */
-        void
-        action(const gcn::ActionEvent &event);
+        void action(const gcn::ActionEvent &event);
 
         /**
          * Sets the text shows in the dialog.
          *
          * @param string The new text.
          */
-        void
-        setText(const std::string &string);
+        void setText(const std::string &string);
 
         /**
          * Adds the text to the text shows in the dialog. Also adds a newline
@@ -64,11 +69,14 @@ class NpcTextDialog : public Window, public gcn::ActionListener
          *
          * @param string The text to add.
          */
-        void
-        addText(const std::string &string);
+        void addText(const std::string &string);
 
     private:
+        gcn::Button *okButton;
+        gcn::ScrollArea *scrollArea;
         TextBox *mTextBox;
+
+        std::string mText;
 };
 
-#endif
+#endif // _TMW_NPC_TEXT_H
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index 90444f1a..cdd38312 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -32,10 +32,15 @@
 NpcListDialog::NpcListDialog():
     Window("NPC")
 {
+    setResizable(true);
+
+    setMinWidth(200);
+    setMinHeight(150);
+
     mItemList = new ListBox(this);
-    ScrollArea *scrollArea = new ScrollArea(mItemList);
-    Button *okButton = new Button("OK", "ok", this);
-    Button *cancelButton = new Button("Cancel", "cancel", this);
+    scrollArea = new ScrollArea(mItemList);
+    okButton = new Button("OK", "ok", this);
+    cancelButton = new Button("Cancel", "cancel", this);
 
     setContentSize(260, 175);
     scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
@@ -59,37 +64,49 @@ NpcListDialog::NpcListDialog():
     setLocationRelativeTo(getParent());
 }
 
-int
-NpcListDialog::getNumberOfElements()
+int NpcListDialog::getNumberOfElements()
 {
     return mItems.size();
 }
 
-std::string
-NpcListDialog::getElementAt(int i)
+std::string NpcListDialog::getElementAt(int i)
 {
     return mItems[i];
 }
 
-void
-NpcListDialog::parseItems(const std::string &itemString)
+void NpcListDialog::parseItems(const std::string &itemString)
 {
     std::istringstream iss(itemString);
 
     std::string tmp;
-    while(getline(iss, tmp, ':')) {
+    while (getline(iss, tmp, ':'))
         mItems.push_back(tmp);
-    }
 }
 
-void
-NpcListDialog::reset()
+void NpcListDialog::reset()
 {
     mItems.clear();
 }
 
-void
-NpcListDialog::action(const gcn::ActionEvent &event)
+void NpcListDialog::widgetResized(const gcn::Event &event)
+{
+    Window::widgetResized(event);
+
+    const gcn::Rectangle &area = getChildrenArea();
+    const int width = area.width;
+    const int height = area.height;
+
+    scrollArea->setDimension(gcn::Rectangle(
+                5, 5, width - 10, height - 15 - okButton->getHeight()));
+    cancelButton->setPosition(
+            width - 5 - cancelButton->getWidth(),
+            height - 5 - cancelButton->getHeight());
+    okButton->setPosition(
+            cancelButton->getX() - 5 - okButton->getWidth(),
+            cancelButton->getY());
+}
+
+void NpcListDialog::action(const gcn::ActionEvent &event)
 {
     int choice = 0;
 
diff --git a/src/gui/npclistdialog.h b/src/gui/npclistdialog.h
index 0e6760f1..f548dbba 100644
--- a/src/gui/npclistdialog.h
+++ b/src/gui/npclistdialog.h
@@ -49,41 +49,46 @@ class NpcListDialog : public Window, public gcn::ActionListener,
         NpcListDialog();
 
         /**
+         * Called when resizing the window
+         *
+         * @param event The calling event
+         */
+        void widgetResized(const gcn::Event &event);
+
+        /**
          * Called when receiving actions from the widgets.
          */
-        void
-        action(const gcn::ActionEvent &event);
+        void action(const gcn::ActionEvent &event);
 
         /**
          * Returns the number of items in the choices list.
          */
-        int
-        getNumberOfElements();
+        int getNumberOfElements();
 
         /**
          * Returns the name of item number i of the choices list.
          */
-        std::string
-        getElementAt(int i);
+        std::string getElementAt(int i);
 
         /**
          * Fills the options list for an NPC dialog.
          *
          * @param itemString A string with the options separated with colons.
          */
-        void
-        parseItems(const std::string &itemString);
+        void parseItems(const std::string &itemString);
 
         /**
          * Resets the list by removing all items.
          */
-        void
-        reset();
+        void reset();
 
     private:
         gcn::ListBox *mItemList;
+        gcn::ScrollArea *scrollArea;
+        gcn::Button *okButton;
+        gcn::Button *cancelButton;
 
         std::vector<std::string> mItems;
 };
 
-#endif
+#endif // _TMW_GUI_NPCLISTDIALOG_H
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index b9f28562..1a257ae8 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -39,7 +39,7 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     setResizable(true);
     setCloseButton(true);
     setDefaultSize((windowContainer->getWidth() - 365) / 2,
-                   (windowContainer->getHeight() - 255) / 2, 365, 255);
+                   (windowContainer->getHeight() - 255) / 2, 365, 275);
     loadWindowState();
 
     // ----------------------
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index c0344b72..7f7d45fc 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -310,6 +310,17 @@ int UpdaterWindow::downloadThread(void *ptr)
             curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
             curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 15);
 
+            struct curl_slist *pHeaders = NULL;
+            if (uw->mDownloadStatus != UPDATE_RESOURCES)
+            {
+                // Make sure the resources2.txt and news.txt aren't cached,
+                // in order to always get the latest version.
+                pHeaders = curl_slist_append(pHeaders, "pragma: no-cache");
+                pHeaders =
+                    curl_slist_append(pHeaders, "Cache-Control: no-cache");
+                curl_easy_setopt(curl, CURLOPT_HTTPHEADER, pHeaders);
+            }
+
             if ((res = curl_easy_perform(curl)) != 0)
             {
                 uw->mDownloadStatus = UPDATE_ERROR;
@@ -334,6 +345,11 @@ int UpdaterWindow::downloadThread(void *ptr)
 
             curl_easy_cleanup(curl);
 
+            if (uw->mDownloadStatus != UPDATE_RESOURCES)
+            {
+                curl_slist_free_all(pHeaders);
+            }
+
             if (!uw->mStoreInMemory)
             {
                 // Don't check resources2.txt checksum
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 5ee40014..e6f2fd1f 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -125,10 +125,10 @@ void ItemDB::load()
 
         CHECK_PARAM(name, "");
         CHECK_PARAM(image, "");
-        // CHECK_PARAM(description, "");
-        // CHECK_PARAM(effect, "");
+        CHECK_PARAM(description, "");
+        CHECK_PARAM(effect, "");
         // CHECK_PARAM(type, 0);
-        CHECK_PARAM(weight, 0);
+        // CHECK_PARAM(weight, 0);
         // CHECK_PARAM(slot, 0);
 
 #undef CHECK_PARAM