Merged changes made for the 0.0.24.1 release (4046:4048 from 0.0.24 branch).

9 files changed, 46 insertions, 24 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d048276..32bffc37 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 PROJECT(TMW)
 
-SET(VERSION 0.0.24)
+SET(VERSION 0.0.24.1)
 
 # where to look for cmake modules
 SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake/Modules)
diff --git a/ChangeLog b/ChangeLog
index 4d77242d..ee7c5615 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-07  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/winver.h, README, configure.ac, data/help/changes.txt,
+	data/help/header.txt, NEWS, CMakeLists.txt: Updated version, release
+	date and changes.
+	* src/being.cpp: Fixed crash on trying to show out of range emoticon.
+
 2008-04-03  David Athay  <ko2fan@gmail.com>
 
 	* src/game.cpp: Tweaked disconnect dialog, hoping to fix a crash bug.
diff --git a/NEWS b/NEWS
index 51a181d0..834c8064 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,17 @@
 0.0.24.1 (7 April 2008)
+- Added /clear command to clear chat window
+- Added ability to close quit dialog by pressing ESC
+- Added key for targetting nearest player
+- Added the possibility to assign particle effects to monsters
+- Added possibility to pass through players with key controls
+- Fixed crash on exit after connection to server was lost
+- Fixed initialization of some variables
+- Fixed an error with chat messages without a sender that include a colon
+- Fixed minimap to not keep reappearing when hidden
+- Fixed a GCC 4.3 compile error
+- Fixed music loading from non-default location
+- Fixed crash on trying to show out of range emoticon
+- Updated Dev-C++ and Code::Blocks project files
 
 0.0.24 (24 December 2007)
 - Added female specific hair styles
diff --git a/README b/README
index 20a8654e..4d9fe6af 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 THE MANA WORLD
 ==============
 
- Version: 0.0.24    Date: 24/12/2007
+ Version: 0.0.24.1    Date: 7/4/2007
 
  Development team:
   - See AUTHORS file for a list
diff --git a/configure.ac b/configure.ac
index ce31ce3e..6816c743 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT([The Mana World], [0.0.24], [elvenprogrammer@gmail.com], [tmw])
+AC_INIT([The Mana World], [0.0.24.1], [elvenprogrammer@gmail.com], [tmw])
 AC_CONFIG_HEADERS([config.h:config.h.in])
 AC_LANG_CPLUSPLUS
 
diff --git a/data/help/changes.txt b/data/help/changes.txt
index 26bd21d1..8b47cc9c 100644
--- a/data/help/changes.txt
+++ b/data/help/changes.txt
@@ -3,6 +3,21 @@
  
 ##3                         === RECENT CHANGES ===
  
+ 0.0.24.1 (7 April 2008)
+ - Added /clear command to clear chat window
+ - Added ability to close quit dialog by pressing ESC
+ - Added key for targetting nearest player
+ - Added the possibility to assign particle effects to monsters
+ - Added possibility to pass through players with key controls
+ - Fixed crash on exit after connection to server was lost
+ - Fixed initialization of some variables
+ - Fixed an error with chat messages without a sender that include a colon
+ - Fixed minimap to not keep reappearing when hidden
+ - Fixed a GCC 4.3 compile error
+ - Fixed music loading from non-default location
+ - Fixed crash on trying to show out of range emoticon
+ - Updated Dev-C++ and Code::Blocks project files
+ 
  0.0.24 (24 December 2007)
  - Added female specific hair styles
  - Added user-definable key settings
@@ -55,18 +70,3 @@
  - Fixed mouse coordinates in debug window
  - Fixed clicking on GUI to cause the player to start walking sometimes
  
- 0.0.22 (24 December 2006)
- - Added support for female-specific equipment graphics
- - Added support for monster sounds
- - Added item icons to buy/sell dialogs
- - Enhanced character select dialog to show equipment
- - Changed to new update host (http://updates.themanaworld.org)
- - Worked around a Guichan exception thrown for mice with many buttons
- - Changed mouse walk to keep following mouse while button is held down
- - Extended font support for å and Å
- - Disabled RLE compression on all surfaces in software mode
- - Fixed joystick setting not to show disabled when it's actually enabled
- - Fixed money field to no longer hide below the bottom of the window
- - Fixed pathfinding to allow walking through beings when they block your path
- - Fixed an issue with NPC dialogs staying open after player respawn
- 
diff --git a/data/help/header.txt b/data/help/header.txt
index 19afb84f..57e9f141 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.24                ##2Date:##324 December 2007
+           ##2Version:##6 0.0.24.1              ##2Date:##37 April 2008
  
 ##2                    Website: http://themanaworld.org
  
diff --git a/src/being.cpp b/src/being.cpp
index e76370fd..31e3eb77 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -418,10 +418,12 @@ Being::drawEmotion(Graphics *graphics, int offsetX, int offsetY)
     if (!mEmotion)
         return;
 
-    int px = mPx + offsetX + 3;
-    int py = mPy + offsetY - 60;
+    const int px = mPx + offsetX + 3;
+    const int py = mPy + offsetY - 60;
+    const int emotionIndex = mEmotion - 1;
 
-    graphics->drawImage(emotionSet->get(mEmotion - 1), px, py);
+    if (emotionIndex >= 0 && emotionIndex < emotionSet->size())
+        graphics->drawImage(emotionSet->get(emotionIndex), px, py);
 }
 
 void
diff --git a/src/winver.h b/src/winver.h
index 02d48f71..52d90315 100644
--- a/src/winver.h
+++ b/src/winver.h
@@ -2,5 +2,5 @@
 #define VER_MAJOR 0

 #define VER_MINOR 0

 #define VER_RELEASE 24

-#define VER_BUILD 0

-#define PACKAGE_VERSION "0.0.24"

+#define VER_BUILD 1

+#define PACKAGE_VERSION "0.0.24.1"