From 46308b7e9d65dd734664f903a09c3210f1684a6c Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Thu, 2 Nov 2006 21:46:36 +0000
Subject: Merged trunk changes from revision 2757 to 2800 into the 0.1.0
 branch.

---
 src/being.cpp          |  4 ++--
 src/gui/browserbox.cpp |  2 +-
 src/gui/gui.cpp        |  2 +-
 src/main.cpp           |  4 ++++
 src/player.cpp         | 16 ++++++++++------
 src/tmw.rc             |  8 ++++----
 6 files changed, 22 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/being.cpp b/src/being.cpp
index 4d542753..fa24ad69 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -64,10 +64,10 @@ Being::Being(Uint16 id, Uint16 job, Map *map):
     mHairStyle(0), mHairColor(0),
     mSpeechTime(0),
     mDamageTime(0),
-    mShowSpeech(false), mShowDamage(false)
+    mShowSpeech(false), mShowDamage(false),
+    mSprites(VECTOREND_SPRITE, NULL)
 {
     setMap(map);
-    mSprites.resize(VECTOREND_SPRITE, NULL);
 }
 
 Being::~Being()
diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp
index 06660cd5..2aec84a5 100644
--- a/src/gui/browserbox.cpp
+++ b/src/gui/browserbox.cpp
@@ -56,7 +56,7 @@ BrowserBox::BrowserBox(unsigned int mode):
                     " abcdefghijklmnopqrstuvwxyz"
                     "ABCDEFGHIJKLMNOPQRSTUVWXYZ01234567"
                     "89:@!\"$%&/=?^+*#[]{}()<>_;'.,\\|-~`"
-                    "øåáÁéÉíÍóÓúÚç륣¢¡¿àãõêñÑöüäÖÜÄß");
+                    "øåáÁéÉíÍóÓúÚç륣¢¡¿àãõêñÑöüäÖÜÄßèÈÅ");
         }
         setFont(browserFont);
         instances++;
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 33852f2b..38b17781 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -143,7 +143,7 @@ Gui::Gui(Graphics *graphics):
         speechFont = new gcn::ImageFont("graphics/gui/rpgfont_wider.png",
                 " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
                 "0123456789.,!?-+/():;%&`'*#=[]\"<>{}^~|_@$\\"
-                "áÁéÉíÍóÓúÚç륣¢¡¿àãõêñÑöüäÖÜÄßø"
+                "áÁéÉíÍóÓúÚç륣¢¡¿àãõêñÑöüäÖÜÄßøèÈåÅ"
                 );
     }
     catch (gcn::Exception e)
diff --git a/src/main.cpp b/src/main.cpp
index 0ae328ea..ea2b7829 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -643,6 +643,10 @@ int main(int argc, char *argv[])
             if (oldstate == STATE_UPDATE)
             {
                 loadUpdates();
+                // Reload the wallpaper in case that it was updated
+                login_wallpaper->decRef();
+                login_wallpaper = ResourceManager::getInstance()->
+                    getImage("graphics/images/login_wallpaper.png");
             }
 
             oldstate = state;
diff --git a/src/player.cpp b/src/player.cpp
index f5f42e9f..12f5f3d5 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -93,12 +93,12 @@ Player::setHairColor(Uint16 color)
 {
     if (color != mHairColor)
     {
-        delete mSprites[HAIR_SPRITE];
         AnimatedSprite *newHairSprite = new AnimatedSprite(
                 "graphics/sprites/hairstyle" + toString(mHairStyle) + ".xml",
                 color);
         newHairSprite->setDirection(getSpriteDirection());
 
+        delete mSprites[HAIR_SPRITE];
         mSprites[HAIR_SPRITE] = newHairSprite;
         resetAnimations();
 
@@ -113,12 +113,12 @@ Player::setHairStyle(Uint16 style)
 {
     if (style != mHairStyle)
     {
-        delete mSprites[HAIR_SPRITE];
         AnimatedSprite *newHairSprite = new AnimatedSprite(
                 "graphics/sprites/hairstyle" + toString(style) + ".xml",
                 mHairColor);
         newHairSprite->setDirection(getSpriteDirection());
 
+        delete mSprites[HAIR_SPRITE];
         mSprites[HAIR_SPRITE] = newHairSprite;
         resetAnimations();
 
@@ -145,11 +145,14 @@ Player::setVisibleEquipment(Uint8 slot, Uint8 id)
             break;
     }
 
-    delete mSprites[position];
-    mSprites[position] = NULL;
-
     // id = 0 means unequip
-    if (id) {
+    if (id == 0)
+    {
+        delete mSprites[position];
+        mSprites[position] = NULL;
+    }
+    else
+    {
         char stringId[4];
         sprintf(stringId, "%03i", id);
 
@@ -157,6 +160,7 @@ Player::setVisibleEquipment(Uint8 slot, Uint8 id)
                 "graphics/sprites/item" + toString(stringId) + ".xml", 0);
         equipmentSprite->setDirection(getSpriteDirection());
 
+        delete mSprites[position];
         mSprites[position] = equipmentSprite;
         resetAnimations();
 
diff --git a/src/tmw.rc b/src/tmw.rc
index 388b643d..d3a43b72 100644
--- a/src/tmw.rc
+++ b/src/tmw.rc
@@ -7,8 +7,8 @@ A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/tmw-icon.ico"
 // TO CHANGE VERSION INFORMATION, EDIT PROJECT OPTIONS...
 //
 1 VERSIONINFO
-FILEVERSION 0,0,21,0
-PRODUCTVERSION 0,0,21,0
+FILEVERSION 0,0,21,1
+PRODUCTVERSION 0,0,21,1
 FILETYPE VFT_APP
 {
   BLOCK "StringFileInfo"
@@ -16,14 +16,14 @@ FILETYPE VFT_APP
 		 BLOCK "040904E4"
 		 {
 			 VALUE "CompanyName", "The Mana World Development Team"
-			 VALUE "FileVersion", "0.0.21"
+			 VALUE "FileVersion", "0.0.21.1"
 			 VALUE "FileDescription", "The Mana World"
 			 VALUE "InternalName", "tmw.exe"
 			 VALUE "LegalCopyright", "2004-2006 (C)"
 			 VALUE "LegalTrademarks", ""
 			 VALUE "OriginalFilename", "tmw.exe"
 			 VALUE "ProductName", "The Mana World MMORPG"
-			 VALUE "ProductVersion", "0.0.21"
+			 VALUE "ProductVersion", "0.0.21.1"
 		 }
 	 }
   BLOCK "VarFileInfo"
-- 
cgit v1.2.3-70-g09d2