Merged trunk changes from revision 2757 to 2800 into the 0.1.0 branch.

15 files changed, 144 insertions, 24 deletions

diff --git a/ChangeLog b/ChangeLog
index ce76ecdb..46e3cbc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,9 +39,103 @@
 	data/help/CMakeLists.txt, data/icons/CMakeLists.txt,
 	data/CMakeLists.txt, CMakeLists.txt: Added CMake support.
 
+2006-11-01  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/gui.cpp, src/gui/browserbox.cpp,
+	data/graphics/gui/rpgfont_wider.png,
+	data/graphics/gui/browserfont.png, data/graphics/gui/fixedfont.png:
+	Added support for å and Å (with help of Håkan Rönn).
+
+2006-10-31  Philipp Sehmisch  <tmw@crushnet.org>
+
+	*data/graphics/tiles/desert1.png, d
+	ata/graphics/tiles/desert_x2.png: adding a bunch of graphical 
+	improvements made by VxD.
+
+2006-10-31  Frode Lindeijer  <f.lindeijer@gmail.com>
+
+	* /data/graphics/sprites/item011.png,
+	/data/graphics/sprites/item011.xml,
+	/data/graphics/sprites/item012.png,
+	/data/graphics/sprites/item018.xml,
+	/data/graphics/sprites/monster21.xml: Fixed some graphical issues,
+	mostly a cosmetic update.
+
+2006-10-30  Yohann Ferreira  <bertram@cegetel.net>
+
+	* debian/changelog: Updated the package's version.
+
+2006-10-30  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/maps/new_9-1.tmx.gz: Removed the night effect that accidently
+	sneaked in with the last map change.
+
+2006-10-30  Eugenio Favalli  <elvenprogrammer@gmail.com>
+
+	* src/tmw.rc: Updated Windows binary version.
+	* data/help/header.txt, NEWS, README: Fixed some release dates and
+	versions.
+	* data/graphics/items/armor-head-axehat.png,
+	data/graphics/items/armor-head-bandana.png,
+	data/graphics/items/armor-head-circlet.png,
+	data/graphics/items/armor-head-eyepatch.png,
+	data/graphics/items/armor-head-goggles.png,
+	data/graphics/items/armor-head-leathergoggles.png,
+	data/graphics/items/armor-head-piratehat.png,
+	data/graphics/items/armor-head-pumpkinhelmet.png,
+	data/graphics/items/Makefile.am, data/items.xml: Added new items.
+	* data/graphics/sprites/Makefile.am,
+	data/graphics/sprites/monster21.png,
+	data/graphics/sprites/monster21.xml,
+	data/graphics/sprites/monster22.png,
+	data/graphics/sprites/monster22.xml: Added new monsters.
+	* data/graphics/sprites/item011.png, data/graphics/sprites/item011.xml,
+	data/graphics/sprites/item012.png, data/graphics/sprites/item012.xml,
+	data/graphics/sprites/item013.png, data/graphics/sprites/item013.xml,
+	data/graphics/sprites/item014.png, data/graphics/sprites/item014.xml,
+	data/graphics/sprites/item015.png, data/graphics/sprites/item015.xml,
+	data/graphics/sprites/item016.png, data/graphics/sprites/item016.xml,
+	data/graphics/sprites/item017.png, data/graphics/sprites/item017.xml,
+	data/graphics/sprites/item018.png, data/graphics/sprites/item018.xml,
+	data/graphics/sprites/Makefile.am: Added new visible equipments.
+	* data/graphics/images/login_wallpaper.png, data/maps/new_1-1.tmx.gz,
+	data/maps/new_10-1.tmx.gz, data/maps/new_11-1.tmx.gz,
+	data/maps/new_14-1.tmx.gz, data/maps/new_15-1.tmx.gz,
+	data/maps/new_16-1.tmx.gz, data/maps/new_3-1.tmx.gz,
+	data/maps/new_7-1.tmx.gz, data/maps/new_9-1.tmx.gz: Halloween related
+	contents.
+	* data/graphics/items/Makefile.am: Fixed wrong filename.
+	* data/graphics/sprites/Makefile.am: Fixed wrong filenames.
+	* data/graphics/sprites/weapon0.png: Replaced knife with scythe.
+
+2006-10-30  Björn Steinbrink  <B.Steinbrink@gmx.de>
+
+	* data/graphics/items/CMakeLists.txt: Synced with autotools config.
+	* data/graphics/items/CMakeLists.txt: Added new items to CMake config.
+	* src/being.cpp: Properly initialize sprite vector.
+
+2006-10-29  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/player.cpp: Fixed excessive unnecessary reloading of sprites.
+
+2006-10-28  Björn Steinbrink  <B.Steinbrink@gmx.de>
+
+	* src/main.c: Reload wallpaper after updates are fetched.
+	* data/graphics/sprites/Makefile.am: Added monster20.
+
+2006-10-28  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/graphics/sprites/monster20.png,
+	data/graphics/sprites/monster20.xml,
+	data/graphics/sprites/CMakeLists.txt:
+	Added pumpkin ghost monster for halloween event.
+	* data/maps/new_9-1.tmx.gz: Fixed a map discrepancy between
+	new_9-1 and new_14-1 (no new walkmap required). Thanks to QOAL
+	for reporting.
+
 2006-10-24  Philipp Sehmisch  <tmw@crushnet.org>
 
-	* /data/graphics/images/ambient/night.png: Added graphic for night
+	* data/graphics/images/ambient/night.png: added graphic for night
 	ambient effect.
 
 2006-10-23  Bjørn Lindeijer  <bjorn@lindeijer.nl>
@@ -52,7 +146,8 @@
 2006-10-12  Yohann Ferreira  <bertram@cegetel.net>
 
 	* debian/rules, debian/tmw-data.install, debian/tmw-data.dirs,
-	debian/tmw-music.install: Updating debian files for bug fixing.
+	debian/tmw-music.install, debian/changelog: Updating debian files for
+	bug fixing.
 
 2006-10-12  Frode Lindeijer  <f.lindeijer@gmail.com>
 
@@ -61,12 +156,12 @@
 
 2006-10-12  Cédric Borgese  <cedric.borgese@gmail.com>
 
-	* data/graphics/tiles/Woodland_x3.png : Enlarge the trunk and the
+	* data/graphics/tiles/Woodland_x3.png: Enlarge the trunk and the
 	base of the trees in the woodland tileset.
 
 2006-10-09  Yohann Ferreira  <bertram@cegetel.net>
 
-	* src/gui/buysell.cpp, src/gui/buy.cpp : A little tweak to the buy
+	* src/gui/buysell.cpp, src/gui/buy.cpp: A little tweak to the buy
 	dialogs.
 
 2006-10-07  Bjørn Lindeijer  <bjorn@lindeijer.nl>
@@ -2711,9 +2806,9 @@
 	src/gui/status.h: Improving General Layout.
 	* src/games.cpp, src/playerinfo.h, src/gui/char_server.cpp,
 	src/gui/char_select.cpp, src/gui/ministatus.cpp, src/gui/skill.cpp,
-	src/gui/status.cpp, src/gui/status.h : Now the derived stats values
+	src/gui/status.cpp, src/gui/status.h: Now the derived stats values
 	are got from the server, and then, are correct ones.
-	* src/gui/minimap.cpp : Only shows the Minimap Window if there's
+	* src/gui/minimap.cpp: Only shows the Minimap Window if there's
 	actually a minimap to the current map.
 	* src/gui/status.cpp, src/game.cpp: The derived stats are now updated
 	correctly upon equipping/unequipping.
diff --git a/NEWS b/NEWS
index 4cb3dbb8..4633c39b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
-0.0.22 (...)
+0.0.21.1 (30 October 2006)
+- Reload wallpaper after loading updates
 - Added support for gzip compressed map layer data
+- Added support for building with CMake
+- Added slider to setup dialog for configuring overlay effect
+- Fixed excessive unnecessary reloading of sprites
 - Fixed problem with OpenGL related redefinition
 - Fixed problems with hiding windows using h
 - Fixed trade window positioning
diff --git a/README b/README
index 0313fac3..54a6dcaf 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 THE MANA WORLD
 ==============
 
- Version: 0.0.21    Date: 17/09/2006
+ Version: 0.0.21.1    Date: 30/10/2006
 
 
  Development team:
diff --git a/data/graphics/gui/browserfont.png b/data/graphics/gui/browserfont.png
index a32317d8..431777c5 100644
--- a/data/graphics/gui/browserfont.png
+++ b/data/graphics/gui/browserfont.png
diff --git a/data/graphics/gui/fixedfont.png b/data/graphics/gui/fixedfont.png
index 70f489bc..10319291 100644
--- a/data/graphics/gui/fixedfont.png
+++ b/data/graphics/gui/fixedfont.png
diff --git a/data/graphics/gui/rpgfont_wider.png b/data/graphics/gui/rpgfont_wider.png
index 4e5d9fbf..55ccbbd6 100644
--- a/data/graphics/gui/rpgfont_wider.png
+++ b/data/graphics/gui/rpgfont_wider.png
diff --git a/data/graphics/images/login_wallpaper.png b/data/graphics/images/login_wallpaper.png
index 54692dfd..258bad22 100644
--- a/data/graphics/images/login_wallpaper.png
+++ b/data/graphics/images/login_wallpaper.png
diff --git a/data/help/header.txt b/data/help/header.txt
index 30c1dc93..b292388a 100644
--- a/data/help/header.txt
+++ b/data/help/header.txt
@@ -2,7 +2,7 @@
 ##1               T  H  E      M  A  N  A      W  O  R  L  D
 ##1               ==========================================
  
-           ##2Version:##6 0.0.21                  ##2Date:##6 17 September 2006
+           ##2Version:##6 0.0.21.1                  ##2Date:##30 October 2006
  
 ##2                    Website: http://themanaworld.org
  
diff --git a/debian/changelog b/debian/changelog
index 5e71e51e..0cd1763d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+tmw (0.0.21.1-1) unstable; urgency=low
+
+  * Bugfixes release.
+
+ -- FERREIRA Yohann <bertram@cegetel.net>  Mon, 30 Oct 2006 22:32:00 +0200
+
+tmw (0.0.21-2) unstable; urgency=low
+
+  * Readded Music Files in ogg format.
+  * Added the forgotten data/graphics/items folder to avoid a crash.
+
+ -- FERREIRA Yohann <bertram@cegetel.net>  Mon, 16 Oct 2006 15:52:00 +0200
+
 tmw (0.0.21-1) unstable; urgency=low
 
   * New upstream release:
@@ -9,7 +22,7 @@ tmw (0.0.21-1) unstable; urgency=low
 tmw (0.0.20-1) unstable; urgency=low
 
   * Make use of a own desktop file for the Debian Package. Close the missing icon bug.
-  * Changed a dependency from xlibmesa-dev to libgl1-mesa-dev to cope with new X server.
+  * Changed dependency from xlibmesa-dev to libgl1-mesa-dev to cope with new X server.
 
  -- FERREIRA Yohann <bertram@cegetel.net>  Mon, 29 May 2006 03:55:33 +0200
 
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"