From 4eec29ac0f6a9b05562ac0fbe3d4e5d7e82deeac Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Thu, 4 Jan 2007 02:20:38 +0000
Subject: Merged 0.0 changes from revision 2898 to 2988 to trunk.

---
 docs/INSTALL/ubuntu.txt | 43 +++++++++++++++++++++++++++++++++++++++++++
 docs/INSTALL/win32.txt  |  5 ++++-
 2 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 docs/INSTALL/ubuntu.txt

(limited to 'docs')

diff --git a/docs/INSTALL/ubuntu.txt b/docs/INSTALL/ubuntu.txt
new file mode 100644
index 00000000..cf830ccc
--- /dev/null
+++ b/docs/INSTALL/ubuntu.txt
@@ -0,0 +1,43 @@
+How to build a .deb for TMW on Ubuntu
+=====================================
+
+This documentation is for those who are interested in building the .deb files
+of The Mana World. Most people do not need to do this, but can instead use the
+repository. You can find information about how to use the repository on our
+downloads page.
+
+
+1. Installing the dependencies
+==============================
+
+First of all you need a working compiler and package building environment. If
+you don't have this yet, install the following packages:
+
+   apt-get install gcc g++ dh-make fakeroot dpkg-dev build-essentials
+
+In order to compile The Mana World, you'll need the developer packages for
+SDL, SDL_mixer, SDL_image, SDL_net, libxml2, libphysfs and libguichan0.
+
+   apt-get install libsdl1.2-dev libsdl-mixer1.2-dev libsdl-image1.2-dev ...
+
+(todo: add missing entries)
+(todo: include information about installing Guichan development package)
+
+
+2. Creating the .debs using DebHelper Tools
+===========================================
+
+Either download the source release of TMW that you want to build a package for,
+or check out the appropriate version from Subversion, for example by using the
+tag.
+
+Make sure the files in the debian directory are up to date. You can do this by
+checking out the appropriate directory from Subversion (will be either
+tmw/branches/0.0/debian or tmw/trunk/debian for the latest release).
+
+Now we can build the packages using the following command.
+
+   fakeroot dpkg-buildpackage
+
+The packages will be created in the parent folder.
+
diff --git a/docs/INSTALL/win32.txt b/docs/INSTALL/win32.txt
index ab2a429f..f438a7e7 100644
--- a/docs/INSTALL/win32.txt
+++ b/docs/INSTALL/win32.txt
@@ -45,7 +45,7 @@ the old stable version, so don't do that. Get Dev-C++ here:
 
   http://www.bloodshed.net/
  
-After you fetched it simply run and install.
+After you have fetched it, simply run and install as prompted.
 
 
 3. Installing the required libraries
@@ -63,6 +63,9 @@ to remove anything the devpak might overlap before installing, for example the
 previous devpak.) Remember to copy the required dlls from your dll folder in
 the Dev-Cpp root directory, to the folder where you have your copy of The Mana
 World. You also have to add the SDL include folder in your C++ include paths.
+If you're using Dev-C++, this means: Tools -> Compiler options ->
+-> Directories -> C++ includes -> Browse... (browse to MinGW/include/SDL) ->
+-> Add -> Ok.
 If you can't get the package or you are experiencing problems with it, just
 send me an email at elvenprogrammer@gmail.com or continue reading. (Coming to
 bug us on the IRC channel is a valid alternative too.)
-- 
cgit v1.2.3-70-g09d2


From 05bdb92c267e3f041788f2aa41a73c9953249e7c Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Tue, 23 Jan 2007 21:05:05 +0000
Subject: Merged 0.0 changes from revision 3035 to 3065 to trunk.

---
 ChangeLog                | 36 ++++++++++++++++++++++++++++++++++--
 INSTALL                  |  2 +-
 NEWS                     |  8 ++++++++
 README                   |  2 +-
 data/help/header.txt     |  2 +-
 docs/INSTALL/win32.txt   |  2 +-
 docs/win32-release.txt   |  2 +-
 src/gui/menuwindow.cpp   |  3 ++-
 src/gui/shoplistbox.cpp  |  2 +-
 src/gui/updatewindow.cpp | 16 +++++++++++-----
 src/gui/viewport.cpp     |  2 +-
 src/gui/viewport.h       |  2 +-
 src/main.cpp             |  4 +---
 tmw.cbp                  | 31 +------------------------------
 14 files changed, 65 insertions(+), 49 deletions(-)

(limited to 'docs')

diff --git a/ChangeLog b/ChangeLog
index d091a061..44caf16c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,34 @@
-2007-01-14  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+2007-01-23  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/shoplistbox.cpp, docs/INSTALL/win32.txt, INSTALL, NEWS:
+	Upgraded to Guichan 0.6.1.
+
+2007-01-22  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/updatewindow.cpp: Identify ourselves when requesting files
+	from the update server.
+
+2007-01-17  Eugenio Favalli  <elvenprogrammer@gmail.com>
+
+	* docs/win32-release.txt, src/gui/register.cpp, src/main.cpp: Changed
+	default server.
+
+2007-01-15  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/viewport.cpp, src/gui/viewport.h: Fixed issue where the
+	player stops walking.
+	* docs/INSTALL/win32.txt, INSTALL: Updated to mention Guichan 0.6.0.
+
+2007-01-15  Eugenio Favalli  <elvenprogrammer@gmail.com>
+
+	* data/help/header.txt, NEWS, README: Updated release date.
+
+2007-01-14  Eugenio Favalli  <elvenprogrammer@gmail.com>
+
+	* src/gui/updatewindow.cpp, src/main.cpp, tmw.cbp: Fixed windows
+	headers issues.
+
+2007-01-14  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/game.cpp, src/main.cpp, src/gui/trade.cpp, src/gui/sell.cpp,
 	src/gui/connection.cpp, src/gui/buddywindow.cpp, src/gui/browserbox.h,
@@ -30,6 +60,8 @@
 	src/gui/chatinput.cpp, src/net/tradehandler.cpp,
 	src/net/playerhandler.cpp: Upgraded to Guichan 0.6.0 (merge from
 	guichan-0.6.0 branch).
+	* src/winver.h, configure.ac, data/help/header.txt, NEWS, README,
+	CMakeLists.txt: Updated version to 0.0.22.1.
 
 2007-01-13  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
@@ -37,7 +69,7 @@
 	data/graphics/sprites/CMakeLists.txt: Updated with regard to renaming
 	of cotton equipment.
 
-2006-01-13  Eugenio Favalli  <elvenprogrammer@gmail.com>
+2007-01-13  Eugenio Favalli  <elvenprogrammer@gmail.com>
 
 	* src/gui/debugwindow.cpp, src/gui/viewport.h: Fixed mouse coordinates
 	display in debug window.
diff --git a/INSTALL b/INSTALL
index 5b3eb3f2..f7e8688e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -20,7 +20,7 @@ and some libraries. The required libraries are:
 * SDL_mixer         http://www.libsdl.org/projects/SDL_mixer/
 * SDL_image         http://www.libsdl.org/projects/SDL_image/
 * SDL_net           http://www.libsdl.org/projects/SDL_net/
-* Guichan 0.5.0     http://guichan.sourceforge.net/
+* Guichan 0.6.1     http://guichan.sourceforge.net/
 * libxml2           http://www.xmlsoft.org/
 * physfs 1.0.x      http://icculus.org/physfs/
 * zlib 1.2.x        http://www.gzip.org/zlib/
diff --git a/NEWS b/NEWS
index 9edd05b6..47421aef 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+0.0.22.2 (...)
+- Updated to work with Guichan 0.6.1 (older versions no longer supported)
+
+0.0.22.1 (15 January 2007)
+- Updated to work with Guichan 0.6.0 (older versions no longer supported)
+- 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
diff --git a/README b/README
index 342524ec..bf128182 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 THE MANA WORLD
 ==============
 
- Version: 0.0.22    Date: 24/12/2006
+ Version: 0.0.22.1    Date: 15/01/2007
 
 
  Development team:
diff --git a/data/help/header.txt b/data/help/header.txt
index 4f4c9615..aef87a45 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.22                  ##2Date:##324 December 2006
+           ##2Version:##6 0.0.22.1                ##2Date:##315 January 2007
  
 ##2                    Website: http://themanaworld.org
  
diff --git a/docs/INSTALL/win32.txt b/docs/INSTALL/win32.txt
index f438a7e7..7f6ee42a 100644
--- a/docs/INSTALL/win32.txt
+++ b/docs/INSTALL/win32.txt
@@ -28,7 +28,7 @@ Besides a C++ compiler, TMW depends on the following libraries:
 1) SDL
 2) SDL_mixer
 3) SDL_image
-4) Guichan 0.4.0
+4) Guichan 0.6.1
 5) libiconv
 5) libxml2
 6) PhysFS
diff --git a/docs/win32-release.txt b/docs/win32-release.txt
index c0c6d0e6..a8696897 100644
--- a/docs/win32-release.txt
+++ b/docs/win32-release.txt
@@ -19,7 +19,7 @@ Every Win32 releaser should follow this checklist when creating a new package.
       <configuration>
         <option name="chatlog" value="chatlog.txt"/>
         <option name="guialpha" value="0.8"/>
-        <option name="host" value="animesites.de"/>
+        <option name="host" value="server.themanaworld.org"/>
         <option name="hwaccel" value="0"/>
         <option name="port" value="6901"/>
         <option name="remember" value="0"/>
diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp
index ba4c8e94..a5b5c99e 100644
--- a/src/gui/menuwindow.cpp
+++ b/src/gui/menuwindow.cpp
@@ -58,7 +58,8 @@ MenuWindow::MenuWindow():
     };
     int x = 0, y = 3, h = 0;
 
-    for (const char **curBtn = buttonNames; *curBtn; curBtn++) {
+    for (const char **curBtn = buttonNames; *curBtn; curBtn++)
+    {
         gcn::Button *btn = new Button(*curBtn, *curBtn, &listener);
         btn->setPosition(x, y);
         add(btn);
diff --git a/src/gui/shoplistbox.cpp b/src/gui/shoplistbox.cpp
index 8cf0b639..946f518b 100644
--- a/src/gui/shoplistbox.cpp
+++ b/src/gui/shoplistbox.cpp
@@ -112,7 +112,7 @@ void ShopListBox::setSelected(int selected)
         mSelected = std::min(mListModel->getNumberOfElements() - 1,
                              std::max(-1, selected));
 
-        gcn::BasicContainer *parent = getParent();
+        gcn::Widget *parent = getParent();
         if (parent)
         {
             gcn::Rectangle scroll;
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index d41dfe13..fe78a27b 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -28,8 +28,6 @@
 #include <SDL_thread.h>
 #include <zlib.h>
 
-#include <curl/curl.h>
-
 #include <guichan/widgets/label.hpp>
 
 #include "browserbox.h"
@@ -37,6 +35,9 @@
 #include "progressbar.h"
 #include "scrollarea.h"
 
+// Curl should be included after Guichan to avoid Windows redefinitions
+#include <curl/curl.h>
+
 #include "../configuration.h"
 #include "../log.h"
 #include "../main.h"
@@ -137,7 +138,7 @@ void UpdaterWindow::action(const gcn::ActionEvent &event)
     if (event.getId() == "cancel")
     {
         // Register the user cancel
-        mUserCancel=true;
+        mUserCancel = true;
         // Skip the updating process
         if (mDownloadStatus == UPDATE_COMPLETE)
         {
@@ -262,6 +263,11 @@ int UpdaterWindow::downloadThread(void *ptr)
                 curl_easy_setopt(curl, CURLOPT_WRITEDATA, outfile);
             }
 
+#ifdef PACKAGE_VERSION
+            curl_easy_setopt(curl, CURLOPT_USERAGENT, "TMW/" PACKAGE_VERSION);
+#else
+            curl_easy_setopt(curl, CURLOPT_USERAGENT, "TMW");
+#endif
             curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, uw->mCurlError);
             curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
             curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0);
@@ -365,13 +371,13 @@ void UpdaterWindow::logic()
         case UPDATE_ERROR:
             if (mThread)
             {
-                if(mUserCancel){
+                if (mUserCancel) {
                     // Kill the thread, because user has canceled
                     SDL_KillThread(mThread);
                     // Set the flag to false again
                     mUserCancel = false;
                 }
-                else{
+                else {
                     SDL_WaitThread(mThread, NULL);
                 }
                 mThread = NULL;
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 671ababa..5f316aea 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -324,7 +324,7 @@ Viewport::mousePressed(gcn::MouseEvent &event)
 }
 
 void
-Viewport::mouseMoved(gcn::MouseEvent &event)
+Viewport::mouseDragged(gcn::MouseEvent &event)
 {
     if (!mMap || !player_node)
         return;
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 80475fbf..f1cadd98 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -92,7 +92,7 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
          * Handles mouse move on map
          */
         void
-        mouseMoved(gcn::MouseEvent &event);
+        mouseDragged(gcn::MouseEvent &event);
 
         /**
          * Handles mouse button release on map.
diff --git a/src/main.cpp b/src/main.cpp
index 3a448494..dc186c84 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -39,8 +39,6 @@
 #if (defined __USE_UNIX98 || defined __FreeBSD__)
 #include <cerrno>
 #include <sys/stat.h>
-#elif defined WIN32
-#define NOGDI
 #endif
 
 #include "configuration.h"
@@ -174,7 +172,7 @@ void initConfiguration(const Options &options)
 {
     // Fill configuration with defaults
     logger->log("Initializing configuration...");
-    config.setValue("host", "animesites.de");
+    config.setValue("host", "server.themanaworld.org");
     config.setValue("port", 9601);
     config.setValue("hwaccel", 0);
 #if (defined __APPLE__ || defined WIN32) && defined USE_OPENGL
diff --git a/tmw.cbp b/tmw.cbp
index c81ffb3e..ac9aebb5 100644
--- a/tmw.cbp
+++ b/tmw.cbp
@@ -19,6 +19,7 @@
 				<Compiler>
 					<Add option="-Wall"/>
 					<Add option="-DUSE_OPENGL"/>
+					<Add option="-DNOGDI"/>
 				</Compiler>
 				<Linker>
 					<Add library="enet"/>
@@ -172,16 +173,6 @@
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\gui\buddywindow.cpp">
-			<Option compilerVar="CPP"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="src\gui\buddywindow.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
-		</Unit>
 		<Unit filename="src\gui\button.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
@@ -222,16 +213,6 @@
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\gui\chargedialog.cpp">
-			<Option compilerVar="CPP"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="src\gui\chargedialog.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
-		</Unit>
 		<Unit filename="src\gui\chat.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
@@ -448,16 +429,6 @@
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\gui\newskill.cpp">
-			<Option compilerVar="CPP"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="src\gui\newskill.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
-		</Unit>
 		<Unit filename="src\gui\npc_text.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
-- 
cgit v1.2.3-70-g09d2


From 457ce3e7b4a869f92d8aef31bdee1b6793587a93 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 28 Jan 2007 22:49:26 +0000
Subject: Some work on documentation.

---
 ChangeLog                   |  10 ++++-
 INSTALL                     |   2 +-
 NEWS                        |   2 +-
 docs/SOURCE/tmw.doxcfg      |   2 +-
 docs/SOURCE/tmwdox.sh       |   0
 src/gui/char_select.h       |   2 +-
 src/main.h                  |  29 ++++++++++++
 src/net/connection.h        |   3 ++
 src/net/messagehandler.h    |   3 ++
 src/net/messagein.h         |   2 +
 src/net/messageout.h        |   5 ++-
 src/net/network.h           |   7 +++
 src/resources/equipmentdb.h | 107 +++++++++++++++++++++++---------------------
 src/resources/itemdb.h      |   2 +-
 src/resources/monsterdb.h   |  93 +++++++++++++++++++-------------------
 src/utils/xml.h             |   3 ++
 16 files changed, 168 insertions(+), 104 deletions(-)
 mode change 100644 => 100755 docs/SOURCE/tmwdox.sh

(limited to 'docs')

diff --git a/ChangeLog b/ChangeLog
index 44caf16c..1ff45551 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
-2007-01-23  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+2007-01-28  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/char_select.h, src/net/messagein.h,
+	src/net/messagehandler.h, src/net/network.h, src/net/connection.h,
+	src/net/messageout.h, src/utils/xml.h, src/main.h,
+	src/resources/monsterdb.h, src/resources/itemdb.h,
+	src/resources/equipmentdb.h: Some work on documentation.
+
+2007-01-23  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/gui/shoplistbox.cpp, docs/INSTALL/win32.txt, INSTALL, NEWS:
 	Upgraded to Guichan 0.6.1.
diff --git a/INSTALL b/INSTALL
index f7e8688e..0f5d53f0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -20,7 +20,7 @@ and some libraries. The required libraries are:
 * SDL_mixer         http://www.libsdl.org/projects/SDL_mixer/
 * SDL_image         http://www.libsdl.org/projects/SDL_image/
 * SDL_net           http://www.libsdl.org/projects/SDL_net/
-* Guichan 0.6.1     http://guichan.sourceforge.net/
+* Guichan 0.6.x     http://guichan.sourceforge.net/
 * libxml2           http://www.xmlsoft.org/
 * physfs 1.0.x      http://icculus.org/physfs/
 * zlib 1.2.x        http://www.gzip.org/zlib/
diff --git a/NEWS b/NEWS
index 47421aef..adeca670 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
 0.0.22.2 (...)
-- Updated to work with Guichan 0.6.1 (older versions no longer supported)
+- Updated to work with Guichan 0.6.1
 
 0.0.22.1 (15 January 2007)
 - Updated to work with Guichan 0.6.0 (older versions no longer supported)
diff --git a/docs/SOURCE/tmw.doxcfg b/docs/SOURCE/tmw.doxcfg
index fe5039fb..19cfb024 100644
--- a/docs/SOURCE/tmw.doxcfg
+++ b/docs/SOURCE/tmw.doxcfg
@@ -1085,7 +1085,7 @@ CALL_GRAPH             = NO
 # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
 # will graphical hierarchy of all classes instead of a textual one.
 
-GRAPHICAL_HIERARCHY    = YES
+GRAPHICAL_HIERARCHY    = NO
 
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
 # generated by dot. Possible values are png, jpg, or gif
diff --git a/docs/SOURCE/tmwdox.sh b/docs/SOURCE/tmwdox.sh
old mode 100644
new mode 100755
diff --git a/src/gui/char_select.h b/src/gui/char_select.h
index d6dee8b5..dbce2cbf 100644
--- a/src/gui/char_select.h
+++ b/src/gui/char_select.h
@@ -94,7 +94,7 @@ class CharSelectDialog : public Window, public gcn::ActionListener
 /**
  * Character creation dialog.
  *
- * \ingroup GUI
+ * \ingroup Interface
  */
 class CharCreateDialog : public Window, public gcn::ActionListener
 {
diff --git a/src/main.h b/src/main.h
index 14f52e4d..6ecf628e 100644
--- a/src/main.h
+++ b/src/main.h
@@ -24,6 +24,35 @@
 #ifndef _TMW_MAIN_H
 #define _TMW_MAIN_H
 
+/**
+ * \mainpage
+ *
+ * \section Introduction Introduction
+ *
+ * This is the documentation for the client of The Mana World
+ * (http://themanaworld.org). It is always a work in progress, with the intent
+ * to make it easier for new developers to grow familiar with the source code.
+ *
+ * \section General General information
+ *
+ * During the game, the current Map is displayed by the main Viewport, which
+ * is the bottom-most widget in the WindowContainer. Aside the viewport, the
+ * window container keeps track of all the \link Window Windows\endlink
+ * displayed during the game.
+ *
+ * A Map is composed of several layers of \link Image Images\endlink (tiles),
+ * a layer with collision information and \link Sprite Sprites\endlink. The
+ * sprites define the visible part of \link Being Beings\endlink and
+ * \link FloorItem FloorItems\endlink, they are drawn from top to bottom
+ * by the map, interleaved with the tiles in the fringe layer.
+ *
+ * The server is split up into an \link Net::AccountServer account
+ * server\endlink, a \link Net::ChatServer chat server\endlink and a \link
+ * Net::GameServer game server\endlink. There may be multiple game servers.
+ * Handling of incoming messages is spread over several \link MessageHandler
+ * MessageHanders\endlink.
+ */
+
 #include <string>
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/net/connection.h b/src/net/connection.h
index d8ea3124..734c8d65 100644
--- a/src/net/connection.h
+++ b/src/net/connection.h
@@ -32,6 +32,9 @@ class MessageOut;
 
 namespace Net
 {
+    /**
+     * \ingroup Network
+     */
     class Connection
     {
         public:
diff --git a/src/net/messagehandler.h b/src/net/messagehandler.h
index b21abd72..a5fc81b3 100644
--- a/src/net/messagehandler.h
+++ b/src/net/messagehandler.h
@@ -28,6 +28,9 @@
 
 class MessageIn;
 
+/**
+ * \ingroup Network
+ */
 class MessageHandler
 {
     public:
diff --git a/src/net/messagein.h b/src/net/messagein.h
index 68bbb933..cb8e44cd 100644
--- a/src/net/messagein.h
+++ b/src/net/messagein.h
@@ -30,6 +30,8 @@
 
 /**
  * Used for parsing an incoming message.
+ *
+ * \ingroup Network
  */
 class MessageIn
 {
diff --git a/src/net/messageout.h b/src/net/messageout.h
index af25e4b4..82412a30 100644
--- a/src/net/messageout.h
+++ b/src/net/messageout.h
@@ -27,7 +27,10 @@
 #include <iosfwd>
 
 /**
- * Used for building an outgoing message.
+ * Used for building an outgoing message. When finished, the message is sent
+ * using Net::Connection::send().
+ *
+ * \ingroup Network
  */
 class MessageOut
 {
diff --git a/src/net/network.h b/src/net/network.h
index 9ffcbb6d..0701a956 100644
--- a/src/net/network.h
+++ b/src/net/network.h
@@ -26,9 +26,16 @@
 
 #include <iosfwd>
 
+/**
+ * \defgroup Network Core network layer
+ */
+
 class MessageHandler;
 class MessageOut;
 
+/**
+ * \ingroup Network
+ */
 namespace Net
 {
     class Connection;
diff --git a/src/resources/equipmentdb.h b/src/resources/equipmentdb.h
index b8618f5f..b43a6145 100644
--- a/src/resources/equipmentdb.h
+++ b/src/resources/equipmentdb.h
@@ -1,52 +1,55 @@
-/*
- *  The Mana World
- *  Copyright 2006 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id:
- */
-
-#ifndef _TMW_EQUIPMENT_DB_H
-#define _TMW_EQUIPMENT_DB_H
-
-#include <map>
-
-#include "equipmentinfo.h"
-
-namespace EquipmentDB
-{
-    /**
-     * Loads the equipment info from Items.xml
-     */
-    void load();
-
-    /**
-     * Frees equipment data
-     */
-    void unload();
-
-    void setEquipment(int id, EquipmentInfo* equipmentInfo);
-
-    EquipmentInfo* get(int id);
-
-    // Equipment database types
-    typedef std::map<int, EquipmentInfo*> EquipmentInfos;
-    typedef EquipmentInfos::iterator EquipmentInfoIterator;
-}
-
-#endif
+/*
+ *  The Mana World
+ *  Copyright 2006 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id:
+ */
+
+#ifndef _TMW_EQUIPMENT_DB_H
+#define _TMW_EQUIPMENT_DB_H
+
+#include <map>
+
+#include "equipmentinfo.h"
+
+/**
+ * Equipment information database.
+ */
+namespace EquipmentDB
+{
+    /**
+     * Loads the equipment info from Items.xml
+     */
+    void load();
+
+    /**
+     * Frees equipment data
+     */
+    void unload();
+
+    void setEquipment(int id, EquipmentInfo* equipmentInfo);
+
+    EquipmentInfo* get(int id);
+
+    // Equipment database types
+    typedef std::map<int, EquipmentInfo*> EquipmentInfos;
+    typedef EquipmentInfos::iterator EquipmentInfoIterator;
+}
+
+#endif
diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
index c080194b..6ead5b22 100644
--- a/src/resources/itemdb.h
+++ b/src/resources/itemdb.h
@@ -29,7 +29,7 @@
 #include <map>
 
 /**
- * The namespace that holds the item information.
+ * Item information database.
  */
 namespace ItemDB
 {
diff --git a/src/resources/monsterdb.h b/src/resources/monsterdb.h
index b105665a..3b69523d 100644
--- a/src/resources/monsterdb.h
+++ b/src/resources/monsterdb.h
@@ -1,45 +1,48 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id:
- */
-
-#ifndef _TMW_MONSTER_DB_H
-#define _TMW_MONSTER_DB_H
-
-#include <map>
-
-#include "monsterinfo.h"
-
-namespace MonsterDB
-{
-    void
-    load();
-
-    void
-    unload();
-
-    const MonsterInfo& get (int id);
-
-    typedef std::map<int, MonsterInfo*> MonsterInfos;
-    typedef MonsterInfos::iterator MonsterInfoIterator;
-}
-
-#endif
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id:
+ */
+
+#ifndef _TMW_MONSTER_DB_H
+#define _TMW_MONSTER_DB_H
+
+#include <map>
+
+#include "monsterinfo.h"
+
+/**
+ * Monster information database.
+ */
+namespace MonsterDB
+{
+    void
+    load();
+
+    void
+    unload();
+
+    const MonsterInfo& get (int id);
+
+    typedef std::map<int, MonsterInfo*> MonsterInfos;
+    typedef MonsterInfos::iterator MonsterInfoIterator;
+}
+
+#endif
diff --git a/src/utils/xml.h b/src/utils/xml.h
index 54ed9951..bf01fc96 100644
--- a/src/utils/xml.h
+++ b/src/utils/xml.h
@@ -28,6 +28,9 @@
 
 #include <string>
 
+/**
+ * XML helper functions.
+ */
 namespace XML
 {
     /**
-- 
cgit v1.2.3-70-g09d2


From a4e31503633c3029cb6c526275bc34d471a3c0d4 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Mon, 29 Jan 2007 23:07:47 +0000
Subject: Some trivial documentation work. Fixes all Doxygen warnings.

---
 ChangeLog                   | 10 +++++++++-
 docs/SOURCE/tmw.doxcfg      |  4 ++--
 src/being.cpp               |  8 ++++----
 src/being.h                 | 12 ++++++------
 src/beingmanager.h          |  7 +++++--
 src/gui/window.h            | 10 +++++-----
 src/main.h                  |  2 +-
 src/properties.h            | 16 ++++++++++++++--
 src/resources/image.h       |  1 +
 src/resources/mapreader.h   |  5 +++--
 src/resources/music.h       |  1 +
 src/resources/soundeffect.h |  1 +
 src/sound.cpp               | 42 +++++++++++++++++++++++++++---------------
 src/sound.h                 | 23 ++++++++++++-----------
 14 files changed, 91 insertions(+), 51 deletions(-)

(limited to 'docs')

diff --git a/ChangeLog b/ChangeLog
index 1ff45551..f33e6a6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
-2007-01-28  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+2007-01-30  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/properties.h, src/being.cpp, src/beingmanager.h, src/sound.h,
+	src/gui/window.h, src/sound.cpp, src/main.h, src/being.h,
+	src/resources/soundeffect.h, src/resources/image.h,
+	src/resources/mapreader.h, src/resources/music.h: Some trivial
+	documentation work. Fixes all Doxygen warnings.
+
+2007-01-28  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/gui/char_select.h, src/net/messagein.h,
 	src/net/messagehandler.h, src/net/network.h, src/net/connection.h,
diff --git a/docs/SOURCE/tmw.doxcfg b/docs/SOURCE/tmw.doxcfg
index 19cfb024..11eb2604 100644
--- a/docs/SOURCE/tmw.doxcfg
+++ b/docs/SOURCE/tmw.doxcfg
@@ -17,7 +17,7 @@
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = The Mana World
+PROJECT_NAME           = "The Mana World"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number.
 # This could be handy for archiving the generated documentation or
@@ -406,7 +406,7 @@ WARN_FORMAT            = "$file:$line: $text"
 # and error messages should be written. If left blank the output is written
 # to stderr.
 
-WARN_LOGFILE           =
+WARN_LOGFILE           = "../docs/SOURCE/warnings.log"
 
 #---------------------------------------------------------------------------
 # configuration options related to the input files
diff --git a/src/being.cpp b/src/being.cpp
index ac003d1c..68b85832 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -42,8 +42,8 @@
 
 extern Spriteset *emotionset;
 
-PATH_NODE::PATH_NODE(Uint16 iX, Uint16 iY):
-    x(iX), y(iY)
+PATH_NODE::PATH_NODE(unsigned short x, unsigned short y):
+    x(x), y(y)
 {
 }
 
@@ -486,7 +486,7 @@ Being::draw(Graphics *graphics, int offsetX, int offsetY) const
 }
 
 void
-Being::drawEmotion(Graphics *graphics, Sint32 offsetX, Sint32 offsetY)
+Being::drawEmotion(Graphics *graphics, int offsetX, int offsetY)
 {
     if (!mEmotion)
         return;
@@ -498,7 +498,7 @@ Being::drawEmotion(Graphics *graphics, Sint32 offsetX, Sint32 offsetY)
 }
 
 void
-Being::drawSpeech(Graphics *graphics, Sint32 offsetX, Sint32 offsetY)
+Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY)
 {
     int px = mPx + offsetX;
     int py = mPy + offsetY;
diff --git a/src/being.h b/src/being.h
index bfd01568..b87cacbe 100644
--- a/src/being.h
+++ b/src/being.h
@@ -146,7 +146,7 @@ class Being : public Sprite
          * Puts a damage bubble above this being for the specified amount
          * of time.
          *
-         * @param text The text that should appear.
+         * @param amount The amount of damage.
          * @param time The amount of time the text should stay in milliseconds.
          */
         void setDamage(Sint16 amount, Uint32 time);
@@ -160,7 +160,7 @@ class Being : public Sprite
         /**
          * Sets the name for the being.
          *
-         * @param text The name that should appear.
+         * @param name The name that should appear.
          */
         void
         setName(const std::string &name) { mName = name; }
@@ -223,19 +223,19 @@ class Being : public Sprite
          * Draws the speech text above the being.
          */
         void
-        drawSpeech(Graphics *graphics, Sint32 offsetX, Sint32 offsetY);
+        drawSpeech(Graphics *graphics, int offsetX, int offsetY);
 
         /**
          * Draws the emotion picture above the being.
          */
         void
-        drawEmotion(Graphics *graphics, Sint32 offsetX, Sint32 offsetY);
+        drawEmotion(Graphics *graphics, int offsetX, int offsetY);
 
         /**
          * Draws the name text below the being.
          */
         virtual void
-        drawName(Graphics *graphics, Sint32 offsetX, Sint32 offsetY) {};
+        drawName(Graphics *graphics, int offsetX, int offsetY) {};
 
         /**
          * Returns the type of the being.
@@ -315,7 +315,7 @@ class Being : public Sprite
          * @see Sprite::draw(Graphics, int, int)
          */
         virtual void
-        draw(Graphics *graphics, Sint32 offsetX, Sint32 offsetY) const;
+        draw(Graphics *graphics, int offsetX, int offsetY) const;
 
         /**
          * Returns the pixel X coordinate.
diff --git a/src/beingmanager.h b/src/beingmanager.h
index 15a347de..f97a23f4 100644
--- a/src/beingmanager.h
+++ b/src/beingmanager.h
@@ -68,8 +68,11 @@ class BeingManager
         /**
          * Return a being nearest to specific coordinates.
          *
-         * \param maxdist maximal distance. If minimal distance is larger,
-         *                no being is returned
+         * @param x       X coordinate.
+         * @param y       Y coordinate.
+         * @param maxdist Maximal distance. If minimal distance is larger,
+         *                no being is returned.
+         * @param type    The type of being to look for.
          */
         Being* findNearestLivingBeing(Uint16 x, Uint16 y, int maxdist,
                                       Being::Type type = Being::UNKNOWN);
diff --git a/src/gui/window.h b/src/gui/window.h
index 9ac02287..31c260cf 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -50,11 +50,11 @@ class Window : public gcn::Window
          * Constructor. Initializes the title to the given text and hooks
          * itself into the window container.
          *
-         * @param text   The initial window title, "Window" by default.
-         * @param modal  Block input to other windows.
-         * @param parent The parent window. This is the window standing above
-         *               this one in the window hiearchy. When reordering,
-         *               a window will never go below its parent window.
+         * @param caption The initial window title, "Window" by default.
+         * @param modal   Block input to other windows.
+         * @param parent  The parent window. This is the window standing above
+         *                this one in the window hiearchy. When reordering,
+         *                a window will never go below its parent window.
          */
         Window(const std::string &caption = "Window", bool modal = false,
                 Window *parent = NULL);
diff --git a/src/main.h b/src/main.h
index 6ecf628e..c001a374 100644
--- a/src/main.h
+++ b/src/main.h
@@ -38,7 +38,7 @@
  * During the game, the current Map is displayed by the main Viewport, which
  * is the bottom-most widget in the WindowContainer. Aside the viewport, the
  * window container keeps track of all the \link Window Windows\endlink
- * displayed during the game.
+ * displayed during the game. It is the <i>top</i> widget for Guichan.
  *
  * A Map is composed of several layers of \link Image Images\endlink (tiles),
  * a layer with collision information and \link Sprite Sprites\endlink. The
diff --git a/src/properties.h b/src/properties.h
index 56e90c0e..bcd114c1 100644
--- a/src/properties.h
+++ b/src/properties.h
@@ -34,13 +34,17 @@
 class Properties
 {
     public:
+        /**
+         * Destructor.
+         */
         virtual
         ~Properties() {}
 
         /**
          * Get a map property.
          *
-         * @param def default value, empty string by default
+         * @param name The name of the property.
+         * @param def  Default value, empty string by default.
          * @return the value of the given property or the given default when it
          *         doesn't exist.
          */
@@ -54,7 +58,8 @@ class Properties
         /**
          * Gets a map property as a float.
          *
-         * @param def default value, 0.0f by default
+         * @param name The name of the property.
+         * @param def  Default value, 0.0f by default.
          * @return the value of the given property, or 0.0f when it doesn't
          *         exist.
          */
@@ -74,6 +79,10 @@ class Properties
 
         /**
          * Returns whether a certain property is available.
+         *
+         * @param name The name of the property.
+         * @return <code>true</code> when a property is defined,
+         *         <code>false</code> otherwise.
          */
         bool
         hasProperty(const std::string &name)
@@ -83,6 +92,9 @@ class Properties
 
         /**
          * Set a map property.
+         *
+         * @param name  The name of the property.
+         * @param value The value of the property.
          */
         void
         setProperty(const std::string &name, const std::string &value)
diff --git a/src/resources/image.h b/src/resources/image.h
index a1ab7f48..03bf0cbc 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -62,6 +62,7 @@ class Image : public Resource
          *
          * @param buffer     The memory buffer containing the image data.
          * @param bufferSize The size of the memory buffer in bytes.
+         * @param idPath     The path identifying the resource.
          *
          * @return <code>NULL</code> if the an error occurred, a valid pointer
          *         otherwise.
diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h
index ad21762d..d16ff1d5 100644
--- a/src/resources/mapreader.h
+++ b/src/resources/mapreader.h
@@ -55,8 +55,9 @@ class MapReader
         /**
          * Reads the properties element.
          *
-         * @param props the Properties instance to which the properties will
-         *              be assigned
+         * @param node  The <code>properties</code> element.
+         * @param props The Properties instance to which the properties will
+         *              be assigned.
          */
         static void
         readProperties(xmlNodePtr node, Properties* props);
diff --git a/src/resources/music.h b/src/resources/music.h
index 9cf75928..2888eaa0 100644
--- a/src/resources/music.h
+++ b/src/resources/music.h
@@ -44,6 +44,7 @@ class Music : public Resource
          *
          * @param buffer     The memory buffer containing the music data.
          * @param bufferSize The size of the memory buffer in bytes.
+         * @param idPath     The path identifying the resource.
          *
          * @return <code>NULL</code> if the an error occurred, a valid pointer
          *         otherwise.
diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h
index 92b0016a..007f5a77 100644
--- a/src/resources/soundeffect.h
+++ b/src/resources/soundeffect.h
@@ -45,6 +45,7 @@ class SoundEffect : public Resource
          *
          * @param buffer     The memory buffer containing the sample data.
          * @param bufferSize The size of the memory buffer in bytes.
+         * @param idPath     The path identifying the resource.
          *
          * @return <code>NULL</code> if the an error occurred, a valid pointer
          *         otherwise.
diff --git a/src/sound.cpp b/src/sound.cpp
index 8ba8fe99..9f858e15 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -40,7 +40,8 @@ Sound::~Sound()
 {
 }
 
-void Sound::init()
+void
+Sound::init()
 {
     // Don't initialize sound engine twice
     if (mInstalled) return;
@@ -71,7 +72,8 @@ void Sound::init()
     mInstalled = true;
 }
 
-void Sound::info()
+void
+Sound::info()
 {
     SDL_version compiledVersion;
     const SDL_version *linkedVersion;
@@ -110,7 +112,8 @@ void Sound::info()
     logger->log("Sound::info() Channels: %i", channels);
 }
 
-void Sound::setMusicVolume(int volume)
+void
+Sound::setMusicVolume(int volume)
 {
     if (!mInstalled) return;
 
@@ -118,7 +121,8 @@ void Sound::setMusicVolume(int volume)
     Mix_VolumeMusic(volume);
 }
 
-void Sound::setSfxVolume(int volume)
+void
+Sound::setSfxVolume(int volume)
 {
     if (!mInstalled) return;
 
@@ -126,7 +130,8 @@ void Sound::setSfxVolume(int volume)
     Mix_Volume(-1, volume);
 }
 
-void Sound::playMusic(const char *path, int loop)
+void
+Sound::playMusic(const std::string &path, int loop)
 {
     if (!mInstalled) return;
 
@@ -134,9 +139,10 @@ void Sound::playMusic(const char *path, int loop)
         stopMusic();
     }
 
-    logger->log("Sound::startMusic() Playing \"%s\" %i times", path, loop);
+    logger->log("Sound::startMusic() Playing \"%s\" %i times", path.c_str(),
+                loop);
 
-    mMusic = Mix_LoadMUS(path);
+    mMusic = Mix_LoadMUS(path.c_str());
     if (mMusic) {
         Mix_PlayMusic(mMusic, loop);
     }
@@ -145,7 +151,8 @@ void Sound::playMusic(const char *path, int loop)
     }
 }
 
-void Sound::stopMusic()
+void
+Sound::stopMusic()
 {
     if (!mInstalled) return;
 
@@ -158,7 +165,8 @@ void Sound::stopMusic()
     }
 }
 
-void Sound::fadeInMusic(const char *path, int loop, int ms)
+void
+Sound::fadeInMusic(const std::string &path, int loop, int ms)
 {
     if (!mInstalled) return;
 
@@ -166,10 +174,11 @@ void Sound::fadeInMusic(const char *path, int loop, int ms)
         stopMusic();
     }
 
-    logger->log("Sound::fadeInMusic() Fading \"%s\" %i times (%i ms)", path,
-            loop, ms);
+    logger->log("Sound::fadeInMusic() Fading \"%s\" %i times (%i ms)",
+                path.c_str(),
+                loop, ms);
 
-    mMusic = Mix_LoadMUS(path);
+    mMusic = Mix_LoadMUS(path.c_str());
     if (mMusic) {
         Mix_FadeInMusic(mMusic, loop, ms);
     }
@@ -178,7 +187,8 @@ void Sound::fadeInMusic(const char *path, int loop, int ms)
     }
 }
 
-void Sound::fadeOutMusic(int ms)
+void
+Sound::fadeOutMusic(int ms)
 {
     if (!mInstalled) return;
 
@@ -191,7 +201,8 @@ void Sound::fadeOutMusic(int ms)
     }
 }
 
-void Sound::playSfx(const std::string &path)
+void
+Sound::playSfx(const std::string &path)
 {
     if (!mInstalled || path.length() == 0) return;
 
@@ -203,7 +214,8 @@ void Sound::playSfx(const std::string &path)
     }
 }
 
-void Sound::close()
+void
+Sound::close()
 {
     stopMusic();
 
diff --git a/src/sound.h b/src/sound.h
index 07db0587..ebcd6442 100644
--- a/src/sound.h
+++ b/src/sound.h
@@ -62,10 +62,10 @@ class Sound {
         /**
          * Starts background music.
          *
-         * \param in   Full path to file
-         * \param loop The number of times the song is played (-1 = infinite)
+         * @param path The full path to the music file.
+         * @param loop The number of times the song is played (-1 = infinite)
          */
-        void playMusic(const char *path, int loop = -1);
+        void playMusic(const std::string &path, int loop = -1);
 
         /**
          * Stops currently running background music track.
@@ -75,37 +75,38 @@ class Sound {
         /**
          * Fades in background music.
          *
-         * \param in   Full path to file
-         * \param loop The number of times the song is played (-1 = infinite)
-         * \param ms   Duration of fade-in effect (ms)
+         * @param path The full path to the music file.
+         * @param loop The number of times the song is played (-1 = infinite)
+         * @param ms   Duration of fade-in effect (ms)
          */
-        void fadeInMusic(const char *path, int loop = -1, int ms = 2000);
+        void fadeInMusic(const std::string &path, int loop = -1,
+                         int ms = 2000);
 
         /**
          * Fades out currently running background music track.
          *
-         * \param ms   Duration of fade-out effect (ms)
+         * @param ms   Duration of fade-out effect (ms)
          */
         void fadeOutMusic(int ms);
 
         /**
          * Sets music volume.
          *
-         * \param volume Volume value
+         * @param volume Volume value
          */
         void setMusicVolume(int volume);
 
         /**
          * Sets sfx volume.
          *
-         * \param volume Volume value
+         * @param volume Volume value
          */
         void setSfxVolume(int volume);
 
         /**
          * Plays an item.
          *
-         * \param path     Full path to file
+         * @param path The resource path to the sound file.
          */
         void playSfx(const std::string &path);
 
-- 
cgit v1.2.3-70-g09d2


From bfbb797e6c528e0650826e917d498c52362abbb0 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sat, 24 Mar 2007 16:24:43 +0000
Subject: Merged 0.0 changes from revision 3177 to 3234 to trunk.

---
 ChangeLog                          | 162 +++++++-
 data/graphics/gui/deepbox.png      | Bin 266 -> 270 bytes
 data/graphics/gui/mouse.png        | Bin 984 -> 1134 bytes
 data/graphics/gui/slider.png       | Bin 502 -> 571 bytes
 data/graphics/gui/thickborder.png  | Bin 480 -> 530 bytes
 data/graphics/gui/vscroll_blue.png | Bin 368 -> 395 bytes
 data/graphics/gui/vscroll_grey.png | Bin 342 -> 371 bytes
 data/graphics/gui/vscroll_red.png  | Bin 367 -> 394 bytes
 data/icons/CMakeLists.txt          |   6 +-
 data/icons/Makefile.am             |   7 +-
 data/icons/tmw-icon.ico            | Bin 2238 -> 0 bytes
 data/icons/tmw-icon.png            | Bin 1103 -> 0 bytes
 data/icons/tmw-icon.xpm            |  56 ---
 data/icons/tmw.ico                 | Bin 0 -> 22382 bytes
 data/icons/tmw.png                 | Bin 0 -> 18176 bytes
 data/icons/tmw.xpm                 | 784 +++++++++++++++++++++++++++++++++++++
 docs/Makefile.am                   |   2 +
 docs/tmw.6                         |  74 ++++
 src/CMakeLists.txt                 |   6 +-
 src/Makefile.am                    |   6 +-
 src/animatedsprite.cpp             |   1 -
 src/being.cpp                      |  14 +-
 src/being.h                        |   4 +-
 src/engine.cpp                     |   4 +-
 src/floor_item.cpp                 |   1 -
 src/gui/char_select.cpp            |  65 +--
 src/gui/char_select.h              |  12 +-
 src/gui/equipmentwindow.cpp        |   1 -
 src/gui/itemcontainer.cpp          |   8 +-
 src/gui/login.cpp                  |  87 ++--
 src/gui/login.h                    |  30 +-
 src/gui/register.cpp               |  89 +++--
 src/gui/register.h                 |  37 +-
 src/gui/unregisterdialog.cpp       |   2 +-
 src/gui/viewport.cpp               | 110 ++++--
 src/gui/viewport.h                 |  24 ++
 src/localplayer.cpp                |   1 +
 src/localplayer.h                  |  12 +
 src/logindata.h                    |   4 +-
 src/main.cpp                       | 101 +++--
 src/monster.h                      |   1 -
 src/net/charserverhandler.cpp      |  24 +-
 src/net/charserverhandler.h        |  13 +
 src/net/equipmenthandler.cpp       |   5 +
 src/net/loginhandler.cpp           |   2 +-
 src/net/protocol.h                 |   1 +
 src/npc.cpp                        |   2 -
 src/resources/animation.h          |   1 -
 src/resources/image.cpp            | 124 +++---
 src/resources/image.h              |   6 +
 src/resources/imageset.cpp         |  65 +++
 src/resources/imageset.h           |  66 ++++
 src/resources/monsterdb.h          |   2 +-
 src/resources/monsterinfo.h        | 157 ++++----
 src/resources/resourcemanager.cpp  |  22 +-
 src/resources/resourcemanager.h    |   8 +-
 src/resources/spritedef.cpp        |  34 +-
 src/resources/spritedef.h          |  10 +-
 src/resources/spriteset.cpp        |  65 ---
 src/resources/spriteset.h          |  69 ----
 src/simpleanimation.cpp            |  50 +++
 src/simpleanimation.h              |  65 +++
 src/tileset.h                      |   8 +-
 src/tmw.rc                         |   2 +-
 tmw.cbp                            |  22 +-
 65 files changed, 1922 insertions(+), 612 deletions(-)
 delete mode 100644 data/icons/tmw-icon.ico
 delete mode 100644 data/icons/tmw-icon.png
 delete mode 100644 data/icons/tmw-icon.xpm
 create mode 100644 data/icons/tmw.ico
 create mode 100644 data/icons/tmw.png
 create mode 100644 data/icons/tmw.xpm
 create mode 100644 docs/tmw.6
 create mode 100644 src/resources/imageset.cpp
 create mode 100644 src/resources/imageset.h
 delete mode 100644 src/resources/spriteset.cpp
 delete mode 100644 src/resources/spriteset.h
 create mode 100644 src/simpleanimation.cpp
 create mode 100644 src/simpleanimation.h

(limited to 'docs')

diff --git a/ChangeLog b/ChangeLog
index 95cf4044..d0f661a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,23 @@
-2007-03-23  Eugenio Favalli  <elvenprogrammer@gmail.com>
+2007-03-24  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/main.cpp: Changed the order of network message handling and
+	logic, in order to prevent an incoming character delete message from
+	deleting the player character that was about to be drawn.
+	* src/gui/char_select.cpp: Removed useless lock/unlock calls.
+	* src/logindata.h, src/main.cpp, src/gui/login.cpp: Go back to login
+	or register state on error, depending on what the user was doing.
+	* src/gui/register.cpp: Actually use the server that is filled in.
+	* src/net/loginhandler.cpp: Fixed error message.
+	* src/net/charserverhandler.cpp: Fixed crash since now logic is called
+	after non-selected characters are deleted, by properly setting deleted
+	instances to 0 and going back to initial selection.
+	* src/main.cpp, src/net/network.h, src/net/network.cpp: Make sure that
+	when a network error occurs, the error message is available and shown
+	to the user.
+	* src/gui/register.h, src/gui/register.cpp: Only enable Register
+	button when all necessary fields are filled in.
+
+2007-03-23  Eugenio Favalli  <elvenprogrammer@gmail.com>
 
 	* tmw.cbp: Updated and fixed Code::Blocks project file.
 
@@ -6,19 +25,116 @@
 
 	* src/gui/char_select.cpp, src/gui/inventorywindow.cpp,
 	src/gui/ministatus.cpp, src/gui/ministatus.h, src/gui/skill.cpp,
-	src/gui/skill.h, src/gui/status.cpp, src/gui/status.h, src/localplayer.cpp
-	, src/localplayer.h, src/net/buysellhandler: Redesigned the localplayer
-	class to use getters and setters instead of direct access to the member
-	variables.
-	src/net/charserverhandler.cpp, src/net/playerhandler.cpp,
-	src/net/protocol.h: Implemented communication of attributes between server
-	and client.
+	src/gui/skill.h, src/gui/status.cpp, src/gui/status.h,
+	src/localplayer.cpp, src/localplayer.h, src/net/buysellhandler:
+	Redesigned the localplayer class to use getters and setters instead of
+	direct access to the member variables.
+	* src/net/charserverhandler.cpp, src/net/playerhandler.cpp,
+	src/net/protocol.h: Implemented communication of attributes between
+	server and client.
+
+2007-03-23  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/char_select.cpp, src/gui/char_select.h,
+	src/net/charserverhandler.h, src/net/charserverhandler.cpp: Clarified
+	the error message when character creation fails and made sure the
+	character creation dialog doesn't close when creation failed.
+
+2007-03-22  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/login.cpp, src/gui/login.h, src/gui/register.h,
+	src/gui/register.cpp: Only enable login button when a username,
+	password and server are filled in. Pass username, password and server
+	on to the register dialog. Go back to login dialog when canceling
+	registration. Fixed a crash caused by deleting an OkDialog twice (it
+	also deletes itself). Made the register dialog a bit wider. Register
+	dialog no longer clears username field when it is invalid.
+	* src/main.cpp, data/icons/CMakeLists.txt, data/icons/Makefile.am,
+	data/icons/tmw-32x32.png: Use a 32x32 non-alpha layered window icon.
+	* tmw.cbp: Updated project file.
+	* data/icons/CMakeLists.txt, data/icons/Makefile.am, src/main.cpp,
+	data/icons/tmw-32x32.png: Removed 32x32 non-alpha layered window icon
+	again, and instead used the icon in the executable on Windows.
+
+2007-03-21  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/main.cpp, src/gui/viewport.cpp, src/resources/image.h,
+	src/resources/image.cpp: Reduced amount of useless logging, calculate
+	nearest power of two in a function and only do the alpha check in
+	software mode.
+	* src/gui/login.cpp: Fixed small issue where default server didn't fit
+	in the server entry field properly.
+	* src/main.cpp: Display a progress bar and connecting status for each
+	server and display the version using a gcn::Label.
+	* src/gui/viewport.cpp, src/monster.h: Avoiding magic numbers where
+	possible (1002) and also display the target when other players are
+	targeted.
+	* src/floor_item.cpp, src/being.cpp, src/main.cpp, src/CMakeLists.txt,
+	src/gui/equipmentwindow.cpp, src/gui/viewport.cpp,
+	src/gui/itemcontainer.cpp, src/gui/viewport.h, src/engine.cpp,
+	src/animatedsprite.cpp, src/tileset.h, src/npc.cpp, src/Makefile.am,
+	src/being.h, src/resources/imageset.cpp, src/resources/animation.h,
+	src/resources/spritedef.cpp, src/resources/resourcemanager.h,
+	src/resources/spriteset.h, src/resources/imageset.h,
+	src/resources/resourcemanager.cpp, src/resources/spriteset.cpp,
+	src/resources/spritedef.h: Renamed Spriteset to ImageSet.
+
+2007-03-20  David Athay  <ko2fan@gmail.com>
+
+	* src/gui/viewport.cpp: Fixed target cursor animation, and changed
+	which layer it is drawn after.
+	* src/gui/viewport.cpp, src/gui/viewport.h: Split drawing the target
+	cursor and target name into functions.
 
 2007-03-20  Philipp Sehmisch  <tmw@crushnet.org>
 
+	* data/graphics/gui/mouse.png: Positioned the cursor image more
+	accurate.
 	* src/gui/char_select.cpp, src/gui/char_select.h,
-	src/net/charserverhandler.cpp, src/net/protocol.h: Implemented a GUI for
-	distributing the characters attributes at character creation.
+	src/net/charserverhandler.cpp, src/net/protocol.h: Implemented a GUI
+	for distributing the characters attributes at character creation.
+
+2007-03-19  David Athay <ko2fan@gmail.com>
+
+	* src/localplayer.cpp, src/gui/viewport.cpp, src/gui/viewport.h,
+	src/net/equipmenthandler.cpp, src/localplayer.h,
+	src/net/protocol.h: Added target cursor.
+
+2007-03-18  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* docs/Makefile.am, docs/tmw.6: Added man page by Patrick Matthäi.
+	* src/resources/image.cpp: Restored alpha layer check, since it should
+	be more efficient in software mode when SDL knows an image doesn't use
+	the alpha layer.
+	* data/graphics/gui/thickborder.png,
+	data/graphics/gui/vscroll_grey.png, data/graphics/gui/slider.png,
+	data/graphics/gui/vscroll_blue.png, data/graphics/gui/vscroll_red.png,
+	data/graphics/gui/deepbox.png,
+	data/graphics/sprites/monster-slime-red.png,
+	data/graphics/sprites/monster-scorpion-black.png,
+	data/graphics/sprites/monster-scorpion.png,
+	data/graphics/sprites/monster-slime-rudolph.png,
+	data/graphics/sprites/monster-snake.png,
+	data/graphics/sprites/monster-slime-santa.png,
+	data/graphics/sprites/monster-maggot.png,
+	data/graphics/sprites/monster-spider.png,
+	data/graphics/sprites/monster-scorpion-red.png,
+	data/graphics/sprites/monster-slime-yellow.png,
+	data/graphics/sprites/monster-slime-green.png,
+	data/graphics/sprites/monster-maggot-giant.png: Replaced pink pixels
+	with transparent ones.
+
+2007-03-18  Rogier Polak  <rogier.l.a.polak@gmail.com>
+
+	* src/main.cpp: Added (-v) version to the arguments. (Applied a patch
+	by Patrick Matthäi).
+	* src/resources/image.cpp: Deleted the "pink code", which added
+	transparancy with SDL_SetColorKey.
+
+2007-03-18  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* icons/tmw.ico, icons/tmw.png, icons/tmw.xpm: Replaced icons with the
+	green globe that is also used on the website.
 
 2007-03-16  Philipp Sehmisch  <tmw@crushnet.org>
 
@@ -26,6 +142,25 @@
 	src/net/accountserver/account.hpp: Implemented 7 atribute system
 	in character creation.
 
+2007-03-14  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/main.cpp, src/tmw.rc, data/icons/tmw-icon.png,
+	data/icons/tmw-icon.xpm, data/icons/tmw.ico, data/icons/tmw-icon.ico,
+	data/icons/Makefile.am, data/icons/tmw.png, data/icons/tmw.xpm,
+	data/icons/CMakeLists.txt: Renamed icons to make things easier for
+	Debian packaging, and the "-icon" part was superfluous anyway.
+
+2007-03-12  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/simpleanimation.cpp, src/simpleanimation.h, src/CmakeLists.txt,
+	src/Makefile.am: Added a simple animation class that hosts a looping
+	animation without the action and direction stuff from AnimatedSprite.
+
+2007-03-12  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* data/graphics/items/armor-head-rangerhat.png: New version of ranger
+	hat icon by Pauan.
+
 2007-03-11  Philipp Sehmisch  <tmw@crushnet.org>
 
 	* src/map.cpp, src/gui/viewport.cpp: Fixed a bug that made the engine
@@ -34,10 +169,11 @@
 2007-03-09  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* data/graphics/gui/target-cursor-blue.png,
-	data/graphics/gui/target-cursor-red.png: Added targeting cursors by Pauan.
+	data/graphics/gui/target-cursor-red.png: Added targeting cursors by
+	Pauan.
 	* data/graphics/sprites/chest-cotton-male.png,
-	data/graphics/sprites/chest-cotton-female.png: Replaced cotton shirt with
-	improved version by Pauan.
+	data/graphics/sprites/chest-cotton-female.png: Replaced cotton shirt
+	with improved version by Pauan.
 
 2007-03-03  Rogier Polak  <rogier.l.a.polak@gmail.com>
 
diff --git a/data/graphics/gui/deepbox.png b/data/graphics/gui/deepbox.png
index 814236ed..ed3231f3 100644
Binary files a/data/graphics/gui/deepbox.png and b/data/graphics/gui/deepbox.png differ
diff --git a/data/graphics/gui/mouse.png b/data/graphics/gui/mouse.png
index 9276fc7c..2eeb0e51 100644
Binary files a/data/graphics/gui/mouse.png and b/data/graphics/gui/mouse.png differ
diff --git a/data/graphics/gui/slider.png b/data/graphics/gui/slider.png
index 60ec2392..1f6e6b35 100644
Binary files a/data/graphics/gui/slider.png and b/data/graphics/gui/slider.png differ
diff --git a/data/graphics/gui/thickborder.png b/data/graphics/gui/thickborder.png
index 2bbd7a50..da72c92f 100644
Binary files a/data/graphics/gui/thickborder.png and b/data/graphics/gui/thickborder.png differ
diff --git a/data/graphics/gui/vscroll_blue.png b/data/graphics/gui/vscroll_blue.png
index aa236883..397501ce 100644
Binary files a/data/graphics/gui/vscroll_blue.png and b/data/graphics/gui/vscroll_blue.png differ
diff --git a/data/graphics/gui/vscroll_grey.png b/data/graphics/gui/vscroll_grey.png
index 6bb6bc3f..87ba8758 100644
Binary files a/data/graphics/gui/vscroll_grey.png and b/data/graphics/gui/vscroll_grey.png differ
diff --git a/data/graphics/gui/vscroll_red.png b/data/graphics/gui/vscroll_red.png
index aadf6925..d7ad4a90 100644
Binary files a/data/graphics/gui/vscroll_red.png and b/data/graphics/gui/vscroll_red.png differ
diff --git a/data/icons/CMakeLists.txt b/data/icons/CMakeLists.txt
index 30d96d86..e50c7ab9 100644
--- a/data/icons/CMakeLists.txt
+++ b/data/icons/CMakeLists.txt
@@ -1,9 +1,7 @@
 SET(FILES
-    tmw-icon.ico
-    tmw-icon.png
-    tmw-icon.xpm
+    tmw.png
     )
 
 INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/icons)
 
-INSTALL(FILES "tmw-icon.png" DESTINATION share/pixmaps RENAME tmw.png)
+INSTALL(FILES "tmw.png" DESTINATION share/pixmaps)
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 26dcd623..375edef7 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,14 +1,11 @@
 
 iconsdir = $(pkgdatadir)/data/icons
 
-icons_DATA =		\
-	tmw-icon.ico	\
-	tmw-icon.png	\
-	tmw-icon.xpm
+icons_DATA = tmw.png
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps
-	$(INSTALL) $(srcdir)/tmw-icon.png $(DESTDIR)$(datadir)/pixmaps/tmw.png
+	$(INSTALL) $(srcdir)/tmw.png $(DESTDIR)$(datadir)/pixmaps/tmw.png
 
 uninstall-local:
 	rm -f $(DESTDIR)$(datadir)/pixmaps/tmw.png
diff --git a/data/icons/tmw-icon.ico b/data/icons/tmw-icon.ico
deleted file mode 100644
index 5ba6e1b7..00000000
Binary files a/data/icons/tmw-icon.ico and /dev/null differ
diff --git a/data/icons/tmw-icon.png b/data/icons/tmw-icon.png
deleted file mode 100644
index 2598a620..00000000
Binary files a/data/icons/tmw-icon.png and /dev/null differ
diff --git a/data/icons/tmw-icon.xpm b/data/icons/tmw-icon.xpm
deleted file mode 100644
index a9e91161..00000000
--- a/data/icons/tmw-icon.xpm
+++ /dev/null
@@ -1,56 +0,0 @@
-/* XPM */
-static char *dummy[]={
-"32 32 21 1",
-". c None",
-"f c #003300",
-"s c #003333",
-"# c #003366",
-"d c #006600",
-"h c #009933",
-"c c #040404",
-"m c #0c0c0c",
-"a c #3366cc",
-"e c #339933",
-"g c #33cc33",
-"o c #66cc99",
-"r c #993300",
-"n c #996633",
-"b c #99ccff",
-"j c #c0c0c0",
-"k c #cc6666",
-"q c #cc9933",
-"i c #cc9999",
-"p c #cccc66",
-"l c #efd6c6",
-"................................",
-".........................#......",
-"........#................a......",
-".......#a..............#aba#....",
-"...#.......cccccccc......a......",
-"...a......ccdeddcfdcc....#......",
-".#ab#....ccccegdheefc...........",
-"...#...cccdheeeeehdddc..........",
-".......cheheegeeehddfcc.cc......",
-"........ccdhedeeehhdcc..cic.....",
-".......ccdhgeeeheeddfc.cijc.....",
-".......cfddhehhhddfccc.cikcc....",
-".......ccccfdhedfdffc..cjliccm..",
-"..........cccdfdfcccc.cciiknc...",
-".....cccc...cccccc...cceciiicc..",
-"....cgoggccccnpqrc..mcgogeckcec.",
-"....ccggogggccqpqccmccecciidogcm",
-"....cjncgggecpncnrcccnijijikdec.",
-".....ciikceccrqqcncrciiliikcnc..",
-"....ccccccrcpqpqnrnkdkiiiiiinc..",
-"..cccgogeccnqpccpqncdcseinikrc..",
-"..cgooogggecnqcnqcpneedddsknegc.",
-"..ccccggoooggcnegeceeegdedseogg.",
-"...ccrkggggggoogggoeggegeeddcec.",
-".....ccrcceggggeggggeggegeeckcc.",
-".....mcnilkcgepccceggecceeecic..",
-"......mcriikccinkcpeeencceciic..",
-"........cijiilikiikccciknccrkc..",
-".......cckiknccckiijiiknrc.cc...",
-"........cccncc.ccnkknrccc...c...",
-"..........ccc....ccccc..........",
-"...........m...................."};
diff --git a/data/icons/tmw.ico b/data/icons/tmw.ico
new file mode 100644
index 00000000..61d559a3
Binary files /dev/null and b/data/icons/tmw.ico differ
diff --git a/data/icons/tmw.png b/data/icons/tmw.png
new file mode 100644
index 00000000..93e6c9ae
Binary files /dev/null and b/data/icons/tmw.png differ
diff --git a/data/icons/tmw.xpm b/data/icons/tmw.xpm
new file mode 100644
index 00000000..06ec2865
--- /dev/null
+++ b/data/icons/tmw.xpm
@@ -0,0 +1,784 @@
+/* XPM */
+static char * tmw_xpm[] = {
+"32 32 749 2",
+"  	c None",
+". 	c #E4EB6D",
+"+ 	c #EFF271",
+"@ 	c #E7EF65",
+"# 	c #DDED61",
+"$ 	c #D6E955",
+"% 	c #DAED4D",
+"& 	c #F6F5A0",
+"* 	c #EFEF89",
+"= 	c #ECF084",
+"- 	c #EDF077",
+"; 	c #EAF075",
+"> 	c #E0E960",
+", 	c #D9E757",
+"' 	c #D4EA52",
+") 	c #CFE74D",
+"! 	c #BEE140",
+"~ 	c #C2E43E",
+"{ 	c #B6DF33",
+"] 	c #F8F7C2",
+"^ 	c #F9F7AB",
+"/ 	c #F2F099",
+"( 	c #EEEF80",
+"_ 	c #F3F077",
+": 	c #F8F8B1",
+"< 	c #E8EE6F",
+"[ 	c #E1EB69",
+"} 	c #DBEB5E",
+"| 	c #D5E852",
+"1 	c #CDE445",
+"2 	c #CEE843",
+"3 	c #B6DC34",
+"4 	c #A9DA2F",
+"5 	c #B3E02F",
+"6 	c #B6E630",
+"7 	c #F1F2E2",
+"8 	c #F9F9D4",
+"9 	c #F9F8C5",
+"0 	c #F8F8CE",
+"a 	c #F9F8D6",
+"b 	c #F9F7CB",
+"c 	c #F9F7B1",
+"d 	c #F9F7A7",
+"e 	c #E7EE73",
+"f 	c #E4EC69",
+"g 	c #DEEB60",
+"h 	c #D8E755",
+"i 	c #D5EB55",
+"j 	c #C2E33F",
+"k 	c #BEE33C",
+"l 	c #B5E339",
+"m 	c #A7DF2E",
+"n 	c #9BDA28",
+"o 	c #95DA24",
+"p 	c #8DD724",
+"q 	c #F9F9F5",
+"r 	c #F9F9EA",
+"s 	c #F9F9E1",
+"t 	c #F9F9F4",
+"u 	c #F9F7DF",
+"v 	c #F9F7D1",
+"w 	c #F9F7C9",
+"x 	c #F9F7B6",
+"y 	c #F9F7AE",
+"z 	c #D7E363",
+"A 	c #E1EC6B",
+"B 	c #DDEC60",
+"C 	c #D8EC61",
+"D 	c #CDE552",
+"E 	c #C6E543",
+"F 	c #BCE440",
+"G 	c #BEE73E",
+"H 	c #ABDF30",
+"I 	c #ACE230",
+"J 	c #8FD720",
+"K 	c #80D01C",
+"L 	c #80D51A",
+"M 	c #F9F9F7",
+"N 	c #F9F9EB",
+"O 	c #F9F9F9",
+"P 	c #F9F7E6",
+"Q 	c #F9F7D3",
+"R 	c #F9F7CE",
+"S 	c #F9F7BF",
+"T 	c #F9F8B9",
+"U 	c #E6EF8F",
+"V 	c #E1EB65",
+"W 	c #E0ED63",
+"X 	c #D1E452",
+"Y 	c #D3E84D",
+"Z 	c #C3E340",
+"` 	c #BBE13E",
+" .	c #B0DD35",
+"..	c #ABDD2E",
+"+.	c #A0DB2A",
+"@.	c #95D923",
+"#.	c #7ED31C",
+"$.	c #7ED31A",
+"%.	c #80DA18",
+"&.	c #F4F3EF",
+"*.	c #F9F9F6",
+"=.	c #F9F8F5",
+"-.	c #F9F7EE",
+";.	c #F9F7E2",
+">.	c #F9F7D5",
+",.	c #F9F6C2",
+"'.	c #F8F69C",
+").	c #D4E56D",
+"!.	c #E4ED73",
+"~.	c #DBEA60",
+"{.	c #DDE961",
+"].	c #C9E54E",
+"^.	c #BFE242",
+"/.	c #BEE33E",
+"(.	c #B1DE34",
+"_.	c #ABDE33",
+":.	c #95D826",
+"<.	c #8DD620",
+"[.	c #8DDB20",
+"}.	c #91DD1E",
+"|.	c #71D116",
+"1.	c #50B910",
+"2.	c #F9F8F7",
+"3.	c #F9F8F4",
+"4.	c #F9F7EB",
+"5.	c #F9F7E1",
+"6.	c #F9F5CF",
+"7.	c #F9F6C9",
+"8.	c #F9F6BF",
+"9.	c #D6E471",
+"0.	c #E9F075",
+"a.	c #E3EC6B",
+"b.	c #D9E96D",
+"c.	c #CEE558",
+"d.	c #CBE44E",
+"e.	c #BEDE3E",
+"f.	c #ACDA37",
+"g.	c #BCE639",
+"h.	c #AEE135",
+"i.	c #9EDB2A",
+"j.	c #8FD822",
+"k.	c #7CD31B",
+"l.	c #82DA1C",
+"m.	c #63CE13",
+"n.	c #61CE12",
+"o.	c #F9F9F8",
+"p.	c #F9F7F5",
+"q.	c #F9F4DD",
+"r.	c #F9F5D7",
+"s.	c #F9F5C9",
+"t.	c #F9F5B6",
+"u.	c #E3ED8D",
+"v.	c #DEE865",
+"w.	c #E3ED6D",
+"x.	c #DDEB5E",
+"y.	c #D3E755",
+"z.	c #CAE349",
+"A.	c #CFEB4D",
+"B.	c #C1E33B",
+"C.	c #BCE743",
+"D.	c #B0E02D",
+"E.	c #95DB28",
+"F.	c #95DB26",
+"G.	c #C6E627",
+"H.	c #E8F433",
+"I.	c #CAED26",
+"J.	c #60CD0F",
+"K.	c #58CD0E",
+"L.	c #F9F7EC",
+"M.	c #F9F7F1",
+"N.	c #F9F4E4",
+"O.	c #F9F3D7",
+"P.	c #F9F3CA",
+"Q.	c #F9F5CA",
+"R.	c #F9F5BB",
+"S.	c #F9F8B6",
+"T.	c #F6F89E",
+"U.	c #DFEB5C",
+"V.	c #CEE453",
+"W.	c #D0E753",
+"X.	c #CDE543",
+"Y.	c #C7E842",
+"Z.	c #C1E53C",
+"`.	c #A7DC30",
+" +	c #E6F453",
+".+	c #E2F448",
+"++	c #D8F03C",
+"@+	c #D1ED2E",
+"#+	c #D0F033",
+"$+	c #CAED2C",
+"%+	c #ACE51F",
+"&+	c #55CF0F",
+"*+	c #F5F6EF",
+"=+	c #F9F9F2",
+"-+	c #F9F9F1",
+";+	c #F9F8F0",
+">+	c #F9F7E7",
+",+	c #F9F5F0",
+"'+	c #F9F3E1",
+")+	c #F9F5DB",
+"!+	c #F9F6DB",
+"~+	c #F9F6BE",
+"{+	c #F8F59B",
+"]+	c #F9F5A2",
+"^+	c #F8F68D",
+"/+	c #F7F689",
+"(+	c #D7EC65",
+"_+	c #CEE84E",
+":+	c #BBE23F",
+"<+	c #B6E238",
+"[+	c #A2DC30",
+"}+	c #EBF553",
+"|+	c #E4F443",
+"1+	c #DCF340",
+"2+	c #D4F033",
+"3+	c #CEEF2D",
+"4+	c #C2E926",
+"5+	c #BEEB20",
+"6+	c #5CD50E",
+"7+	c #53CE0D",
+"8+	c #F9F7D9",
+"9+	c #F9F6F2",
+"0+	c #F9F5EB",
+"a+	c #F9F3DA",
+"b+	c #F9F6DF",
+"c+	c #F9F7D0",
+"d+	c #F9F7C2",
+"e+	c #F9F7BB",
+"f+	c #F8F68F",
+"g+	c #F7F58D",
+"h+	c #F6F58B",
+"i+	c #EEF68B",
+"j+	c #BFDF43",
+"k+	c #B5DE37",
+"l+	c #B5E234",
+"m+	c #A7DD30",
+"n+	c #E7F248",
+"o+	c #D6EF40",
+"p+	c #DBF239",
+"q+	c #D0ED2F",
+"r+	c #C3EB2A",
+"s+	c #BCEB26",
+"t+	c #B5E81E",
+"u+	c #52CE0F",
+"v+	c #4ECB0B",
+"w+	c #F9F9D9",
+"x+	c #F9F9D7",
+"y+	c #F9F8F8",
+"z+	c #F9F7E9",
+"A+	c #F9F6E9",
+"B+	c #F9F5E0",
+"C+	c #F8F2D6",
+"D+	c #F9F3CE",
+"E+	c #F9F7CA",
+"F+	c #F9F8B5",
+"G+	c #F6F691",
+"H+	c #F9F699",
+"I+	c #F5F68F",
+"J+	c #F3F579",
+"K+	c #E8F575",
+"L+	c #C7E646",
+"M+	c #B5DF37",
+"N+	c #B9E438",
+"O+	c #9CD928",
+"P+	c #D7F348",
+"Q+	c #DBEF3B",
+"R+	c #D1EF35",
+"S+	c #D7F230",
+"T+	c #C1EA25",
+"U+	c #B5E91F",
+"V+	c #63DC1E",
+"W+	c #48CA0C",
+"X+	c #F4F4DC",
+"Y+	c #F9F9C3",
+"Z+	c #F9F9C5",
+"`+	c #F9F9C7",
+" @	c #F9F9E8",
+".@	c #F9F6DD",
+"+@	c #F9F6D6",
+"@@	c #F9F3C1",
+"#@	c #F9F3BF",
+"$@	c #F9F5B8",
+"%@	c #F8F8A6",
+"&@	c #F6F68F",
+"*@	c #F4F791",
+"=@	c #ABD746",
+"-@	c #C5E449",
+";@	c #C1E448",
+">@	c #BBE23E",
+",@	c #BBE237",
+"'@	c #A9DC30",
+")@	c #99D927",
+"!@	c #D3E32C",
+"~@	c #E2F340",
+"{@	c #D3ED2D",
+"]@	c #CAED2B",
+"^@	c #CDF028",
+"/@	c #C5EB27",
+"(@	c #B0E51C",
+"_@	c #91DC13",
+":@	c #49CA08",
+"<@	c #25B305",
+"[@	c #F5F6BE",
+"}@	c #F5F5A9",
+"|@	c #F3F4B0",
+"1@	c #F6F6B0",
+"2@	c #F7F8B5",
+"3@	c #EDF097",
+"4@	c #F5F18F",
+"5@	c #F9F7B8",
+"6@	c #F9F4B0",
+"7@	c #F9F3AE",
+"8@	c #F9F3A4",
+"9@	c #F9F7A4",
+"0@	c #F7F7A0",
+"a@	c #F5F682",
+"b@	c #D3E75E",
+"c@	c #CAE646",
+"d@	c #CBE846",
+"e@	c #EDF05A",
+"f@	c #C6E432",
+"g@	c #A9E02E",
+"h@	c #99DA27",
+"i@	c #B9DB20",
+"j@	c #E1F33F",
+"k@	c #CEEB2E",
+"l@	c #C7EB27",
+"m@	c #BBEA26",
+"n@	c #B9E722",
+"o@	c #A6DF19",
+"p@	c #ABE815",
+"q@	c #48CB09",
+"r@	c #3ECA08",
+"s@	c #F8F7A7",
+"t@	c #F3F4A0",
+"u@	c #F4F59C",
+"v@	c #F0F49C",
+"w@	c #F2F5A4",
+"x@	c #F5F6A0",
+"y@	c #EFF28F",
+"z@	c #F9F8CD",
+"A@	c #F9F6A7",
+"B@	c #F9F3A0",
+"C@	c #F8F399",
+"D@	c #F8F493",
+"E@	c #F8F693",
+"F@	c #F7F58B",
+"G@	c #E8EF65",
+"H@	c #C7E445",
+"I@	c #C7DB30",
+"J@	c #E1ED48",
+"K@	c #E8F353",
+"L@	c #C3E227",
+"M@	c #D9EB2E",
+"N@	c #E7F549",
+"O@	c #D3EE3B",
+"P@	c #CBED2D",
+"Q@	c #CDEF27",
+"R@	c #BFEC23",
+"S@	c #B6E81E",
+"T@	c #A9E518",
+"U@	c #B1EB1B",
+"V@	c #35BE06",
+"W@	c #38C306",
+"X@	c #F9F9A7",
+"Y@	c #F2F38F",
+"Z@	c #F2F495",
+"`@	c #F3F38D",
+" #	c #F9F9E9",
+".#	c #F7F8C5",
+"+#	c #F8F7D1",
+"@#	c #F8F6A2",
+"##	c #F9F7A9",
+"$#	c #F8F59C",
+"%#	c #F8F291",
+"&#	c #F8F58F",
+"*#	c #F6F789",
+"=#	c #F2F477",
+"-#	c #F0F571",
+";#	c #EAEE52",
+">#	c #DCEA45",
+",#	c #EBEF43",
+"'#	c #E4F04D",
+")#	c #DEEF45",
+"!#	c #E1F246",
+"~#	c #E4F448",
+"{#	c #DBF039",
+"]#	c #D9F235",
+"^#	c #C9ED2B",
+"/#	c #CAEF2C",
+"(#	c #CEF22B",
+"_#	c #B6E91E",
+":#	c #B1EB21",
+"<#	c #A9E815",
+"[#	c #48CF09",
+"}#	c #40CD06",
+"|#	c #EDEF6B",
+"1#	c #EBF07C",
+"2#	c #E7EB71",
+"3#	c #E8E865",
+"4#	c #F8F79E",
+"5#	c #F8F7A4",
+"6#	c #F9F69E",
+"7#	c #F8F48F",
+"8#	c #F6F280",
+"9#	c #F6F482",
+"0#	c #F3F473",
+"a#	c #EFF169",
+"b#	c #EDF467",
+"c#	c #EAF35C",
+"d#	c #EAF258",
+"e#	c #E4F052",
+"f#	c #E4F046",
+"g#	c #E0F03F",
+"h#	c #D5EE3B",
+"i#	c #DFF23E",
+"j#	c #D7F137",
+"k#	c #CEED2E",
+"l#	c #C9EF28",
+"m#	c #CAF025",
+"n#	c #B9EA1E",
+"o#	c #B3E91D",
+"p#	c #B1EB1A",
+"q#	c #A6E817",
+"r#	c #39C506",
+"s#	c #35C505",
+"t#	c #B3BC3E",
+"u#	c #E9F07C",
+"v#	c #DEE867",
+"w#	c #F9F79E",
+"x#	c #F8F793",
+"y#	c #F8F78F",
+"z#	c #F7F684",
+"A#	c #F5F27E",
+"B#	c #F4F26D",
+"C#	c #F4F36F",
+"D#	c #EDF061",
+"E#	c #EEF363",
+"F#	c #EDF35C",
+"G#	c #EEF45C",
+"H#	c #EAF357",
+"I#	c #E8F34B",
+"J#	c #DCEE43",
+"K#	c #E1F03F",
+"L#	c #D6ED37",
+"M#	c #D5EE33",
+"N#	c #D5F134",
+"O#	c #D9F232",
+"P#	c #CEF22D",
+"Q#	c #C7F22A",
+"R#	c #9BDB18",
+"S#	c #A7E518",
+"T#	c #AEEB1B",
+"U#	c #95E514",
+"V#	c #37C306",
+"W#	c #3CC705",
+"X#	c #E0EC60",
+"Y#	c #D1E455",
+"Z#	c #F7F78F",
+"`#	c #F7F891",
+" $	c #F8F78B",
+".$	c #F5F782",
+"+$	c #F8F791",
+"@$	c #EFF06B",
+"#$	c #F3F36D",
+"$$	c #EFF36D",
+"%$	c #F1F56F",
+"&$	c #EDF260",
+"*$	c #EDF461",
+"=$	c #E7F150",
+"-$	c #E9F355",
+";$	c #E8F349",
+">$	c #E8F442",
+",$	c #DDF13E",
+"'$	c #DAF038",
+")$	c #CEEB26",
+"!$	c #D0EE2C",
+"~$	c #B9E82A",
+"{$	c #C1ED26",
+"]$	c #A0E41C",
+"^$	c #ABE71B",
+"/$	c #99E315",
+"($	c #99E415",
+"_$	c #33B306",
+":$	c #2BBB05",
+"<$	c #D9EB5E",
+"[$	c #CDE44E",
+"}$	c #F6F579",
+"|$	c #F4F577",
+"1$	c #F3F571",
+"2$	c #F4F57C",
+"3$	c #F3F363",
+"4$	c #F2F475",
+"5$	c #F0F567",
+"6$	c #A2D93F",
+"7$	c #C3E43F",
+"8$	c #B6D92E",
+"9$	c #A7CD1F",
+"0$	c #E4F042",
+"a$	c #E4F248",
+"b$	c #E5F348",
+"c$	c #D7EC39",
+"d$	c #DBF33C",
+"e$	c #DDF23E",
+"f$	c #D1EF2D",
+"g$	c #C1E825",
+"h$	c #BFEB26",
+"i$	c #AEE61B",
+"j$	c #A7E318",
+"k$	c #B0E818",
+"l$	c #9EE615",
+"m$	c #6DD30D",
+"n$	c #27A603",
+"o$	c #2CBE05",
+"p$	c #E2ED50",
+"q$	c #CBE348",
+"r$	c #F6F780",
+"s$	c #F5F577",
+"t$	c #F3F56F",
+"u$	c #EFF469",
+"v$	c #F3F471",
+"w$	c #F3F46F",
+"x$	c #EFF461",
+"y$	c #E7F053",
+"z$	c #C6E83F",
+"A$	c #A4D733",
+"B$	c #ABDD2F",
+"C$	c #B0DF2E",
+"D$	c #A7DD2B",
+"E$	c #E4F240",
+"F$	c #E8F555",
+"G$	c #DDF33C",
+"H$	c #E1F53E",
+"I$	c #D4F032",
+"J$	c #CEF02E",
+"K$	c #CAEF2D",
+"L$	c #C2EF28",
+"M$	c #B5E91B",
+"N$	c #93DD13",
+"O$	c #93E215",
+"P$	c #93E213",
+"Q$	c #80DB0D",
+"R$	c #45CA05",
+"S$	c #2FC204",
+"T$	c #CEE743",
+"U$	c #C1E23E",
+"V$	c #F0F365",
+"W$	c #F5F473",
+"X$	c #F2F269",
+"Y$	c #E9EF57",
+"Z$	c #EFF363",
+"`$	c #E8F052",
+" %	c #EBF358",
+".%	c #B8E439",
+"+%	c #BCE839",
+"@%	c #A4DC2A",
+"#%	c #ABE22D",
+"$%	c #95D822",
+"%%	c #E1F240",
+"&%	c #D6ED32",
+"*%	c #CFEC2C",
+"=%	c #D4F02F",
+"-%	c #CAEE2B",
+";%	c #C3EB27",
+">%	c #C6EE25",
+",%	c #C3EE21",
+"'%	c #B8ED21",
+")%	c #AEEA16",
+"!%	c #79D90F",
+"~%	c #2EB106",
+"{%	c #26B808",
+"]%	c #2CBF05",
+"^%	c #C9E73B",
+"/%	c #C5E63C",
+"(%	c #F0F56B",
+"_%	c #EEF258",
+":%	c #F0F265",
+"<%	c #EFF155",
+"[%	c #EDF358",
+"}%	c #EBF550",
+"|%	c #EBF54D",
+"1%	c #C9E83B",
+"2%	c #A4DB28",
+"3%	c #9EDC2B",
+"4%	c #8FD622",
+"5%	c #82D01E",
+"6%	c #7EC512",
+"7%	c #C9E827",
+"8%	c #D0EE2E",
+"9%	c #C7ED2C",
+"0%	c #C7EE27",
+"a%	c #C1EE2A",
+"b%	c #C2EF24",
+"c%	c #BEED22",
+"d%	c #A9E718",
+"e%	c #3EC307",
+"f%	c #39C306",
+"g%	c #38C606",
+"h%	c #23B603",
+"i%	c #ACDB2F",
+"j%	c #B0DF34",
+"k%	c #EDF35A",
+"l%	c #EDF553",
+"m%	c #E2F045",
+"n%	c #E6F350",
+"o%	c #E6F448",
+"p%	c #9CD01E",
+"q%	c #8BC916",
+"r%	c #B8DC1B",
+"s%	c #7CBC0F",
+"t%	c #95D618",
+"u%	c #7ED319",
+"v%	c #BFE118",
+"w%	c #C6ED2A",
+"x%	c #C1EA21",
+"y%	c #C1ED22",
+"z%	c #B8EA1D",
+"A%	c #B6EB1D",
+"B%	c #BCEF1F",
+"C%	c #53CA07",
+"D%	c #3FC708",
+"E%	c #2EBC05",
+"F%	c #2FBE04",
+"G%	c #2DBF04",
+"H%	c #A2CF1F",
+"I%	c #B1E12F",
+"J%	c #B5E32E",
+"K%	c #E8F243",
+"L%	c #D7EB45",
+"M%	c #E8F245",
+"N%	c #DDEF40",
+"O%	c #E2F342",
+"P%	c #DFF33E",
+"Q%	c #E4F542",
+"R%	c #DAF138",
+"S%	c #D8F230",
+"T%	c #CBEB28",
+"U%	c #D1F02E",
+"V%	c #C6EC24",
+"W%	c #CAEF25",
+"X%	c #BCEB21",
+"Y%	c #B6EB1E",
+"Z%	c #ABE91B",
+"`%	c #A2E616",
+" &	c #3CC508",
+".&	c #3EC906",
+"+&	c #37C305",
+"@&	c #27B903",
+"#&	c #209B02",
+"$&	c #A9DF27",
+"%&	c #A4DD27",
+"&&	c #91D623",
+"*&	c #E3F13C",
+"=&	c #E4F340",
+"-&	c #E4F33F",
+";&	c #E4F43E",
+">&	c #E2F439",
+",&	c #D6F033",
+"'&	c #D5F034",
+")&	c #CEEF2E",
+"!&	c #CBED26",
+"~&	c #CFEF27",
+"{&	c #D5F22E",
+"]&	c #B5E620",
+"^&	c #B9EA1F",
+"/&	c #84E620",
+"(&	c #3EB508",
+"_&	c #58CE0D",
+":&	c #39CA11",
+"<&	c #3EC607",
+"[&	c #3BCA08",
+"}&	c #28BB04",
+"|&	c #28BC03",
+"1&	c #8FD620",
+"2&	c #97D823",
+"3&	c #A6E22B",
+"4&	c #69CB1D",
+"5&	c #86D61F",
+"6&	c #E5F740",
+"7&	c #DCF338",
+"8&	c #CAEC2D",
+"9&	c #CDED2B",
+"0&	c #D1F02C",
+"a&	c #CDEE27",
+"b&	c #C1EB22",
+"c&	c #CFF228",
+"d&	c #BCE922",
+"e&	c #3CBB09",
+"f&	c #50CD0C",
+"g&	c #4BCD0B",
+"h&	c #3CC207",
+"i&	c #42CD09",
+"j&	c #2EBB04",
+"k&	c #28B905",
+"l&	c #28B903",
+"m&	c #61B113",
+"n&	c #7ED41A",
+"o&	c #89D71B",
+"p&	c #8DDB1A",
+"q&	c #7CD518",
+"r&	c #8FDA1B",
+"s&	c #71D314",
+"t&	c #7CDA18",
+"u&	c #BEF232",
+"v&	c #8BD715",
+"w&	c #63C207",
+"x&	c #55C108",
+"y&	c #5AD111",
+"z&	c #4BC90B",
+"A&	c #3EC108",
+"B&	c #46C908",
+"C&	c #40CB08",
+"D&	c #34C205",
+"E&	c #32C505",
+"F&	c #22A003",
+"G&	c #79D818",
+"H&	c #75D314",
+"I&	c #67D012",
+"J&	c #69D313",
+"K&	c #71D613",
+"L&	c #67D413",
+"M&	c #4BC20C",
+"N&	c #4DCB0E",
+"O&	c #5AD510",
+"P&	c #50CA0B",
+"Q&	c #4BC909",
+"R&	c #3CC708",
+"S&	c #42C906",
+"T&	c #35C206",
+"U&	c #33C306",
+"V&	c #30C504",
+"W&	c #49C30E",
+"X&	c #71D913",
+"Y&	c #84E318",
+"Z&	c #5ECF0E",
+"`&	c #58D00D",
+" *	c #5ED40D",
+".*	c #48C70A",
+"+*	c #57D40B",
+"@*	c #37BE06",
+"#*	c #39C707",
+"$*	c #37C505",
+"%*	c #34C705",
+"&*	c #49BE0B",
+"**	c #4BD00C",
+"=*	c #46C609",
+"-*	c #46D00A",
+";*	c #33BE06",
+">*	c #20A904",
+"                          . + @ # $ %                           ",
+"                    & * = - ; > , ' ) ! ~ {                     ",
+"                ] ^ / ( _ : < [ } | 1 2 3 4 5 6                 ",
+"            7 8 9 0 a b c d e f g h i j k l m n o p             ",
+"          q r s t u v w x y z A B C D E F G H I J K L           ",
+"        M M N O P u Q R S T U V W X Y Z `  ...+.@.#.$.%.        ",
+"      &.O *.O =.-.;.>.R ,.'.).!.~.{.].^./.(._.:.<.[.}.|.1.      ",
+"      O O O 2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.      ",
+"    o.O *.p.p.3.-.q.r.s.t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.    ",
+"    O o.q L.p.M.N.O.P.Q.R.S.T.U.V.W.X.Y.Z.`. +.+++@+#+$+%+&+    ",
+"  *+=+-+;+>+p.,+'+)+!+~+8.{+]+^+/+(+_+:+<+[+}+|+1+2+3+4+5+6+7+  ",
+"  r N N 8+p.9+0+a+b+c+d+e+d f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+  ",
+"  w+x+w+y+z+A+B+C+D+E+S F+G+H+I+J+K+L+M+N+O+P+Q+R+S+$+T+U+V+W+  ",
+"X+Y+Z+`+ @.@+@6.@@#@$@^ %@&@*@=@-@;@>@,@'@)@!@~@{@]@^@/@(@_@:@<@",
+"[@}@|@1@2@3@4@5@6@7@8@9@0@a@b@) c@d@e@f@g@h@i@j@k@l@m@n@o@p@q@r@",
+"s@t@u@v@w@x@y@z@A@B@C@D@E@F@G@H@>@I@J@K@L@M@N@O@P@Q@R@S@T@U@V@W@",
+"X@Y@Z@`@ #.#+#@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#^#/#(#_#:#<#[#}#",
+"|#1#2#3#4###5#'.6#7#8#9#0#a#b#c#d#e#f#g#h#i#j#k#l#m#n#o#p#q#r#s#",
+"t#u#v#w#s@x#y#z#a@A#B#C#D#E#F#G#H#I#J#K#L#M#N#O#P#Q#R#S#T#U#V#W#",
+"  X#Y#Z#`# $.$+$@$#$$$%$&$*$=$-$I#;$>$,$'$)$!$~${$]$^$/$($_$:$  ",
+"  <$[$}$|$*#1$2$3$4$5$6$7$8$9$0$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o$  ",
+"  p$q$r$s$t$u$v$w$x$y$z$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O$P$Q$R$S$  ",
+"    T$U$V$W$X$Y$Z$`$ %.%+%@%#%$%%%&%*%=%-%;%>%,%'%)%!%~%{%]%    ",
+"    ^%/%(%_%:%<%[%}%|%1%2%3%4%5%6%7%8%9%0%a%b%c%d%($e%f%g%h%    ",
+"      i%j%k%l%a$m%n%o%p%q%r%s%t%u%v%w%x%y%z%A%B%C%D%E%F%G%      ",
+"      H%I%J%K%L%M%N%O%P%Q%G$R%S%T%U%V%W%X%Y%Z%`% &.&+&@&#&      ",
+"        $&%&&&*&=&-&;&>&,&'&)&!&~&{&]&^&/&(&_&:&<&[&}&|&        ",
+"          1&2&3&4&5&6&7&8&9&0&a&b&c&d&e&f&g&h&i&j&k&l&          ",
+"            m&n&o&p&q&r&s&t&u&v&w&x&y&z&A&B&C&D&E&F&            ",
+"                G&H&I&J&K&L&M&N&O&P&Q&R&S&T&U&V&                ",
+"                    W&X&Y&Z&`& *.*+*@*#*$*%*                    ",
+"                          &***=*-*;*>*                          "};
diff --git a/docs/Makefile.am b/docs/Makefile.am
index e106768b..8b57d5bb 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,3 +1,5 @@
+man6_MANS = tmw.6
+
 EXTRA_DIST = packages.txt \
 	     FAQ.txt \
 	     HACKING.txt \
diff --git a/docs/tmw.6 b/docs/tmw.6
new file mode 100644
index 00000000..0dee82c7
--- /dev/null
+++ b/docs/tmw.6
@@ -0,0 +1,74 @@
+.TH "TMW" "6"
+.SH "NAME"
+tmw \- tmw is The Mana World: A fantasy online game
+.SH "SYNOPSIS"
+\fBtmw\fR
+.SH "DESCRIPTION"
+This manual page documents briefly the
+\fBtmw\fR ingame
+commands.
+\fBtmw\fR is a great online game based upon the Seiken Densetsu Serie.
+It has its own universe, and and its own character management system, which will
+give you the opportunity to play in a 2D heroic-fantasy world forever.
+.SH "BINARY PARAMETERS"
+This program follows the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+.TP
+.B \-h, \-\-help
+Show summary of options.
+.TP
+.B \-v, \-\-version
+Show version of the program.
+.TP
+.B \-u, \-\-skipupdate
+Skip the update process.
+.TP
+.B \-U, \-\-username
+Login with this username.
+.TP
+.B \-P, \-\-password
+Login with this password.
+.TP
+.B \-D, \-\-default
+Bypass the login process with default settings.
+.TP
+.B \-p, \-\-playername
+Login with this player.
+.TP
+.B \-C, \-\-configfile
+Configuration file to use
+.SH "COMMON KEYS"
+.TP
+.B Arrow Keys:
+Move your character around.
+.TP
+.B Left Ctrl:
+Make your character attack.
+.TP
+.B Key A:
+Target nearest monster.
+.TP
+.B Key G:
+Get items on the ground or in a chest.
+.TP
+.B Alt + 1...9:
+Shows an emoticon above your character.
+.TP
+.B Alt + I:
+Shows / Hide inventory window.
+.TP
+.B Alt + K:
+Shows / Hide skills window.
+.TP
+.B Alt + E:
+Shows / Hide equipment window.
+.TP
+.B Alt + C:
+Shows configuration window.
+.SH "AUTHOR"
+This manual page was written by Patrick Matth\[:a]i <patrick.matthaei@web.de>
+for The Mana World project.
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU General Public License, Version 2 any
+later version published by the Free Software Foundation.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4b5bad01..e28e235e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -268,10 +268,10 @@ SET(SRCS
     resources/sdlimageloader.h
     resources/soundeffect.cpp
     resources/soundeffect.h
-    resources/spriteset.cpp
     resources/spritedef.h
     resources/spritedef.cpp
-    resources/spriteset.h
+    resources/imageset.h
+    resources/imageset.cpp
     utils/base64.cpp
     utils/base64.h
     utils/dtor.h
@@ -330,6 +330,8 @@ SET(SRCS
     player.h
     properties.h
     serverinfo.h
+    simpleanimation.cpp
+    simpleanimation.h
     sound.cpp
     sound.h
     sprite.h
diff --git a/src/Makefile.am b/src/Makefile.am
index da1bc44d..f1f51b79 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -222,8 +222,8 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      resources/soundeffect.cpp \
 	      resources/spritedef.h \
 	      resources/spritedef.cpp \
-	      resources/spriteset.h \
-	      resources/spriteset.cpp \
+	      resources/imageset.h \
+	      resources/imageset.cpp \
 	      resources/buddylist.h \
 	      resources/buddylist.cpp \
 	      utils/base64.cpp \
@@ -284,6 +284,8 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      player.h \
 	      properties.h \
 	      serverinfo.h \
+	      simpleanimation.cpp \
+  	      simpleanimation.h \
 	      sound.cpp \
 	      sound.h \
 	      sprite.h \
diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index 3d1979a9..7260a512 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.cpp
@@ -30,7 +30,6 @@
 #include "resources/animation.h"
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
-#include "resources/spriteset.h"
 
 #include "utils/xml.h"
 
diff --git a/src/being.cpp b/src/being.cpp
index e4a1e9fc..682daddb 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -34,7 +34,7 @@
 #include "map.h"
 
 #include "resources/resourcemanager.h"
-#include "resources/spriteset.h"
+#include "resources/imageset.h"
 
 #include "gui/gui.h"
 
@@ -42,7 +42,7 @@
 #include "utils/tostring.h"
 
 int Being::instances = 0;
-Spriteset *Being::emotionset = NULL;
+ImageSet *Being::emotionSet = NULL;
 
 Being::Being(Uint16 id, Uint16 job, Map *map):
     mJob(job),
@@ -72,8 +72,8 @@ Being::Being(Uint16 id, Uint16 job, Map *map):
     {
         // Load the emotion set
         ResourceManager *rm = ResourceManager::getInstance();
-        emotionset = rm->getSpriteset("graphics/sprites/emotions.png", 30, 32);
-        if (!emotionset) logger->error("Unable to load emotions spriteset!");
+        emotionSet = rm->getImageSet("graphics/sprites/emotions.png", 30, 32);
+        if (!emotionSet) logger->error("Unable to load emotions!");
     }
 
     instances++;
@@ -89,8 +89,8 @@ Being::~Being()
 
     if (instances == 0)
     {
-        emotionset->decRef();
-        emotionset = NULL;
+        emotionSet->decRef();
+        emotionSet = NULL;
     }
 }
 
@@ -515,7 +515,7 @@ Being::drawEmotion(Graphics *graphics, int offsetX, int offsetY)
     int px = mPx + offsetX + 3;
     int py = mPy + offsetY - 60;
 
-    graphics->drawImage(emotionset->get(mEmotion - 1), px, py);
+    graphics->drawImage(emotionSet->get(mEmotion - 1), px, py);
 }
 
 void
diff --git a/src/being.h b/src/being.h
index c3cba247..332f1b4a 100644
--- a/src/being.h
+++ b/src/being.h
@@ -41,7 +41,7 @@ class Equipment;
 class Item;
 class Map;
 class Graphics;
-class Spriteset;
+class ImageSet;
 
 /**
  * A position along a being's path.
@@ -397,7 +397,7 @@ class Being : public Sprite
         Uint16 mStepTime;
 
         static int instances;           /**< Number of Being instances */
-        static Spriteset *emotionset;   /**< Emoticons used by beings */
+        static ImageSet *emotionSet;    /**< Emoticons used by beings */
 };
 
 #endif
diff --git a/src/engine.cpp b/src/engine.cpp
index a3097d49..31bec9ff 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -44,7 +44,6 @@
 #include "resources/mapreader.h"
 #include "resources/monsterdb.h"
 #include "resources/resourcemanager.h"
-#include "resources/spriteset.h"
 
 #include "utils/dtor.h"
 #include "utils/tostring.h"
@@ -77,7 +76,8 @@ void Engine::changeMap(const std::string &mapPath)
 
     // Notify the minimap and beingManager about the map change
     Image *mapImage = NULL;
-    if (newMap->hasProperty("minimap")) {
+    if (newMap->hasProperty("minimap"))
+    {
         ResourceManager *resman = ResourceManager::getInstance();
         mapImage = resman->getImage(newMap->getProperty("minimap"));
     }
diff --git a/src/floor_item.cpp b/src/floor_item.cpp
index f33f7eb4..5d83e1dd 100644
--- a/src/floor_item.cpp
+++ b/src/floor_item.cpp
@@ -27,7 +27,6 @@
 
 #include "resources/itemdb.h"
 #include "resources/iteminfo.h"
-#include "resources/spriteset.h"
 
 
 FloorItem::FloorItem(unsigned int id,
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 09ce5b87..128a803e 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -42,9 +42,14 @@
 #include "../logindata.h"
 
 #include "../net/accountserver/account.h"
+#include "../net/charserverhandler.h"
+#include "../net/messageout.h"
 
 #include "../utils/tostring.h"
 
+// Defined in main.cpp, used here for setting the char create dialog
+extern CharServerHandler charServerHandler;
+
 /**
  * Listener for confirming character deletion.
  */
@@ -155,14 +160,14 @@ void CharSelectDialog::action(const gcn::ActionEvent &event)
     }
     else if (event.getId() == "new")
     {
-        //TODO: search the first free slot, and start CharCreateDialog
-        //      maybe add that search to the constructor
+        // TODO: Search the first free slot, and start CharCreateDialog
+        //       maybe add that search to the constructor.
         if (!(mCharInfo->getEntry()))
         {
             // Start new character dialog
-            mCharInfo->lock();
-            new CharCreateDialog(this, mCharInfo->getPos());
-            mCharInfo->unlock();
+            CharCreateDialog *charCreateDialog =
+                new CharCreateDialog(this, mCharInfo->getPos());
+            charServerHandler.setCharCreateDialog(charCreateDialog);
         }
     }
     else if (event.getId() == "delete")
@@ -344,14 +349,19 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot):
 
     setLocationRelativeTo(getParent());
     setVisible(true);
+    mNameField->requestFocus();
 }
 
 CharCreateDialog::~CharCreateDialog()
 {
     delete mPlayer;
+
+    // Make sure the char server handler knows that we're gone
+    charServerHandler.setCharCreateDialog(0);
 }
 
-void CharCreateDialog::action(const gcn::ActionEvent &event)
+void
+CharCreateDialog::action(const gcn::ActionEvent &event)
 {
     if (event.getId() == "create") {
         if (getName().length() >= 4) {
@@ -362,15 +372,14 @@ void CharCreateDialog::action(const gcn::ActionEvent &event)
                     mPlayer->getHairStyle(),
                     mPlayer->getHairColor(),
                     0,   // gender
-                    (int)mAttributeSlider[0]->getValue(),  // STR
-                    (int)mAttributeSlider[1]->getValue(),  // AGI
-                    (int)mAttributeSlider[2]->getValue(),  // DEX
-                    (int)mAttributeSlider[3]->getValue(),  // VIT
-                    (int)mAttributeSlider[4]->getValue(),  // INT
-                    (int)mAttributeSlider[5]->getValue(),  // WILL
-                    (int)mAttributeSlider[6]->getValue()   // CHAR
+                    (int) mAttributeSlider[0]->getValue(),  // STR
+                    (int) mAttributeSlider[1]->getValue(),  // AGI
+                    (int) mAttributeSlider[2]->getValue(),  // DEX
+                    (int) mAttributeSlider[3]->getValue(),  // VIT
+                    (int) mAttributeSlider[4]->getValue(),  // INT
+                    (int) mAttributeSlider[5]->getValue(),  // WILL
+                    (int) mAttributeSlider[6]->getValue()   // CHAR
             );
-            scheduleDelete();
         }
         else {
             new OkDialog("Error",
@@ -399,21 +408,23 @@ void CharCreateDialog::action(const gcn::ActionEvent &event)
     }
 }
 
-std::string CharCreateDialog::getName()
+const std::string&
+CharCreateDialog::getName()
 {
     return mNameField->getText();
 }
 
 void CharCreateDialog::UpdateSliders()
 {
-    for (int i=0; i<=6; i++)
+    for (int i = 0; i < 7; i++)
     {
-        // update captions
-        mAttributeValue[i]->setCaption(toString((int)(mAttributeSlider[i]->getValue())));
+        // Update captions
+        mAttributeValue[i]->setCaption(
+                toString((int) (mAttributeSlider[i]->getValue())));
         mAttributeValue[i]->adjustSize();
     }
 
-    // update distributed points
+    // Update distributed points
     int pointsLeft = 70 - getDistributedPoints();
     if (pointsLeft == 0)
     {
@@ -425,24 +436,32 @@ void CharCreateDialog::UpdateSliders()
         mCreateButton->setEnabled(false);
         if (pointsLeft > 0)
         {
-            mAttributesLeft->setCaption(std::string("Please distribute " + toString(pointsLeft) + " points"));
+            mAttributesLeft->setCaption(std::string("Please distribute " +
+                                        toString(pointsLeft) + " points"));
         }
         else
         {
-            mAttributesLeft->setCaption(std::string("Please remove " + toString(-pointsLeft) + " points"));
+            mAttributesLeft->setCaption(std::string("Please remove " +
+                                        toString(-pointsLeft) + " points"));
         }
     }
 
     mAttributesLeft->adjustSize();
 }
 
+void
+CharCreateDialog::unlock()
+{
+    mCreateButton->setEnabled(true);
+}
+
 int CharCreateDialog::getDistributedPoints()
 {
     int points = 0;
 
-    for (int i=0; i<7; i++)
+    for (int i = 0; i < 7; i++)
     {
-        points += (int)mAttributeSlider[i]->getValue();
+        points += (int) mAttributeSlider[i]->getValue();
     }
     return points;
 }
diff --git a/src/gui/char_select.h b/src/gui/char_select.h
index 5066897e..9d9184ea 100644
--- a/src/gui/char_select.h
+++ b/src/gui/char_select.h
@@ -114,9 +114,17 @@ class CharCreateDialog : public Window, public gcn::ActionListener
          */
         ~CharCreateDialog();
 
-        void action(const gcn::ActionEvent &event);
+        void
+        action(const gcn::ActionEvent &event);
 
-        std::string getName();
+        const std::string&
+        getName();
+
+        /**
+         * Unlocks the dialog, enabling the create character button again.
+         */
+        void
+        unlock();
 
     private:
         int getDistributedPoints();
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index ec525c47..ec84491e 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -30,7 +30,6 @@
 
 #include "../resources/iteminfo.h"
 #include "../resources/resourcemanager.h"
-#include "../resources/spriteset.h"
 
 #include "../utils/tostring.h"
 
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index 308311b7..a176f226 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -35,7 +35,6 @@
 #include "../resources/image.h"
 #include "../resources/iteminfo.h"
 #include "../resources/resourcemanager.h"
-#include "../resources/spriteset.h"
 
 #include "../utils/tostring.h"
 
@@ -65,7 +64,8 @@ ItemContainer::logic()
 
     int i = mInventory->getLastUsedSlot() + 1;
 
-    if (i != mMaxItems) {
+    if (i != mMaxItems)
+    {
         mMaxItems = i;
         setWidth(getWidth());
     }
@@ -192,9 +192,9 @@ ItemContainer::mousePressed(gcn::MouseEvent &event)
         int my = event.getY();
         int index = mx / gridWidth + ((my / gridHeight) * columns);
 
-        if (index > INVENTORY_SIZE) {
+        if (index > INVENTORY_SIZE)
             index = INVENTORY_SIZE - 1;
-        }
+
         setSelectedItem(mInventory->getItem(index));
     }
 }
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index 9df3b489..15ec6314 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -36,24 +36,6 @@
 #include "passwordfield.h"
 #include "textfield.h"
 
-void
-WrongDataNoticeListener::setTarget(gcn::TextField *textField)
-{
-    mTarget = textField;
-}
-
-void
-WrongDataNoticeListener::action(const gcn::ActionEvent &event)
-{
-    if (event.getId() == "ok")
-    {
-        // Reset the field
-        mTarget->setText("");
-        mTarget->setCaretPosition(0);
-        mTarget->requestFocus();
-    }
-}
-
 LoginDialog::LoginDialog(LoginData *loginData):
     Window("Login"), mLoginData(loginData)
 {
@@ -66,28 +48,33 @@ LoginDialog::LoginDialog(LoginData *loginData):
     mCancelButton = new Button("Cancel", "cancel", this);
     mRegisterButton = new Button("Register", "register", this);
 
-    setContentSize(200, 91);
+    const int width = 220;
+    const int height = 100;
+
+    setContentSize(width, height);
 
     userLabel->setPosition(5, 5);
     passLabel->setPosition(5, 14 + userLabel->getHeight());
     mUserField->setPosition(65, 5);
     mPassField->setPosition(65, 14 + userLabel->getHeight());
-    mUserField->setWidth(130);
-    mPassField->setWidth(130);
+    mUserField->setWidth(width - 70);
+    mPassField->setWidth(width - 70);
     mKeepCheck->setPosition(4, 68);
     mCancelButton->setPosition(
-            200 - mCancelButton->getWidth() - 5,
-            91 - mCancelButton->getHeight() - 5);
+            width - mCancelButton->getWidth() - 5,
+            height - mCancelButton->getHeight() - 5);
     mOkButton->setPosition(
             mCancelButton->getX() - mOkButton->getWidth() - 5,
-            91 - mOkButton->getHeight() - 5);
+            height - mOkButton->getHeight() - 5);
     mRegisterButton->setPosition(
             mKeepCheck->getX() + mKeepCheck->getWidth() + 10,
-            91 - mRegisterButton->getHeight() - 5);
+            height - mRegisterButton->getHeight() - 5);
 
     mUserField->setActionEventId("ok");
     mPassField->setActionEventId("ok");
 
+    mUserField->addKeyListener(this);
+    mPassField->addKeyListener(this);
     mUserField->addActionListener(this);
     mPassField->addActionListener(this);
     mKeepCheck->addActionListener(this);
@@ -110,37 +97,27 @@ LoginDialog::LoginDialog(LoginData *loginData):
         mPassField->requestFocus();
     }
 
-    mWrongDataNoticeListener = new WrongDataNoticeListener();
+    mOkButton->setEnabled(canSubmit());
 }
 
 LoginDialog::~LoginDialog()
 {
-    delete mWrongDataNoticeListener;
 }
 
 void
 LoginDialog::action(const gcn::ActionEvent &event)
 {
-    if (event.getId() == "ok")
+    if (event.getId() == "ok" && canSubmit())
     {
-        // Check login
-        if (mUserField->getText().empty())
-        {
-            mWrongDataNoticeListener->setTarget(mPassField);
-            OkDialog *dlg = new OkDialog("Error", "Enter your username first");
-            dlg->addActionListener(mWrongDataNoticeListener);
-        }
-        else
-        {
-            mLoginData->username = mUserField->getText();
-            mLoginData->password = mPassField->getText();
-            mLoginData->remember = mKeepCheck->isMarked();
-
-            mOkButton->setEnabled(false);
-            mRegisterButton->setEnabled(false);
-
-            state = STATE_LOGIN_ATTEMPT;
-        }
+        mLoginData->username = mUserField->getText();
+        mLoginData->password = mPassField->getText();
+        mLoginData->remember = mKeepCheck->isMarked();
+        mLoginData->registerLogin = false;
+
+        mOkButton->setEnabled(false);
+        mRegisterButton->setEnabled(false);
+
+        state = STATE_LOGIN_ATTEMPT;
     }
     else if (event.getId() == "cancel")
     {
@@ -148,6 +125,24 @@ LoginDialog::action(const gcn::ActionEvent &event)
     }
     else if (event.getId() == "register")
     {
+        // Transfer these fields on to the register dialog
+        mLoginData->username = mUserField->getText();
+        mLoginData->password = mPassField->getText();
+
         state = STATE_REGISTER;
     }
 }
+
+void
+LoginDialog::keyPressed(gcn::KeyEvent &keyEvent)
+{
+    mOkButton->setEnabled(canSubmit());
+}
+
+bool
+LoginDialog::canSubmit()
+{
+    return !mUserField->getText().empty() &&
+           !mPassField->getText().empty() &&
+           state == STATE_LOGIN;
+}
diff --git a/src/gui/login.h b/src/gui/login.h
index 05c0da31..d8ae7eaf 100644
--- a/src/gui/login.h
+++ b/src/gui/login.h
@@ -26,29 +26,21 @@
 
 #include <iosfwd>
 #include <guichan/actionlistener.hpp>
+#include <guichan/keylistener.hpp>
 
 #include "window.h"
 #include "../guichanfwd.h"
 
 class LoginData;
 
-/**
- * Listener used for handling wrong data.
- */
-class WrongDataNoticeListener : public gcn::ActionListener {
-    public:
-        void setTarget(gcn::TextField *textField);
-        void action(const gcn::ActionEvent &event);
-    private:
-        gcn::TextField *mTarget;
-};
-
 /**
  * The login dialog.
  *
  * \ingroup Interface
  */
-class LoginDialog : public Window, public gcn::ActionListener {
+class LoginDialog : public Window, public gcn::ActionListener,
+                    public gcn::KeyListener
+{
     public:
         /**
          * Constructor
@@ -67,7 +59,19 @@ class LoginDialog : public Window, public gcn::ActionListener {
          */
         void action(const gcn::ActionEvent &event);
 
+        /**
+         * Called when a key is pressed in one of the text fields.
+         */
+        void keyPressed(gcn::KeyEvent &keyEvent);
+
     private:
+        /**
+         * Returns whether submit can be enabled. This is true in the login
+         * state, when all necessary fields have some text.
+         */
+        bool
+        canSubmit();
+
         gcn::TextField *mUserField;
         gcn::TextField *mPassField;
         gcn::CheckBox *mKeepCheck;
@@ -75,8 +79,6 @@ class LoginDialog : public Window, public gcn::ActionListener {
         gcn::Button *mCancelButton;
         gcn::Button *mRegisterButton;
 
-        WrongDataNoticeListener *mWrongDataNoticeListener;
-
         LoginData *mLoginData;
 };
 
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index be15747d..c8e01a6c 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -41,6 +41,21 @@
 #include "textfield.h"
 #include "ok_dialog.h"
 
+void
+WrongDataNoticeListener::setTarget(gcn::TextField *textField)
+{
+    mTarget = textField;
+}
+
+void
+WrongDataNoticeListener::action(const gcn::ActionEvent &event)
+{
+    if (event.getId() == "ok")
+    {
+        mTarget->requestFocus();
+    }
+}
+
 RegisterDialog::RegisterDialog(LoginData *loginData):
     Window("Register"),
     mWrongDataNoticeListener(new WrongDataNoticeListener()),
@@ -50,28 +65,28 @@ RegisterDialog::RegisterDialog(LoginData *loginData):
     gcn::Label *passwordLabel = new gcn::Label("Password:");
     gcn::Label *confirmLabel = new gcn::Label("Confirm:");
     gcn::Label *emailLabel = new gcn::Label("Email:");
-    mUserField = new TextField("player");
-    mPasswordField = new PasswordField();
+    mUserField = new TextField(loginData->username);
+    mPasswordField = new PasswordField(loginData->password);
     mConfirmField = new PasswordField();
     mEmailField = new TextField();
     mRegisterButton = new Button("Register", "register", this);
     mCancelButton = new Button("Cancel", "cancel", this);
 
-    const int width = 200;
+    const int width = 220;
     const int height = 130;
     setContentSize(width, height);
 
     mUserField->setPosition(65, 5);
-    mUserField->setWidth(130);
+    mUserField->setWidth(width - 70);
     mPasswordField->setPosition(
             65, mUserField->getY() + mUserField->getHeight() + 7);
-    mPasswordField->setWidth(130);
+    mPasswordField->setWidth(mUserField->getWidth());
     mConfirmField->setPosition(
             65, mPasswordField->getY() + mPasswordField->getHeight() + 7);
-    mConfirmField->setWidth(130);
+    mConfirmField->setWidth(mUserField->getWidth());
     mEmailField->setPosition(
             65, mConfirmField->getY() + mConfirmField->getHeight() + 7);
-    mEmailField->setWidth(130);
+    mEmailField->setWidth(mUserField->getWidth());
 
     userLabel->setPosition(5, mUserField->getY() + 1);
     passwordLabel->setPosition(5, mPasswordField->getY() + 1);
@@ -79,11 +94,30 @@ RegisterDialog::RegisterDialog(LoginData *loginData):
     emailLabel->setPosition(5, mEmailField->getY() + 1);
 
     mCancelButton->setPosition(
-            width - 5 - mCancelButton->getWidth(),
-            height - 5 - mCancelButton->getHeight());
+            width - mCancelButton->getWidth() - 5,
+            height - mCancelButton->getHeight() - 5);
     mRegisterButton->setPosition(
-            mCancelButton->getX() - 5 - mRegisterButton->getWidth(),
-            mCancelButton->getY());
+            mCancelButton->getX() - mRegisterButton->getWidth() - 5,
+            height - mRegisterButton->getHeight() - 5);
+
+    mUserField->addKeyListener(this);
+    mPasswordField->addKeyListener(this);
+    mConfirmField->addKeyListener(this);
+    mEmailField->addKeyListener(this);
+
+    /* TODO:
+     * This is a quick and dirty way to respond to the ENTER key, regardless of
+     * which text field is selected. There may be a better way now with the new
+     * input system of Guichan 0.6.0. See also the login dialog.
+     */
+    mUserField->setActionEventId("register");
+    mPasswordField->setActionEventId("register");
+    mConfirmField->setActionEventId("register");
+    mEmailField->setActionEventId("register");
+    mUserField->addActionListener(this);
+    mPasswordField->addActionListener(this);
+    mConfirmField->addActionListener(this);
+    mEmailField->addActionListener(this);
 
     add(userLabel);
     add(passwordLabel);
@@ -100,6 +134,8 @@ RegisterDialog::RegisterDialog(LoginData *loginData):
     setVisible(true);
     mUserField->requestFocus();
     mUserField->setCaretPosition(mUserField->getText().length());
+
+    mRegisterButton->setEnabled(canSubmit());
 }
 
 RegisterDialog::~RegisterDialog()
@@ -114,7 +150,7 @@ RegisterDialog::action(const gcn::ActionEvent &event)
     {
         state = STATE_LOGIN;
     }
-    else if (event.getId() == "register")
+    else if (event.getId() == "register" && canSubmit())
     {
         const std::string user = mUserField->getText();
         logger->log("RegisterDialog::register Username is %s", user.c_str());
@@ -122,14 +158,7 @@ RegisterDialog::action(const gcn::ActionEvent &event)
         std::stringstream errorMsg;
         int error = 0;
 
-        // Check login
-        if (user.empty())
-        {
-            // No username
-            errorMsg << "Enter your username first.";
-            error = 1;
-        }
-        else if (user.length() < LEN_MIN_USERNAME)
+        if (user.length() < LEN_MIN_USERNAME)
         {
             // Name too short
             errorMsg << "The username needs to be at least "
@@ -178,9 +207,11 @@ RegisterDialog::action(const gcn::ActionEvent &event)
             }
             else if (error == 2)
             {
-                mWrongDataNoticeListener->setTarget(this->mPasswordField);
                 // Reset password confirmation
+                mPasswordField->setText("");
                 mConfirmField->setText("");
+
+                mWrongDataNoticeListener->setTarget(this->mPasswordField);
             }
 
             OkDialog *dlg = new OkDialog("Error", errorMsg.str());
@@ -191,7 +222,6 @@ RegisterDialog::action(const gcn::ActionEvent &event)
             // No errors detected, register the new user.
             mRegisterButton->setEnabled(false);
 
-            mLoginData->port = (short)config.getValue("port", 0);
             mLoginData->username = mUserField->getText();
             mLoginData->password = mPasswordField->getText();
             mLoginData->email = mEmailField->getText();
@@ -201,3 +231,18 @@ RegisterDialog::action(const gcn::ActionEvent &event)
         }
     }
 }
+
+void
+RegisterDialog::keyPressed(gcn::KeyEvent &keyEvent)
+{
+    mRegisterButton->setEnabled(canSubmit());
+}
+
+bool
+RegisterDialog::canSubmit()
+{
+    return !mUserField->getText().empty() &&
+           !mPasswordField->getText().empty() &&
+           !mConfirmField->getText().empty() &&
+           state == STATE_REGISTER;
+}
diff --git a/src/gui/register.h b/src/gui/register.h
index 4ffe451f..088e8f9b 100644
--- a/src/gui/register.h
+++ b/src/gui/register.h
@@ -26,23 +26,39 @@
 
 #include <iosfwd>
 #include <guichan/actionlistener.hpp>
+#include <guichan/keylistener.hpp>
 
 #include "window.h"
 #include "../guichanfwd.h"
 
 class LoginData;
 class OkDialog;
-class WrongDataNoticeListener;
 
 /**
- * The login dialog.
+ * Listener used while dealing with wrong data. It is used to direct the focus
+ * to the field which contained wrong data when the Ok button was pressed on
+ * the error notice.
+ */
+class WrongDataNoticeListener : public gcn::ActionListener {
+    public:
+        void setTarget(gcn::TextField *textField);
+        void action(const gcn::ActionEvent &event);
+    private:
+        gcn::TextField *mTarget;
+};
+
+/**
+ * The registration dialog.
  *
  * \ingroup Interface
  */
-class RegisterDialog : public Window, public gcn::ActionListener {
+class RegisterDialog : public Window, public gcn::ActionListener,
+                       public gcn::KeyListener
+{
     public:
         /**
-         * Constructor
+         * Constructor. Name, password and server fields will be initialized to
+         * the information already present in the LoginData instance.
          *
          * @see Window::Window
          */
@@ -58,10 +74,19 @@ class RegisterDialog : public Window, public gcn::ActionListener {
          */
         void action(const gcn::ActionEvent &event);
 
-        // Made them public to have the possibility to request focus
-        // from external functions.
+        /**
+         * Called when a key is pressed in one of the text fields.
+         */
+        void keyPressed(gcn::KeyEvent &keyEvent);
 
     private:
+        /**
+         * Returns whether submit can be enabled. This is true in the register
+         * state, when all necessary fields have some text.
+         */
+        bool
+        canSubmit();
+
         gcn::TextField *mUserField;
         gcn::TextField *mPasswordField;
         gcn::TextField *mConfirmField;
diff --git a/src/gui/unregisterdialog.cpp b/src/gui/unregisterdialog.cpp
index 9a09389d..5558e8fc 100644
--- a/src/gui/unregisterdialog.cpp
+++ b/src/gui/unregisterdialog.cpp
@@ -34,7 +34,7 @@
 
 #include "button.h"
 #include "checkbox.h"
-#include "login.h"
+#include "register.h"
 #include "passwordfield.h"
 #include "textfield.h"
 #include "ok_dialog.h"
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index bc635cce..f3e9031c 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -28,15 +28,20 @@
 #include "gui.h"
 #include "popupmenu.h"
 
+#include "../simpleanimation.h"
 #include "../beingmanager.h"
 #include "../configuration.h"
 #include "../flooritemmanager.h"
 #include "../graphics.h"
 #include "../localplayer.h"
 #include "../map.h"
+#include "../monster.h"
 #include "../npc.h"
 
-#include "../resources/monsterdb.h"
+#include "../resources/animation.h"
+#include "../resources/monsterinfo.h"
+#include "../resources/resourcemanager.h"
+#include "../resources/imageset.h"
 
 #include "../utils/tostring.h"
 
@@ -60,11 +65,39 @@ Viewport::Viewport():
     config.addListener("ScrollRadius", this);
 
     mPopupMenu = new PopupMenu();
+
+    // Load target cursors
+    ResourceManager *resman = ResourceManager::getInstance();
+    mInRangeImages = resman->getImageSet(
+            "graphics/gui/target-cursor-blue.png", 44, 35);
+    mOutRangeImages = resman->getImageSet(
+            "graphics/gui/target-cursor-red.png", 44, 35);
+    Animation *animInRange = new Animation();
+    Animation *animOutRange = new Animation();
+
+    for (unsigned int i = 0; i < mInRangeImages->size(); ++i)
+    {
+        animInRange->addFrame(mInRangeImages->get(i), 75, 0, 0);
+    }
+
+    for (unsigned int j = 0; j < mOutRangeImages->size(); ++j)
+    {
+        animOutRange->addFrame(mOutRangeImages->get(j), 75, 0, 0);
+    }
+
+    mTargetCursorInRange = new SimpleAnimation(animInRange);
+    mTargetCursorOutRange = new SimpleAnimation(animOutRange);
 }
 
 Viewport::~Viewport()
 {
     delete mPopupMenu;
+
+    delete mTargetCursorInRange;
+    delete mTargetCursorOutRange;
+
+    mInRangeImages->decRef();
+    mOutRangeImages->decRef();
 }
 
 void
@@ -158,10 +191,12 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
     if (mMap)
     {
         mMap->draw(graphics, mCameraX, mCameraY, 0);
+        drawTargetCursor(graphics);
         mMap->draw(graphics, mCameraX, mCameraY, 1);
         mMap->draw(graphics, mCameraX, mCameraY, 2);
         mMap->drawOverlay(graphics, mViewX, mViewY,
                 (int) config.getValue("OverlayDetail", 2));
+        drawTargetName(graphics);
     }
 
     // Find a path from the player to the mouse, and draw it. This is for debug
@@ -201,28 +236,6 @@ Viewport::draw(gcn::Graphics *gcnGraphics)
         (*i)->drawEmotion(graphics, -mCameraX, -mCameraY);
     }
 
-    // Draw target marker if needed
-    Being *target = player_node->getTarget();
-    if (target)
-    {
-        graphics->setFont(speechFont);
-        graphics->setColor(gcn::Color(255, 32, 32));
-        int dy = (target->getType() == Being::PLAYER) ? 80 : 42;
-
-        std::string mobName = "";
-
-        if (target->mJob >= 1002)
-        {
-            int mobId = target->mJob - 1002;
-            mobName = MonsterDB::get(mobId).getName();
-
-            graphics->drawText(mobName,
-                    target->getPixelX() - mCameraX + 15,
-                    target->getPixelY() - mCameraY - dy,
-                    gcn::Graphics::CENTER);
-        }
-    }
-
     // Draw contained widgets
     WindowContainer::draw(gcnGraphics);
 }
@@ -245,6 +258,57 @@ Viewport::logic()
                                     mouseY + mCameraY);
         mWalkTime = player_node->mWalkTime;
     }
+
+    mTargetCursorInRange->update(10);
+    mTargetCursorOutRange->update(10);
+}
+
+void
+Viewport::drawTargetCursor(Graphics *graphics)
+{
+    // Draw target marker if needed
+    Being *target = player_node->getTarget();
+    if (target)
+    {
+        // Find whether target is in range
+        int rangeX = abs(target->mX - player_node->mX);
+        int rangeY = abs(target->mY - player_node->mY);
+        int attackRange = player_node->getAttackRange();
+
+        // Draw the target cursor, which one depends if the target is in range
+        if (rangeX > attackRange || rangeY > attackRange)
+        {
+            // Draw the out of range cursor
+            graphics->drawImage(mTargetCursorOutRange->getCurrentImage(),
+                                target->getPixelX() - mCameraX,
+                                target->getPixelY() - mCameraY);
+        }
+        else
+        {
+            // Draw the in range cursor
+            graphics->drawImage(mTargetCursorInRange->getCurrentImage(),
+                                target->getPixelX() - mCameraX,
+                                target->getPixelY() - mCameraY);
+        }
+    }
+}
+
+void
+Viewport::drawTargetName(Graphics *graphics)
+{
+    // Draw target marker if needed
+    Being *target = player_node->getTarget();
+    if (target && target->getType() == Being::MONSTER)
+    {
+        graphics->setFont(speechFont);
+        graphics->setColor(gcn::Color(255, 32, 32));
+
+        const MonsterInfo &mi = static_cast<Monster*>(target)->getInfo();
+        graphics->drawText(mi.getName(),
+                           target->getPixelX() - mCameraX + 15,
+                           target->getPixelY() - mCameraY - 42,
+                           gcn::Graphics::CENTER);
+    }
 }
 
 void
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index f1cadd98..84efeff3 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -33,8 +33,11 @@
 class Map;
 class Being;
 class FloorItem;
+class ImageSet;
 class Item;
 class PopupMenu;
+class Graphics;
+class SimpleAnimation;
 
 /**
  * The viewport on the map. Displays the current map and handles mouse input
@@ -138,6 +141,18 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
          */
         void showPopup(int x, int y, Being *being);
 
+        /**
+         * Draws range based target cursor
+         */
+        void
+        drawTargetCursor(Graphics *graphics);
+
+        /**
+         * Draws target name
+         */
+        void
+        drawTargetName(Graphics *graphics);
+
 
         Map *mMap;                 /**< The current map. */
 
@@ -149,6 +164,15 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
         int mCameraY;              /**< Current viewpoint in tiles. */
         bool mShowDebugPath;       /**< Show a path from player to pointer. */
 
+        ImageSet *mInRangeImages;  /**< Images of in range target cursor. */
+        ImageSet *mOutRangeImages; /**< Images of out of range target cursor.*/
+
+        /** Animated in range target cursor. */
+        SimpleAnimation *mTargetCursorInRange;
+
+        /** Animated out of range target cursor. */
+        SimpleAnimation *mTargetCursorOutRange;
+
         bool mPlayerFollowMouse;
         int mWalkTime;
 
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 7f595ef1..97371677 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -38,6 +38,7 @@ LocalPlayer *player_node = NULL;
 
 LocalPlayer::LocalPlayer():
     Player(65535, 0, NULL),
+    mAttackRange(0),
     mInventory(new Inventory()),
     mAttributeBase(NB_BASE_ATTRIBUTES, 0),
     mAttributeEffective(NB_BASE_ATTRIBUTES, 0),
diff --git a/src/localplayer.h b/src/localplayer.h
index 299cf85a..fb7703dd 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -152,6 +152,16 @@ class LocalPlayer : public Player
         void dropItem(Item *item, int quantity);
         void pickUp(FloorItem *item);
 
+        /**
+         * Sets the attack range.
+         */
+        void setAttackRange(int range) { mAttackRange = range; }
+
+        /**
+         * Gets the attack range.
+         */
+        int getAttackRange() const { return mAttackRange; }
+
         /**
          * Sents a trade request to the given being.
          */
@@ -213,6 +223,8 @@ class LocalPlayer : public Player
         int getMaxHP() const
         { return mMaxHP; }
 
+        Uint16 mAttackRange;
+
         void setHP(int value)
         { mHP = value; }
 
diff --git a/src/logindata.h b/src/logindata.h
index 0a01331c..fbbbb573 100644
--- a/src/logindata.h
+++ b/src/logindata.h
@@ -36,8 +36,8 @@ struct LoginData
     int session_ID1;
     int session_ID2;
 
-    bool remember;
-    bool registerLogin;
+    bool remember;            /**< Whether to store the username and host. */
+    bool registerLogin;       /**< Whether an account is being registered. */
 
     void clear()
     {
diff --git a/src/main.cpp b/src/main.cpp
index aad6a68c..bbbf0fd1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -30,9 +30,13 @@
 #include <vector>
 #include <SDL_image.h>
 
-#include <guichan/actionlistener.hpp>
+#ifdef WIN32
+#include <SDL_syswm.h>
+#endif
 
+#include <guichan/actionlistener.hpp>
 #include <guichan/sdl/sdlinput.hpp>
+#include <guichan/widgets/label.hpp>
 
 #include <libxml/parser.h>
 
@@ -63,11 +67,11 @@
 #include "gui/login.h"
 #include "gui/quitdialog.h"
 #include "gui/ok_dialog.h"
+#include "gui/progressbar.h"
 #include "gui/register.h"
 #include "gui/updatewindow.h"
 #include "gui/textfield.h"
 
-
 #include "net/charserverhandler.h"
 #include "net/connection.h"
 #include "net/loginhandler.h"
@@ -86,7 +90,6 @@
 #include "resources/itemdb.h"
 #include "resources/monsterdb.h"
 #include "resources/resourcemanager.h"
-#include "resources/spriteset.h"
 
 #include "utils/dtor.h"
 #include "utils/tostring.h"
@@ -103,23 +106,13 @@ unsigned char screen_mode;
 Sound sound;
 Music *bgm;
 
-Configuration config;         /**< Xml file configuration reader */
+Configuration config;         /**< XML file configuration reader */
 Logger *logger;               /**< Log object */
 
 Net::Connection *accountServerConnection = 0;
 Net::Connection *gameServerConnection = 0;
 Net::Connection *chatServerConnection = 0;
 
-namespace {
-    struct ErrorListener : public gcn::ActionListener
-    {
-        void action(const gcn::ActionEvent &event)
-        {
-            state = STATE_CHOOSE_SERVER;
-        }
-    } errorListener;
-}
-
 /**
  * A structure holding the values of various options that can be passed from
  * the command line.
@@ -131,12 +124,14 @@ struct Options
      */
     Options():
         printHelp(false),
+        printVersion(false),
         skipUpdate(false),
         chooseDefault(false),
         serverPort(0)
     {};
 
     bool printHelp;
+    bool printVersion;
     bool skipUpdate;
     bool chooseDefault;
     std::string playername;
@@ -237,7 +232,16 @@ void initEngine()
     SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
 
     SDL_WM_SetCaption("The Mana World", NULL);
-    SDL_WM_SetIcon(IMG_Load(TMW_DATADIR "data/icons/tmw-icon.png"), NULL);
+#ifdef WIN32
+    static SDL_SysWMinfo pInfo;
+    SDL_GetWMInfo(&pInfo);
+    HICON icon = LoadIcon(GetModuleHandle(NULL), "A");
+    SetClassLong(pInfo.window, GCL_HICON, (LONG) icon);
+#else
+    SDL_Surface *icon = IMG_Load(TMW_DATADIR "data/icons/tmw.png");
+    SDL_SetAlpha(icon, SDL_SRCALPHA, SDL_ALPHA_OPAQUE);
+    SDL_WM_SetIcon(icon, NULL);
+#endif
 
     ResourceManager *resman = ResourceManager::getInstance();
 
@@ -356,6 +360,7 @@ void printHelp()
         "tmw\n\n"
         "Options:\n"
         "  -h --help       : Display this help\n"
+        "  -v --version    : Display the version\n"
         "  -u --skipupdate : Skip the update process\n"
         "  -U --username   : Login with this username\n"
         "  -P --password   : Login with this password\n"
@@ -366,12 +371,23 @@ void printHelp()
         "  -C --configfile : Configuration file to use\n";
 }
 
+void printVersion()
+{
+#ifdef PACKAGE_VERSION
+    std::cout << "The Mana World version " << PACKAGE_VERSION << std::endl;
+#else
+    std::cout << "The Mana World version " <<
+             "(local build?, PACKAGE_VERSION is not defined)" << std::endl;
+#endif
+}
+
 void parseOptions(int argc, char *argv[], Options &options)
 {
-    const char *optstring = "huU:P:Dp:s:o:C:";
+    const char *optstring = "hvuU:P:Dp:s:o:C:";
 
     const struct option long_options[] = {
         { "help",       no_argument,       0, 'h' },
+        { "version",    no_argument,       0, 'v' },
         { "skipupdate", no_argument,       0, 'u' },
         { "username",   required_argument, 0, 'U' },
         { "password",   required_argument, 0, 'P' },
@@ -395,6 +411,9 @@ void parseOptions(int argc, char *argv[], Options &options)
             case 'h':
                 options.printHelp = true;
                 break;
+            case 'v':
+                options.printVersion = true;
+                break;
             case 'u':
                 options.skipUpdate = true;
                 break;
@@ -449,6 +468,16 @@ LoginHandler loginHandler;
 LogoutHandler logoutHandler;
 LockedArray<LocalPlayer*> charInfo(MAX_SLOT + 1);
 
+namespace {
+    struct ErrorListener : public gcn::ActionListener
+    {
+        void action(const gcn::ActionEvent &event)
+        {
+            state = STATE_CHOOSE_SERVER;
+        }
+    } errorListener;
+}
+
 // TODO Find some nice place for these functions
 void accountLogin(LoginData *loginData)
 {
@@ -466,15 +495,17 @@ void accountLogin(LoginData *loginData)
     // Clear the password, avoids auto login when returning to login
     loginData->password = "";
 
-    //remove _M or _F from username after a login for registration purpose
+    // Remove _M or _F from username after a login for registration purpose
     if (loginData->registerLogin)
     {
-        loginData->registerLogin = false;
-        loginData->username = loginData->username.substr(0, loginData->username.length() - 2);
+        loginData->username =
+            loginData->username.substr(0, loginData->username.length() - 2);
     }
+
     // TODO This is not the best place to save the config, but at least better
     // than the login gui window
-    if (loginData->remember) {
+    if (loginData->remember)
+    {
         config.setValue("host", loginData->hostname);
         config.setValue("username", loginData->username);
     }
@@ -557,7 +588,7 @@ void logoutThenExit()
     logoutHandler.reset();
     logoutHandler.setScenario(LOGOUT_EXIT);
 
-    //Can't logout if we were not logged in ...
+    // Can't logout if we were not logged in ...
     if (accountServerConnection->isConnected())
     {
         Net::AccountServer::logout();
@@ -616,10 +647,6 @@ void initXML()
 /** Main */
 int main(int argc, char *argv[])
 {
-#ifdef PACKAGE_VERSION
-    std::cout << "The Mana World v" << PACKAGE_VERSION << std::endl;
-#endif
-
     // Parse command line options
     Options options;
     parseOptions(argc, argv, options);
@@ -628,6 +655,11 @@ int main(int argc, char *argv[])
         printHelp();
         return 0;
     }
+    else if (options.printVersion)
+    {
+        printVersion();
+        return 0;
+    }
 
     // Initialize PhysicsFS
     PHYSFS_init(argv[0]);
@@ -647,10 +679,16 @@ int main(int argc, char *argv[])
     initConfiguration(options);
     initEngine();
 
+    Game *game = NULL;
     Window *currentDialog = NULL;
     QuitDialog* quitDialog = NULL;
     Image *login_wallpaper = NULL;
-    Game *game = NULL;
+
+    gcn::Container *top = static_cast<gcn::Container*>(gui->getTop());
+#ifdef PACKAGE_VERSION
+    gcn::Label *versionLabel = new gcn::Label(PACKAGE_VERSION);
+    top->add(versionLabel, 2, 2);
+#endif
 
     sound.playMusic(TMW_DATADIR "data/music/Magick - Real.ogg");
 
@@ -715,8 +753,8 @@ int main(int argc, char *argv[])
             guiInput->pushInput(event);
         }
 
-        gui->logic();
         Net::flush();
+        gui->logic();
 
         if (!login_wallpaper)
         {
@@ -729,10 +767,6 @@ int main(int argc, char *argv[])
         }
 
         graphics->drawImage(login_wallpaper, 0, 0);
-#ifdef PACKAGE_VERSION
-        graphics->setFont(gui->getFont());
-        graphics->drawText(PACKAGE_VERSION, 0, 0);
-#endif
         gui->draw();
         graphics->updateScreen();
 
@@ -759,7 +793,6 @@ int main(int argc, char *argv[])
                  accountServerConnection->isConnected())
         {
             reconnectAccount(token);
-
             state = STATE_WAIT;
         }
 
@@ -936,6 +969,10 @@ int main(int argc, char *argv[])
                     Net::ChatServer::connect(chatServerConnection, token);
                     sound.fadeOutMusic(1000);
 
+#ifdef PACKAGE_VERSION
+                    delete versionLabel;
+                    versionLabel = NULL;
+#endif
                     currentDialog = NULL;
 
                     logger->log("State: GAME");
diff --git a/src/monster.h b/src/monster.h
index 18fa703e..39bbf3d7 100644
--- a/src/monster.h
+++ b/src/monster.h
@@ -43,7 +43,6 @@ class Monster : public Being
          */
         virtual void handleAttack();
 
-    protected:
         /**
          * Returns the MonsterInfo, with static data about this monster.
          */
diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp
index 34fc188d..820aaea4 100644
--- a/src/net/charserverhandler.cpp
+++ b/src/net/charserverhandler.cpp
@@ -34,11 +34,13 @@
 #include "../main.h"
 
 #include "../gui/ok_dialog.h"
+#include "../gui/char_select.h"
 
 extern Net::Connection *gameServerConnection;
 extern Net::Connection *chatServerConnection;
 
-CharServerHandler::CharServerHandler()
+CharServerHandler::CharServerHandler():
+    mCharCreateDialog(0)
 {
     static const Uint16 _messages[] = {
         APMSG_CHAR_CREATE_RESPONSE,
@@ -99,6 +101,13 @@ CharServerHandler::handleMessage(MessageIn &msg)
             mCharInfo->unlock();
             mCharInfo->select(slot);
             mCharInfo->setEntry(tempPlayer);
+
+            // Close the character create dialog
+            if (mCharCreateDialog)
+            {
+                mCharCreateDialog->scheduleDelete();
+                mCharCreateDialog = 0;
+            }
             break;
 
         case APMSG_CHAR_SELECT_RESPONSE:
@@ -154,6 +163,9 @@ CharServerHandler::handleCharCreateResponse(MessageIn &msg)
         }
         new OkDialog("Error", message);
     }
+
+    if (mCharCreateDialog)
+        mCharCreateDialog->unlock();
 }
 
 void
@@ -177,15 +189,20 @@ CharServerHandler::handleCharSelectResponse(MessageIn &msg)
 
         // Keep the selected character and delete the others
         player_node = mCharInfo->getEntry();
+        int slot = mCharInfo->getPos();
         mCharInfo->unlock();
         mCharInfo->select(0);
 
         do {
             LocalPlayer *tmp = mCharInfo->getEntry();
             if (tmp != player_node)
+            {
                 delete tmp;
+                mCharInfo->setEntry(0);
+            }
             mCharInfo->next();
         } while (mCharInfo->getPos());
+        mCharInfo->select(slot);
 
         mCharInfo->clear(); //player_node will be deleted by ~Game
 
@@ -204,8 +221,11 @@ CharServerHandler::readPlayerData(MessageIn &msg, int &slot)
     tempPlayer->setHairColor(msg.readByte());
     tempPlayer->setLevel(msg.readByte());
     tempPlayer->setMoney(msg.readLong());
-    for (int i = 0; i < 7; i++) {
+
+    for (int i = 0; i < 7; i++)
+    {
         tempPlayer->setAttributeBase(i, msg.readByte());
     }
+
     return tempPlayer;
 }
diff --git a/src/net/charserverhandler.h b/src/net/charserverhandler.h
index 342641d7..4a4fe0c3 100644
--- a/src/net/charserverhandler.h
+++ b/src/net/charserverhandler.h
@@ -28,9 +28,13 @@
 
 #include "../lockedarray.h"
 
+class CharCreateDialog;
 class LocalPlayer;
 class LoginData;
 
+/**
+ * Deals with incoming messages related to character selection.
+ */
 class CharServerHandler : public MessageHandler
 {
     public:
@@ -45,6 +49,14 @@ class CharServerHandler : public MessageHandler
             mCharInfo = charInfo;
         }
 
+        /**
+         * Sets the character create dialog. The handler will clean up this
+         * dialog when a new character is succesfully created, and will unlock
+         * the dialog when a new character failed to be created.
+         */
+        void setCharCreateDialog(CharCreateDialog *window)
+        { mCharCreateDialog = window; }
+
     protected:
         void
         handleCharCreateResponse(MessageIn &msg);
@@ -53,6 +65,7 @@ class CharServerHandler : public MessageHandler
         handleCharSelectResponse(MessageIn &msg);
 
         LockedArray<LocalPlayer*> *mCharInfo;
+        CharCreateDialog *mCharCreateDialog;
 
         LocalPlayer*
         readPlayerData(MessageIn &msg, int &slot);
diff --git a/src/net/equipmenthandler.cpp b/src/net/equipmenthandler.cpp
index 1c0fd4ca..c0072a45 100644
--- a/src/net/equipmenthandler.cpp
+++ b/src/net/equipmenthandler.cpp
@@ -43,6 +43,7 @@ EquipmentHandler::EquipmentHandler()
         0x01d7,
         SMSG_PLAYER_UNEQUIP,
         SMSG_PLAYER_ARROW_EQUIP,
+        SMSG_PLAYER_ATTACK_RANGE,
         0
     };
     handledMessages = _messages;
@@ -191,6 +192,10 @@ void EquipmentHandler::handleMessage(MessageIn &msg)
                     index, equipPoint, type, position);
             break;
 
+        case SMSG_PLAYER_ATTACK_RANGE:
+            player_node->setAttackRange(msg.readShort());
+            break;
+
         case SMSG_PLAYER_ARROW_EQUIP:
             itemId = msg.readShort();
 
diff --git a/src/net/loginhandler.cpp b/src/net/loginhandler.cpp
index c68a620a..90f2dbd5 100644
--- a/src/net/loginhandler.cpp
+++ b/src/net/loginhandler.cpp
@@ -88,7 +88,7 @@ void LoginHandler::handleMessage(MessageIn &msg)
             {
                 switch (errMsg) {
                     case REGISTER_INVALID_VERSION:
-                    errorMessage = "Client has an insufficient version number to login.";
+                        errorMessage = "Client has an insufficient version number to login.";
                         break;
                     case ERRMSG_INVALID_ARGUMENT:
                         errorMessage = "Wrong username, password or email address";
diff --git a/src/net/protocol.h b/src/net/protocol.h
index a9ee0e5b..b5dc2996 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.h
@@ -44,6 +44,7 @@
 #define SMSG_PLAYER_EQUIPMENT        0x00a4
 #define SMSG_PLAYER_EQUIP            0x00aa
 #define SMSG_PLAYER_UNEQUIP          0x00ac
+#define SMSG_PLAYER_ATTACK_RANGE     0x013a
 #define SMSG_PLAYER_ARROW_EQUIP      0x013c
 #define SMSG_PLAYER_ARROW_MESSAGE    0x013b
 #define SMSG_PLAYER_SKILLS           0x010f
diff --git a/src/npc.cpp b/src/npc.cpp
index ccd085b6..2d291104 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -28,8 +28,6 @@
 
 #include "gui/gui.h"
 
-class Spriteset;
-
 NPC *current_npc = 0;
 
 NPC::NPC(Uint16 id, Uint16 job, Map *map):
diff --git a/src/resources/animation.h b/src/resources/animation.h
index 54142bcb..d0d11c69 100644
--- a/src/resources/animation.h
+++ b/src/resources/animation.h
@@ -29,7 +29,6 @@
 #include <libxml/tree.h>
 
 class Image;
-class Spriteset;
 
 /**
  * A single frame in an animation, with a delay and an offset.
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index 58325213..a27783d4 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -80,7 +80,7 @@ Image* Image::load(void *buffer, unsigned int bufferSize,
         tmpImage = IMG_Load_RW(rw, 1);
     }
 
-    if (tmpImage == NULL) {
+    if (!tmpImage) {
         logger->log("Error, image load failed: %s", IMG_GetError());
         return NULL;
     }
@@ -99,87 +99,28 @@ Image* Image::load(void *buffer, unsigned int bufferSize,
     amask = 0xff000000;
 #endif
 
-    // Convert the image to a 32 bit software surface for processing
-    SDL_Surface *formatImage = SDL_CreateRGBSurface(SDL_SWSURFACE, 0, 0, 32,
-            rmask, gmask, bmask, amask);
-
-    if (formatImage == NULL) {
-        logger->log("Error, image load failed: not enough memory");
-        SDL_FreeSurface(tmpImage);
-        return NULL;
-    }
-
-    SDL_Surface *image = SDL_ConvertSurface(
-            tmpImage, formatImage->format, SDL_SWSURFACE);
-
-    SDL_FreeSurface(formatImage);
-
-    if (image == NULL) {
-        logger->log("Error, image load failed: not enough memory");
-        return NULL;
-    }
-
-    bool hasPink = false;
-    bool hasAlpha = false;
-    int i;
-    Uint32 pink = SDL_MapRGB(image->format, 255, 0, 255);
-
-    // Figure out whether the image has pink pixels
-    for (i = 0; i < image->w * image->h; ++i)
-    {
-        if (((Uint32*)image->pixels)[i] == pink)
-        {
-            hasPink = true;
-            break;
-        }
-    }
-
-    // Figure out whether the image uses its alpha layer
-    for (i = 0; i < image->w * image->h; ++i)
-    {
-        Uint8 r, g, b, a;
-        SDL_GetRGBA(
-                ((Uint32*)image->pixels)[i],
-                image->format,
-                &r, &g, &b, &a);
-
-        if (a != 255)
-        {
-            hasAlpha = true;
-            break;
-        }
-    }
-
-    SDL_FreeSurface(image);
-
-    if (hasPink && !hasAlpha) {
-        SDL_SetColorKey(tmpImage, SDL_SRCCOLORKEY,
-                SDL_MapRGB(tmpImage->format, 255, 0, 255));
-    } else if (hasAlpha) {
-        SDL_SetAlpha(tmpImage, SDL_SRCALPHA, SDL_ALPHA_OPAQUE);
-    }
-
 #ifdef USE_OPENGL
     if (mUseOpenGL)
     {
         int width = tmpImage->w;
         int height = tmpImage->h;
-        int realWidth = 1, realHeight = 1;
+        int realWidth = powerOfTwo(width);
+        int realHeight = powerOfTwo(height);
 
-        while (realWidth < width && realWidth < 1024) {
-            realWidth *= 2;
-        }
-
-        while (realHeight < height && realHeight < 1024) {
-            realHeight *= 2;
+        if (realWidth < width || realHeight < height)
+        {
+            logger->log("Warning: image too large, cropping to %dx%d texture!",
+                    tmpImage->w, tmpImage->h);
         }
 
+        // Make sure the alpha channel is not used, but copied to destination
         SDL_SetAlpha(tmpImage, 0, SDL_ALPHA_OPAQUE);
+
         SDL_Surface *oldImage = tmpImage;
-        tmpImage = SDL_CreateRGBSurface(SDL_SWSURFACE, realWidth, realHeight, 32,
-                rmask, gmask, bmask, amask);
+        tmpImage = SDL_CreateRGBSurface(SDL_SWSURFACE, realWidth, realHeight,
+            32, rmask, gmask, bmask, amask);
 
-        if (tmpImage == NULL) {
+        if (!tmpImage) {
             logger->log("Error, image convert failed: out of memory");
             return NULL;
         }
@@ -189,8 +130,6 @@ Image* Image::load(void *buffer, unsigned int bufferSize,
 
         GLuint texture;
         glGenTextures(1, &texture);
-        logger->log("Binding texture %d (%dx%d)",
-                texture, tmpImage->w, tmpImage->h);
         glBindTexture(GL_TEXTURE_2D, texture);
 
         if (SDL_MUSTLOCK(tmpImage)) {
@@ -246,8 +185,27 @@ Image* Image::load(void *buffer, unsigned int bufferSize,
     }
 #endif
 
-    // Set color key and alpha blending optins, and convert the surface to the
-    // current display format
+    bool hasAlpha = false;
+
+    // Figure out whether the image uses its alpha layer
+    for (int i = 0; i < tmpImage->w * tmpImage->h; ++i)
+    {
+        Uint8 r, g, b, a;
+        SDL_GetRGBA(
+                ((Uint32*) tmpImage->pixels)[i],
+                tmpImage->format,
+                &r, &g, &b, &a);
+
+        if (a != 255)
+        {
+            hasAlpha = true;
+            break;
+        }
+    }
+
+    SDL_Surface *image;
+
+    // Convert the surface to the current display format
     if (hasAlpha) {
         image = SDL_DisplayFormatAlpha(tmpImage);
     }
@@ -256,7 +214,7 @@ Image* Image::load(void *buffer, unsigned int bufferSize,
     }
     SDL_FreeSurface(tmpImage);
 
-    if (image == NULL) {
+    if (!image) {
         logger->log("Error: Image convert failed.");
         return NULL;
     }
@@ -315,10 +273,22 @@ float Image::getAlpha()
 }
 
 #ifdef USE_OPENGL
-void Image::setLoadAsOpenGL(bool useOpenGL)
+void
+Image::setLoadAsOpenGL(bool useOpenGL)
 {
     Image::mUseOpenGL = useOpenGL;
 }
+
+int
+Image::powerOfTwo(int input)
+{
+    int value = 1;
+    while (value < input && value < 1024)
+    {
+        value <<= 1;
+    }
+    return value;
+}
 #endif
 
 //============================================================================
diff --git a/src/resources/image.h b/src/resources/image.h
index 03bf0cbc..cad21dcd 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -126,6 +126,12 @@ class Image : public Resource
 #ifdef USE_OPENGL
         Image(const std::string &idPath, GLuint glimage, int width, int height,
                 int texWidth, int texHeight);
+
+        /**
+         * Returns the first power of two equal or bigger than the input.
+         */
+        static int
+        powerOfTwo(int input);
 #endif
         Image(const std::string &idPath, SDL_Surface *image);
 
diff --git a/src/resources/imageset.cpp b/src/resources/imageset.cpp
new file mode 100644
index 00000000..677c024b
--- /dev/null
+++ b/src/resources/imageset.cpp
@@ -0,0 +1,65 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#include "imageset.h"
+
+#include "../log.h"
+
+#include "image.h"
+
+#include "../utils/dtor.h"
+
+ImageSet::ImageSet(const std::string& idPath,
+                     Image *img,
+                     int width, int height):
+    Resource(idPath)
+{
+    for (int y = 0; y + height <= img->getHeight(); y += height)
+    {
+        for (int x = 0; x + width <= img->getWidth(); x += width)
+        {
+            mImages.push_back(img->getSubImage(x, y, width, height));
+        }
+    }
+    mWidth = width;
+    mHeight = height;
+}
+
+ImageSet::~ImageSet()
+{
+    for_each(mImages.begin(), mImages.end(), make_dtor(mImages));
+}
+
+Image*
+ImageSet::get(size_type i)
+{
+    if (i >= mImages.size())
+    {
+        logger->log("Warning: Sprite #%i does not exist in this image set", i);
+        return NULL;
+    }
+    else
+    {
+        return mImages[i];
+    }
+}
diff --git a/src/resources/imageset.h b/src/resources/imageset.h
new file mode 100644
index 00000000..3469a3bb
--- /dev/null
+++ b/src/resources/imageset.h
@@ -0,0 +1,66 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _TMW_IMAGESET_H
+#define _TMW_IMAGESET_H
+
+#include <vector>
+
+#include "resource.h"
+
+class Image;
+
+
+/**
+ * Stores a set of subimages originating from a single image.
+ */
+class ImageSet : public Resource
+{
+    public:
+        /*
+         * Cuts the passed image in a grid of sub images.
+         */
+        ImageSet(const std::string &idPath, Image *img, int w, int h);
+
+        /**
+         * Destructor.
+         */
+        ~ImageSet();
+
+        int getWidth() { return mWidth; };
+
+        int getHeight() { return mHeight; };
+
+        typedef std::vector<Image*>::size_type size_type;
+        Image* get(size_type i);
+
+        size_type size() { return mImages.size(); }
+
+    private:
+        std::vector<Image*> mImages;
+
+        int mHeight; /**< Height of the images in the image set. */
+        int mWidth;  /**< Width of the images in the image set. */
+};
+
+#endif
diff --git a/src/resources/monsterdb.h b/src/resources/monsterdb.h
index 048638c2..46a33b06 100644
--- a/src/resources/monsterdb.h
+++ b/src/resources/monsterdb.h
@@ -39,7 +39,7 @@ namespace MonsterDB
     void
     unload();
 
-    const MonsterInfo& get (int id);
+    const MonsterInfo& get(int id);
 
     typedef std::map<int, MonsterInfo*> MonsterInfos;
     typedef MonsterInfos::iterator MonsterInfoIterator;
diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h
index 413dafa0..05d4c014 100644
--- a/src/resources/monsterinfo.h
+++ b/src/resources/monsterinfo.h
@@ -1,74 +1,83 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: monsterinfo.h 2650 2006-09-03 15:00:47Z b_lindeijer $
- */
-
-#ifndef _TMW_MONSTERINFO_H_
-#define _TMW_MONSTERINFO_H_
-
-#include <map>
-#include <string>
-#include <vector>
-
-
-enum SoundEvent
-{
-    EVENT_HIT,
-    EVENT_MISS,
-    EVENT_HURT,
-    EVENT_DIE
-};
-
-
-class MonsterInfo
-{
-    public:
-        MonsterInfo();
-
-        ~MonsterInfo();
-
-        void
-        setName(std::string name) { mName = name; } ;
-
-        void
-        setSprite(std::string filename) { mSprite = filename; }
-
-        void
-        addSound (SoundEvent event, std::string filename);
-
-        const std::string&
-        getName () const { return mName; };
-
-        const std::string&
-        getSprite () const { return mSprite; };
-
-        std::string
-        getSound (SoundEvent event) const;
-
-    private:
-
-        std::string mName;
-        std::string mSprite;
-
-        std::map<SoundEvent, std::vector<std::string>* > mSounds;
-};
-
-#endif
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id: monsterinfo.h 2650 2006-09-03 15:00:47Z b_lindeijer $
+ */
+
+#ifndef _TMW_MONSTERINFO_H_
+#define _TMW_MONSTERINFO_H_
+
+#include <map>
+#include <string>
+#include <vector>
+
+enum SoundEvent
+{
+    EVENT_HIT,
+    EVENT_MISS,
+    EVENT_HURT,
+    EVENT_DIE
+};
+
+/**
+ * Holds information about a certain type of monster. This includes the name
+ * of the monster, the sprite to display and the sounds the monster makes.
+ *
+ * @see MonsterDB
+ */
+class MonsterInfo
+{
+    public:
+        /**
+         * Constructor.
+         */
+        MonsterInfo();
+
+        /**
+         * Destructor.
+         */
+        ~MonsterInfo();
+
+        void
+        setName(std::string name) { mName = name; } ;
+
+        void
+        setSprite(std::string filename) { mSprite = filename; }
+
+        void
+        addSound (SoundEvent event, std::string filename);
+
+        const std::string&
+        getName () const { return mName; };
+
+        const std::string&
+        getSprite () const { return mSprite; };
+
+        std::string
+        getSound (SoundEvent event) const;
+
+    private:
+        std::string mName;
+        std::string mSprite;
+
+        std::map<SoundEvent, std::vector<std::string>* > mSounds;
+};
+
+#endif
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 2059a5c3..448e7f80 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -31,7 +31,7 @@
 #include "image.h"
 #include "music.h"
 #include "soundeffect.h"
-#include "spriteset.h"
+#include "imageset.h"
 #include "spritedef.h"
 
 #include "../log.h"
@@ -46,7 +46,7 @@ ResourceManager::ResourceManager()
 
 ResourceManager::~ResourceManager()
 {
-    // Release any remaining spritedefs first because they depend on spritesets
+    // Release any remaining spritedefs first because they depend on image sets
     ResourceIterator iter = mResources.begin();
     while (iter != mResources.end())
     {
@@ -63,11 +63,11 @@ ResourceManager::~ResourceManager()
         }
     }
 
-    // Release any remaining spritesets first because they depend on images
+    // Release any remaining image sets first because they depend on images
     iter = mResources.begin();
     while (iter != mResources.end())
     {
-        if (dynamic_cast<Spriteset*>(iter->second) != 0)
+        if (dynamic_cast<ImageSet*>(iter->second) != 0)
         {
             cleanUp(iter->second);
             ResourceIterator toErase = iter;
@@ -232,8 +232,8 @@ ResourceManager::getSoundEffect(const std::string &idPath)
     return dynamic_cast<SoundEffect*>(get(SOUND_EFFECT, idPath));
 }
 
-Spriteset*
-ResourceManager::getSpriteset(const std::string &imagePath, int w, int h)
+ImageSet*
+ResourceManager::getImageSet(const std::string &imagePath, int w, int h)
 {
     std::stringstream ss;
     ss << imagePath << "[" << w << "x" << h << "]";
@@ -243,7 +243,7 @@ ResourceManager::getSpriteset(const std::string &imagePath, int w, int h)
 
     if (resIter != mResources.end()) {
         resIter->second->incRef();
-        return dynamic_cast<Spriteset*>(resIter->second);
+        return dynamic_cast<ImageSet*>(resIter->second);
     }
 
     Image *img = getImage(imagePath);
@@ -252,13 +252,13 @@ ResourceManager::getSpriteset(const std::string &imagePath, int w, int h)
         return NULL;
     }
 
-    Spriteset *spriteset = new Spriteset(idPath, img, w, h);
-    spriteset->incRef();
-    mResources[idPath] = spriteset;
+    ImageSet *imageSet = new ImageSet(idPath, img, w, h);
+    imageSet->incRef();
+    mResources[idPath] = imageSet;
 
     img->decRef();
 
-    return spriteset;
+    return imageSet;
 }
 
 SpriteDef*
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index e176e337..db29e6d3 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -33,7 +33,7 @@ class Resource;
 class Image;
 class Music;
 class SoundEffect;
-class Spriteset;
+class ImageSet;
 class SpriteDef;
 
 /**
@@ -143,11 +143,11 @@ class ResourceManager
         getSoundEffect(const std::string &idPath);
 
         /**
-         * Creates a spriteset based on the image referenced by the given
+         * Creates a image set based on the image referenced by the given
          * path and the supplied sprite sizes
          */
-        Spriteset*
-        getSpriteset(const std::string &imagePath, int w, int h);
+        ImageSet*
+        getImageSet(const std::string &imagePath, int w, int h);
 
         /**
          * Creates a sprite definition based on a given path and the supplied
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index feb6f8f8..d29bd847 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -28,7 +28,7 @@
 #include "animation.h"
 #include "action.h"
 #include "resourcemanager.h"
-#include "spriteset.h"
+#include "imageset.h"
 #include "image.h"
 
 #include "../utils/xml.h"
@@ -135,30 +135,30 @@ SpriteDef::loadImageSet(xmlNodePtr node)
     std::string imageSrc = XML::getProperty(node, "src", "");
 
     ResourceManager *resman = ResourceManager::getInstance();
-    Spriteset *spriteset = resman->getSpriteset(imageSrc, width, height);
+    ImageSet *imageSet = resman->getImageSet(imageSrc, width, height);
 
-    if (!spriteset)
+    if (!imageSet)
     {
         logger->error("Couldn't load imageset!");
     }
 
-    mSpritesets[name] = spriteset;
+    mImageSets[name] = imageSet;
 }
 
 void
 SpriteDef::loadAction(xmlNodePtr node, int variant_offset)
 {
     const std::string actionName = XML::getProperty(node, "name", "");
-    const std::string imagesetName = XML::getProperty(node, "imageset", "");
+    const std::string imageSetName = XML::getProperty(node, "imageset", "");
 
-    SpritesetIterator si = mSpritesets.find(imagesetName);
-    if (si == mSpritesets.end())
+    ImageSetIterator si = mImageSets.find(imageSetName);
+    if (si == mImageSets.end())
     {
         logger->log("Warning: imageset \"%s\" not defined in %s",
-                imagesetName.c_str(), getIdPath().c_str());
+                imageSetName.c_str(), getIdPath().c_str());
         return;
     }
-    Spriteset *imageset = si->second;
+    ImageSet *imageSet = si->second;
 
     SpriteAction actionType = makeSpriteAction(actionName);
     if (actionType == ACTION_INVALID)
@@ -183,14 +183,14 @@ SpriteDef::loadAction(xmlNodePtr node, int variant_offset)
     {
         if (xmlStrEqual(animationNode->name, BAD_CAST "animation"))
         {
-            loadAnimation(animationNode, action, imageset, variant_offset);
+            loadAnimation(animationNode, action, imageSet, variant_offset);
         }
     }
 }
 
 void
 SpriteDef::loadAnimation(xmlNodePtr animationNode,
-                         Action *action, Spriteset *imageset,
+                         Action *action, ImageSet *imageSet,
                          int variant_offset)
 {
     std::string directionName =
@@ -215,8 +215,8 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode,
         int delay = XML::getProperty(frameNode, "delay", 0);
         int offsetX = XML::getProperty(frameNode, "offsetX", 0);
         int offsetY = XML::getProperty(frameNode, "offsetY", 0);
-        offsetY -= imageset->getHeight() - 32;
-        offsetX -= imageset->getWidth() / 2 - 16;
+        offsetY -= imageSet->getHeight() - 32;
+        offsetX -= imageSet->getWidth() / 2 - 16;
 
         if (xmlStrEqual(frameNode->name, BAD_CAST "frame"))
         {
@@ -228,7 +228,7 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode,
                 continue;
             }
 
-            Image *img = imageset->get(index + variant_offset);
+            Image *img = imageSet->get(index + variant_offset);
 
             if (!img)
             {
@@ -251,7 +251,7 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode,
 
             while (end >= start)
             {
-                Image *img = imageset->get(start + variant_offset);
+                Image *img = imageSet->get(start + variant_offset);
 
                 if (!img)
                 {
@@ -296,8 +296,8 @@ SpriteDef::substituteAction(SpriteAction complete, SpriteAction with)
 
 SpriteDef::~SpriteDef()
 {
-    for (SpritesetIterator i = mSpritesets.begin();
-            i != mSpritesets.end(); ++i)
+    for (ImageSetIterator i = mImageSets.begin();
+            i != mImageSets.end(); ++i)
     {
         i->second->decRef();
     }
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index 057129ad..6d335b02 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -32,7 +32,7 @@
 #include <libxml/tree.h>
 
 class Action;
-class Spriteset;
+class ImageSet;
 
 enum SpriteAction
 {
@@ -111,7 +111,7 @@ class SpriteDef : public Resource
          */
         void
         loadAnimation(xmlNodePtr animationNode,
-                      Action *action, Spriteset *imageset,
+                      Action *action, ImageSet *imageSet,
                       int variant_offset);
 
         /**
@@ -140,12 +140,12 @@ class SpriteDef : public Resource
         makeSpriteDirection(const std::string &direction);
 
 
-        typedef std::map<std::string, Spriteset*> Spritesets;
-        typedef Spritesets::iterator SpritesetIterator;
+        typedef std::map<std::string, ImageSet*> ImageSets;
+        typedef ImageSets::iterator ImageSetIterator;
 
         typedef std::map<SpriteAction, Action*> Actions;
 
-        Spritesets mSpritesets;
+        ImageSets mImageSets;
         Actions mActions;
         Action *mAction;
         SpriteDirection mDirection;
diff --git a/src/resources/spriteset.cpp b/src/resources/spriteset.cpp
deleted file mode 100644
index 96bcef0c..00000000
--- a/src/resources/spriteset.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
- */
-
-#include "spriteset.h"
-
-#include "../log.h"
-
-#include "image.h"
-
-#include "../utils/dtor.h"
-
-Spriteset::Spriteset(const std::string& idPath,
-                     Image *img,
-                     int width, int height):
-    Resource(idPath)
-{
-    for (int y = 0; y + height <= img->getHeight(); y += height)
-    {
-        for (int x = 0; x + width <= img->getWidth(); x += width)
-        {
-            mSpriteset.push_back(img->getSubImage(x, y, width, height));
-        }
-    }
-    mWidth = width;
-    mHeight = height;
-}
-
-Spriteset::~Spriteset()
-{
-    for_each(mSpriteset.begin(), mSpriteset.end(), make_dtor(mSpriteset));
-}
-
-Image*
-Spriteset::get(size_type i)
-{
-    if (i >= mSpriteset.size())
-    {
-        logger->log("Warning: Sprite #%i does not exist in this spriteset", i);
-        return NULL;
-    }
-    else
-    {
-        return mSpriteset[i];
-    }
-}
diff --git a/src/resources/spriteset.h b/src/resources/spriteset.h
deleted file mode 100644
index 7f6b42df..00000000
--- a/src/resources/spriteset.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
- */
-
-#ifndef _TMW_SPRITESET_H
-#define _TMW_SPRITESET_H
-
-#include <vector>
-
-#include "resource.h"
-
-class Image;
-
-
-/**
- * Stores a set of subimages originating from a single image.
- *
- * TODO: Should probably be renamed to ImageSet or TileSet.
- */
-class Spriteset : public Resource
-{
-    public:
-        /*
-         * Cuts the passed image in a grid of sub images.
-         */
-        Spriteset(const std::string &idPath, Image *img, int w, int h);
-
-        /**
-         * Destructor.
-         */
-        ~Spriteset();
-
-        int getWidth() { return mWidth; };
-
-        int getHeight() { return mHeight; };
-
-        typedef std::vector<Image*>::size_type size_type;
-        Image* get(size_type i);
-
-        size_type size() { return mSpriteset.size(); }
-
-    private:
-        // Vector storing the whole spriteset.
-        std::vector<Image*> mSpriteset;
-        // Height and width of the images in the spriteset
-        int mHeight;
-        int mWidth;
-};
-
-#endif
diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp
new file mode 100644
index 00000000..5fc35bcd
--- /dev/null
+++ b/src/simpleanimation.cpp
@@ -0,0 +1,50 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#include "simpleanimation.h"
+
+
+void SimpleAnimation::update(unsigned int timePassed)
+{
+    mAnimationTime += timePassed;
+    while (mAnimationTime > mCurrentFrame->delay)
+    {
+        mAnimationTime -= mCurrentFrame->delay;
+        mAnimationPhase++;
+        if (mAnimationPhase >= mAnimation->getLength())
+        {
+            mAnimationPhase = 0;
+        }
+        mCurrentFrame = mAnimation->getFrame(mAnimationPhase);
+    }
+}
+
+Image *SimpleAnimation::getCurrentImage() const
+{
+    return mCurrentFrame->image;
+}
+
+SimpleAnimation::~SimpleAnimation()
+{
+    delete mAnimation;
+}
diff --git a/src/simpleanimation.h b/src/simpleanimation.h
new file mode 100644
index 00000000..a56c31da
--- /dev/null
+++ b/src/simpleanimation.h
@@ -0,0 +1,65 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _TMW_SIMPLEANIMAION_H
+#define _TMW_SIMPLEANIMAION_H
+
+#include "resources/animation.h"
+
+class Frame;
+
+/**
+ * This class is a leightweight alternative to the AnimatedSprite class.
+ * It hosts a looping animation without actions and directions.
+ */
+class SimpleAnimation
+{
+    public:
+        SimpleAnimation(Animation *animation):
+            mAnimation(animation),
+            mAnimationTime(0),
+            mAnimationPhase(0),
+            mCurrentFrame(mAnimation->getFrame(0))
+        {};
+
+        ~SimpleAnimation();
+
+        void update(unsigned int timePassed);
+
+        Image *getCurrentImage() const;
+
+    private:
+        /** The hosted animation. */
+        Animation *mAnimation;
+
+        /** Time in game ticks the current frame is shown. */
+        unsigned int mAnimationTime;
+
+        /** Index of current animation frame. */
+        unsigned int mAnimationPhase;
+
+        /** Current animation frame. */
+        Frame *mCurrentFrame;
+};
+
+#endif
diff --git a/src/tileset.h b/src/tileset.h
index 27bc28c3..7521a3e5 100644
--- a/src/tileset.h
+++ b/src/tileset.h
@@ -24,19 +24,19 @@
 #ifndef _TMW_TILESET_H_
 #define _TMW_TILESET_H_
 
-#include "resources/spriteset.h"
+#include "resources/imageset.h"
 
 /**
- * A tileset, which is basically just a spriteset but it stores a firstgid.
+ * A tileset, which is basically just an image set but it stores a firstgid.
  */
-class Tileset : public Spriteset
+class Tileset : public ImageSet
 {
     public:
         /**
          * Constructor.
          */
         Tileset(Image *img, int w, int h, int firstGid):
-            Spriteset("", img, w, h),
+            ImageSet("", img, w, h),
             mFirstGid(firstGid)
         {
         }
diff --git a/src/tmw.rc b/src/tmw.rc
index ee5f99cd..673b2387 100644
--- a/src/tmw.rc
+++ b/src/tmw.rc
@@ -2,7 +2,7 @@
 
 #include "winver.h"
 
-A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/tmw-icon.ico"
+A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/tmw.ico"
 
 1 VERSIONINFO
 FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
diff --git a/tmw.cbp b/tmw.cbp
index 96ef5a36..c66a5719 100644
--- a/tmw.cbp
+++ b/tmw.cbp
@@ -1262,6 +1262,16 @@
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
+		<Unit filename="src\resources\imageset.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="default"/>
+		</Unit>
+		<Unit filename="src\resources\imageset.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="default"/>
+		</Unit>
 		<Unit filename="src\resources\imagewriter.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
@@ -1392,17 +1402,17 @@
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\resources\spriteset.cpp">
-			<Option compilerVar="CPP"/>
+		<Unit filename="src\serverinfo.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\resources\spriteset.h">
+		<Unit filename="src\simpleanimation.cpp">
 			<Option compilerVar="CPP"/>
-			<Option compile="0"/>
-			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\serverinfo.h">
+		<Unit filename="src\simpleanimation.h">
 			<Option compilerVar=""/>
 			<Option compile="0"/>
 			<Option link="0"/>
-- 
cgit v1.2.3-70-g09d2


From a353543dd4da3c489a84f6f17125fdd0e1be2349 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Mon, 4 Jun 2007 21:48:47 +0000
Subject: Merged 0.0 changes from revision 3234 to 3317 to trunk.

---
 ChangeLog                                  | 465 ++++++++++++++++++++++++++++-
 NEWS                                       |  16 +
 README                                     |   3 +-
 data/graphics/gui/CMakeLists.txt           |   8 +-
 data/graphics/gui/Makefile.am              |   6 +
 data/graphics/gui/target-cursor-blue-l.png | Bin 0 -> 23803 bytes
 data/graphics/gui/target-cursor-blue-m.png | Bin 0 -> 18439 bytes
 data/graphics/gui/target-cursor-blue-s.png | Bin 0 -> 8353 bytes
 data/graphics/gui/target-cursor-blue.png   | Bin 8353 -> 0 bytes
 data/graphics/gui/target-cursor-red-l.png  | Bin 0 -> 25586 bytes
 data/graphics/gui/target-cursor-red-m.png  | Bin 0 -> 17950 bytes
 data/graphics/gui/target-cursor-red-s.png  | Bin 0 -> 8361 bytes
 data/graphics/gui/target-cursor-red.png    | Bin 8361 -> 0 bytes
 data/help/changes.txt                      | 147 ++++-----
 data/help/header.txt                       |   2 +-
 docs/Makefile.am                           |   3 +-
 src/CMakeLists.txt                         |  14 +
 src/Makefile.am                            |  16 +-
 src/animatedsprite.cpp                     |  24 ++
 src/animatedsprite.h                       |  12 +
 src/animationparticle.cpp                  |  51 ++++
 src/animationparticle.h                    |  49 +++
 src/being.cpp                              | 122 +++++---
 src/being.h                                |  36 ++-
 src/engine.cpp                             |   7 +
 src/game.cpp                               |  24 +-
 src/graphics.cpp                           |   2 -
 src/gui/buy.cpp                            | 117 +++-----
 src/gui/buy.h                              |   6 +
 src/gui/chat.cpp                           |   4 +-
 src/gui/chat.h                             |   4 +-
 src/gui/debugwindow.cpp                    |  10 +
 src/gui/debugwindow.h                      |   1 +
 src/gui/inventorywindow.cpp                |   7 +-
 src/gui/sell.cpp                           | 159 +++++-----
 src/gui/sell.h                             |   6 +
 src/gui/updatewindow.cpp                   |   7 +-
 src/gui/viewport.cpp                       | 108 ++++---
 src/gui/viewport.h                         |  20 +-
 src/gui/widgets/resizegrip.cpp             |  65 ++++
 src/gui/widgets/resizegrip.h               |  61 ++++
 src/gui/window.cpp                         | 185 ++++++++----
 src/gui/window.h                           |  66 ++--
 src/imageparticle.cpp                      |  69 +++++
 src/imageparticle.h                        |  61 ++++
 src/main.cpp                               |  26 +-
 src/map.cpp                                |  23 ++
 src/map.h                                  |  25 +-
 src/monster.cpp                            |   6 +
 src/monster.h                              |   3 +
 src/net/beinghandler.cpp                   |  17 +-
 src/openglgraphics.cpp                     |  24 +-
 src/particle.cpp                           | 370 +++++++++++++++++++++++
 src/particle.h                             | 288 ++++++++++++++++++
 src/particleemitter.cpp                    | 327 ++++++++++++++++++++
 src/particleemitter.h                      | 120 ++++++++
 src/resources/animation.h                  |   2 +-
 src/resources/image.cpp                    |  25 +-
 src/resources/mapreader.cpp                |  24 ++
 src/resources/monsterdb.cpp                |  21 ++
 src/resources/monsterinfo.h                |  14 +-
 src/simpleanimation.cpp                    |  85 ++++++
 src/simpleanimation.h                      |  15 +-
 src/sprite.h                               |  16 +
 src/textparticle.cpp                       |  64 ++++
 src/textparticle.h                         |  53 ++++
 src/utils/fastsqrt.h                       |  24 ++
 src/utils/minmax.h                         |  47 +++
 src/utils/wingettimeofday.h                | 226 +++++++-------
 src/utils/xml.cpp                          |  23 ++
 src/utils/xml.h                            |  11 +
 71 files changed, 3240 insertions(+), 602 deletions(-)
 create mode 100644 data/graphics/gui/target-cursor-blue-l.png
 create mode 100644 data/graphics/gui/target-cursor-blue-m.png
 create mode 100644 data/graphics/gui/target-cursor-blue-s.png
 delete mode 100644 data/graphics/gui/target-cursor-blue.png
 create mode 100644 data/graphics/gui/target-cursor-red-l.png
 create mode 100644 data/graphics/gui/target-cursor-red-m.png
 create mode 100644 data/graphics/gui/target-cursor-red-s.png
 delete mode 100644 data/graphics/gui/target-cursor-red.png
 create mode 100644 src/animationparticle.cpp
 create mode 100644 src/animationparticle.h
 create mode 100644 src/gui/widgets/resizegrip.cpp
 create mode 100644 src/gui/widgets/resizegrip.h
 create mode 100644 src/imageparticle.cpp
 create mode 100644 src/imageparticle.h
 create mode 100644 src/particle.cpp
 create mode 100644 src/particle.h
 create mode 100644 src/particleemitter.cpp
 create mode 100644 src/particleemitter.h
 create mode 100644 src/textparticle.cpp
 create mode 100644 src/textparticle.h
 create mode 100644 src/utils/fastsqrt.h
 create mode 100644 src/utils/minmax.h

(limited to 'docs')

diff --git a/ChangeLog b/ChangeLog
index 61aef963..63aaa1eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,162 @@
+2007-06-03  David Athay  <ko2fan@gmail.com>
+
+	* src/main.cpp, src/game.cpp: Fixed screenshot taking on OSX.
+
+2007-06-03  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/CMakeLists.txt, src/Makefile.am, docs/Makefile.am: Added some
+	files to be included with the release.
+	* src/utils/fastsqrt.h: Fixed warning about strict-aliasing rules.
+	* src/Makefile.am: Don't die on warnings by default.
+	* src/resources/image.cpp: Fixed image loading in software mode to not
+	check for alpha layer when images aren't 32-bit.
+	* src/graphics.cpp, src/graphics.h, src/imageparticle.cpp: Removed
+	drawImageTransparent from Graphics class, should be set on image.
+	* src/imageparticle.h, src/particleemitter.h, src/particle.h,
+	src/particleemitter.cpp, src/particle.cpp, src/imageparticle.cpp: Have
+	ParticleEmitter load a possible particle image early on and don't
+	cause a crash when the image can't be found.
+
+2007-06-02  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/winver.h, README, NEWS, CMakeLists.txt, configure.ac,
+	data/help/changes.txt, data/help/header.txt: Updated version and
+	release date and summarized changes.
+	* src/gui/chat.h, src/gui/chat.cpp: Changed color of chat messages in
+	OpenGL mode from orange to black.
+	* src/gui/sell.cpp, src/gui/buy.h, src/gui/buy.cpp, src/gui/sell.h:
+	Some cleanup of buy/sell dialog code.
+
+2007-06-01  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* data/graphics/gui/CMakeLists.txt, data/graphics/gui/Makefile.am:
+	Added target cursors to installed files.
+
+2007-05-31  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/maps/new_16-1.tmx.gz: Fixed an inconsistency with the neighbor
+	map (no new walkmap required).
+
+2007-05-23  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/sell.cpp, src/gui/buy.cpp, src/being.cpp: A bunch of
+	lingering syntactical changes.
+	* src/gui/viewport.cpp: Added a missing include and fixed a bug with
+	cleaning up target cursor animations.
+
+2007-05-23  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/gui/viewport.cpp,
+	data/graphics/gui/target-cursor-blue-s.png,
+	data/graphics/gui/target-cursor-blue-m.png,
+	data/graphics/gui/target-cursor-blue-l.png,
+	data/graphics/gui/target-cursor-red-s.png,
+	data/graphics/gui/target-cursor-red-m.png,
+	data/graphics/gui/target-cursor-red-l.png: Replaced target cursor
+	graphics with higher quality ones by Pauan.
+	* src/particle.cpp: Made bouncing particles immune against death by
+	ground contact and removed a nonsensical debugging log message. Made
+	text splash effects fade out.
+	* src/textparticle.cpp: Implemented fading in and out for text
+	particles.
+	* src/being.cpp, src/particle.cpp, src/particle.h,
+	src/textparticle.cpp, src/textparticle.h: The color values of text
+	particles are now stored in 3 integers instead of a Guichan color
+	structure.
+
+2007-05-20  Eugenio Favalli  <elvenprogrammer@gmail.com>
+
+	* tmw.cbp: Updated Code::Blocks project file.
+
+2007-05-20  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/gui/buy.cpp, src/gui/sell.cpp: Unified some differences between
+	buy and sell dialog. Money label now shows money after transaction
+	instead of current money.
+	* src/gui/sell.cpp: Fixed the amount-not-reset-when-using-scrollwheel
+	bug.
+	* src/being.h, src/gui/viewport.cpp, src/gui/viewport.h: Added 3
+	different target cursor sizes.
+	* src/monster.h, src/monster.cpp, src/resources/monsterdb.cpp,
+	scr/resources/monsterinfo.h, data/monsters.xml: Target cursor size for
+	monster is read from the monsters.xml.
+	* data/graphics/gui/target-cursor-blue-s.png,
+	data/graphics/gui/target-cursor-blue-m.png,
+	data/graphics/gui/target-cursor-blue-l.png,
+	data/graphics/gui/target-cursor-red-s.png,
+	data/graphics/gui/target-cursor-red-m.png,
+	data/graphics/gui/target-cursor-red-l.png: Added temporary
+	placeholders for small and large target cursors until better versions
+	based on the original SVG are available.
+
+2007-05-08  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/graphics/sprites/monster-bat.png,
+	data/graphics/sprites/monster-bat.xml,
+	data/graphics/sprites/monster-flower.xml,
+	data/graphics/sprites/monster-fluffy.xml,
+	data/graphics/sprites/monster-fluffy.png,
+	data/graphics/sprites/monster-goblin-fire.xml,
+	data/graphics/sprites/monster-maggot-giant.xml,
+	data/graphics/sprites/monster-maggot.xml,
+	data/graphics/sprites/monster-mountsnake.xml,
+	data/graphics/sprites/monster-mushroom-red.xml,
+	data/graphics/sprites/monster-mushroom-spiky.xml,
+	data/graphics/sprites/monster-pinkie.xml,
+	data/graphics/sprites/monster-scorpion-black.xml,
+	data/graphics/sprites/monster-scorpion-red.png,
+	data/graphics/sprites/monster-scorpion-red.xml,
+	data/graphics/sprites/monster-skull-poison.xml,
+	data/graphics/sprites/monster-slime-green.xml,
+	data/graphics/sprites/monster-slime-red.xml,
+	data/graphics/sprites/monster-slime-rudolph.xml,
+	data/graphics/sprites/monster-slime-santa.png,
+	data/graphics/sprites/monster-slime-santa.xml,
+	data/graphics/sprites/monster-slime-yellow.xml,
+	data/graphics/sprites/monster-snake-cave.png,
+	data/graphics/sprites/monster-snake-cave.xml,
+	data/graphics/sprites/monster-snake.xml,
+	data/graphics/sprites/monster-spider.xml:
+	Adjusted offsets of monster sprites (thanks to Pauan for finding out
+	the correct offsets - I just subtracted 6 of all x offsets to take the
+	new position of the target circle in account) and committed some
+	modifications at some monster graphics by Pauan.
+
+2007-05-02  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/sprite.h, src/being.cpp, src/being.h, src/animatedsprite.cpp,
+	src/animatedsprite.h: Added methods to get the width and height of the
+	graphical representation of a sprite.
+	* src/gui/viewport.cpp: Fixed positioning of monster names and target
+	circles.
+
+2007-05-02  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/particle.cpp: Fixed a compiler warning.
+
+2007-05-02  Björn Steinbrink  <B.Steinbrink@gmx.de>
+
+	* src/Makefile.am: Add the new particle subclasses to the automake
+	configuration.
+	* src/imageparticle.h, src/textparticle.h, src/particle.h,
+	src/animationparticle.h, src/CMakeLists.txt, src/particleemitter.cpp,
+	src/animationparticle.cpp, src/particle.cpp, src/imageparticle.cpp,
+	src/textparticle.cpp, src/utils/xml.cpp, src/utils/xml.h: Split the
+	particle class into subclasses based on their appearance.
+
+2007-04-24  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/particle.cpp, src/particle.h: Some minor code cleanups, speed
+	optimizations and a bit of documentation.
+
+2007-04-23  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/graphics/particles/flame.particle.xml,
+	data/graphics/particles/blaze.png: Added two files I forgot with the
+	last commit.
+	* src/resources/mapreader.cpp, src/particle.cpp,
+	src/particleemitter.cpp: Using XML child node iteration macro.
+
 2007-04-22  Björn Steinbrink  <B.Steinbrink@gmx.de>
 
 	* CMake/Modules/FindENet.cmake: Fixed ENet status always being set to
@@ -10,11 +169,74 @@
 	* src/resources/itemdb.cpp: Made the parameter checks more terse and
 	manageable.
 
+2007-04-19  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/resources/mapreader.cpp: Emitter positions are now read from map
+	files.
+	* src/engine.cpp: Removed the player follow effect used for testing.
+	* data/maps/new_4-1.tmx.gz, data/maps/new_5-1.tmx.gz: Added flame
+	effect to all lamps on the cave maps
+	* data/maps/new_9-1.tmx.gz: Added waterfall effect to the upper right
+	corner of NW woodland map.
+
+2007-04-15  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/openglgraphics.cpp: Rely on default 0 value for z axis.
+	* src/CMakeLists.txt, src/gui/window.cpp, src/gui/widgets,
+	src/gui/widgets/resizegrip.cpp, src/gui/widgets/resizegrip.h,
+	src/gui/inventorywindow.cpp, src/gui/window.h, src/Makefile.am:
+	Reimplemented window resizing. It is now once again possible to resize
+	windows using their borders (except for the top one, since that's the
+	title bar for Guichan) and the resize grip in the bottom right is much
+	easier to grab.
+	* src/gui/window.cpp: Increased minimum window height and fixed a
+	problem with setting window content size which was introduced with the
+	new resize grip.
+
 2007-04-13  Björn Steinbrink  <B.Steinbrink@gmx.de>
 
 	* data/graphics/gui/CMakeLists.txt: Added target cursor graphics to
 	the set of files to be installed.
 
+2007-04-05  Eugenio Favalli  <elvenprogrammer@gmail.com>
+
+	* src/main.cpp:  Unified storage of configuration, updates and
+	screenshots in home directory.
+
+2007-04-03  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* data/graphics/items/generic-easteregg-blue.png,
+	data/graphics/items/generic-easteregg-green.png,
+	data/graphics/items/generic-easteregg-pink.png,
+	data/graphics/items/generic-easteregg-red.png,
+	data/graphics/items/generic-easteregg-teal.png,
+	data/graphics/items/generic-easteregg-yellow.png,
+	data/items.xml: Added six different easter egg item graphics for the
+	easter event. Item IDs are 1208 - 1213.
+	* data/graphics/sprites/npcs.png: Added bunny girl npc for the easter
+	event.
+
+2007-04-01  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/game.cpp: Screenshots are no longer saved directly in the users
+	home directory on UNIX systems but in the sub folder /.tmw/. A chatlog
+	message about the success of the screenshot saving does appear now.
+	Based on a patch by Patrick "the-me" Matthäi.
+
+2007-03-27  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/main.cpp: Icon loading doesn't necessarily succeed, so better
+	not crash when it doesn't.
+
+2007-03-25  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/particle.cpp, src/particle.h, src/particleemitter.cpp,
+	src/particleemitter.h: Improved programming style and documentation
+	and added some small tweaks.
+	* src/engine.cpp, src/map.cpp, src/map.h, src/resources/mapreader.cpp:
+	Prepared getting the emitter positions from the map file by storing
+	them in the Map class and setting them up from the MapReader.
+
 2007-03-24  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/main.cpp: Changed the order of network message handling and
@@ -49,6 +271,16 @@
 	src/net/charserverhandler.h, src/net/charserverhandler.cpp: Made sure
 	the character creation dialog doesn't close when creation failed.
 
+2007-03-22  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/simpleanimation.cpp, src/simpleanimation.h: Added new
+	constructor for simple animation that allows to build the animation
+	based on an xmlNodePtr pointing to an <animation> node.
+	* src/particle.cpp, src/particle.h: Added support for <image> and
+	<animation> childtags for effect root particles.
+	* data/graphics/particles/playerglow.particle.xml: New player follow
+	effect that demonstrates an animated root particle with an emitter.
+
 2007-03-22  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/gui/login.cpp, src/gui/login.h, src/gui/register.h,
@@ -84,6 +316,11 @@
 	src/resources/resourcemanager.cpp, src/resources/spriteset.cpp,
 	src/resources/spritedef.h: Renamed Spriteset to ImageSet.
 
+2007-03-20  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/gui/updatewindow.cpp: Cancel button is now disabled after
+	downloading is finished.
+
 2007-03-20  David Athay  <ko2fan@gmail.com>
 
 	* src/gui/viewport.cpp: Fixed target cursor animation, and changed
@@ -160,6 +397,8 @@
 	* src/simpleanimation.cpp, src/simpleanimation.h, src/CmakeLists.txt,
 	src/Makefile.am: Added a simple animation class that hosts a looping
 	animation without the action and direction stuff from AnimatedSprite.
+	* src/particle.cpp, src/particle.h, src/particleemitter.cpp: Used said
+	simple animation class for animated particles.
 
 2007-03-12  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
@@ -171,6 +410,14 @@
 	* src/map.cpp, src/gui/viewport.cpp: Fixed a bug that made the engine
 	not draw the last row and column of the map.
 
+2007-03-09  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/particle.cpp: Reimplemented physics mode that uses the default
+	square root function as fallback for systems where the fastInvSqrt
+	function doesn't work properly.
+	* src/particle.cpp, src/particle.h: Some performance optimizations
+	suggested by Rogier "Avaniel" Polak.
+
 2007-03-09  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* data/graphics/gui/target-cursor-blue.png,
@@ -221,6 +468,10 @@
 	data/sfx/pinkie-hit1.ogg, data/sfx/pinkie-miss1.ogg,
 	data/monsters.xml: New sound effects by Cosmostrator.
 
+2007-02-25 Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/particle.h, src/particleemitter.h: Just some documentation work.
+
 2007-02-25  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/CMakeLists.txt: Updated CMake file.
@@ -247,6 +498,12 @@
 	size and data type.
 	* src/logindata.h: Added a clear function.
 
+2007-02-22  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/particle.cpp, src/particle.h, src/particleemitter.cpp,
+	src/particleemitter.h: Added new particle property "bounce" that makes
+	particles bounce off the ground and use it with the damage numbers.
+
 2007-02-21  Philipp Sehmisch  <tmw@crushnet.org>
 
 	* src/gui/char-server.cpp, src/gui/updatewindow.cpp, src/gui/main.cpp,
@@ -286,6 +543,16 @@
 	* src/winver.h, README, configure.ac, data/help/header.txt, NEWS,
 	CMakeLists.txt: Changed version to 0.0.22.2.
 
+2007-02-15  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/engine.cpp: The name conflict problem with Guichan seems to be
+	solved with version 0.6.1.
+	* src/particle.cpp, src/particle.h, src/particleemitter.cpp,
+	src/particleemitter.h: Added support for animated particles.
+	* data/graphics/particles/playerglow.particle.xml: Created a new
+	player follow particle that spawns a swarm of animated bats that
+	follow the player.
+
 2007-02-13  Philipp Sehmisch  <tmw@crushnet.org>
 
 	* src/gui/register.cpp, src/logindata.h, src/main.cpp: Fixed the _M/_F
@@ -306,8 +573,36 @@
 
 2007-02-10  Philipp Sehmisch  <tmw@crushnet.org>
 
-	* src/gui/viewport.cpp: Fixed the bug in the scrolling limitation that made
-	it possible to scroll outside of the map in the south and east.
+	* src/gui/viewport.cpp: Fixed the bug in the scrolling limitation that
+	made it possible to scroll outside of the map in the south and east.
+
+2007-02-09  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/particle.cpp: Fixed a misspelled include and another
+	optimisation at the vector calculation.
+
+2007-02-08  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/particle.cpp, src/utils/fastsqrt.h: Added a faster function to
+	calculate square roots and using it for hypotenuse calculations.
+	Thanks to Rogier aka Avaniel for finding the function.
+
+2007-02-07  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/particle.cpp, src/particle.h, src/particleemitter.cpp: Renamed
+	Particle::MAX_PARTICLES to Particle::maxCount and read the value from
+	config ("particleMaxCount")
+	* src/particle.cpp: Added fast physics mode that replaces the
+	trigonometric calculations made for calculating the acceleration by
+	much less cpu intense but also less accurate formulas. To enable it
+	set the config option "particleFastPhysics" to "1".
+	* src/particle.cpp: Added the config option "particleEmitterSkip" that
+	allows to reduces the output of the emitters by making them spawn
+	particles only every n-th game tick.
+	* src/graphics.cpp, src/graphics.h: Added a new method
+	"drawImageTransparent" to the graphic engine that blits an image with
+	an alpha factor.
+	* src/particle.cpp: Using new drawImageTransparent method.
 
 2007-02-04  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
@@ -357,6 +652,35 @@
 	Defence: 12, Weight: 120.
 	* data/graphics/sprites/chest-cotton-female.png: Huh? Shouldn't this
 	be on svn for ages?
+	* src/particle.cpp, src/particle.h, src/particleemitter.cpp,
+	src/particleemitter.h: Implemented die-distance (particles are deleted
+	when they reached a certain proximity to their target)
+	* src/particle.cpp: Fixed a bug in the acceleration vector calculation.
+	* src/particle.cpp, src/particle.h: Fixed a problem with particles with
+	unlimited lifetime and fade-in.
+	* data/graphics/particles/playerglow.particle.xml: And again a new
+	player follow particle. This time it demonstrates die-distance and the
+	fixed acceleration vector calculation.
+	* src/engine.cpp, data/graphics/particles/snow.particle.xml,
+	data/graphics/particles/snowflake.png: I can't stand the begging
+	anymore. Now it snows in the snow area... and the forest... and the
+	desert... and under the earth... and indoors... Are you happy now,
+	Rotonen and Elven? ;-)
+	* src/particle.cpp: Removed some debug log messages.
+	* src/being.cpp: Avoided crash when attempting to control an invalid
+	particle.
+	* src/particle.cpp, src/particle.h, src/particleemitter.cpp,
+	src/particleemitter.h: Cleaned the includes up.
+
+2007-01-31  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/particle.cpp, src/particle.h, src/particleemitter.cpp,
+	src/particleemitter.h: Changed some variable names.
+	* data/graphics/particles/waterfall.particle.xml,
+	data/graphics/particles/waterfall-a.png: New waterfall with Modanungs
+	waterfall particle.
+	* src/particle.cpp: forgot to remove a svn conflict marker and changed
+	the order of initialisations to fix some compiler warnings.
 
 2007-01-30  Eugenio Favalli  <elvenprogrammer@gmail.com>
 
@@ -373,6 +697,54 @@
 	src/resources/mapreader.h, src/resources/music.h: Some trivial
 	documentation work. Fixes all Doxygen warnings.
 
+2007-01-30  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/net/beinghandler.cpp,
+	data/graphics/particles/skillup.particle.xml: Added different particle
+	effect for job levelup.
+	* src/particle.cpp, src/particle.h, src/particleemitter.cpp,
+	src/particleemitter.h: Renamed "alphafade" to "fade-out", added new
+	property "fade-in".
+	* data/graphics/particles/playerglow.particle.xml: Added a new player
+	effect (a fire) demonstrating how to use fade-in and fade-out to fade
+	one color into another.
+
+2007-01-29  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/particle.cpp, src/particle.h, src/particleemitter.cpp,
+	src/particleemitter.h: Added a new particle property "alphafade" that
+	makes the particles fade into alpha before their lifetime ends.
+	* src/particle.cpp, src/particle.h: fixed an issue with particles that
+	have a lifetime of 0 and an issue with the momentum property.
+	* data/graphics/particles/waterfall.particle.xml,
+	data/graphics/particles/fog-medium-white-a.png,
+	data/graphics/particles/fog-medium-white-b.png,
+	data/graphics/particles/fog-medium-white-c.png: Added fog to the
+	waterfall effect demonstrating the new alphafade feature.
+
+2007-01-28  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/utils/xml.cpp, src/utils/xml.h, src/particleemitter.cpp: Most
+	values are now read as floating point values from the emitter files.
+	* data/graphics/particles/fountain.particle.xml,
+	data/graphics/particles/hit.particle.xml,
+	data/graphics/particles/playerglow.particle.xml: Changed some values
+	as floating point values. Made the player follow effect magenta to
+	improve the visibility of the hit effects.
+	* src/engine.cpp, data/graphics/particles/waterfall.particle.xml:
+	Removed the fountain and added a waterfall instead.
+	* src/particle.h: Corrected the drawing order of the particles in
+	relation to the other sprites.
+	* src/gui/debugwindow.cpp, src/gui/debugwindow.h: Added particle count
+	to debug window.
+	* src/particle.cpp: Allowed momentum without acceleration and
+	implement the acceleration properly.
+	* src/utils/minmax.h, src/particleemitter.cpp, src/particleemitter.h:
+	Added a structure to hold a pair of numeric minimum and maximum values
+	and used it to store all numeric emitter properties.
+	* src/utils/randbetween.h: Removed (the functionality is now in struct
+	MinMax)
+
 2007-01-28  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/gui/char_select.h, src/net/messagein.h,
@@ -383,6 +755,39 @@
 	* data/maps/new_8-1.tmx.gz, data/maps/new_11-1.tmx.gz: Map fixes by
 	Pauan.
 
+2007-01-27  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/gui/shoplistbox.cpp: Fixed compilation against Guichan 0.6.1.
+	* src/utils/randbetween.h: Fixed integer overflow causing the
+	randBetween function not to work properly on Linux.
+
+2007-01-27  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/net/beinghandler.cpp: Fixed a compiler issue.
+	* src/particle.cpp, src/particle.h, src/particleemitter.cpp,
+	src/particleemitter.h, src/engine.cpp: Emitter data is read from
+	external xml files. Reimplemented target-based particles with the
+	difference that they don't target beings or locations but other
+	particles (at the moment the host particle of the effect).
+	* src/being.cpp: Beings now move controlled particles to their center
+	instead of their upper left corner.
+	* data/graphics/particles/orb*: Added a bunch of new particles.
+	* data/graphics/particles/fountain.particle.xml: Reimplementation of
+	the fountain effect in XML.
+	* data/graphics/particles/playerglow.particle.xml: New effect that
+	spawns orbs that orbit around the origin.
+	* src/being.cpp, data/graphics/particles/hit.particle.xml: Added
+	particle effect on hit.
+	* src/net/beinghandler.cpp,
+	data/graphics/particles/levelup.particle.xml: Added particle effect on
+	levelup (own or other player).
+
+2007-01-24  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/particle.cpp: Initialized all variables of the particles in the
+	constructor.
+	* src/particleemitter.cpp, src/particleemitter.h: minor cleanups.
+
 2007-01-23  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/gui/shoplistbox.cpp, docs/INSTALL/win32.txt, INSTALL, NEWS:
@@ -393,6 +798,39 @@
 	* src/gui/updatewindow.cpp: Identify ourselves when requesting files
 	from the update server.
 
+2007-01-22  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/being.cpp, src/being.h, src/particle.cpp, src/particle.h
+	src/particleemitter.cpp, src/particleemitter.h, src/engine.cpp:
+	Particle effects are now created in child particles of the root
+	particle. Particle emitters have no longer a being they check every
+	frame. Instead beings have the ability to take control of particles.
+
+2007-01-19  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/particle.cpp, src/particle.h, src/particleemitter.cpp,
+	src/particleemitter.h: Implemented emitters that follow a being.
+	* src/engine.cpp: Added an emitter that follows the local player.
+	* src/particle.cpp: Fixed the crash on exit (reason was that the
+	mSpriteIterator wasn't initialized in every case)
+
+2007-01-18  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/properties.h, src/being.cpp, src/beingmanager.h, src/sound.h,
+	src/gui/window.h, src/sound.cpp, src/main.h, src/being.h,
+	src/resources/soundeffect.h, src/resources/image.h,
+	src/resources/mapreader.h, src/resources/music.h: Some trivial
+	documentation work. Fixes all Doxygen warnings.
+	* src/particle.h, src/particle.cpp, src/CMakeLists.txt,
+	src/Makefile.am: Fixed compilation issues on Linux.
+	* src/gui/char_select.h, src/net/messagein.h,
+	src/net/messagehandler.h, src/net/network.h, src/net/connection.h,
+	src/net/messageout.h, src/utils/xml.h, src/main.h,
+	src/resources/monsterdb.h, src/resources/itemdb.h,
+	src/resources/equipmentdb.h: Some work on documentation.
+	* data/maps/new_8-1.tmx.gz, data/maps/new_11-1.tmx.gz: Map fixes by
+	Pauan.
+
 2007-01-17  Eugenio Favalli  <elvenprogrammer@gmail.com>
 
 	* docs/win32-release.txt, src/gui/register.cpp, src/main.cpp: Changed
@@ -408,6 +846,12 @@
 
 	* data/help/header.txt, NEWS, README: Updated release date.
 
+2007-01-15  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/game.cpp, src/particle.cpp, src/particle.h,
+	src/particleemitter.h: Made the particle count global and more
+	performant.
+
 2007-01-14  Eugenio Favalli  <elvenprogrammer@gmail.com>
 
 	* src/gui/updatewindow.cpp, src/main.cpp, tmw.cbp: Fixed windows
@@ -448,6 +892,17 @@
 	* src/winver.h, configure.ac, data/help/header.txt, NEWS, README,
 	CMakeLists.txt: Updated version to 0.0.22.1.
 
+2007-01-14  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/particle.cpp, src/particle.h; src/particleemitter.cpp,
+	src/particleemitter.h, src/utils/randbetween.h:
+	Implemented particle engine.
+	* src/engine.cpp, src/game.cpp: added calls to the particle engine
+	* data/graphics/particles/*: added a bunch of particle graphics for
+	testing purpose.
+	* particleengine-todo.txt: Added particle engine todo list (please
+	omit when merging)
+
 2007-01-13  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* data/graphics/sprites/Makefile.am,
@@ -1298,7 +1753,7 @@
 2006-10-12  Yohann Ferreira  <bertram@cegetel.net>
 
 	* debian/rules, debian/tmw-data.install, debian/tmw-data.dirs,
-	debian/tmw-music.install, debian/changelog: Updating debian files for
+	debian/tmw-music.install, debian/changelog: Updating Debian files for
 	bug fixing.
 
 2006-10-12  Frode Lindeijer  <f.lindeijer@gmail.com>
@@ -1473,7 +1928,7 @@
 	* src/animation.h, src/animatedsprite.h,
 	data/graphics/sprites/weapon.xml: Some modifications at the animation
 	system. No more "undefined action foo" warnings in the tmw.log. Not
-	visible actions must now be declared explicitely.
+	visible actions must now be declared explicitly.
 	* data/graphics/images/ambient/sandstorm.png,
 	data/graphics/images/ambient/clouds.png: Improved quality of the overlay
 	graphics.
@@ -1892,7 +2347,7 @@
 	with more distinctive names. (no, i won't list all 114)
 	* src/itemmanager.cpp, data/items.xml: Replaced indices on the item
 	spriteset with filenames. added names and descriptions for all missing
-	items. Changed names and dascriptions of some items.
+	items. Changed names and descriptions of some items.
 	* src/engine.cpp: Removed global item spriteset.
 	* src/floor_item.cpp, src/floor_item.h, src/iteminfo.cpp,
 	src/iteminfo.h, src/equipmentwindow.cpp, src/equipmentwindow.h,
diff --git a/NEWS b/NEWS
index 5281cf78..9529ae1b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,19 @@
+0.0.23 (3 June 2007)
+- Added a particle engine along with some particle effects
+- Added a cursor to indicate targeted enemy
+- Added new program icon
+- Added a man page for UNIX like systems
+- Added the --version command line parameter
+- Improved MacOS X release
+- Screenshots are now saved in the .tmw directory on UNIX like systems
+- Magic pink is no longer used for transparency (fixes issues with that on Mac)
+- Fixed difficulties with resizing windows
+- Fixed misleading error message when connecting fails
+- Fixed wrong error message when account name already exists
+- Fixed crash when deleting a character
+- Fixed error message when creating a new character fails
+- Fixed updating problem when using scrollwheel to change shop selection
+
 0.0.22.2 (17 February 2007)
 - Updated to work with Guichan 0.6.1
 - Changed to new default server (server.themanaworld.org)
diff --git a/README b/README
index 2d6f07b1..39677e1e 100644
--- a/README
+++ b/README
@@ -1,8 +1,7 @@
 THE MANA WORLD
 ==============
 
- Version: 0.0.22.2    Date: 17/02/2007
-
+ Version: 0.1.0       Date: XX/XX/2007
 
  Development team:
   - See AUTHORS file for a list
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index 1549b2b4..5a02d7f1 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -30,8 +30,12 @@ SET (FILES
     sansserif8.png
     selection.png
     slider.png
-    target-cursor-blue.png
-    target-cursor-red.png
+    target-cursor-blue-l.png
+    target-cursor-blue-m.png
+    target-cursor-blue-s.png
+    target-cursor-red-l.png
+    target-cursor-red-m.png
+    target-cursor-red-s.png
     thickborder.png
     vscroll_blue.png
     vscroll_down_default.png
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index c0e0655b..a37e1196 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -33,6 +33,12 @@ gui_DATA =				\
 	sansserif8.png			\
 	selection.png			\
 	slider.png			\
+	target-cursor-blue-l.png	\
+	target-cursor-blue-m.png	\
+	target-cursor-blue-s.png	\
+	target-cursor-red-l.png		\
+	target-cursor-red-m.png		\
+	target-cursor-red-s.png		\
 	thickborder.png			\
 	vscroll_blue.png		\
 	vscroll_down_default.png	\
diff --git a/data/graphics/gui/target-cursor-blue-l.png b/data/graphics/gui/target-cursor-blue-l.png
new file mode 100644
index 00000000..77cdf4b6
Binary files /dev/null and b/data/graphics/gui/target-cursor-blue-l.png differ
diff --git a/data/graphics/gui/target-cursor-blue-m.png b/data/graphics/gui/target-cursor-blue-m.png
new file mode 100644
index 00000000..c0107357
Binary files /dev/null and b/data/graphics/gui/target-cursor-blue-m.png differ
diff --git a/data/graphics/gui/target-cursor-blue-s.png b/data/graphics/gui/target-cursor-blue-s.png
new file mode 100644
index 00000000..3e81c75d
Binary files /dev/null and b/data/graphics/gui/target-cursor-blue-s.png differ
diff --git a/data/graphics/gui/target-cursor-blue.png b/data/graphics/gui/target-cursor-blue.png
deleted file mode 100644
index 3e81c75d..00000000
Binary files a/data/graphics/gui/target-cursor-blue.png and /dev/null differ
diff --git a/data/graphics/gui/target-cursor-red-l.png b/data/graphics/gui/target-cursor-red-l.png
new file mode 100644
index 00000000..76d2101b
Binary files /dev/null and b/data/graphics/gui/target-cursor-red-l.png differ
diff --git a/data/graphics/gui/target-cursor-red-m.png b/data/graphics/gui/target-cursor-red-m.png
new file mode 100644
index 00000000..e2ab79c2
Binary files /dev/null and b/data/graphics/gui/target-cursor-red-m.png differ
diff --git a/data/graphics/gui/target-cursor-red-s.png b/data/graphics/gui/target-cursor-red-s.png
new file mode 100644
index 00000000..09195f44
Binary files /dev/null and b/data/graphics/gui/target-cursor-red-s.png differ
diff --git a/data/graphics/gui/target-cursor-red.png b/data/graphics/gui/target-cursor-red.png
deleted file mode 100644
index 09195f44..00000000
Binary files a/data/graphics/gui/target-cursor-red.png and /dev/null differ
diff --git a/data/help/changes.txt b/data/help/changes.txt
index f8a3eb67..dd062e49 100644
--- a/data/help/changes.txt
+++ b/data/help/changes.txt
@@ -3,99 +3,56 @@
  
 ##3                         === RECENT CHANGES ===
  
- 0.0.21 (17 September 2006)
- - Added item pickup messages to the chat dialog
- - Added XP bar to ministatus in the top left
- - Added configurable smooth and lazy scrolling
- - Added option to turn off the joystick
- - Added --playername option for automatic character picking
- - Added --configfile option for specifying which configuration file to use
- - Added shortcut and middle mouse button for targetting nearest monster
- - Added support for map effect overlays
- - Fixed FPS limiter
- - Fixed updating system on Windows
- - Fixed player animations going out of sync on changing equipment or hairstyle
- - Fixed SDL_image configure check on some systems by first checking for libpng
- - Fixed big memory leak when using OpenGL
- - Updated to work with Guichan 0.5.0 (older versions no longer supported)
- 
- 0.0.20 (24 July 2006)
- - Added new hairstyle, and some fixes to the old ones
- - Added slider to set FPS limit
- - Added visible equipments
- - Added new maps and monsters
- - Added female characters
- - Implemented a new animation system
- - Updated the updating system
- - Reduced size of textures to stay within the limits of some OpenGL drivers
- - Fixed connection not being shut down completely in case of an error
- - Fixed min size of a window when resizing
- - Fixed some maps issues
- - Some fixes to monsters and player graphics
- - Minor bug fixes and lots of code cleanups
- 
- 0.0.19 (6 March 2006)
- 
- - Added --username, --password and --defaults command line options
- - Improved login sequence
- - Enabled 3 slots to create players
- - Improved setup window and added a joystick calibration tool
- - Some maps fixes
- - Reorganized and improved network code
- - Fixed some bugs
- - Made the player walk to items prior to picking them up
- - Added new playerset
- - Lots of cleanups and code re-roganization
- 
- 0.0.18.1 (30 December 2005)
- 
- - Fixed a drawing glitch with high tiles at the bottom of the screen
- - Fixed glitches caused by fading out the damage display
- 
- 0.0.18 (20 December 2005)
- 
- - Added new items, npcs, tilesets, maps and monsters
- - Non blocking connection at startup
- - Enabled monster emotions
- - Client version is now displayed during login
- - Fixed setup window behaviour
- - Fixed a Windows crash issue
- - Fixed ScrollArea and BrowserBox behaviour
- - Code cleanups
- 
- 0.0.17 (10 October 2005)
- 
- - Added remembering of window position and sizes
- - Added taking screenshot with Alt+P
- - Added notice about the player being overweight
- - Added time to chat messages
- - Added messagebox on error for MacOS X
- - Added new network layer based on SDL_net
- - Added proper error message for when the map server goes offline
- - Added more international characters to fixed and rpg fonts
- - Improved damage text font, shadow is now translucent
- - Improved GUI layout, new profile window
- - Improved support for building on FreeBSD and MacOS X
- - Improved tile engine to fix graphics glitches and make mapping easier
- - Rearranged keyboard shortcuts
- - Fixed items on map to be removed on map switch
- - Fixed OpenGL checkbox in the setup window to be usable
- - Cleaned up a lot of code
- 
- 0.0.16 (04 September 2005)
-
- - Added inn and casino
- - Improved status window
- - Improved OpenGL support
- - Removed lot of bugs
- - Code cleanups
- 
- 0.0.15 (31 July 2005)
-
- - Added dynamic updating of client data
- - Added much better font for chat and names
- - Added option not to use the custom mouse cursor
- - Added joystick support
- - Improved mouse attack by not walking while pressing shift
- - Fixed items being shown as equipped in inventory although they are not
+ 0.0.23 (3 June 2007)
+ - Added a particle engine along with some particle effects
+ - Added a cursor to indicate targeted enemy
+ - Added new program icon
+ - Added a man page for UNIX like systems
+ - Added the --version command line parameter
+ - Improved MacOS X release
+ - Screenshots are now saved in the .tmw directory on UNIX like systems
+ - Magic pink is no longer used for transparency (fixes issues with that on Mac)
+ - Fixed difficulties with resizing windows
+ - Fixed misleading error message when connecting fails
+ - Fixed wrong error message when account name already exists
+ - Fixed crash when deleting a character
+ - Fixed error message when creating a new character fails
+ - Fixed updating problem when using scrollwheel to change shop selection
+ 
+ 0.0.22.2 (17 February 2007)
+ - Updated to work with Guichan 0.6.1
+ - Changed to new default server (server.themanaworld.org)
+ - Changed custom mouse cursor
+ - Fixed the issue where _M or _F is appended to the username
+ - Fixed problem with Cancel button in update dialog
+ 
+ 0.0.22.1 (15 January 2007)
+ - Updated to work with Guichan 0.6.0 (older versions no longer supported)
+ - 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
+ 
+ 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/data/help/header.txt b/data/help/header.txt
index 7311c111..b10ed991 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.22.2                ##2Date:##317 February 2007
+           ##2Version:##6 0.0.23                ##2Date:##33 June 2007
  
 ##2                    Website: http://themanaworld.org
  
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 8b57d5bb..1ee9a9a6 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,6 +1,7 @@
 man6_MANS = tmw.6
 
-EXTRA_DIST = packages.txt \
+EXTRA_DIST = $(man6_MANS) \
+	     packages.txt \
 	     FAQ.txt \
 	     HACKING.txt \
 	     SOURCE/tmwdox.sh \
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e28e235e..7a4da70d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -47,6 +47,8 @@ MARK_AS_ADVANCED(SDL_INCLUDE_DIR)
 MARK_AS_ADVANCED(SDL_LIBRARY)
 
 SET(SRCS
+    gui/widgets/resizegrip.cpp
+    gui/widgets/resizegrip.h
     gui/box.cpp
     gui/box.h
     gui/browserbox.cpp
@@ -275,11 +277,15 @@ SET(SRCS
     utils/base64.cpp
     utils/base64.h
     utils/dtor.h
+    utils/fastsqrt.h
+    utils/minmax.h
     utils/tostring.h
     utils/xml.cpp
     utils/xml.h
     animatedsprite.cpp
     animatedsprite.h
+    animationparticle.cpp
+    animationparticle.h
     being.cpp
     being.h
     beingmanager.cpp
@@ -304,6 +310,8 @@ SET(SRCS
     graphics.cpp
     graphics.h
     guichanfwd.h
+    imageparticle.cpp
+    imageparticle.h
     inventory.cpp
     inventory.h
     item.cpp
@@ -326,6 +334,10 @@ SET(SRCS
     npc.h
     openglgraphics.cpp
     openglgraphics.h
+    particle.cpp
+    particle.h
+    particleemitter.cpp
+    particleemitter.h
     player.cpp
     player.h
     properties.h
@@ -335,6 +347,8 @@ SET(SRCS
     sound.cpp
     sound.h
     sprite.h
+    textparticle.cpp
+    textparticle.h
     tileset.h
     )
 
diff --git a/src/Makefile.am b/src/Makefile.am
index f1f51b79..92c1b1b2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,6 +3,8 @@ AUTOMAKE_OPTIONS = subdir-objects
 bin_PROGRAMS = tmw
 tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      gui/widgets/dropdown.h \
+	      gui/widgets/resizegrip.cpp \
+	      gui/widgets/resizegrip.h \
 	      gui/browserbox.cpp \
 	      gui/browserbox.h \
 	      gui/buddywindow.cpp \
@@ -229,11 +231,15 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      utils/base64.cpp \
 	      utils/base64.h \
 	      utils/dtor.h \
+	      utils/fastsqrt.h \
+	      utils/minmax.h \
 	      utils/tostring.h \
 	      utils/xml.cpp \
 	      utils/xml.h \
 	      animatedsprite.cpp \
 	      animatedsprite.h \
+	      animationparticle.cpp \
+	      animationparticle.h \
 	      being.cpp \
 	      being.h \
 	      beingmanager.cpp \
@@ -258,6 +264,8 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      graphics.cpp \
 	      graphics.h \
 	      guichanfwd.h \
+	      imageparticle.cpp \
+	      imageparticle.h \
 	      inventory.cpp \
 	      inventory.h \
 	      item.cpp \
@@ -280,15 +288,21 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 	      npc.h \
 	      openglgraphics.cpp\
 	      openglgraphics.h \
+	      particle.cpp \
+	      particle.h \
+	      particleemitter.cpp \
+	      particleemitter.h \
 	      player.cpp \
 	      player.h \
 	      properties.h \
 	      serverinfo.h \
 	      simpleanimation.cpp \
-  	      simpleanimation.h \
+	      simpleanimation.h \
 	      sound.cpp \
 	      sound.h \
 	      sprite.h \
+	      textparticle.cpp \
+	      textparticle.h \
 	      tileset.h
 
 # set the include path found by configure
diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index 7260a512..c1e89ff0 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.cpp
@@ -197,3 +197,27 @@ AnimatedSprite::setDirection(SpriteDirection direction)
         }
     }
 }
+
+int
+AnimatedSprite::getWidth() const
+{
+    if (mFrame)
+    {
+        return mFrame->image->getWidth();
+    }
+    else {
+        return 0;
+    }
+}
+
+int
+AnimatedSprite::getHeight() const
+{
+    if (mFrame)
+    {
+        return mFrame->image->getHeight();
+    }
+    else {
+        return 0;
+    }
+}
diff --git a/src/animatedsprite.h b/src/animatedsprite.h
index 2257c0f0..42c0a743 100644
--- a/src/animatedsprite.h
+++ b/src/animatedsprite.h
@@ -85,6 +85,18 @@ class AnimatedSprite
         bool
         draw(Graphics* graphics, int posX, int posY) const;
 
+        /**
+         * gets the width in pixels of the image of the current frame
+         */
+        int
+        getWidth() const;
+
+        /**
+         * gets the height in pixels of the image of the current frame
+         */
+        int
+        getHeight() const;
+
         /**
          * Sets the direction.
          */
diff --git a/src/animationparticle.cpp b/src/animationparticle.cpp
new file mode 100644
index 00000000..30c33da7
--- /dev/null
+++ b/src/animationparticle.cpp
@@ -0,0 +1,51 @@
+/*
+ *  The Mana World
+ *  Copyright 2006 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#include "animationparticle.h"
+
+#include "graphics.h"
+#include "simpleanimation.h"
+
+AnimationParticle::AnimationParticle(Map *map, Animation *animation):
+    ImageParticle(map, 0),
+    mAnimation(new SimpleAnimation(animation))
+{
+}
+
+AnimationParticle::AnimationParticle(Map *map, xmlNodePtr animationNode):
+    ImageParticle(map, 0),
+    mAnimation(new SimpleAnimation(animationNode))
+{
+}
+
+AnimationParticle::~AnimationParticle()
+{
+    delete mAnimation;
+}
+
+bool AnimationParticle::update()
+{
+    mAnimation->update(10); // particle engine is updated every 10ms
+    mImage = mAnimation->getCurrentImage();
+
+    return Particle::update();
+}
diff --git a/src/animationparticle.h b/src/animationparticle.h
new file mode 100644
index 00000000..054b1b73
--- /dev/null
+++ b/src/animationparticle.h
@@ -0,0 +1,49 @@
+/*
+ *  The Mana World
+ *  Copyright 2006 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#ifndef _ANIMATION_PARTICLE
+#define _ANIMATION_PARTICLE
+
+#include <libxml/tree.h>
+
+#include "imageparticle.h"
+
+class Animation;
+class Map;
+class SimpleAnimation;
+
+class AnimationParticle : public ImageParticle
+{
+    public:
+        AnimationParticle(Map *map, Animation *animation);
+
+        AnimationParticle(Map *map, xmlNodePtr animationNode);
+
+        ~AnimationParticle();
+
+        virtual bool update();
+
+    private:
+        SimpleAnimation *mAnimation; /**< Used animation for this particle */
+};
+
+#endif
diff --git a/src/being.cpp b/src/being.cpp
index 682daddb..7ba9ddb9 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -32,12 +32,16 @@
 #include "graphics.h"
 #include "log.h"
 #include "map.h"
+#include "particle.h"
 
 #include "resources/resourcemanager.h"
 #include "resources/imageset.h"
 
 #include "gui/gui.h"
 
+#include "resources/resourcemanager.h"
+#include "resources/imageset.h"
+
 #include "utils/dtor.h"
 #include "utils/tostring.h"
 
@@ -61,7 +65,6 @@ Being::Being(Uint16 id, Uint16 job, Map *map):
     mMap(NULL),
     mHairStyle(0), mHairColor(0),
     mSpeechTime(0),
-    mDamageTime(0),
     mPx(0), mPy(0),
     mSprites(VECTOREND_SPRITE, NULL),
     mEquipmentSpriteIDs(VECTOREND_SPRITE, 0)
@@ -85,6 +88,13 @@ Being::~Being()
     clearPath();
     setMap(NULL);
 
+    for (   std::list<Particle *>::iterator i = mChildParticleEffects.begin();
+            i != mChildParticleEffects.end();
+            i++)
+    {
+        (*i)->kill();
+    }
+
     instances--;
 
     if (instances == 0)
@@ -292,8 +302,32 @@ Being::setSpeech(const std::string &text, Uint32 time)
 void
 Being::takeDamage(int amount)
 {
-    mDamage = amount ? toString(amount) : "miss";
-    mDamageTime = 300;
+    gcn::Font* font;
+    std::string damage = amount ? toString(amount) : "miss";
+
+    // Selecting the right color
+    if (damage == "miss")
+    {
+        font = hitYellowFont;
+    }
+    else
+    {
+        // hit particle effect
+        controlParticle(particleEngine->addEffect("graphics/particles/hit.particle.xml", 0, 0));
+
+        if (getType() == MONSTER)
+        {
+            font = hitBlueFont;
+        }
+        else
+        {
+            font = hitRedFont;
+        }
+    }
+
+    // show damage number
+    particleEngine->addTextSplashEffect(damage, 255, 255, 255, font,
+                                        mPx + 16, mPy + 16);
 }
 
 void
@@ -318,6 +352,19 @@ Being::setMap(Map *map)
     {
         mSpriteIterator = mMap->addSprite(this);
     }
+
+    //clear particle effect list because child particles became invalid
+    mChildParticleEffects.clear();
+}
+
+void
+Being::controlParticle(Particle *particle)
+{
+    if (particle)
+    {
+        particle->disableAutoDelete();  //the effect may not die without the beings permission or we segvault
+        mChildParticleEffects.push_back(particle);
+    }
 }
 
 void
@@ -465,10 +512,6 @@ Being::logic()
     if (mSpeechTime > 0)
         mSpeechTime--;
 
-    // Reduce the time that damage is still displayed
-    if (mDamageTime > 0)
-        mDamageTime--;
-
     // Update pixel coordinates
     mPx = mX - 16 + getXOffset();
     mPy = mY - 16 + getYOffset();
@@ -489,6 +532,14 @@ Being::logic()
             mSprites[i]->update(tick_time * 10);
         }
     }
+
+    //Update particle effects
+    for (   std::list<Particle *>::iterator i = mChildParticleEffects.begin();
+        i != mChildParticleEffects.end();
+        i++)
+    {
+        (*i)->setPosition((float)mPx + 16.0f, (float)mPy + 32.0f);
+    }
 }
 
 void
@@ -531,37 +582,6 @@ Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY)
         graphics->setColor(gcn::Color(255, 255, 255));
         graphics->drawText(mSpeech, px + 18, py - 60, gcn::Graphics::CENTER);
     }
-
-    // Draw damage above this being
-    if (mDamageTime > 0 && mDamageTime < 275)
-    {
-        // Selecting the right color
-        if (mDamage == "miss")
-        {
-            graphics->setFont(hitYellowFont);
-        }
-        else if (getType() == MONSTER)
-        {
-            graphics->setFont(hitBlueFont);
-        }
-        else
-        {
-            graphics->setFont(hitRedFont);
-        }
-
-        int textY = (getType() == MONSTER) ? 32 : 70;
-        int ft = 150 - mDamageTime;
-        float a = (ft > 0) ? 1.0 - ft / 150.0 : 1.0;
-
-        graphics->setColor(gcn::Color(255, 255, 255, (int)(255 * a)));
-        graphics->drawText(mDamage,
-                           px + 16,
-                           py - textY - (300 - mDamageTime) / 10,
-                           gcn::Graphics::CENTER);
-
-        // Reset alpha value
-        graphics->setColor(gcn::Color(255, 255, 255));
-    }
 }
 
 Being::Type
@@ -632,3 +652,29 @@ int Being::getOffset(int step) const
 
     return offset;
 }
+
+
+int
+Being::getWidth() const
+{
+    if (mSprites[BASE_SPRITE])
+    {
+        return mSprites[BASE_SPRITE]->getWidth();
+    }
+    else {
+        return 0;
+    }
+}
+
+
+int
+Being::getHeight() const
+{
+    if (mSprites[BASE_SPRITE])
+    {
+        return mSprites[BASE_SPRITE]->getHeight();
+    }
+    else {
+        return 0;
+    }
+}
diff --git a/src/being.h b/src/being.h
index 332f1b4a..8820c30a 100644
--- a/src/being.h
+++ b/src/being.h
@@ -42,6 +42,7 @@ class Item;
 class Map;
 class Graphics;
 class ImageSet;
+class Particle;
 
 /**
  * A position along a being's path.
@@ -97,6 +98,13 @@ class Being : public Sprite
             VECTOREND_SPRITE
         };
 
+        enum TargetCursorSize {
+            TC_SMALL = 0,
+            TC_MEDIUM,
+            TC_LARGE,
+            NUM_TC
+        };
+
 
         /**
          * Directions, to be used as bitmask values
@@ -359,8 +367,33 @@ class Being : public Sprite
         int
         getYOffset() const { return getOffset(mStepY); }
 
+        /**
+         * Returns the horizontal size of the current base sprite of the being
+         */
+        virtual int
+        getWidth() const;
+
+        /**
+         * Returns the vertical size of the current base sprite of the being
+         */
+        virtual int
+        getHeight() const;
+
+        /**
+         * Returns the required size of a target cursor for this being
+         */
+        virtual Being::TargetCursorSize
+        getTargetCursorSize() const
+        { return TC_MEDIUM; }
+
         std::auto_ptr<Equipment> mEquipment;
 
+        /**
+         * Take control of a particle
+         */
+        void
+        controlParticle(Particle *particle);
+
     protected:
         /**
          * Sets the new path for this being.
@@ -380,14 +413,13 @@ class Being : public Sprite
 
         Path mPath;
         std::string mSpeech;
-        std::string mDamage;
         Uint16 mHairStyle, mHairColor;
         Uint32 mSpeechTime;
-        Uint32 mDamageTime;
         Sint32 mPx, mPy;                /**< Pixel coordinates */
 
         std::vector<AnimatedSprite*> mSprites;
         std::vector<int> mEquipmentSpriteIDs;
+        std::list<Particle *> mChildParticleEffects;
 
     private:
         int
diff --git a/src/engine.cpp b/src/engine.cpp
index 31bec9ff..3b5fb403 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -35,6 +35,7 @@
 #include "localplayer.h"
 #include "log.h"
 #include "map.h"
+#include "particle.h"
 #include "sound.h"
 
 #include "gui/gui.h"
@@ -63,6 +64,7 @@ void Engine::changeMap(const std::string &mapPath)
     floorItemManager->clear();
 
     beingManager->clear();
+    particleEngine->clear();
 
     // Store full map path in global var
     map_path = "maps/" + mapPath;
@@ -83,8 +85,12 @@ void Engine::changeMap(const std::string &mapPath)
     }
     minimap->setMapImage(mapImage);
     beingManager->setMap(newMap);
+    particleEngine->setMap(newMap);
     viewport->setMap(newMap);
 
+    // Initialize map-based particle effects
+    newMap->initializeParticleEffects(particleEngine);
+
     // Start playing new music file when necessary
     std::string oldMusic = "";
 
@@ -106,5 +112,6 @@ void Engine::changeMap(const std::string &mapPath)
 void Engine::logic()
 {
     beingManager->logic();
+    particleEngine->update();
     gui->logic();
 }
diff --git a/src/game.cpp b/src/game.cpp
index ba4e2b9d..1afc530b 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -41,6 +41,7 @@
 #include "localplayer.h"
 #include "log.h"
 #include "npc.h"
+#include "particle.h"
 
 #include "gui/buy.h"
 #include "gui/buysell.h"
@@ -121,6 +122,8 @@ BeingManager *beingManager = NULL;
 FloorItemManager *floorItemManager = NULL;
 ChannelManager *channelManager = NULL;
 
+Particle *particleEngine = NULL;
+
 const int MAX_TIME = 10000;
 
 /**
@@ -242,6 +245,9 @@ Game::Game():
     floorItemManager = new FloorItemManager();
     channelManager = new ChannelManager();
 
+    particleEngine = new Particle(NULL);
+    particleEngine->setupEngine();
+
     // Initialize timers
     tick_time = 0;
     mLogicCounterId =   SDL_AddTimer(10, nextTick, NULL);    //Logic counter
@@ -286,6 +292,7 @@ Game::~Game()
     delete floorItemManager;
     delete channelManager;
     delete joystick;
+    delete particleEngine;
 
     beingManager = NULL;
     floorItemManager = NULL;
@@ -308,7 +315,9 @@ bool saveScreenshot(SDL_Surface *screenshot)
         screenshotCount++;
         filename.str("");
 #if (defined __USE_UNIX98 || defined __FreeBSD__ || defined __APPLE__)
-        filename << PHYSFS_getUserDir() << "/";
+        filename << PHYSFS_getUserDir() << ".tmw/";
+#elif defined __APPLE__
+        filename << PHYSFS_getUserDir() << "Desktop/";
 #endif
         filename << "TMW_Screenshot_" << screenshotCount << ".png";
         testExists.open(filename.str().c_str(), std::ios::in);
@@ -316,7 +325,18 @@ bool saveScreenshot(SDL_Surface *screenshot)
         testExists.close();
     } while (!found);
 
-    return ImageWriter::writePNG(screenshot, filename.str());
+    if (ImageWriter::writePNG(screenshot, filename.str()))
+    {
+        std::stringstream chatlogentry;
+        chatlogentry << "Screenshot saved to " << filename.str().c_str();
+        chatWindow->chatLog(chatlogentry.str(), BY_SERVER);
+        return true;
+    }
+    else
+    {
+        chatWindow->chatLog("Saving screenshot failed!", BY_SERVER);
+        return false;
+    }
 }
 
 void Game::optionChanged(const std::string &name)
diff --git a/src/graphics.cpp b/src/graphics.cpp
index f007470a..1e31f903 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -136,8 +136,6 @@ bool Graphics::drawImage(Image *image, int srcX, int srcY, int dstX, int dstY,
     srcX += image->mBounds.x;
     srcY += image->mBounds.y;
 
-
-
     SDL_Rect dstRect;
     SDL_Rect srcRect;
     dstRect.x = dstX; dstRect.y = dstY;
diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index cb07da22..2a8616f8 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -111,27 +111,21 @@ void BuyDialog::setMoney(int amount)
 {
     mMoney = amount;
     mShopItemList->setPlayersMoney(amount);
-    mMoneyLabel->setCaption("Price: 0 GP / " + toString(mMoney)  + " GP");
-    mMoneyLabel->adjustSize();
+
+    updateButtonsAndLabels();
 }
 
 void BuyDialog::reset()
 {
     mShopItems->clear();
+    mShopItemList->adjustSize();
     mMoney = 0;
     mSlider->setValue(0.0);
-    mAmountItems = 0;
 
     // Reset Previous Selected Items to prevent failing asserts
     mShopItemList->setSelected(-1);
-    mIncreaseButton->setEnabled(false);
-    mDecreaseButton->setEnabled(false);
-    mQuantityLabel->setCaption("0");
-    mQuantityLabel->adjustSize();
-    mMoneyLabel->setCaption("Price: 0 GP / " + toString(mMoney) + " GP");
-    mMoneyLabel->adjustSize();
-    mItemDescLabel->setCaption("");
-    mItemEffectLabel->setCaption("");
+
+    updateButtonsAndLabels();
 }
 
 void BuyDialog::addItem(short id, int price)
@@ -151,45 +145,36 @@ void BuyDialog::action(const gcn::ActionEvent &event)
     }
 
     // The following actions require a valid selection
-    if (selectedItem < 0 || selectedItem >= int(mShopItems->getNumberOfElements()))
+    if (selectedItem < 0 ||
+            selectedItem >= (int) mShopItems->getNumberOfElements())
     {
         return;
     }
 
-    bool updateButtonsAndLabels = false;
-
     if (event.getId() == "slider")
     {
         mAmountItems = (int)(mSlider->getValue() * mMaxItems);
-        updateButtonsAndLabels = true;
+        updateButtonsAndLabels();
     }
-    else if (event.getId() == "+")
+    else if (event.getId() == "+" && mAmountItems < mMaxItems)
     {
-        if (mAmountItems < mMaxItems) {
-            mAmountItems++;
-        } else {
-            mAmountItems = mMaxItems;
-        }
+        mAmountItems++;
 
-        mSlider->setValue(double(mAmountItems)/double(mMaxItems));
-        updateButtonsAndLabels = true;
+        mSlider->setValue((double) mAmountItems / (double) mMaxItems);
+        updateButtonsAndLabels();
     }
-    else if (event.getId() == "-")
+    else if (event.getId() == "-" && mAmountItems > 0)
     {
-        if (mAmountItems > 0) {
-            mAmountItems--;
-        } else {
-            mAmountItems = 0;
-        }
+        mAmountItems--;
 
-        mSlider->setValue(double(mAmountItems)/double(mMaxItems));
-        updateButtonsAndLabels = true;
+        mSlider->setValue((double) mAmountItems / (double) mMaxItems);
+        updateButtonsAndLabels();
     }
     // TODO: Actually we'd have a bug elsewhere if this check for the number
     // of items to be bought ever fails, Bertram removed the assertions, is
     // there a better way to ensure this fails in an _obivous_ way in C++?
-    else if (event.getId() == "buy" && (mAmountItems > 0 &&
-                mAmountItems <= mMaxItems))
+    else if (event.getId() == "buy" && mAmountItems > 0 &&
+                mAmountItems <= mMaxItems)
     {
         // XXX Convert for new server
         /*
@@ -199,38 +184,15 @@ void BuyDialog::action(const gcn::ActionEvent &event)
         outMsg.writeShort(mShopItems->at(selectedItem).id);
         */
 
-        // update money !
+        // Update money and adjust the max number of items that can be bought
         mMoney -= mAmountItems * mShopItems->at(selectedItem).price;
-        // Update number of items that can be bought at max
         mMaxItems -= mAmountItems;
 
-        if (!mMaxItems) {
-            mSlider->setEnabled(false);
-        }
-
         // Reset selection
         mAmountItems = 0;
-        mSlider->setValue(0);
-
-        updateButtonsAndLabels = true;
-    }
+        mSlider->setValue(0.0);
 
-    // If anything has changed, we have to update the buttons and labels
-    if (updateButtonsAndLabels)
-    {
-        // Update buttons
-        mIncreaseButton->setEnabled(mAmountItems < mMaxItems);
-        mDecreaseButton->setEnabled(mAmountItems > 0);
-        mBuyButton->setEnabled(mAmountItems > 0);
-
-        // Update labels
-        mQuantityLabel->setCaption(toString(mAmountItems));
-        mQuantityLabel->adjustSize();
-
-        int price = mAmountItems * mShopItems->at(selectedItem).price;
-        mMoneyLabel->setCaption("Price: " + toString(price)  + " GP / "
-                                + toString(mMoney) + " GP" );
-        mMoneyLabel->adjustSize();
+        updateButtonsAndLabels();
     }
 }
 
@@ -238,17 +200,16 @@ void BuyDialog::selectionChanged(const SelectionEvent &event)
 {
     // Reset amount of items and update labels
     mAmountItems = 0;
-    mSlider->setValue(0);
-    mQuantityLabel->setCaption("0");
-    mQuantityLabel->adjustSize();
-    mMoneyLabel->setCaption("Price: 0 GP / " + toString(mMoney) + " GP");
-    mMoneyLabel->adjustSize();
+    mSlider->setValue(0.0);
 
-    // Disable buttons for buying and decreasing
-    mBuyButton->setEnabled(false);
-    mDecreaseButton->setEnabled(false);
+    updateButtonsAndLabels();
+}
 
+void
+BuyDialog::updateButtonsAndLabels()
+{
     int selectedItem = mShopItemList->getSelected();
+    int price = 0;
 
     if (selectedItem > -1)
     {
@@ -259,16 +220,32 @@ void BuyDialog::selectionChanged(const SelectionEvent &event)
 
         // Calculate how many the player can afford
         mMaxItems = mMoney / mShopItems->at(selectedItem).price;
+        if (mAmountItems > mMaxItems)
+        {
+            mAmountItems = mMaxItems;
+        }
+
+        // Calculate price of pending purchase
+        price = mAmountItems * mShopItems->at(selectedItem).price;
     }
     else
     {
         mItemDescLabel->setCaption("Description:");
         mItemEffectLabel->setCaption("Effect:");
         mMaxItems = 0;
+        mAmountItems = 0;
     }
 
-    // When at least one item can be bought, enable the slider and the
-    // increase button
-    mIncreaseButton->setEnabled(mMaxItems > 0);
+    // Enable or disable buttons and slider
+    mIncreaseButton->setEnabled(mAmountItems < mMaxItems);
+    mDecreaseButton->setEnabled(mAmountItems > 0);
+    mBuyButton->setEnabled(mAmountItems > 0);
     mSlider->setEnabled(mMaxItems > 0);
+
+    // Update quantity and money labels
+    mQuantityLabel->setCaption(toString(mAmountItems));
+    mQuantityLabel->adjustSize();
+    mMoneyLabel->setCaption("Price: " + toString(price)  + " GP / "
+                             + toString(mMoney - price) + " GP" );
+    mMoneyLabel->adjustSize();
 }
diff --git a/src/gui/buy.h b/src/gui/buy.h
index 13116b6e..7834a434 100644
--- a/src/gui/buy.h
+++ b/src/gui/buy.h
@@ -92,6 +92,12 @@ class BuyDialog : public Window, public gcn::ActionListener, SelectionListener
          */
         std::string getElementAt(int i);
 
+        /**
+         * Updates the state of buttons and labels.
+         */
+        void
+        updateButtonsAndLabels();
+
     private:
         gcn::Button *mBuyButton;
         gcn::Button *mQuitButton;
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index eb6b7612..48df9efe 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -160,7 +160,7 @@ ChatWindow::chatLog(std::string line, int own, std::string channelName)
             break;
         case BY_OTHER:
             tmp.nick += CAT_NORMAL;
-            lineColor = "##4"; // Equiv. to BrowserBox::ORANGE
+            lineColor = "##0"; // Equiv. to BrowserBox::BLACK
             break;
         case BY_SERVER:
             tmp.nick += std::string("Server: ");
@@ -195,7 +195,7 @@ ChatWindow::chatLog(std::string line, int own, std::string channelName)
     // We look if the Vertical Scroll Bar is set at the max before
     // adding a row, otherwise the max will always be a row higher
     // at comparison.
-    if (mScrollArea->getVerticalScrollAmount() == mScrollArea->getVerticalMaxScroll() )
+    if (mScrollArea->getVerticalScrollAmount() == mScrollArea->getVerticalMaxScroll())
     {
         mTextOutput->addRow(line);
         mScrollArea->setVerticalScrollAmount(mScrollArea->getVerticalMaxScroll());
diff --git a/src/gui/chat.h b/src/gui/chat.h
index c7e51ebf..6f9b91fe 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.h
@@ -168,13 +168,13 @@ class ChatWindow : public Window, public gcn::ActionListener,
 
         /*
          * Determines whether to send a command or an ordinary message, then
-         * contructs packets & sends them
+         * contructs packets & sends them.
          *
          * @param nick The character's name to display in front.
          * @param msg  The message text which is to be send.
          *
          * NOTE:
-         * the nickname is required by the server, if not specified
+         * The nickname is required by the server, if not specified
          * the message may not be sent unless a command was intended
          * which requires another packet to be constructed! you can
          * achieve this by putting a slash ("/") infront of the
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index 563f380f..ebf7d974 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -33,6 +33,7 @@
 
 #include "../game.h"
 #include "../engine.h"
+#include "../particle.h"
 #include "../map.h"
 
 #include "../utils/tostring.h"
@@ -58,6 +59,9 @@ DebugWindow::DebugWindow():
     mTileMouseLabel = new gcn::Label("[Mouse: 0, 0]");
     mTileMouseLabel->setPosition(100, 0);
 
+    mParticleCountLabel = new gcn::Label("[Particle count: 0]");
+    mParticleCountLabel->setPosition(100, 60);
+
     Button *closeButton = new Button("Close", "close", this);
     closeButton->setPosition(5, 60);
 
@@ -65,6 +69,7 @@ DebugWindow::DebugWindow():
     add(mMusicFileLabel);
     add(mMapFileLabel);
     add(mTileMouseLabel);
+    add(mParticleCountLabel);
     add(closeButton);
 }
 
@@ -97,6 +102,11 @@ DebugWindow::logic()
         mMapFileLabel->setCaption(minimap);
         mMapFileLabel->adjustSize();
     }
+
+    mParticleCountLabel->setCaption("[Particle count: " +
+                                    toString(Particle::particleCount)
+                                    +"]");
+    mParticleCountLabel->adjustSize();
 }
 
 void
diff --git a/src/gui/debugwindow.h b/src/gui/debugwindow.h
index 4fd33d83..d082b2ca 100644
--- a/src/gui/debugwindow.h
+++ b/src/gui/debugwindow.h
@@ -58,6 +58,7 @@ class DebugWindow : public Window, public gcn::ActionListener
     private:
         gcn::Label *mMusicFileLabel, *mMapFileLabel;
         gcn::Label *mTileMouseLabel, *mFPSLabel;
+        gcn::Label *mParticleCountLabel;
 };
 
 #endif
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 44d042a6..2018c75a 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -165,8 +165,8 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
 
         if (!item) return;
 
-        /* Convert relative to the window coordinates to
-         * absolute screen coordinates.
+        /* Convert relative to the window coordinates to absolute screen
+         * coordinates.
          */
         int mx = event.getX() + getX();
         int my = event.getY() + getY();
@@ -178,7 +178,8 @@ void InventoryWindow::mouseDragged(gcn::MouseEvent &event)
 {
     int tmpWidth = getWidth(), tmpHeight = getHeight();
     Window::mouseDragged(event);
-    if (getWidth() != tmpWidth || getHeight() != tmpHeight) {
+    if (getWidth() != tmpWidth || getHeight() != tmpHeight)
+    {
         updateWidgets();
     }
 }
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index c9878c84..478371b1 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -88,7 +88,7 @@ SellDialog::SellDialog():
     quitButton->setPosition(208, 186);
 
     mShopItemList->setActionEventId("item");
-    mSlider->setActionEventId("mSlider");
+    mSlider->setActionEventId("slider");
 
     mShopItemList->setPriceCheck(false);
 
@@ -119,20 +119,11 @@ void SellDialog::reset()
 {
     mShopItems->clear();
     mSlider->setValue(0.0);
-    mAmountItems = 0;
-
-    mQuantityLabel->setCaption("0");
-    mQuantityLabel->adjustSize();
-    mMoneyLabel->setCaption("Money: 0 GP / Total: "
-            + toString(mPlayerMoney) + " GP");
-    mMoneyLabel->adjustSize();
-    mItemDescLabel->setCaption("");
-    mItemEffectLabel->setCaption("");
 
-    // Reset Previous Selected Items to prevent failing asserts
+    // Reset previous selected item to prevent failing asserts
     mShopItemList->setSelected(-1);
-    mIncreaseButton->setEnabled(false);
-    mDecreaseButton->setEnabled(false);
+
+    updateButtonsAndLabels();
 }
 
 void SellDialog::addItem(Item *item, int price)
@@ -162,25 +153,7 @@ void SellDialog::action(const gcn::ActionEvent &event)
     {
         mAmountItems = 0;
         mSlider->setValue(0);
-        mDecreaseButton->setEnabled(false);
-        mSellButton->setEnabled(false);
-
-        mQuantityLabel->adjustSize();
-        mMoneyLabel->setCaption("Money: 0 GP / Total: "
-            + toString(mPlayerMoney) + " GP");
-        mMoneyLabel->adjustSize();
-
-        if (selectedItem > -1) {
-            mSlider->setEnabled(true);
-            mIncreaseButton->setEnabled(true);
-            mMaxItems = mShopItems->at(selectedItem).quantity;
-            mQuantityLabel->setCaption("0 / " + toString(mMaxItems));
-        } else {
-            mSlider->setEnabled(false);
-            mIncreaseButton->setEnabled(false);
-            mQuantityLabel->setCaption("0");
-        }
-        mQuantityLabel->adjustSize();
+        updateButtonsAndLabels();
     }
     else if (event.getId() == "quit")
     {
@@ -189,40 +162,35 @@ void SellDialog::action(const gcn::ActionEvent &event)
     }
 
     // The following actions require a valid item selection
-    if (selectedItem == -1 || selectedItem >= int(mShopItems->getNumberOfElements())) {
+    if (selectedItem == -1 ||
+            selectedItem >= (int) mShopItems->getNumberOfElements())
+    {
         return;
     }
 
-    bool updateButtonsAndLabels = false;
-
-    if (event.getId() == "mSlider")
+    if (event.getId() == "slider")
     {
-        mAmountItems = (int)(mSlider->getValue() * mMaxItems);
-
-        updateButtonsAndLabels = true;
+        mAmountItems = (int) (mSlider->getValue() * mMaxItems);
+        updateButtonsAndLabels();
     }
-    else if (event.getId() == "+")
+    else if (event.getId() == "+" && mAmountItems < mMaxItems)
     {
-        assert(mAmountItems < mMaxItems);
         mAmountItems++;
-        mSlider->setValue(double(mAmountItems)/double(mMaxItems));
 
-        updateButtonsAndLabels = true;
+        mSlider->setValue((double) mAmountItems /(double) mMaxItems);
+        updateButtonsAndLabels();
     }
-    else if (event.getId() == "-")
+    else if (event.getId() == "-" && mAmountItems > 0)
     {
-        assert(mAmountItems > 0);
         mAmountItems--;
 
-        mSlider->setValue(double(mAmountItems)/double(mMaxItems));
-
-        updateButtonsAndLabels = true;
+        mSlider->setValue((double) mAmountItems / (double) mMaxItems);
+        updateButtonsAndLabels();
     }
-    else if (event.getId() == "sell")
+    else if (event.getId() == "sell" && mAmountItems > 0
+            && mAmountItems <= mMaxItems)
     {
         // Attempt sell
-        assert(mAmountItems > 0 && mAmountItems <= mMaxItems);
-
         // XXX Convert for new server
         /*
         MessageOut outMsg(CMSG_NPC_SELL_REQUEST);
@@ -236,60 +204,77 @@ void SellDialog::action(const gcn::ActionEvent &event)
         mPlayerMoney += (mAmountItems * mShopItems->at(selectedItem).price);
         mAmountItems = 0;
         mSlider->setValue(0);
-        mSlider->setEnabled(mMaxItems != 0);
-
-        // All were sold
-        if (!mMaxItems) {
 
+        if (!mMaxItems)
+        {
+            // All were sold
             mShopItemList->setSelected(-1);
-            mShopItems->getShop()->erase(mShopItems->getShop()->begin() + selectedItem);
+            mShopItems->getShop()->erase(
+                    mShopItems->getShop()->begin() + selectedItem);
+        }
+        else
+        {
+            // Update only when there are items left, the entry doesn't exist
+            // otherwise and can't be updated
+            updateButtonsAndLabels();
         }
-
-        // Update only when there are items left, the entry doesn't exist
-        // otherwise and can't be updated
-        updateButtonsAndLabels = bool(mMaxItems);
-    }
-
-    // If anything changed, we need to update the buttons and labels
-    if (updateButtonsAndLabels)
-    {
-        // Update labels
-        mQuantityLabel->setCaption(toString(mAmountItems) + " / " + toString(mMaxItems));
-        mQuantityLabel->adjustSize();
-
-        int price = mAmountItems * mShopItems->at(selectedItem).price;
-        mMoneyLabel->setCaption("Money: " + toString(price) + " GP / Total: "
-            + toString(price + mPlayerMoney) + " GP");
-        mMoneyLabel->adjustSize();
-
-        // Update Buttons
-        mSellButton->setEnabled(mAmountItems > 0);
-        mDecreaseButton->setEnabled(mAmountItems > 0);
-        mIncreaseButton->setEnabled(mAmountItems < mMaxItems);
     }
 }
 
 void SellDialog::selectionChanged(const SelectionEvent &event)
+{
+    // Reset amount of items and update labels
+    mAmountItems = 0;
+    mSlider->setValue(0);
+
+    updateButtonsAndLabels();
+}
+
+void SellDialog::setMoney(int amount)
+{
+    mPlayerMoney = amount;
+    mShopItemList->setPlayersMoney(amount);
+}
+
+void
+SellDialog::updateButtonsAndLabels()
 {
     int selectedItem = mShopItemList->getSelected();
+    int income = 0;
 
     if (selectedItem > -1)
     {
-        const ItemInfo &info =
-            ItemDB::get(mShopItems->at(selectedItem).id);
+        mMaxItems = mShopItems->at(selectedItem).quantity;
+        if (mAmountItems > mMaxItems)
+        {
+            mAmountItems = mMaxItems;
+        }
 
+        income = mAmountItems * mShopItems->at(selectedItem).price;
+
+        const ItemInfo &info = ItemDB::get(mShopItems->at(selectedItem).id);
         mItemDescLabel->setCaption("Description: " + info.getDescription());
         mItemEffectLabel->setCaption("Effect: " + info.getEffect());
     }
     else
     {
-        mItemDescLabel->setCaption("Description");
-        mItemEffectLabel->setCaption("Effect");
+        mMaxItems = 0;
+        mAmountItems = 0;
+        mItemDescLabel->setCaption("Description:");
+        mItemEffectLabel->setCaption("Effect:");
     }
-}
 
-void SellDialog::setMoney(int amount)
-{
-    mPlayerMoney = amount;
-    mShopItemList->setPlayersMoney(amount);
+    // Update Buttons and slider
+    mSellButton->setEnabled(mAmountItems > 0);
+    mDecreaseButton->setEnabled(mAmountItems > 0);
+    mIncreaseButton->setEnabled(mAmountItems < mMaxItems);
+    mSlider->setEnabled(selectedItem > -1);
+
+    // Update the quantity and money labels
+    mQuantityLabel->setCaption(
+            toString(mAmountItems) + " / " + toString(mMaxItems));
+    mQuantityLabel->adjustSize();
+    mMoneyLabel->setCaption("Money: " + toString(income) + " GP / Total: "
+                            + toString(mPlayerMoney + income) + " GP");
+    mMoneyLabel->adjustSize();
 }
diff --git a/src/gui/sell.h b/src/gui/sell.h
index 68bd7b8b..b8385a6f 100644
--- a/src/gui/sell.h
+++ b/src/gui/sell.h
@@ -82,6 +82,12 @@ class SellDialog : public Window, gcn::ActionListener, SelectionListener
          */
         void setMoney(int amount);
 
+        /**
+         * Updates the state of buttons and labels.
+         */
+        void
+        updateButtonsAndLabels();
+
     private:
         gcn::Button *mSellButton;
         gcn::Button *mIncreaseButton;
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index d8130cd3..ed75e5b3 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -157,6 +157,7 @@ void UpdaterWindow::setLabel(const std::string &str)
 
 void UpdaterWindow::enable()
 {
+    mCancelButton->setEnabled(false);
     mPlayButton->setEnabled(true);
     mPlayButton->requestFocus();
 }
@@ -168,11 +169,7 @@ void UpdaterWindow::action(const gcn::ActionEvent &event)
         // Register the user cancel
         mUserCancel = true;
         // Skip the updating process
-        if (mDownloadStatus == UPDATE_COMPLETE)
-        {
-            state = STATE_EXIT;
-        }
-        else
+        if (mDownloadStatus != UPDATE_COMPLETE)
         {
             mDownloadStatus = UPDATE_ERROR;
         }
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index f3e9031c..2af1d960 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -41,10 +41,13 @@
 #include "../resources/animation.h"
 #include "../resources/monsterinfo.h"
 #include "../resources/resourcemanager.h"
+#include "../resources/image.h"
 #include "../resources/imageset.h"
 
 #include "../utils/tostring.h"
 
+#include <cassert>
+
 Viewport::Viewport():
     mMap(0),
     mViewX(0.0f),
@@ -67,37 +70,62 @@ Viewport::Viewport():
     mPopupMenu = new PopupMenu();
 
     // Load target cursors
+    loadTargetCursor("graphics/gui/target-cursor-blue-s.png", 44, 35,
+                     false, Being::TC_SMALL);
+    loadTargetCursor("graphics/gui/target-cursor-red-s.png", 44, 35,
+                     true, Being::TC_SMALL);
+    loadTargetCursor("graphics/gui/target-cursor-blue-m.png", 62, 44,
+                     false, Being::TC_MEDIUM);
+    loadTargetCursor("graphics/gui/target-cursor-red-m.png", 62, 44,
+                     true, Being::TC_MEDIUM);
+    loadTargetCursor("graphics/gui/target-cursor-blue-l.png", 82, 60,
+                     false, Being::TC_LARGE);
+    loadTargetCursor("graphics/gui/target-cursor-red-l.png", 82, 60,
+                     true, Being::TC_LARGE);
+}
+
+void
+Viewport::loadTargetCursor(std::string filename, int width, int height,
+                           bool outRange, Being::TargetCursorSize size)
+{
+    assert(size > -1);
+    assert(size < 3);
+
+    ImageSet* currentImageSet;
+    SimpleAnimation* currentCursor;
+
     ResourceManager *resman = ResourceManager::getInstance();
-    mInRangeImages = resman->getImageSet(
-            "graphics/gui/target-cursor-blue.png", 44, 35);
-    mOutRangeImages = resman->getImageSet(
-            "graphics/gui/target-cursor-red.png", 44, 35);
-    Animation *animInRange = new Animation();
-    Animation *animOutRange = new Animation();
-
-    for (unsigned int i = 0; i < mInRangeImages->size(); ++i)
+
+    currentImageSet = resman->getImageSet(filename, width, height);
+    Animation *anim = new Animation();
+    for (unsigned int i = 0; i < currentImageSet->size(); ++i)
     {
-        animInRange->addFrame(mInRangeImages->get(i), 75, 0, 0);
+        anim->addFrame(currentImageSet->get(i), 75, 0, 0);
     }
+    currentCursor = new SimpleAnimation(anim);
 
-    for (unsigned int j = 0; j < mOutRangeImages->size(); ++j)
+    if (outRange)
     {
-        animOutRange->addFrame(mOutRangeImages->get(j), 75, 0, 0);
+        mOutRangeImages[size] = currentImageSet;
+        mTargetCursorOutRange[size] = currentCursor;
+    }
+    else {
+        mInRangeImages[size] = currentImageSet;
+        mTargetCursorInRange[size] = currentCursor;
     }
-
-    mTargetCursorInRange = new SimpleAnimation(animInRange);
-    mTargetCursorOutRange = new SimpleAnimation(animOutRange);
 }
 
 Viewport::~Viewport()
 {
     delete mPopupMenu;
 
-    delete mTargetCursorInRange;
-    delete mTargetCursorOutRange;
-
-    mInRangeImages->decRef();
-    mOutRangeImages->decRef();
+    for (int i = Being::TC_SMALL; i < Being::NUM_TC; i++)
+    {
+        delete mTargetCursorInRange[i];
+        delete mTargetCursorOutRange[i];
+        mInRangeImages[i]->decRef();
+        mOutRangeImages[i]->decRef();
+    }
 }
 
 void
@@ -259,8 +287,11 @@ Viewport::logic()
         mWalkTime = player_node->mWalkTime;
     }
 
-    mTargetCursorInRange->update(10);
-    mTargetCursorOutRange->update(10);
+    for (int i = 0; i < 3; i++)
+    {
+        mTargetCursorInRange[i]->update(10);
+        mTargetCursorOutRange[i]->update(10);
+    }
 }
 
 void
@@ -270,26 +301,31 @@ Viewport::drawTargetCursor(Graphics *graphics)
     Being *target = player_node->getTarget();
     if (target)
     {
+        // Calculate target circle position
+
         // Find whether target is in range
         int rangeX = abs(target->mX - player_node->mX);
         int rangeY = abs(target->mY - player_node->mY);
         int attackRange = player_node->getAttackRange();
 
-        // Draw the target cursor, which one depends if the target is in range
+        // Get the correct target cursors graphic
+        Being::TargetCursorSize cursorSize = target->getTargetCursorSize();
+        Image* targetCursor;
         if (rangeX > attackRange || rangeY > attackRange)
         {
-            // Draw the out of range cursor
-            graphics->drawImage(mTargetCursorOutRange->getCurrentImage(),
-                                target->getPixelX() - mCameraX,
-                                target->getPixelY() - mCameraY);
+            targetCursor = mTargetCursorOutRange[cursorSize]->getCurrentImage();
         }
-        else
-        {
-            // Draw the in range cursor
-            graphics->drawImage(mTargetCursorInRange->getCurrentImage(),
-                                target->getPixelX() - mCameraX,
-                                target->getPixelY() - mCameraY);
+        else {
+            targetCursor = mTargetCursorInRange[cursorSize]->getCurrentImage();
         }
+
+        // Draw the target cursor at the correct position
+        int posX = target->getPixelX() + 16 -
+                   targetCursor->getWidth() / 2 - mCameraX;
+        int posY = target->getPixelY() + 16 -
+                   targetCursor->getHeight() / 2 - mCameraY;
+
+        graphics->drawImage(targetCursor, posX, posY);
     }
 }
 
@@ -304,10 +340,10 @@ Viewport::drawTargetName(Graphics *graphics)
         graphics->setColor(gcn::Color(255, 32, 32));
 
         const MonsterInfo &mi = static_cast<Monster*>(target)->getInfo();
-        graphics->drawText(mi.getName(),
-                           target->getPixelX() - mCameraX + 15,
-                           target->getPixelY() - mCameraY - 42,
-                           gcn::Graphics::CENTER);
+        int posX = target->getPixelX() + 16 - mCameraX;
+        int posY = target->getPixelY() + 16 - target->getHeight() - mCameraY;
+
+        graphics->drawText(mi.getName(), posX, posY, gcn::Graphics::CENTER);
     }
 }
 
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 84efeff3..22d0f249 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -29,9 +29,9 @@
 #include "windowcontainer.h"
 
 #include "../configlistener.h"
+#include "../being.h"
 
 class Map;
-class Being;
 class FloorItem;
 class ImageSet;
 class Item;
@@ -141,6 +141,13 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
          */
         void showPopup(int x, int y, Being *being);
 
+        /**
+         * Helper function for loading target cursors
+         */
+        void
+        loadTargetCursor(std::string filename, int width, int height,
+                         bool outRange, Being::TargetCursorSize size);
+
         /**
          * Draws range based target cursor
          */
@@ -164,14 +171,17 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
         int mCameraY;              /**< Current viewpoint in tiles. */
         bool mShowDebugPath;       /**< Show a path from player to pointer. */
 
-        ImageSet *mInRangeImages;  /**< Images of in range target cursor. */
-        ImageSet *mOutRangeImages; /**< Images of out of range target cursor.*/
+        /** Images of in range target cursor. */
+        ImageSet *mInRangeImages[Being::NUM_TC];
+
+        /** Images of out of range target cursor. */
+        ImageSet *mOutRangeImages[Being::NUM_TC];
 
         /** Animated in range target cursor. */
-        SimpleAnimation *mTargetCursorInRange;
+        SimpleAnimation *mTargetCursorInRange[Being::NUM_TC];
 
         /** Animated out of range target cursor. */
-        SimpleAnimation *mTargetCursorOutRange;
+        SimpleAnimation *mTargetCursorOutRange[Being::NUM_TC];
 
         bool mPlayerFollowMouse;
         int mWalkTime;
diff --git a/src/gui/widgets/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp
new file mode 100644
index 00000000..50a6fce4
--- /dev/null
+++ b/src/gui/widgets/resizegrip.cpp
@@ -0,0 +1,65 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#include "resizegrip.h"
+
+#include <guichan/graphics.hpp>
+
+#include "../../graphics.h"
+
+#include "../../resources/image.h"
+#include "../../resources/resourcemanager.h"
+
+Image *ResizeGrip::gripImage = 0;
+int ResizeGrip::mInstances = 0;
+
+ResizeGrip::ResizeGrip()
+{
+    if (mInstances == 0)
+    {
+        // Load the grip image
+        ResourceManager *resman = ResourceManager::getInstance();
+        gripImage = resman->getImage("graphics/gui/resize.png");
+    }
+
+    mInstances++;
+
+    setWidth(gripImage->getWidth() + 2);
+    setHeight(gripImage->getHeight() + 2);
+}
+
+ResizeGrip::~ResizeGrip()
+{
+    mInstances--;
+
+    if (mInstances == 0)
+    {
+        gripImage->decRef();
+    }
+}
+
+void
+ResizeGrip::draw(gcn::Graphics *graphics)
+{
+    dynamic_cast<Graphics*>(graphics)->drawImage(gripImage, 0, 0);
+}
diff --git a/src/gui/widgets/resizegrip.h b/src/gui/widgets/resizegrip.h
new file mode 100644
index 00000000..04be3db3
--- /dev/null
+++ b/src/gui/widgets/resizegrip.h
@@ -0,0 +1,61 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _TMW_RESIZEGRIP_H
+#define _TMW_RESIZEGRIP_H
+
+#include <guichan/widget.hpp>
+
+class Image;
+
+/**
+ * Resize grip. The resize grip is part of a resizable Window. It relies on the
+ * fact that uncaught mouse events are automatically routed to the parent
+ * window.
+ *
+ * \ingroup GUI
+ */
+class ResizeGrip : public gcn::Widget
+{
+    public:
+        /**
+         * Constructor.
+         */
+        ResizeGrip();
+
+        /**
+         * Destructor.
+         */
+        ~ResizeGrip();
+
+        /**
+         * Draws the resize grip.
+         */
+        void draw(gcn::Graphics *graphics);
+
+    private:
+        static Image *gripImage;   /**< Resize grip image */
+        static int mInstances;     /**< Number of resize grip instances */
+};
+
+#endif
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index bb60c6ff..8a052bba 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -24,10 +24,13 @@
 #include "window.h"
 
 #include <guichan/exception.hpp>
+#include <guichan/widgets/icon.hpp>
 
 #include "gccontainer.h"
 #include "windowcontainer.h"
 
+#include "widgets/resizegrip.h"
+
 #include "../configlistener.h"
 #include "../configuration.h"
 #include "../graphics.h"
@@ -36,11 +39,10 @@
 #include "../resources/image.h"
 #include "../resources/resourcemanager.h"
 
-ConfigListener *Window::windowConfigListener = NULL;
-WindowContainer *Window::windowContainer = NULL;
+ConfigListener *Window::windowConfigListener = 0;
+WindowContainer *Window::windowContainer = 0;
 int Window::instances = 0;
 ImageRect Window::border;
-Image *Window::resizeGrip;
 
 class WindowConfigListener : public ConfigListener
 {
@@ -54,16 +56,16 @@ class WindowConfigListener : public ConfigListener
 
 Window::Window(const std::string& caption, bool modal, Window *parent):
     gcn::Window(caption),
+    mGrip(0),
     mParent(parent),
     mWindowName("window"),
-    mSnapSize(8),
     mShowTitle(true),
     mModal(modal),
     mResizable(false),
-    mMouseResize(false),
+    mMouseResize(0),
     mSticky(false),
     mMinWinWidth(100),
-    mMinWinHeight(28),
+    mMinWinHeight(40),
     mMaxWinWidth(INT_MAX),
     mMaxWinHeight(INT_MAX)
 {
@@ -87,7 +89,6 @@ Window::Window(const std::string& caption, bool modal, Window *parent):
         border.grid[6] = dBorders->getSubImage(0, 15, 4, 4);
         border.grid[7] = dBorders->getSubImage(4, 15, 3, 4);
         border.grid[8] = dBorders->getSubImage(7, 15, 4, 4);
-        resizeGrip = resman->getImage("graphics/gui/resize.png");
         dBorders->decRef();
         windowConfigListener = new WindowConfigListener();
         // Send GUI alpha changed for initialization
@@ -151,10 +152,10 @@ Window::~Window()
         delete border.grid[6];
         delete border.grid[7];
         delete border.grid[8];
-        resizeGrip->decRef();
     }
 
     delete mChrome;
+    delete mGrip;
 }
 
 void Window::setWindowContainer(WindowContainer *wc)
@@ -162,22 +163,15 @@ void Window::setWindowContainer(WindowContainer *wc)
     windowContainer = wc;
 }
 
-void Window::draw(gcn::Graphics* graphics)
+void Window::draw(gcn::Graphics *graphics)
 {
-    Graphics *g = (Graphics*)graphics;
+    Graphics *g = static_cast<Graphics*>(graphics);
 
     g->drawImageRect(0, 0, getWidth(), getHeight(), border);
 
-    // Draw grip
-    if (mResizable)
-    {
-        g->drawImage(Window::resizeGrip,
-                     getWidth() - resizeGrip->getWidth(),
-                     getHeight() - resizeGrip->getHeight());
-    }
-
     // Draw title
-    if (mShowTitle) {
+    if (mShowTitle)
+    {
         graphics->setFont(getFont());
         graphics->drawText(getCaption(), 7, 5, gcn::Graphics::LEFT);
     }
@@ -188,13 +182,13 @@ void Window::draw(gcn::Graphics* graphics)
 void Window::setContentWidth(int width)
 {
     mChrome->setWidth(width);
-    resizeToContent();
+    setWidth(width + 2 * getPadding());
 }
 
 void Window::setContentHeight(int height)
 {
     mChrome->setHeight(height);
-    resizeToContent();
+    setHeight(height + getPadding() + getTitleBarHeight());
 }
 
 void Window::setContentSize(int width, int height)
@@ -203,6 +197,37 @@ void Window::setContentSize(int width, int height)
     setContentHeight(height);
 }
 
+void Window::setWidth(int width)
+{
+    gcn::Window::setWidth(width);
+
+    if (mGrip)
+    {
+        mGrip->setX(getWidth() - mGrip->getWidth() - getChildrenArea().x);
+    }
+}
+
+void Window::setHeight(int height)
+{
+    gcn::Window::setHeight(height);
+
+    if (mGrip)
+    {
+        mGrip->setY(getHeight() - mGrip->getHeight() - getChildrenArea().y);
+    }
+}
+
+void Window::setDimension(const gcn::Rectangle &dimension)
+{
+    gcn::Window::setDimension(dimension);
+
+    if (mGrip)
+    {
+        mGrip->setX(getWidth() - mGrip->getWidth() - getChildrenArea().x);
+        mGrip->setY(getHeight() - mGrip->getHeight() - getChildrenArea().y);
+    }
+}
+
 void Window::setLocationRelativeTo(gcn::Widget *widget)
 {
     int wx, wy;
@@ -238,6 +263,19 @@ void Window::setMaxHeight(unsigned int height)
 void Window::setResizable(bool r)
 {
     mResizable = r;
+
+    if (mResizable)
+    {
+        mGrip = new ResizeGrip();
+        mGrip->setX(getWidth() - mGrip->getWidth() - getChildrenArea().x);
+        mGrip->setY(getHeight() - mGrip->getHeight() - getChildrenArea().y);
+        gcn::Window::add(mGrip);
+    }
+    else
+    {
+        delete mGrip;
+        mGrip = 0;
+    }
 }
 
 bool Window::isResizable()
@@ -287,15 +325,27 @@ void Window::mousePressed(gcn::MouseEvent &event)
     // Let Guichan move window to top and figure out title bar drag
     gcn::Window::mousePressed(event);
 
-    int x = event.getX();
-    int y = event.getY();
+    const int x = event.getX();
+    const int y = event.getY();
+    mMouseResize = 0;
 
-    // Activate resizing if the left mouse button was pressed on the grip
-    mMouseResize =
-        isResizable() &&
-        event.getButton() == gcn::MouseEvent::LEFT &&
-        getGripDimension().isPointInRect(x, y) &&
-        !getChildrenArea().isPointInRect(x, y);
+    // Activate resizing handles as appropriate
+    if (event.getSource() == this && isResizable() &&
+            event.getButton() == gcn::MouseEvent::LEFT &&
+            !getChildrenArea().isPointInRect(x, y))
+    {
+        mMouseResize |= (x > getWidth() - resizeBorderWidth) ? RIGHT :
+                        (x < resizeBorderWidth) ? LEFT : 0;
+        mMouseResize |= (y > getHeight() - resizeBorderWidth) ? BOTTOM :
+                        (y < resizeBorderWidth) ? TOP : 0;
+    }
+    else if (event.getSource() == mGrip)
+    {
+        mDragOffsetX = x + mGrip->getX();
+        mDragOffsetY = y + mGrip->getY();
+        mMouseResize |= BOTTOM | RIGHT;
+        mIsMoving = false;
+    }
 }
 
 void Window::mouseDragged(gcn::MouseEvent &event)
@@ -303,20 +353,47 @@ void Window::mouseDragged(gcn::MouseEvent &event)
     // Let Guichan handle title bar drag
     gcn::Window::mouseDragged(event);
 
-    // Keep guichan window inside screen
-    int newX = std::max(0, getX());
-    int newY = std::max(0, getY());
-    newX = std::min(windowContainer->getWidth() - getWidth(), newX);
-    newY = std::min(windowContainer->getHeight() - getHeight(), newY);
-    setPosition(newX, newY);
+    // Keep guichan window inside screen when it may be moved
+    if (isMovable() && mIsMoving)
+    {
+        int newX = std::max(0, getX());
+        int newY = std::max(0, getY());
+        newX = std::min(windowContainer->getWidth() - getWidth(), newX);
+        newY = std::min(windowContainer->getHeight() - getHeight(), newY);
+        setPosition(newX, newY);
+    }
 
     if (mMouseResize && !mIsMoving)
     {
+        const int dx = event.getX() - mDragOffsetX +
+            ((event.getSource() == mGrip) ? mGrip->getX() : 0);
+        const int dy = event.getY() - mDragOffsetY +
+            ((event.getSource() == mGrip) ? mGrip->getY() : 0);
         gcn::Rectangle newDim = getDimension();
 
-        // We're dragging bottom right
-        newDim.width += event.getX() - mDragOffsetX;
-        newDim.height += event.getY() - mDragOffsetY;
+        if (mMouseResize & (TOP | BOTTOM))
+        {
+            int newHeight = newDim.height + ((mMouseResize & TOP) ? -dy : dy);
+            newDim.height = std::min(mMaxWinHeight,
+                                     std::max(mMinWinHeight, newHeight));
+
+            if (mMouseResize & TOP)
+            {
+                newDim.y -= newDim.height - getHeight();
+            }
+        }
+
+        if (mMouseResize & (LEFT | RIGHT))
+        {
+            int newWidth = newDim.width + ((mMouseResize & LEFT) ? -dx : dx);
+            newDim.width = std::min(mMaxWinWidth,
+                                    std::max(mMinWinWidth, newWidth));
+
+            if (mMouseResize & LEFT)
+            {
+                newDim.x -= newDim.width - getWidth();
+            }
+        }
 
         // Keep guichan window inside screen (supports resizing any side)
         if (newDim.x < 0)
@@ -338,29 +415,16 @@ void Window::mouseDragged(gcn::MouseEvent &event)
             newDim.height = windowContainer->getHeight() - newDim.y;
         }
 
-        // Keep the window at least its minimum size
-        if (newDim.width < mMinWinWidth)
-        {
-            newDim.width = mMinWinWidth;
-        }
-        else if (newDim.width > mMaxWinWidth)
-        {
-            newDim.width = mMaxWinWidth;
-        }
-
-        if (newDim.height < mMinWinHeight)
+        // Update mouse offset when dragging bottom or right border
+        if (mMouseResize & BOTTOM)
         {
-            newDim.height = mMinWinHeight;
+            mDragOffsetY += newDim.height - getHeight();
         }
-        else if (newDim.height > mMaxWinHeight)
+        if (mMouseResize & RIGHT)
         {
-            newDim.height = mMaxWinHeight;
+            mDragOffsetX += newDim.width - getWidth();
         }
 
-        // Update mouse offset when dragging bottom or right border
-        mDragOffsetX += newDim.width - getWidth();
-        mDragOffsetY += newDim.height - getHeight();
-
         // Set the new window and content dimensions
         setDimension(newDim);
         const gcn::Rectangle area = getChildrenArea();
@@ -368,15 +432,6 @@ void Window::mouseDragged(gcn::MouseEvent &event)
     }
 }
 
-gcn::Rectangle
-Window::getGripDimension()
-{
-    return gcn::Rectangle(getWidth() - resizeGrip->getWidth(),
-                          getHeight() - resizeGrip->getHeight(),
-                          getWidth(),
-                          getHeight());
-}
-
 void
 Window::loadWindowState()
 {
diff --git a/src/gui/window.h b/src/gui/window.h
index 31c260cf..03248908 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -30,11 +30,10 @@
 
 class ConfigListener;
 class GCContainer;
-class Image;
 class ImageRect;
+class ResizeGrip;
 class WindowContainer;
 
-
 /**
  * A window. This window can be dragged around and has a title bar. Windows are
  * invisible by default.
@@ -99,6 +98,21 @@ class Window : public gcn::Window
          */
         void setContentSize(int width, int height);
 
+        /**
+         * Sets the width of this window.
+         */
+        void setWidth(int width);
+
+        /**
+         * Sets the height of this window.
+         */
+        void setHeight(int height);
+
+        /**
+         * Sets the position and size of this window.
+         */
+        void setDimension(const gcn::Rectangle &dimension);
+
         /**
          * Sets the location relative to the given widget.
          */
@@ -168,16 +182,15 @@ class Window : public gcn::Window
         void scheduleDelete();
 
         /**
-         * Window dragging and resizing mouse related. These methods also makes
-         * sure the window is not dragged/resized outside of the screen.
+         * Starts window resizing when appropriate.
          */
         void mousePressed(gcn::MouseEvent &event);
-        void mouseDragged(gcn::MouseEvent &event);
 
         /**
-         * Gets the position of the resize grip.
+         * Implements window resizing and makes sure the window is not
+         * dragged/resized outside of the screen.
          */
-        gcn::Rectangle getGripDimension();
+        void mouseDragged(gcn::MouseEvent &event);
 
         /**
          * Sets the name of the window. This is not the window title.
@@ -214,37 +227,50 @@ class Window : public gcn::Window
          */
         virtual void resetToDefaultSize();
 
+        enum ResizeHandles
+        {
+            TOP    = 0x01,
+            RIGHT  = 0x02,
+            BOTTOM = 0x04,
+            LEFT   = 0x08
+        };
+
     protected:
-        GCContainer *mChrome;   /**< Contained container */
+        GCContainer *mChrome;      /**< Contained container */
+        ResizeGrip *mGrip;         /**< Resize grip */
         Window *mParent;           /**< The parent window */
         std::string mWindowName;   /**< Name of the window */
-        int mSnapSize;              /**< Snap distance to window edge */
         bool mShowTitle;           /**< Window has a title bar */
         bool mModal;               /**< Window is modal */
-        bool mResizable;            /**< Window can be resized */
-        bool mMouseResize;         /**< Window is being resized */
-        bool mSticky;              /**< Window resists minimzation */
-        int mMinWinWidth;           /**< Minimum window width */
-        int mMinWinHeight;          /**< Minimum window height */
-        int mMaxWinWidth;           /**< Maximum window width */
-        int mMaxWinHeight;          /**< Maximum window height */
+        bool mResizable;           /**< Window can be resized */
+        int mMouseResize;          /**< Window is being resized */
+        bool mSticky;              /**< Window resists minimization */
+        int mMinWinWidth;          /**< Minimum window width */
+        int mMinWinHeight;         /**< Minimum window height */
+        int mMaxWinWidth;          /**< Maximum window width */
+        int mMaxWinHeight;         /**< Maximum window height */
         int mDefaultX;             /**< Default window X position */
         int mDefaultY;             /**< Default window Y position */
         int mDefaultWidth;         /**< Default window width */
         int mDefaultHeight;        /**< Default window height */
 
         /** The window container windows add themselves to. */
-        static WindowContainer* windowContainer;
+        static WindowContainer *windowContainer;
 
         /**
-         * The config listener that listens to changes relevant to all
-         * windows
+         * The config listener that listens to changes relevant to all windows.
          */
         static ConfigListener *windowConfigListener;
 
         static int instances;      /**< Number of Window instances */
         static ImageRect border;   /**< The window border and background */
-        static Image *resizeGrip;  /**< The grip to resize window */
+
+        /**
+         * The width of the resize border. Is independent of the actual window
+         * border width, and determines mostly the size of the corner area
+         * where two borders are moved at the same time.
+         */
+        static const int resizeBorderWidth = 10;
 };
 
 #endif
diff --git a/src/imageparticle.cpp b/src/imageparticle.cpp
new file mode 100644
index 00000000..35cc21ad
--- /dev/null
+++ b/src/imageparticle.cpp
@@ -0,0 +1,69 @@
+/*
+ *  The Mana World
+ *  Copyright 2006 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#include "imageparticle.h"
+
+#include "graphics.h"
+
+#include "resources/image.h"
+
+ImageParticle::ImageParticle(Map *map, Image *image):
+    Particle(map),
+    mImage(image)
+{
+    mImage->incRef();
+}
+
+ImageParticle::~ImageParticle()
+{
+    mImage->decRef();
+}
+
+void ImageParticle::draw(Graphics *graphics, int offsetX, int offsetY) const
+{
+    if (!mAlive)
+        return;
+
+    int screenX = (int) mPosX + offsetX - mImage->getWidth() / 2;
+    int screenY = (int) mPosY - (int) mPosZ + offsetY - mImage->getHeight()/2;
+
+    // Check if on screen
+    if (screenX + mImage->getWidth() < 0 ||
+            screenX > graphics->getWidth() ||
+            screenY + mImage->getHeight() < 0 ||
+            screenY > graphics->getHeight())
+    {
+        return;
+    }
+
+    float alphafactor = 1.0f;
+
+    if (mLifetimeLeft > -1 && mLifetimeLeft < mFadeOut)
+        alphafactor *= (float) mLifetimeLeft / (float) mFadeOut;
+
+    if (mLifetimePast < mFadeIn)
+        alphafactor *= (float) mLifetimePast / (float) mFadeIn;
+
+    mImage->setAlpha(alphafactor);
+    graphics->drawImage(mImage, screenX, screenY);
+}
diff --git a/src/imageparticle.h b/src/imageparticle.h
new file mode 100644
index 00000000..0ad515cc
--- /dev/null
+++ b/src/imageparticle.h
@@ -0,0 +1,61 @@
+/*
+ *  The Mana World
+ *  Copyright 2006 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _IMAGEPARTICLE_H
+#define _IMAGEPARTICLE_H
+
+#include "particle.h"
+
+class Image;
+class Map;
+
+/**
+ * A particle that uses an image for its visualization.
+ */
+class ImageParticle : public Particle
+{
+    public:
+        /**
+         * Constructor. The image is reference counted by this particle.
+         *
+         * @param map   the map this particle appears on
+         * @param image an Image instance, may not be NULL
+         */
+        ImageParticle(Map *map, Image *image);
+
+        /**
+         * Destructor.
+         */
+        ~ImageParticle();
+
+        /**
+         * Draws the particle image
+         */
+        virtual void
+        draw(Graphics *graphics, int offsetX, int offsetY) const;
+
+    protected:
+        Image *mImage;   /**< The image used for this particle. */
+};
+
+#endif
diff --git a/src/main.cpp b/src/main.cpp
index bbbf0fd1..58c563ab 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -40,7 +40,7 @@
 
 #include <libxml/parser.h>
 
-#if (defined __USE_UNIX98 || defined __FreeBSD__ || defined __APPLE__)
+#ifndef WIN32
 #include <cerrno>
 #include <sys/stat.h>
 #endif
@@ -148,21 +148,21 @@ struct Options
  */
 void initHomeDir()
 {
-#if !(defined __USE_UNIX98 || defined __FreeBSD__ || defined __APPLE__)
-    homeDir = ".";
-#else
     homeDir = std::string(PHYSFS_getUserDir()) + "/.tmw";
-
+#if defined WIN32
+    if (!CreateDirectory(homeDir.c_str(), 0) &&
+            GetLastError() != ERROR_ALREADY_EXISTS)
+#else
     // Checking if /home/user/.tmw folder exists.
     if ((mkdir(homeDir.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) &&
             (errno != EEXIST))
+#endif
     {
         std::cout << homeDir
-                  << " can't be made, but it doesn't exist! Exiting."
+                  << " can't be created, but it doesn't exist! Exiting."
                   << std::endl;
         exit(1);
     }
-#endif
 }
 
 /**
@@ -236,11 +236,17 @@ void initEngine()
     static SDL_SysWMinfo pInfo;
     SDL_GetWMInfo(&pInfo);
     HICON icon = LoadIcon(GetModuleHandle(NULL), "A");
-    SetClassLong(pInfo.window, GCL_HICON, (LONG) icon);
+    if (icon)
+    {
+        SetClassLong(pInfo.window, GCL_HICON, (LONG) icon);
+    }
 #else
     SDL_Surface *icon = IMG_Load(TMW_DATADIR "data/icons/tmw.png");
-    SDL_SetAlpha(icon, SDL_SRCALPHA, SDL_ALPHA_OPAQUE);
-    SDL_WM_SetIcon(icon, NULL);
+    if (icon)
+    {
+        SDL_SetAlpha(icon, SDL_SRCALPHA, SDL_ALPHA_OPAQUE);
+        SDL_WM_SetIcon(icon, NULL);
+    }
 #endif
 
     ResourceManager *resman = ResourceManager::getInstance();
diff --git a/src/map.cpp b/src/map.cpp
index a6beb951..ac570627 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -29,6 +29,7 @@
 #include "beingmanager.h"
 #include "game.h"
 #include "graphics.h"
+#include "particle.h"
 #include "sprite.h"
 #include "tileset.h"
 
@@ -530,3 +531,25 @@ Map::findPath(int startX, int startY, int destX, int destY)
 
     return path;
 }
+
+void
+Map::addParticleEffect (std::string effectFile, int x, int y)
+{
+    ParticleEffectData newEffect;
+    newEffect.file = effectFile;
+    newEffect.x = x;
+    newEffect.y = y;
+    particleEffects.push_back(newEffect);
+}
+
+void
+Map::initializeParticleEffects(Particle* particleEngine)
+{
+    for (std::list<ParticleEffectData>::iterator i = particleEffects.begin();
+         i != particleEffects.end();
+         i++
+        )
+    {
+        particleEngine->addEffect(i->file, i->x, i->y);
+    }
+}
diff --git a/src/map.h b/src/map.h
index c8a6fdb3..17772847 100644
--- a/src/map.h
+++ b/src/map.h
@@ -32,8 +32,9 @@
 class AmbientOverlay;
 class Graphics;
 class Image;
-class Tileset;
+class Particle;
 class Sprite;
+class Tileset;
 
 struct PATH_NODE;
 
@@ -185,6 +186,17 @@ class Map : public Properties
         void
         removeSprite(SpriteIterator iterator);
 
+        /**
+         * Adds a particle effect
+         */
+        void addParticleEffect (std::string effectFile, int x, int y);
+
+        /**
+         * Initializes all added particle effects
+         */
+        void
+        initializeParticleEffects(Particle* particleEngine);
+
     private:
         /**
          * Converts a global tile id to the Image* pointing to the associated
@@ -220,10 +232,19 @@ class Map : public Properties
         // Pathfinding members
         int mOnClosedList, mOnOpenList;
 
-        //overlay Data
+        // Overlay Data
         std::list<AmbientOverlay*> mOverlays;
         float mLastScrollX;
         float mLastScrollY;
+
+        // Particle effect data
+        struct ParticleEffectData
+        {
+            std::string file;
+            int x;
+            int y;
+        };
+        std::list<ParticleEffectData> particleEffects;
 };
 
 #endif
diff --git a/src/monster.cpp b/src/monster.cpp
index bea5b7a5..768bf16a 100644
--- a/src/monster.cpp
+++ b/src/monster.cpp
@@ -93,6 +93,12 @@ Monster::handleAttack()
     sound.playSfx(mi.getSound(EVENT_HIT));
 }
 
+Being::TargetCursorSize
+Monster::getTargetCursorSize() const
+{
+    return getInfo().getTargetCursorSize();
+}
+
 const MonsterInfo&
 Monster::getInfo() const
 {
diff --git a/src/monster.h b/src/monster.h
index 39bbf3d7..4915520d 100644
--- a/src/monster.h
+++ b/src/monster.h
@@ -37,6 +37,9 @@ class Monster : public Being
 
         virtual Type getType() const;
 
+        virtual TargetCursorSize
+        getTargetCursorSize() const;
+
         /**
          * Handles an attack of another being by this monster. Plays a hit or
          * miss sound when appropriate.
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index 53746671..f82a0fa8 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -34,6 +34,7 @@
 #include "../localplayer.h"
 #include "../log.h"
 #include "../main.h"
+#include "../particle.h"
 #include "../sound.h"
 
 const int EMOTION_TIME = 150;    /**< Duration of emotion icon */
@@ -240,13 +241,23 @@ void BeingHandler::handleMessage(MessageIn &msg)
             break;
 
         case SMSG_BEING_LEVELUP:
-            if ((Uint32) msg.readLong() == player_node->getId()) {
+            id = (Uint32) msg->readLong();
+
+            if (id == player_node->getId()) {
                 logger->log("Level up");
                 sound.playSfx("sfx/levelup.ogg");
-            } else {
+            }
+            else {
                 logger->log("Someone else went level up");
             }
-            msg.readLong();  // type
+            Particle *levelupFX;
+            if (msg->readLong() == 0) { // type
+                levelupFX = particleEngine->addEffect("graphics/particles/levelup.particle.xml", 0, 0);
+            }
+            else {
+                levelupFX = particleEngine->addEffect("graphics/particles/skillup.particle.xml", 0, 0);
+            }
+            beingManager->findBeing(id)->controlParticle(levelupFX);
             break;
 
         case SMSG_BEING_EMOTION:
diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp
index ec6c1ee3..f4cda0b9 100644
--- a/src/openglgraphics.cpp
+++ b/src/openglgraphics.cpp
@@ -261,7 +261,7 @@ void OpenGLGraphics::drawPoint(int x, int y)
     setTexturingAndBlending(false);
 
     glBegin(GL_POINTS);
-    glVertex3i(x, y, 0);
+    glVertex2i(x, y);
     glEnd();
 }
 
@@ -270,12 +270,12 @@ void OpenGLGraphics::drawLine(int x1, int y1, int x2, int y2)
     setTexturingAndBlending(false);
 
     glBegin(GL_LINES);
-    glVertex3f(x1 + 0.5f, y1 + 0.5f, 0);
-    glVertex3f(x2 + 0.5f, y2 + 0.5f, 0);
+    glVertex2f(x1 + 0.5f, y1 + 0.5f);
+    glVertex2f(x2 + 0.5f, y2 + 0.5f);
     glEnd();
 
     glBegin(GL_POINTS);
-    glVertex3f(x2 + 0.5f, y2 + 0.5f, 0);
+    glVertex2f(x2 + 0.5f, y2 + 0.5f);
     glEnd();
 }
 
@@ -329,10 +329,10 @@ void OpenGLGraphics::drawRectangle(const gcn::Rectangle& rect, bool filled)
     setTexturingAndBlending(false);
 
     glBegin(filled ? GL_QUADS : GL_LINE_LOOP);
-    glVertex3f(rect.x + offset, rect.y + offset, 0);
-    glVertex3f(rect.x + rect.width - offset, rect.y + offset, 0);
-    glVertex3f(rect.x + rect.width - offset, rect.y + rect.height - offset, 0);
-    glVertex3f(rect.x + offset, rect.y + rect.height - offset, 0);
+    glVertex2f(rect.x + offset, rect.y + offset);
+    glVertex2f(rect.x + rect.width - offset, rect.y + offset);
+    glVertex2f(rect.x + rect.width - offset, rect.y + rect.height - offset);
+    glVertex2f(rect.x + offset, rect.y + rect.height - offset);
     glEnd();
 }
 
@@ -344,16 +344,16 @@ void OpenGLGraphics::drawTexedQuad(int x, int y, int w, int h,
     // Draw a textured quad
     glBegin(GL_QUADS);
     glTexCoord2f(texX1, texY1);
-    glVertex3i(x, y, 0);
+    glVertex2i(x, y);
 
     glTexCoord2f(texX2, texY1);
-    glVertex3i(x + w, y, 0);
+    glVertex2i(x + w, y);
 
     glTexCoord2f(texX2, texY2);
-    glVertex3i(x + w, y + h, 0);
+    glVertex2i(x + w, y + h);
 
     glTexCoord2f(texX1, texY2);
-    glVertex3i(x, y + h, 0);
+    glVertex2i(x, y + h);
     glEnd();
 }
 
diff --git a/src/particle.cpp b/src/particle.cpp
new file mode 100644
index 00000000..509c20ee
--- /dev/null
+++ b/src/particle.cpp
@@ -0,0 +1,370 @@
+/*
+ *  The Mana World
+ *  Copyright 2006 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#include "particle.h"
+
+#include <cmath>
+
+#include "animationparticle.h"
+#include "configuration.h"
+#include "imageparticle.h"
+#include "log.h"
+#include "map.h"
+#include "particleemitter.h"
+#include "textparticle.h"
+
+#include "resources/resourcemanager.h"
+
+#include "utils/dtor.h"
+#include "utils/fastsqrt.h"
+#include "utils/xml.h"
+
+class Graphics;
+class Image;
+
+int Particle::particleCount = 0;
+int Particle::maxCount = 0;
+int Particle::fastPhysics = 0;
+int Particle::emitterSkip = 1;
+const float Particle::PARTICLE_SKY = 800.0f;
+
+Particle::Particle(Map *map):
+    mAlive(true),
+    mPosX(0.0f), mPosY(0.0f), mPosZ(0.0f),
+    mLifetimeLeft(-1),
+    mLifetimePast(0),
+    mFadeOut(0),
+    mFadeIn(0),
+    mAutoDelete(true),
+    mMap(map),
+    mVectorX(0.0f), mVectorY(0.0f), mVectorZ(0.0f),
+    mGravity(0.0f),
+    mRandomnes(0),
+    mBounce(0.0f),
+    mTarget(NULL),
+    mAcceleration(0.0f),
+    mInvDieDistance(-1.0f),
+    mMomentum(1.0f)
+{
+    Particle::particleCount++;
+    if (mMap) setSpriteIterator(mMap->addSprite(this));
+}
+
+
+void
+Particle::setupEngine()
+{
+    Particle::maxCount = (int)config.getValue("particleMaxCount", 3000);
+    Particle::fastPhysics = (int)config.getValue("particleFastPhysics", 0);
+    Particle::emitterSkip = (int)config.getValue("particleEmitterSkip", 0) + 1;
+    disableAutoDelete();
+    logger->log("Particle engine set up");
+}
+
+bool
+Particle::update()
+{
+    if (!mMap) return false;
+
+    if (mLifetimeLeft == 0)
+    {
+        mAlive = false;
+    }
+
+    if (mAlive)
+    {
+        // Update child emitters
+        if (mLifetimePast%Particle::emitterSkip == 0)
+        {
+            for (   EmitterIterator e = mChildEmitters.begin();
+                    e != mChildEmitters.end();
+                    e++
+                )
+            {
+                Particles newParticles = (*e)->createParticles();
+                for (   ParticleIterator p = newParticles.begin();
+                        p != newParticles.end();
+                        p++
+                    )
+                {
+                    (*p)->moveBy(mPosX, mPosY, mPosZ);
+                    mChildParticles.push_back (*p);
+                }
+            }
+        }
+
+        if (mMomentum != 1.0f)
+        {
+            mVectorX *= mMomentum;
+            mVectorY *= mMomentum;
+            mVectorZ *= mMomentum;
+        }
+
+        if (mTarget && mAcceleration != 0.0f)
+        {
+            float distX = mPosX - mTarget->getPosX();
+            float distY = mPosY - mTarget->getPosY();
+            float distZ = mPosZ - mTarget->getPosZ();
+            float invHypotenuse;
+
+            switch(Particle::fastPhysics)
+            {
+                case 1:
+                    invHypotenuse = fastInvSqrt(
+                        distX * distX + distY * distY + distZ * distZ);
+                    break;
+                case 2:
+                    invHypotenuse = 2.0f /
+                        fabs(distX) + fabs(distY) + fabs(distZ);
+                    break;
+                default:
+                    invHypotenuse = 1.0f / sqrt(
+                        distX * distX + distY * distY + distZ * distZ);
+                    break;
+            }
+
+            if (invHypotenuse)
+            {
+                if (mInvDieDistance > 0.0f && invHypotenuse > mInvDieDistance)
+                {
+                    mAlive = false;
+                }
+                float accFactor = invHypotenuse * mAcceleration;
+                mVectorX -= distX * accFactor;
+                mVectorY -= distY * accFactor;
+                mVectorZ -= distZ * accFactor;
+            }
+        }
+
+        if (mRandomnes > 0)
+        {
+            mVectorX += (rand()%mRandomnes - rand()%mRandomnes) / 1000.0f;
+            mVectorY += (rand()%mRandomnes - rand()%mRandomnes) / 1000.0f;
+            mVectorZ += (rand()%mRandomnes - rand()%mRandomnes) / 1000.0f;
+        }
+
+        mVectorZ -= mGravity;
+
+        // Update position
+        mPosX += mVectorX;
+        mPosY += mVectorY;
+        mPosZ += mVectorZ;
+
+        // Update other stuff
+        if (mLifetimeLeft > 0)
+        {
+            mLifetimeLeft--;
+        }
+        mLifetimePast++;
+
+        if (mPosZ > PARTICLE_SKY || mPosZ < 0.0f)
+        {
+            if (mBounce > 0.0f)
+            {
+                mPosZ *= -mBounce;
+                mVectorX *= mBounce;
+                mVectorY *= mBounce;
+                mVectorZ *= -mBounce;
+            }
+            else {
+                mAlive = false;
+            }
+        }
+    }
+
+    // Update child particles
+    for (   ParticleIterator p = mChildParticles.begin();
+            p != mChildParticles.end();
+
+        )
+    {
+        if ((*p)->update())
+        {
+            p++;
+        } else {
+            delete (*p);
+            p = mChildParticles.erase(p);
+        }
+    }
+
+    if (!mAlive && mChildParticles.empty() && mAutoDelete)
+    {
+        return false;
+    }
+
+    return true;
+}
+
+
+void Particle::draw(Graphics *graphics, int offsetX, int offsetY) const
+{
+}
+
+
+Particle*
+Particle::addEffect(std::string particleEffectFile, int pixelX, int pixelY)
+{
+    Particle *newParticle = NULL;
+
+    // XML parser initialisation stuff
+    int size;
+    ResourceManager *resman = ResourceManager::getInstance();
+    char *data = (char*) resman->loadFile(particleEffectFile.c_str(), size);
+
+    if (!data) {
+        logger->log("Warning: Particle engine could not find %s !",
+                    particleEffectFile.c_str());
+        return NULL;
+    }
+
+    xmlDocPtr doc = xmlParseMemory(data, size);
+    free(data);
+
+    if (!doc) {
+        logger->log("Warning: Particle engine found syntax error in %s!",
+                    particleEffectFile.c_str());
+        return NULL;
+    }
+
+    xmlNodePtr rootNode = xmlDocGetRootElement(doc);
+    if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "effect"))
+    {
+        logger->log("Warning: %s is not a valid particle effect definition file!",
+                    particleEffectFile.c_str());
+        return NULL;
+    }
+
+    // Parse particles
+    for_each_xml_child_node(effectChildNode, rootNode)
+    {
+        // We're only interested in particles
+        if (!xmlStrEqual(effectChildNode->name, BAD_CAST "particle"))
+            continue;
+
+        // Determine the exact particle type
+        xmlNodePtr node;
+
+        // Animation
+        if ((node = XML::findFirstChildByName(
+                        effectChildNode, "animation"))) {
+            newParticle = new AnimationParticle(mMap, node);
+        }
+        // Image
+        else if ((node = XML::findFirstChildByName(
+                        effectChildNode, "image"))) {
+            Image *img= resman->getImage((const char*)
+                    node->xmlChildrenNode->content);
+
+            newParticle = new ImageParticle(mMap, img);
+        }
+        // Other
+        else {
+            newParticle = new Particle(mMap);
+        }
+
+        // Read and set the basic properties of the particle
+        int offsetX = XML::getProperty(effectChildNode, "position-x", 0);
+        int offsetY = XML::getProperty(effectChildNode, "position-y", 0);
+        int offsetZ = XML::getProperty(effectChildNode, "position-z", 0);
+
+        int particleX = (int)mPosX + pixelX + offsetX;
+        int particleY = (int)mPosY + pixelY + offsetY;
+        int particleZ = (int)mPosZ          + offsetZ;
+
+        int lifetime = XML::getProperty(effectChildNode, "lifetime", -1);
+
+        newParticle->setPosition(particleX, particleY, particleZ);
+        newParticle->setLifetime(lifetime);
+
+        // Look for additional emitters for this particle
+        for_each_xml_child_node(emitterNode, effectChildNode)
+        {
+            if (!xmlStrEqual(emitterNode->name, BAD_CAST "emitter"))
+                continue;
+
+            ParticleEmitter *newEmitter;
+            newEmitter = new ParticleEmitter(emitterNode, newParticle, mMap);
+            newParticle->addEmitter(newEmitter);
+        }
+
+        mChildParticles.push_back(newParticle);
+    }
+
+    return newParticle;
+}
+
+
+Particle*
+Particle::addTextSplashEffect(std::string text,
+                              int colorR, int colorG, int colorB,
+                              gcn::Font *font, int x, int y)
+{
+    Particle *newParticle = new TextParticle(mMap, text, colorR, colorG, colorB,
+                                             font);
+    newParticle->setPosition(x, y, 0);
+    newParticle->setVector  (   ((rand()%100) - 50) / 200.0f,  // X vector
+                                ((rand()%100) - 50) / 200.0f,  // Y vector
+                                ((rand()%100) / 200.0f) + 4.0f // Z vector
+                            );
+    newParticle->setGravity(0.1f);
+    newParticle->setBounce(0.5f);
+    newParticle->setLifetime(200);
+    newParticle->setFadeOut(100);
+
+    mChildParticles.push_back(newParticle);
+
+    return newParticle;
+}
+
+
+void
+Particle::setMap(Map *map)
+{
+    mMap = map;
+    if (mMap) setSpriteIterator(mMap->addSprite(this));
+
+    // TODO: Create map emitters based on emitter data in map data
+}
+
+
+Particle::~Particle()
+{
+    // Remove from map sprite list
+    if (mMap) mMap->removeSprite(mSpriteIterator);
+    // Delete child emitters and child particles
+    clear();
+    Particle::particleCount--;
+}
+
+
+void
+Particle::clear()
+{
+    std::for_each(mChildEmitters.begin(), mChildEmitters.end(),
+            make_dtor(mChildEmitters));
+    mChildEmitters.clear();
+
+    std::for_each(mChildParticles.begin(), mChildParticles.end(),
+            make_dtor(mChildParticles));
+    mChildParticles.clear();
+}
diff --git a/src/particle.h b/src/particle.h
new file mode 100644
index 00000000..7a747a5f
--- /dev/null
+++ b/src/particle.h
@@ -0,0 +1,288 @@
+/*
+ *  The Mana World
+ *  Copyright 2006 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _PARTICLE_H
+#define _PARTICLE_H
+
+#include <list>
+#include <string>
+
+#include <guichan/color.hpp>
+
+#include "guichanfwd.h"
+#include "sprite.h"
+
+
+class Map;
+class Particle;
+class ParticleEmitter;
+
+typedef std::list<Particle *> Particles;
+typedef Particles::iterator ParticleIterator;
+typedef std::list<ParticleEmitter *> Emitters;
+typedef Emitters::iterator EmitterIterator;
+
+/**
+ * A particle spawned by a ParticleEmitter.
+ */
+class Particle : public Sprite
+{
+    public:
+        static const float PARTICLE_SKY; /**< Maximum Z position of particles */
+        static int fastPhysics;          /**< Mode of squareroot calculation */
+        static int particleCount;        /**< Current number of particles */
+        static int maxCount;             /**< Maximum number of particles */
+        static int emitterSkip;          /**< Duration of pause between two emitter updates in ticks */
+
+        /**
+         * Constructor.
+         *
+         * @param map the map this particle will add itself to, may be NULL
+         */
+        Particle(Map *map);
+
+        /**
+         * Destructor.
+         */
+        ~Particle();
+
+        /**
+         * Deletes all child particles and emitters
+         */
+        void
+        clear();
+
+        /**
+         * Gives a particle the properties of an engine root particle and loads
+         * the particle-related config settings
+         */
+        void
+        setupEngine();
+
+        /**
+         * Updates particle position, returns false when the particle should
+         * be deleted
+         */
+        virtual bool
+        update();
+
+        /**
+         * Draws the particle image
+         */
+        virtual void
+        draw(Graphics *graphics, int offsetX, int offsetY) const;
+
+        /**
+         * Necessary for sorting with the other sprites
+         */
+        virtual int
+        getPixelY() const
+        {
+            return (int)(mPosY + mPosZ) - 64;
+        };
+
+        /*
+            Basic Particle properties:
+         */
+
+        /**
+         * Sets the map the particle is on.
+         */
+        void setMap(Map *map);
+
+        /**
+         * Creates a child particle that hosts some emitters described in the
+         * particleEffectFile.
+         */
+        Particle*
+        addEffect(std::string particleEffectFile, int pixelX, int pixelY);
+
+        /**
+         * Creates a standalone text particle.
+         */
+        Particle*
+        addTextSplashEffect(std::string text, int colorR, int colorG, int colorB,
+                            gcn::Font *font, int x, int y);
+
+        /**
+         * Adds an emitter to the particle.
+         */
+        void
+        addEmitter (ParticleEmitter* emitter)
+        { mChildEmitters.push_back(emitter); }
+
+        /**
+         * Sets the position in 3 dimensional space in pixels relative to map
+         */
+        void
+        setPosition(float x, float y, float z)
+        { mPosX = x; mPosY = y; mPosZ = z; }
+
+        /**
+         * Sets the position in 2 dimensional space in pixels relative to map
+         */
+        void
+        setPosition(float x, float y)
+        { mPosX = x; mPosY = y; }
+
+        float getPosX() const
+        { return mPosX; }
+
+        float getPosY() const
+        { return mPosY; }
+
+        float getPosZ() const
+        { return mPosZ; }
+
+        /**
+         * Changes the particle position relative
+         */
+        void
+        moveBy(float x, float y, float z)
+        { mPosX += x; mPosY += y; mPosZ += z; }
+
+        /**
+         * Sets the time in game ticks until the particle is destroyed.
+         */
+        void
+        setLifetime(int lifetime)
+        { mLifetimeLeft = lifetime; mLifetimePast = 0; }
+
+        /**
+         * Sets the age of the pixel in game ticks where the particle has
+         * faded in completely
+         */
+        void
+        setFadeOut (int fadeOut)
+        { mFadeOut = fadeOut; }
+
+        /**
+         * Sets the remaining particle lifetime where the particle starts to
+         * fade out
+         */
+        void
+        setFadeIn (int fadeIn)
+        { mFadeIn = fadeIn; }
+
+        /**
+         * Sets the sprite iterator of the particle on the current map to make
+         * it easier to remove the particle from the map when it is destroyed
+         */
+        void
+        setSpriteIterator(std::list<Sprite*>::iterator spriteIterator)
+        { mSpriteIterator = spriteIterator; }
+
+        /**
+         * Gets the sprite iterator of the particle on the current map
+         */
+        std::list<Sprite*>::iterator
+        getSpriteIterator() const
+        { return mSpriteIterator; }
+
+        /**
+         * Sets the current velocity in 3 dimensional space
+         */
+        void
+        setVector(float x, float y, float z)
+        { mVectorX = x; mVectorY = y; mVectorZ = z; }
+
+        /**
+         * Sets the downward acceleration
+         */
+        void
+        setGravity(float g)
+        { mGravity = g; }
+
+        /**
+         * Sets the ammount of random vector changes
+         */
+        void
+        setRandomnes(int r)
+        { mRandomnes = r; }
+
+        /**
+         * Sets the ammount of velocity particles retain after
+         * hitting the ground.
+         */
+        void
+        setBounce(float bouncieness)
+        { mBounce = bouncieness; }
+
+        /**
+         * Makes the particle move toward another particle with a
+         * given acceleration and momentum
+         */
+        void setDestination(Particle *target, float accel, float moment)
+        { mTarget = target; mAcceleration = accel; mMomentum = moment; }
+
+        /**
+         * Sets the distance in pixel the particle can come near the target
+         * particle before it is destroyed. Does only make sense after a
+         * target particle has been set using setDestination.
+         */
+        void setDieDistance(float dist)
+        { mInvDieDistance = 1.0f / dist; }
+
+        /**
+         * Manually marks the particle for deletion
+         */
+        void kill()
+        { mAlive = false; mAutoDelete = true; }
+
+        /**
+         * After calling this function the particle will only request
+         * deletion when kill() is called
+         */
+        void disableAutoDelete()
+        { mAutoDelete = false; }
+
+    protected:
+        bool mAlive;                /**< Is the particle supposed to be drawn and updated?*/
+        float mPosX, mPosY, mPosZ;  /**< Position in 3 dimensonal space - pixel based relative to map */
+        int mLifetimeLeft;          /**< Lifetime left in game ticks*/
+        int mLifetimePast;          /**< Age of the particle in game ticks*/
+        int mFadeOut;               /**< Lifetime in game ticks left where fading out begins*/
+        int mFadeIn;                /**< Age in game ticks where fading in is finished*/
+
+    private:
+        // generic properties
+        bool mAutoDelete;           /**< May the particle request its deletion by the parent particle?*/
+        Map *mMap;                  /**< Map the particle is on*/
+        std::list<Sprite*>::iterator mSpriteIterator;   /**< iterator of the particle on the current map */
+        Emitters mChildEmitters;    /**< List of child emitters*/
+        Particles mChildParticles;  /**< List of particles controlled by this particle*/
+        //dynamic particle
+        float mVectorX, mVectorY, mVectorZ; /**< Speed in 3 dimensional space in pixels per game-tick */
+        float mGravity;             /**< Downward acceleration in pixels per game-tick²*/
+        int mRandomnes;             /**< Ammount of random vector change*/
+        float mBounce;              /**< How much the particle bounces off when hitting the ground*/
+        //follow-point particles
+        Particle *mTarget;          /**< The particle that attracts this particle*/
+        float mAcceleration;        /**< Acceleration towards the target particle in pixels per game-tick²*/
+        float mInvDieDistance;      /**< Distance in pixels from the target particle that causes the destruction of the particle*/
+        float mMomentum;            /**< How much speed the particle retains after each game tick*/
+};
+
+extern Particle *particleEngine;
+
+#endif
diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp
new file mode 100644
index 00000000..2387c652
--- /dev/null
+++ b/src/particleemitter.cpp
@@ -0,0 +1,327 @@
+/*
+ *  The Mana World
+ *  Copyright 2006 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#include "particleemitter.h"
+
+#include "animationparticle.h"
+#include "imageparticle.h"
+#include "log.h"
+#include "particle.h"
+
+#include "resources/animation.h"
+#include "resources/image.h"
+#include "resources/resourcemanager.h"
+#include "resources/imageset.h"
+
+#include <cmath>
+
+#define SIN45 0.707106781f
+#define DEG_RAD_FACTOR 0.017453293f
+
+ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, Map *map):
+    mParticleImage(0)
+{
+    mMap = map;
+    mParticleTarget = target;
+
+    //initializing default values
+    mParticlePosX.set(0.0f);
+    mParticlePosY.set(0.0f);
+    mParticlePosZ.set(0.0f);
+    mParticleAngleHorizontal.set(0.0f);
+    mParticleAngleVertical.set(0.0f);
+    mParticlePower.set(0.0f);
+    mParticleGravity.set(0.0f);
+    mParticleRandomnes.set(0);
+    mParticleBounce.set(0.0f);
+    mParticleAcceleration.set(0.0f);
+    mParticleDieDistance.set(-1.0f);
+    mParticleMomentum.set(1.0f);
+    mParticleLifetime.set(-1);
+    mParticleFadeOut.set(0);
+    mParticleFadeIn.set(0);
+    mOutput.set(1);
+
+    for_each_xml_child_node(propertyNode, emitterNode)
+    {
+        if (xmlStrEqual(propertyNode->name, BAD_CAST "property"))
+        {
+            std::string name = XML::getProperty(propertyNode, "name", "");
+
+            if (name == "position-x")
+            {
+                mParticlePosX = readMinMax(propertyNode, 0.0f);
+            }
+            else if (name == "position-y")
+            {
+
+                mParticlePosY = readMinMax(propertyNode, 0.0f);
+             }
+            else if (name == "position-z")
+            {
+                mParticlePosZ = readMinMax(propertyNode, 0.0f);
+            }
+            else if (name == "image")
+            {
+                std::string image = XML::getProperty(propertyNode, "value", "");
+                // Don't leak when multiple images are defined
+                if (image != "" && !mParticleImage)
+                {
+                    ResourceManager *resman = ResourceManager::getInstance();
+                    mParticleImage = resman->getImage(image);
+                }
+            }
+            else if (name == "horizontal-angle")
+            {
+                mParticleAngleHorizontal = readMinMax(propertyNode, 0.0f);
+                mParticleAngleHorizontal.minVal *= DEG_RAD_FACTOR;
+                mParticleAngleHorizontal.maxVal *= DEG_RAD_FACTOR;
+            }
+            else if (name == "vertical-angle")
+            {
+                mParticleAngleVertical = readMinMax(propertyNode, 0.0f);
+                mParticleAngleVertical.minVal *= DEG_RAD_FACTOR;
+                mParticleAngleVertical.maxVal *= DEG_RAD_FACTOR;
+            }
+            else if (name == "power")
+            {
+                mParticlePower = readMinMax(propertyNode, 0.0f);
+            }
+            else if (name == "gravity")
+            {
+                mParticleGravity = readMinMax(propertyNode, 0.0f);
+            }
+            else if (name == "randomnes")
+            {
+                mParticleRandomnes = readMinMax(propertyNode, 0);
+            }
+            else if (name == "bounce")
+            {
+                mParticleBounce = readMinMax(propertyNode, 0.0f);
+            }
+            else if (name == "lifetime")
+            {
+                mParticleLifetime = readMinMax(propertyNode, 0);
+                mParticleLifetime.minVal += 1;
+            }
+            else if (name == "output")
+            {
+                mOutput = readMinMax(propertyNode, 0);
+                mOutput.maxVal +=1;
+            }
+            else if (name == "acceleration")
+            {
+                mParticleAcceleration = readMinMax(propertyNode, 0.0f);
+            }
+            else if (name == "die-distance")
+            {
+                mParticleDieDistance = readMinMax(propertyNode, 0.0f);
+            }
+            else if (name == "momentum")
+            {
+                mParticleMomentum = readMinMax(propertyNode, 1.0f);
+            }
+            else if (name == "fade-out")
+            {
+                mParticleFadeOut = readMinMax(propertyNode, 0);
+            }
+            else if (name == "fade-in")
+            {
+                mParticleFadeIn = readMinMax(propertyNode, 0);
+            }
+            else
+            {
+                logger->log("Particle Engine: Warning, unknown emitter property \"%s\"",
+                            name.c_str()
+                           );
+            }
+        }
+        else if (xmlStrEqual(propertyNode->name, BAD_CAST "emitter"))
+        {
+            ParticleEmitter newEmitter(propertyNode, mParticleTarget, map);
+            mParticleChildEmitters.push_back(newEmitter);
+        }
+        else if (xmlStrEqual(propertyNode->name, BAD_CAST "animation"))
+        {
+            ImageSet *imageset = ResourceManager::getInstance()->getImageSet(
+                XML::getProperty(propertyNode, "imageset", ""),
+                XML::getProperty(propertyNode, "width", 0),
+                XML::getProperty(propertyNode, "height", 0)
+            );
+
+            // Get animation frames
+            for_each_xml_child_node(frameNode, propertyNode)
+            {
+                int delay = XML::getProperty(frameNode, "delay", 0);
+                int offsetX = XML::getProperty(frameNode, "offsetX", 0);
+                int offsetY = XML::getProperty(frameNode, "offsetY", 0);
+                offsetY -= imageset->getHeight() - 32;
+                offsetX -= imageset->getWidth() / 2 - 16;
+
+                if (xmlStrEqual(frameNode->name, BAD_CAST "frame"))
+                {
+                    int index = XML::getProperty(frameNode, "index", -1);
+
+                    if (index < 0)
+                    {
+                        logger->log("No valid value for 'index'");
+                        continue;
+                    }
+
+                    Image *img = imageset->get(index);
+
+                    if (!img)
+                    {
+                        logger->log("No image at index " + (index));
+                        continue;
+                    }
+
+                    mParticleAnimation.addFrame(img, delay, offsetX, offsetY);
+                }
+                else if (xmlStrEqual(frameNode->name, BAD_CAST "sequence"))
+                {
+                    int start = XML::getProperty(frameNode, "start", -1);
+                    int end = XML::getProperty(frameNode, "end", -1);
+
+                    if (start < 0 || end < 0)
+                    {
+                        logger->log("No valid value for 'start' or 'end'");
+                        continue;
+                    }
+
+                    while (end >= start)
+                    {
+                        Image *img = imageset->get(start);
+
+                        if (!img)
+                        {
+                            logger->log("No image at index " +
+                                    (start));
+                            continue;
+                        }
+
+                        mParticleAnimation.addFrame(img, delay, offsetX, offsetY);
+                        start++;
+                    }
+                }
+                else if (xmlStrEqual(frameNode->name, BAD_CAST "end"))
+                {
+                    mParticleAnimation.addTerminator();
+                }
+            } // for frameNode
+        }
+    }
+}
+
+
+ParticleEmitter::~ParticleEmitter()
+{
+    if (mParticleImage)
+    {
+        mParticleImage->decRef();
+    }
+}
+
+
+template <typename T> MinMax<T>
+ParticleEmitter::readMinMax(xmlNodePtr propertyNode, T def)
+{
+    MinMax<T> retval;
+
+    def = (T)XML::getFloatProperty(propertyNode, "value", (double)def);
+    retval.set  (   (T)XML::getFloatProperty(propertyNode, "min", (double)def),
+                    (T)XML::getFloatProperty(propertyNode, "max", (double)def)
+                );
+
+    return retval;
+}
+
+
+std::list<Particle *>
+ParticleEmitter::createParticles()
+{
+    std::list<Particle *> newParticles;
+
+    for (int i = mOutput.value(); i > 0; i--)
+    {
+        // Limit maximum particles
+        if (Particle::particleCount > Particle::maxCount) break;
+
+        Particle *newParticle;
+        if (mParticleImage)
+        {
+            newParticle = new ImageParticle(mMap, mParticleImage);
+        }
+        else if (mParticleAnimation.getLength() > 0)
+        {
+            Animation *newAnimation = new Animation(mParticleAnimation);
+            newParticle = new AnimationParticle(mMap, newAnimation);
+        }
+        else
+        {
+            newParticle = new Particle(mMap);
+        }
+
+
+        newParticle->setPosition(
+            mParticlePosX.value(),
+            mParticlePosY.value(),
+            mParticlePosZ.value()
+        );
+
+        float angleH = mParticleAngleHorizontal.value();
+        float angleV = mParticleAngleVertical.value();
+        float power = mParticlePower.value();
+        newParticle->setVector(
+            cos(angleH) * cos(angleV) * power,
+            sin(angleH) * cos(angleV) * SIN45 * power,
+            sin(angleV) * SIN45 * power
+        );
+
+        newParticle->setRandomnes(mParticleRandomnes.value());
+        newParticle->setGravity(mParticleGravity.value());
+        newParticle->setBounce(mParticleBounce.value());
+
+        newParticle->setDestination(mParticleTarget,
+                                    mParticleAcceleration.value(),
+                                    mParticleMomentum.value()
+                                   );
+        newParticle->setDieDistance(mParticleDieDistance.value());
+
+        newParticle->setLifetime(mParticleLifetime.value());
+        newParticle->setFadeOut(mParticleFadeOut.value());
+        newParticle->setFadeIn(mParticleFadeIn.value());
+
+        for (   std::list<ParticleEmitter>::iterator i = mParticleChildEmitters.begin();
+                i != mParticleChildEmitters.end();
+                i++
+            )
+        {
+            newParticle->addEmitter(new ParticleEmitter(*i));
+        }
+
+        newParticles.push_back(newParticle);
+    }
+
+    return newParticles;
+}
diff --git a/src/particleemitter.h b/src/particleemitter.h
new file mode 100644
index 00000000..ca6d8622
--- /dev/null
+++ b/src/particleemitter.h
@@ -0,0 +1,120 @@
+/*
+ *  The Mana World
+ *  Copyright 2006 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _PARTICLEEMITTER_H
+#define _PARTICLEEMITTER_H
+
+#include <list>
+
+#include "utils/xml.h"
+#include "utils/minmax.h"
+
+#include "resources/animation.h"
+
+class Image;
+class Map;
+class Particle;
+
+/**
+ * Every Particle can have one or more particle emitters that create new
+ * particles when they are updated
+ */
+class ParticleEmitter
+{
+    public:
+        /**
+         * Constructor.
+         */
+        ParticleEmitter(xmlNodePtr emitterNode,  Particle *target, Map *map);
+
+        /**
+         * Destructor.
+         */
+        ~ParticleEmitter();
+
+        /**
+         * Spawns new particles
+         * @return: a list of created particles
+         */
+        std::list<Particle *> createParticles();
+
+        /**
+         * Sets the target of the particles that are created
+         */
+        void
+        setTarget(Particle *target)
+        { mParticleTarget = target; };
+
+    private:
+        template <typename T> MinMax<T> readMinMax(xmlNodePtr propertyNode, T def);
+
+        /**
+         * initial position of particles:
+         */
+        MinMax<float> mParticlePosX, mParticlePosY, mParticlePosZ;
+
+        /**
+         * initial vector of particles:
+         */
+        MinMax<float> mParticleAngleHorizontal, mParticleAngleVertical;
+
+        /**
+         * Initial velocity of particles
+         */
+        MinMax<float> mParticlePower;
+
+        /*
+         * Vector changing of particles:
+         */
+        MinMax<float> mParticleGravity;
+        MinMax<int> mParticleRandomnes;
+        MinMax<float> mParticleBounce;
+
+        /*
+         * Properties of targeting particles:
+         */
+        Particle *mParticleTarget;
+        MinMax<float> mParticleAcceleration;
+        MinMax<float> mParticleDieDistance;
+        MinMax<float> mParticleMomentum;
+
+        /*
+         * Behavior over time of the particles:
+         */
+        MinMax<int> mParticleLifetime;
+        MinMax<int> mParticleFadeOut;
+        MinMax<int> mParticleFadeIn;
+
+        Map *mMap;             /**< Map the particles are spawned on */
+
+        MinMax<int> mOutput;   /**< Number of particles spawned per update */
+
+        Image *mParticleImage; /**< Particle image, if used */
+
+        /** Filename of particle animation file */
+        Animation mParticleAnimation;
+
+        /** List of emitters the spawned particles are equipped with */
+        std::list<ParticleEmitter> mParticleChildEmitters;
+};
+#endif
diff --git a/src/resources/animation.h b/src/resources/animation.h
index d0d11c69..aad93cda 100644
--- a/src/resources/animation.h
+++ b/src/resources/animation.h
@@ -54,7 +54,7 @@ class Animation
         Animation();
 
         /**
-         * Appends a new animation at the end of the sequence
+         * Appends a new animation at the end of the sequence.
          */
         void
         addFrame(Image *image, unsigned int delay, int offsetX, int offsetY);
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index a27783d4..d7d4e64b 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -187,19 +187,22 @@ Image* Image::load(void *buffer, unsigned int bufferSize,
 
     bool hasAlpha = false;
 
-    // Figure out whether the image uses its alpha layer
-    for (int i = 0; i < tmpImage->w * tmpImage->h; ++i)
+    if (tmpImage->format->BitsPerPixel == 32)
     {
-        Uint8 r, g, b, a;
-        SDL_GetRGBA(
-                ((Uint32*) tmpImage->pixels)[i],
-                tmpImage->format,
-                &r, &g, &b, &a);
-
-        if (a != 255)
+        // Figure out whether the image uses its alpha layer
+        for (int i = 0; i < tmpImage->w * tmpImage->h; ++i)
         {
-            hasAlpha = true;
-            break;
+            Uint8 r, g, b, a;
+            SDL_GetRGBA(
+                    ((Uint32*) tmpImage->pixels)[i],
+                    tmpImage->format,
+                    &r, &g, &b, &a);
+
+            if (a != 255)
+            {
+                hasAlpha = true;
+                break;
+            }
         }
     }
 
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index fda8916d..2230cb6a 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -231,6 +231,30 @@ MapReader::readMap(xmlNodePtr node, const std::string &path)
         {
             readProperties(childNode, map);
         }
+        else if (xmlStrEqual(childNode->name, BAD_CAST "objectgroup"))
+        {
+            for_each_xml_child_node(objectNode, childNode)
+            {
+                if (xmlStrEqual(objectNode->name, BAD_CAST "object"))
+                {
+                    std::string objName = XML::getProperty(objectNode, "name", "");
+                    std::string objType = XML::getProperty(objectNode, "type", "");
+                    int objX = XML::getProperty(objectNode, "x", 0);
+                    int objY = XML::getProperty(objectNode, "y", 0);
+
+                    logger->log("- Loading object name: %s type: %s at %d:%d",
+                                objName.c_str(), objType.c_str(), objX, objY);
+                    if (objType == "PARTICLE_EFFECT")
+                    {
+                        map->addParticleEffect(objName, objX, objY);
+                    }
+                    else
+                    {
+                        logger->log("   Warning: Unknown object type");
+                    }
+                }
+            }
+        }
     }
 
     map->initializeOverlays();
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index ac3ac3bc..89afc549 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -83,6 +83,27 @@ MonsterDB::load()
 
         currentInfo->setName (XML::getProperty(monsterNode, "name", "unnamed"));
 
+        std::string targetCursor;
+        targetCursor = XML::getProperty(monsterNode, "targetCursor", "medium");
+        if (targetCursor == "small")
+        {
+            currentInfo->setTargetCursorSize(Being::TC_SMALL);
+        }
+        else if (targetCursor == "medium")
+        {
+            currentInfo->setTargetCursorSize(Being::TC_MEDIUM);
+        }
+        else if (targetCursor == "large")
+        {
+            currentInfo->setTargetCursorSize(Being::TC_LARGE);
+        }
+        else
+        {
+            logger->log("MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one",
+                        targetCursor.c_str(), currentInfo->getName().c_str());
+            currentInfo->setTargetCursorSize(Being::TC_MEDIUM);
+        }
+
         //iterate <sprite>s and <sound>s
         for_each_xml_child_node(spriteNode, monsterNode)
         {
diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h
index 05d4c014..d2a0a2c8 100644
--- a/src/resources/monsterinfo.h
+++ b/src/resources/monsterinfo.h
@@ -28,6 +28,9 @@
 #include <string>
 #include <vector>
 
+#include "../being.h"
+
+
 enum SoundEvent
 {
     EVENT_HIT,
@@ -62,7 +65,11 @@ class MonsterInfo
         setSprite(std::string filename) { mSprite = filename; }
 
         void
-        addSound (SoundEvent event, std::string filename);
+        setTargetCursorSize(Being::TargetCursorSize targetCursorSize)
+        { mTargetCursorSize = targetCursorSize; }
+
+        void
+        addSound(SoundEvent event, std::string filename);
 
         const std::string&
         getName () const { return mName; };
@@ -70,13 +77,16 @@ class MonsterInfo
         const std::string&
         getSprite () const { return mSprite; };
 
+        const Being::TargetCursorSize
+        getTargetCursorSize() const { return mTargetCursorSize; }
+
         std::string
         getSound (SoundEvent event) const;
 
     private:
         std::string mName;
         std::string mSprite;
-
+        Being::TargetCursorSize mTargetCursorSize;
         std::map<SoundEvent, std::vector<std::string>* > mSounds;
 };
 
diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp
index 5fc35bcd..18e732ef 100644
--- a/src/simpleanimation.cpp
+++ b/src/simpleanimation.cpp
@@ -23,6 +23,91 @@
 
 #include "simpleanimation.h"
 
+#include "graphics.h"
+#include "log.h"
+
+#include "resources/image.h"
+#include "resources/resourcemanager.h"
+#include "resources/imageset.h"
+
+
+SimpleAnimation::SimpleAnimation(xmlNodePtr animationNode):
+    mAnimationTime(0),
+    mAnimationPhase(0)
+{
+    mAnimation = new Animation();
+
+    ImageSet *imageset = ResourceManager::getInstance()->getImageSet(
+        XML::getProperty(animationNode, "imageset", ""),
+        XML::getProperty(animationNode, "width", 0),
+        XML::getProperty(animationNode, "height", 0)
+    );
+
+    // Get animation frames
+    for (   xmlNodePtr frameNode = animationNode->xmlChildrenNode;
+            frameNode != NULL;
+            frameNode = frameNode->next)
+    {
+        int delay = XML::getProperty(frameNode, "delay", 0);
+        int offsetX = XML::getProperty(frameNode, "offsetX", 0);
+        int offsetY = XML::getProperty(frameNode, "offsetY", 0);
+        offsetY -= imageset->getHeight() - 32;
+        offsetX -= imageset->getWidth() / 2 - 16;
+
+        if (xmlStrEqual(frameNode->name, BAD_CAST "frame"))
+        {
+            int index = XML::getProperty(frameNode, "index", -1);
+
+            if (index < 0)
+            {
+                logger->log("No valid value for 'index'");
+                continue;
+            }
+
+            Image *img = imageset->get(index);
+
+            if (!img)
+            {
+                logger->log("No image at index " + (index));
+                continue;
+            }
+
+            mAnimation->addFrame(img, delay, offsetX, offsetY);
+        }
+        else if (xmlStrEqual(frameNode->name, BAD_CAST "sequence"))
+        {
+            int start = XML::getProperty(frameNode, "start", -1);
+            int end = XML::getProperty(frameNode, "end", -1);
+
+            if (start < 0 || end < 0)
+            {
+                logger->log("No valid value for 'start' or 'end'");
+                continue;
+            }
+
+            while (end >= start)
+            {
+                Image *img = imageset->get(start);
+
+                if (!img)
+                {
+                    logger->log("No image at index " +
+                            (start));
+                    continue;
+                }
+
+                mAnimation->addFrame(img, delay, offsetX, offsetY);
+                start++;
+            }
+        }
+        else if (xmlStrEqual(frameNode->name, BAD_CAST "end"))
+        {
+            mAnimation->addTerminator();
+        }
+    }
+
+    mCurrentFrame = mAnimation->getFrame(0);
+}
 
 void SimpleAnimation::update(unsigned int timePassed)
 {
diff --git a/src/simpleanimation.h b/src/simpleanimation.h
index a56c31da..561c540d 100644
--- a/src/simpleanimation.h
+++ b/src/simpleanimation.h
@@ -26,7 +26,10 @@
 
 #include "resources/animation.h"
 
+#include "utils/xml.h"
+
 class Frame;
+class Graphics;
 
 /**
  * This class is a leightweight alternative to the AnimatedSprite class.
@@ -35,6 +38,9 @@ class Frame;
 class SimpleAnimation
 {
     public:
+        /**
+         * Creates a simple animation with an already created animation.
+         */
         SimpleAnimation(Animation *animation):
             mAnimation(animation),
             mAnimationTime(0),
@@ -42,6 +48,11 @@ class SimpleAnimation
             mCurrentFrame(mAnimation->getFrame(0))
         {};
 
+        /**
+         * Creates a simple animation that creates its animation from XML Data.
+         */
+        SimpleAnimation(xmlNodePtr animationNode);
+
         ~SimpleAnimation();
 
         void update(unsigned int timePassed);
@@ -55,10 +66,10 @@ class SimpleAnimation
         /** Time in game ticks the current frame is shown. */
         unsigned int mAnimationTime;
 
-        /** Index of current animation frame. */
+        /** Index of current animation phase. */
         unsigned int mAnimationPhase;
 
-        /** Current animation frame. */
+        /** Current animation phase. */
         Frame *mCurrentFrame;
 };
 
diff --git a/src/sprite.h b/src/sprite.h
index 51811149..89780519 100644
--- a/src/sprite.h
+++ b/src/sprite.h
@@ -49,6 +49,22 @@ class Sprite
         virtual void
         draw(Graphics *graphics, int offsetX, int offsetY) const = 0;
 
+        /**
+         * Returns the horizontal size of the sprites graphical representation
+         * in pixels or 0 when it is undefined.
+         */
+        virtual int
+        getWidth() const
+        { return 0; }
+
+        /**
+         * Returns the vertical size of the sprites graphical representation
+         * in pixels or 0 when it is undefined.
+         */
+        virtual int
+        getHeight() const
+        { return 0; }
+
         /**
          * Returns the pixel Y coordinate of the sprite.
          */
diff --git a/src/textparticle.cpp b/src/textparticle.cpp
new file mode 100644
index 00000000..dd01d2fe
--- /dev/null
+++ b/src/textparticle.cpp
@@ -0,0 +1,64 @@
+/*
+ *  The Mana World
+ *  Copyright 2006 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#include "textparticle.h"
+
+#include "graphics.h"
+
+TextParticle::TextParticle(Map *map, const std::string &text,
+        int colorR, int colorG, int colorB, gcn::Font *font):
+    Particle(map),
+    mText(text),
+    mTextFont(font),
+    mColorR(colorR),
+    mColorG(colorG),
+    mColorB(colorB)
+{
+}
+
+void TextParticle::draw(Graphics *graphics, int offsetX, int offsetY) const
+{
+    if (!mAlive)
+        return;
+
+    int screenX = (int)mPosX + offsetX;
+    int screenY = (int)mPosY - int(mPosZ) + offsetY;
+
+    int alpha = 255;
+
+    if (mLifetimeLeft > -1 && mLifetimeLeft < mFadeOut)
+    {
+        alpha *= mLifetimeLeft;
+        alpha /= mFadeOut;
+    };
+
+    if (mLifetimePast < mFadeIn)
+    {
+        alpha *= mLifetimePast;
+        alpha /= mFadeIn;
+    }
+
+    graphics->setFont(mTextFont);
+    graphics->setColor(gcn::Color (mColorR, mColorG, mColorB, alpha));
+    graphics->drawText(mText, screenX, screenY, gcn::Graphics::CENTER);
+}
diff --git a/src/textparticle.h b/src/textparticle.h
new file mode 100644
index 00000000..b365c885
--- /dev/null
+++ b/src/textparticle.h
@@ -0,0 +1,53 @@
+/*
+ *  The Mana World
+ *  Copyright 2006 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _TEXTPARTICLE_H
+#define _TEXTPARTICLE_H
+
+#include "particle.h"
+
+#include <guichan/color.hpp>
+
+#include "guichanfwd.h"
+
+class TextParticle : public Particle
+{
+    public:
+        TextParticle(Map *map, const std::string &text,
+                int colorR, int colorG, int colorB, gcn::Font *font);
+        /**
+         * Draws the particle image
+         */
+        virtual void
+        draw(Graphics *graphics, int offsetX, int offsetY) const;
+
+        // hack to improve text visibility
+        virtual int getPixelY() const { return (int)(mPosY + mPosZ); }
+
+    private:
+        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 */
+};
+
+#endif
diff --git a/src/utils/fastsqrt.h b/src/utils/fastsqrt.h
new file mode 100644
index 00000000..8da1d354
--- /dev/null
+++ b/src/utils/fastsqrt.h
@@ -0,0 +1,24 @@
+/* A very fast function to calculate the approximate inverse square root of a
+ * floating point value and a helper function that uses it for getting the
+ * normal squareroot. For an explanation of the inverse squareroot function
+ * read:
+ * http://www.math.purdue.edu/~clomont/Math/Papers/2003/InvSqrt.pdf
+ *
+ * Unfortunately the original creator of this function seems to be unknown.
+ */
+
+float fastInvSqrt(float x)
+{
+    union { int i; float x; } tmp;
+    float xhalf = 0.5f * x;
+    tmp.x = x;
+    tmp.i = 0x5f375a86 - (tmp.i >> 1);
+    x = tmp.x;
+    x = x * (1.5f - xhalf * x * x);
+    return x;
+}
+
+float fastSqrt(float x)
+{
+    return 1.0f / fastInvSqrt(x);
+}
diff --git a/src/utils/minmax.h b/src/utils/minmax.h
new file mode 100644
index 00000000..1add2b7e
--- /dev/null
+++ b/src/utils/minmax.h
@@ -0,0 +1,47 @@
+/*
+ *  The Mana World
+ *  Copyright 2006 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+/**
+ * Returns a random numeric value that is larger than or equal min and smaller
+ * than max
+ */
+
+template <typename T> struct MinMax
+{
+    void set(T min, T max)
+    {
+        minVal=min; maxVal=max;
+    }
+
+    void set(T val)
+    {
+        set(val, val);
+    }
+
+    T value()
+    {
+        return (T)(minVal + (maxVal - minVal) * (rand() / ((double) RAND_MAX + 1)));
+    }
+
+    T minVal;
+    T maxVal;
+};
diff --git a/src/utils/wingettimeofday.h b/src/utils/wingettimeofday.h
index a5537f39..28afb7e5 100644
--- a/src/utils/wingettimeofday.h
+++ b/src/utils/wingettimeofday.h
@@ -1,113 +1,113 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
- */
-
-#ifndef _TMW_WINGETTIMEOFDAY_H_
-#define _TMW_WINGETTIMEOFDAY_H_
-
-#ifdef WIN32
-
-#include <windows.h>
-
-/*
- * the function gettimeofday() is available on UNIX but not on windows.
- * this header defines a windows implementation as a
- * GetSystemTimeAsFileTime() wrapper.
- */
-
-int gettimeofday(struct timeval* tv, void *tz)
-/*---------------------------------------------------------------
- * Copyright (c) 1999,2000,2001,2002,2003
- * The Board of Trustees of the University of Illinois
- * All Rights Reserved.
- *---------------------------------------------------------------
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software (Iperf) and associated
- * documentation files (the "Software"), to deal in the Software
- * without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute,
- * sublicense, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- *
- * Redistributions of source code must retain the above
- * copyright notice, this list of conditions and
- * the following disclaimers.
- *
- *
- * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimers in the documentation and/or other materials
- * provided with the distribution.
- *
- *
- * Neither the names of the University of Illinois, NCSA,
- * nor the names of its contributors may be used to endorse
- * or promote products derived from this Software without
- * specific prior written permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE CONTIBUTORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- * ________________________________________________________________
- * National Laboratory for Applied Network Research
- * National Center for Supercomputing Applications
- * University of Illinois at Urbana-Champaign
- * http://www.ncsa.uiuc.edu
- * ________________________________________________________________
- *
- * gettimeofday.c
- * by Mark Gates <mgates@nlanr.net>
- * -------------------------------------------------------------------
- * A (hack) implementation of gettimeofday for Windows.
- * Since I send sec/usec in UDP packets, this made the most sense.
- * ------------------------------------------------------------------- */
-{
-    FILETIME time;
-    double   timed;
-
-    GetSystemTimeAsFileTime( &time );
-
-    // Apparently Win32 has units of 1e-7 sec (tenths of microsecs)
-    // 4294967296 is 2^32, to shift high word over
-    // 11644473600 is the number of seconds between
-    // the Win32 epoch 1601-Jan-01 and the Unix epoch 1970-Jan-01
-    // Tests found floating point to be 10x faster than 64bit int math.
-
-    timed = ((time.dwHighDateTime * 4294967296e-7) - 11644473600.0) +
-            (time.dwLowDateTime  * 1e-7);
-
-    tv->tv_sec  = (long) timed;
-    tv->tv_usec = (long) ((timed - tv->tv_sec) * 1e6);
-
-    return 0;
-}
-
-
-#endif // WIN32
-#endif
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _TMW_WINGETTIMEOFDAY_H_
+#define _TMW_WINGETTIMEOFDAY_H_
+
+#ifdef WIN32
+
+#include <windows.h>
+
+/*
+ * the function gettimeofday() is available on UNIX but not on windows.
+ * this header defines a windows implementation as a
+ * GetSystemTimeAsFileTime() wrapper.
+ */
+
+int gettimeofday(struct timeval* tv, void *tz)
+/*---------------------------------------------------------------
+ * Copyright (c) 1999,2000,2001,2002,2003
+ * The Board of Trustees of the University of Illinois
+ * All Rights Reserved.
+ *---------------------------------------------------------------
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software (Iperf) and associated
+ * documentation files (the "Software"), to deal in the Software
+ * without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit
+ * persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ *
+ * Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and
+ * the following disclaimers.
+ *
+ *
+ * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimers in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ *
+ * Neither the names of the University of Illinois, NCSA,
+ * nor the names of its contributors may be used to endorse
+ * or promote products derived from this Software without
+ * specific prior written permission.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE CONTIBUTORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * ________________________________________________________________
+ * National Laboratory for Applied Network Research
+ * National Center for Supercomputing Applications
+ * University of Illinois at Urbana-Champaign
+ * http://www.ncsa.uiuc.edu
+ * ________________________________________________________________
+ *
+ * gettimeofday.c
+ * by Mark Gates <mgates@nlanr.net>
+ * -------------------------------------------------------------------
+ * A (hack) implementation of gettimeofday for Windows.
+ * Since I send sec/usec in UDP packets, this made the most sense.
+ * ------------------------------------------------------------------- */
+{
+    FILETIME time;
+    double   timed;
+
+    GetSystemTimeAsFileTime( &time );
+
+    // Apparently Win32 has units of 1e-7 sec (tenths of microsecs)
+    // 4294967296 is 2^32, to shift high word over
+    // 11644473600 is the number of seconds between
+    // the Win32 epoch 1601-Jan-01 and the Unix epoch 1970-Jan-01
+    // Tests found floating point to be 10x faster than 64bit int math.
+
+    timed = ((time.dwHighDateTime * 4294967296e-7) - 11644473600.0) +
+            (time.dwLowDateTime  * 1e-7);
+
+    tv->tv_sec  = (long) timed;
+    tv->tv_usec = (long) ((timed - tv->tv_sec) * 1e6);
+
+    return 0;
+}
+
+
+#endif // WIN32
+#endif
diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp
index 7c917dc0..e30450f0 100644
--- a/src/utils/xml.cpp
+++ b/src/utils/xml.cpp
@@ -39,6 +39,20 @@ namespace XML
         return ret;
     }
 
+    double
+    getFloatProperty(xmlNodePtr node, const char* name, double def)
+    {
+        double &ret = def;
+
+        xmlChar *prop = xmlGetProp(node, BAD_CAST name);
+        if (prop) {
+            ret = atof((char*)prop);
+            xmlFree(prop);
+        }
+
+        return ret;
+    }
+
     std::string
     getProperty(xmlNodePtr node, const char *name, const std::string &def)
     {
@@ -51,4 +65,13 @@ namespace XML
 
         return def;
     }
+
+    xmlNodePtr findFirstChildByName(xmlNodePtr parent, const char *name)
+    {
+        for_each_xml_child_node(child, parent)
+            if (xmlStrEqual(child->name, BAD_CAST name))
+                return child;
+
+        return NULL;
+    }
 }
diff --git a/src/utils/xml.h b/src/utils/xml.h
index db4c264a..ef3bad3d 100644
--- a/src/utils/xml.h
+++ b/src/utils/xml.h
@@ -39,11 +39,22 @@ namespace XML
     int
     getProperty(xmlNodePtr node, const char *name, int def);
 
+    /**
+     * Gets an floating point property from an xmlNodePtr.
+     */
+    double
+    getFloatProperty(xmlNodePtr node, const char *name, double def);
+
     /**
      * Gets a string property from an xmlNodePtr.
      */
     std::string
     getProperty(xmlNodePtr node, const char *name, const std::string &def);
+
+    /**
+     * Finds the first child node with the given name
+     */
+    xmlNodePtr findFirstChildByName(xmlNodePtr parent, const char *name);
 }
 
 #define for_each_xml_child_node(var, parent) \
-- 
cgit v1.2.3-70-g09d2


From 25db7453b0027863ae4b966a91fb3653d73d324c Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Tue, 24 Jul 2007 19:57:58 +0000
Subject: Renamed Doxygen file to standard filename and changed it so that
 simply running 'doxygen' from this directory is enough.

---
 docs/SOURCE/Doxyfile   | 1153 ++++++++++++++++++++++++++++++++++++++++++++++++
 docs/SOURCE/tmw.doxcfg | 1153 ------------------------------------------------
 docs/SOURCE/tmwdox.sh  |    1 -
 3 files changed, 1153 insertions(+), 1154 deletions(-)
 create mode 100644 docs/SOURCE/Doxyfile
 delete mode 100644 docs/SOURCE/tmw.doxcfg
 delete mode 100755 docs/SOURCE/tmwdox.sh

(limited to 'docs')

diff --git a/docs/SOURCE/Doxyfile b/docs/SOURCE/Doxyfile
new file mode 100644
index 00000000..96541dc8
--- /dev/null
+++ b/docs/SOURCE/Doxyfile
@@ -0,0 +1,1153 @@
+# Doxyfile 1.3.8
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = "The Mana World"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
+# if some version control system is used.
+
+PROJECT_NUMBER         =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = 
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of source
+# files, where putting all generated files in the same directory would otherwise
+# cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish,
+# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese,
+# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish,
+# Swedish, and Ukrainian.
+
+OUTPUT_LANGUAGE        = English
+
+# This tag can be used to specify the encoding used in the generated output.
+# The encoding is not always determined by the language that is chosen,
+# but also whether or not the output is meant for Windows or non-Windows users.
+# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES
+# forces the Windows encoding (this is the default for the Windows binary),
+# whereas setting the tag to NO uses a Unix-style encoding (the default for
+# all platforms other than Windows).
+
+USE_WINDOWS_ENCODING   = NO
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is used
+# as the annotated text. Otherwise, the brief description is used as-is. If left
+# blank, the following values are used ("$name" is automatically replaced with the
+# name of the entity): "The $name class" "The $name widget" "The $name file"
+# "is" "provides" "specifies" "contains" "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited
+# members of a class in the documentation of that class as if those members were
+# ordinary class members. Constructors, destructors and assignment operators of
+# the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
+# path to strip.
+
+STRIP_FROM_PATH        =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful is your file systems
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like the Qt-style comments (thus requiring an
+# explicit @brief command for a brief description.
+
+JAVADOC_AUTOBRIEF      = YES
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the DETAILS_AT_TOP tag is set to YES then Doxygen
+# will output the detailed description near the top, like JavaDoc.
+# If set to NO, the detailed description appears after the member
+# documentation.
+
+DETAILS_AT_TOP         = YES
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources
+# only. Doxygen will then generate output that is more tailored for Java.
+# For instance, namespaces will be presented as packages, qualified scopes
+# will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
+# the \nosubgrouping command.
+
+SUBGROUPING            = YES
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = YES
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# will be included in the documentation.
+
+EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     = YES
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     = YES
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
+# of that file.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+# is inserted in the documentation for inline members.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
+# declaration order.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
+# declaration order.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
+# commands in the documentation.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
+# commands in the documentation.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
+# commands in the documentation.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or define consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and defines in the
+# documentation can be controlled using \showinitializer or \hideinitializer
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES        = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
+# NO is used.
+
+WARNINGS               = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR      = YES
+
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
+# warning originated and the warning text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
+# to stderr.
+
+WARN_LOGFILE           = "warnings.log"
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
+# with spaces.
+
+INPUT                  = "../../src"
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp
+# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm
+
+FILE_PATTERNS          =
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
+# If left blank NO is used.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories
+# that are symbolic links (a Unix filesystem feature) are excluded from the input.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+
+EXCLUDE_PATTERNS       =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
+# the \include command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank all files are included.
+
+EXAMPLE_PATTERNS       =
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
+# the \image command).
+
+IMAGE_PATH             =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output.  If FILTER_PATTERNS is specified, this tag will be
+# ignored.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis.  Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match.  The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
+# is applied to all files.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES    = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER         = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES (the default)
+# then for each documented function all documented
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES (the default)
+# then for each documented function all documented entities
+# called/used by that function will be listed.
+
+REFERENCES_RELATION    = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX     = NO
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# generate HTML output.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard header.
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard footer.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If the tag is left blank doxygen
+# will generate a default style sheet. Note that doxygen will try to copy
+# the style sheet file to the HTML output directory, so don't put your own
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET        =
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+# files or namespaces will be aligned in HTML using tables. If set to
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS     = YES
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+# be used to specify the file name of the resulting .chm file. You
+# can add a path in front of the file if the result should not be
+# written to the html output directory.
+
+CHM_FILE               = tmw.chm
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+# be used to specify the location (absolute path including file name) of
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION           =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+# controls if a separate .chi index file is generated (YES) or that
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI           = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND             = NO
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
+# top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it.
+
+DISABLE_INDEX          = NO
+
+# This tag can be used to set the number of enum values (range [1..20])
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
+# generated containing a tree-like index structure (just like the one that
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
+# probably better off using the HTML help feature.
+
+GENERATE_TREEVIEW      = NO
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+# used to set the initial width (in pixels) of the frame in which the tree
+# is shown.
+
+TREEVIEW_WIDTH         = 250
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+# generate Latex output.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked. If left blank `latex' will be used as the default command name.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as the
+# default command name.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, a4wide, letter, legal and
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER           =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS         = NO
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+# plain latex in the generated Makefile. Set this option to YES to get a
+# higher quality PDF documentation.
+
+USE_PDFLATEX           = NO
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE        = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
+# in the output.
+
+LATEX_HIDE_INDICES     = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimized for Word 97 and may not look very pretty with
+# other RTF readers or editors.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+# RTF documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an rtf document.
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    =
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+# generate man pages
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+# then it will generate one additional man file for each entity
+# documented in the real man page(s). These additional files
+# only source the real man page, but without them the man command
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
+# the code including all documentation.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_SCHEMA             =
+
+# The XML_DTD tag can be used to specify an XML DTD,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_DTD                =
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+# dump the program listings (including syntax highlighting
+# and cross-referencing information) to the XML output. Note that
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
+# moment.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader.  This is useful
+# if you want to understand what is going on.  On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much smaller
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
+# files.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a controlled
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
+# PREDEFINED and EXPAND_AS_PREDEFINED tags.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
+# the preprocessor.
+
+INCLUDE_PATH           =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will
+# be used.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are
+# omitted =1 is assumed.
+
+PREDEFINED             =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be expanded.
+# The macro definition that is found in the sources will be used.
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all function-like macros that are alone
+# on a line, have an all uppercase name, and do not end with a semicolon. Such
+# function macros are typically used for boiler-plate code, and will confuse the
+# parser if not removed.
+
+SKIP_FUNCTION_MACROS   = NO
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles.
+# Optionally an initial location of the external documentation
+# can be added for each tagfile. The format of a tag file without
+# this location is as follows:
+#   TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+#   TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths or
+# URLs. If a location is present for each tag, the installdox tool
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE       =
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
+# will be listed.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will
+# be listed.
+
+EXTERNAL_GROUPS        = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or
+# super classes. Setting the tag to NO turns the diagrams off. Note that this
+# option is superseded by the HAVE_DOT option below. This is only a fallback. It is
+# recommended to install and use dot, since it yields more powerful graphs.
+
+CLASS_DIAGRAMS         = YES
+
+# If set to YES, the inheritance and collaboration graphs will hide
+# inheritance and usage relations if the target is undocumented
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz, a graph visualization
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT               = NO
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect inheritance relations. Setting this tag to YES will force the
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect implementation dependencies (inheritance, containment, and
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH    = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+
+UML_LOOK               = YES
+
+# If set to YES, the inheritance and collaboration graphs will show the
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
+# tags are set to YES then doxygen will generate a graph for each documented
+# file showing the direct and indirect include dependencies of the file with
+# other documented files.
+
+INCLUDE_GRAPH          = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
+# documented header file showing the documented files that directly or
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will
+# generate a call dependency graph for every global function or class method.
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command.
+
+CALL_GRAPH             = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
+# will graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY    = NO
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. Possible values are png, jpg, or gif
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT       = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found on the path.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the
+# \dotfile command).
+
+DOTFILE_DIRS           =
+
+# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width
+# (in pixels) of the graphs generated by dot. If a graph becomes larger than
+# this value, doxygen will try to truncate the graph, so that it fits within
+# the specified constraint. Beware that most browsers cannot cope with very
+# large images.
+
+MAX_DOT_GRAPH_WIDTH    = 1024
+
+# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height
+# (in pixels) of the graphs generated by dot. If a graph becomes larger than
+# this value, doxygen will try to truncate the graph, so that it fits within
+# the specified constraint. Beware that most browsers cannot cope with very
+# large images.
+
+MAX_DOT_GRAPH_HEIGHT   = 1024
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
+# graphs generated by dot. A depth value of 3 means that only nodes reachable
+# from the root by following a path via at most 3 edges will be shown. Nodes that
+# lay further from the root node will be omitted. Note that setting this option to
+# 1 or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that a graph may be further truncated if the graph's image dimensions are
+# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT).
+# If 0 is used for the depth value (the default), the graph is not depth-constrained.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
+# generate a legend page explaining the meaning of the various boxes and
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
+# remove the intermediate dot files that are used to generate
+# the various graphs.
+
+DOT_CLEANUP            = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine
+#---------------------------------------------------------------------------
+
+# The SEARCHENGINE tag specifies whether or not a search engine should be
+# used. If set to NO the values of all tags below this one will be ignored.
+
+SEARCHENGINE           = YES
diff --git a/docs/SOURCE/tmw.doxcfg b/docs/SOURCE/tmw.doxcfg
deleted file mode 100644
index 11eb2604..00000000
--- a/docs/SOURCE/tmw.doxcfg
+++ /dev/null
@@ -1,1153 +0,0 @@
-# Doxyfile 1.3.8
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
-
-PROJECT_NAME           = "The Mana World"
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
-
-PROJECT_NUMBER         =
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = ../docs/SOURCE/
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of source
-# files, where putting all generated files in the same directory would otherwise
-# cause performance problems for the file system.
-
-CREATE_SUBDIRS         = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish,
-# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese,
-# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish,
-# Swedish, and Ukrainian.
-
-OUTPUT_LANGUAGE        = English
-
-# This tag can be used to specify the encoding used in the generated output.
-# The encoding is not always determined by the language that is chosen,
-# but also whether or not the output is meant for Windows or non-Windows users.
-# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES
-# forces the Windows encoding (this is the default for the Windows binary),
-# whereas setting the tag to NO uses a Unix-style encoding (the default for
-# all platforms other than Windows).
-
-USE_WINDOWS_ENCODING   = NO
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is used
-# as the annotated text. Otherwise, the brief description is used as-is. If left
-# blank, the following values are used ("$name" is automatically replaced with the
-# name of the entity): "The $name class" "The $name widget" "The $name file"
-# "is" "provides" "specifies" "contains" "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF       =
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
-# description.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited
-# members of a class in the documentation of that class as if those members were
-# ordinary class members. Constructors, destructors and assignment operators of
-# the base classes will not be shown.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES        = YES
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
-# path to strip.
-
-STRIP_FROM_PATH        =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH    =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like the Qt-style comments (thus requiring an
-# explicit @brief command for a brief description.
-
-JAVADOC_AUTOBRIEF      = YES
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen
-# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member
-# documentation.
-
-DETAILS_AT_TOP         = YES
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# re-implements.
-
-INHERIT_DOCS           = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE               = 4
-
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES                =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
-# only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C  = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources
-# only. Doxygen will then generate output that is more tailored for Java.
-# For instance, namespaces will be presented as packages, qualified scopes
-# will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
-# the \nosubgrouping command.
-
-SUBGROUPING            = YES
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL            = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
-
-EXTRACT_PRIVATE        = YES
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
-
-EXTRACT_STATIC         = NO
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS     = YES
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES     = YES
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-
-CASE_SENSE_NAMES       = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
-# of that file.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-# is inserted in the documentation for inline members.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
-# declaration order.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
-# declaration order.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
-# alphabetical list.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
-# commands in the documentation.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
-# commands in the documentation.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
-# commands in the documentation.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS       =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or define consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and defines in the
-# documentation can be controlled using \showinitializer or \hideinitializer
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES        = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
-# NO is used.
-
-WARNINGS               = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
-# don't exist or using markup commands wrongly.
-
-WARN_IF_DOC_ERROR      = YES
-
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text.
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
-# to stderr.
-
-WARN_LOGFILE           = "../docs/SOURCE/warnings.log"
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
-# with spaces.
-
-INPUT                  =
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp
-# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm
-
-FILE_PATTERNS          =
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
-# If left blank NO is used.
-
-RECURSIVE              = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-
-EXCLUDE                =
-
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories
-# that are symbolic links (a Unix filesystem feature) are excluded from the input.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
-
-EXCLUDE_PATTERNS       =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-# the \include command).
-
-EXAMPLE_PATH           =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank all files are included.
-
-EXAMPLE_PATTERNS       =
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
-# the \image command).
-
-IMAGE_PATH             =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output.  If FILTER_PATTERNS is specified, this tag will be
-# ignored.
-
-INPUT_FILTER           =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis.  Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match.  The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
-# is applied to all files.
-
-FILTER_PATTERNS        =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES    = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
-# VERBATIM_HEADERS is set to NO.
-
-SOURCE_BROWSER         = YES
-
-# Setting the INLINE_SOURCES tag to YES will include the body
-# of functions and classes directly in the documentation.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C and C++ comments will always remain visible.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES (the default)
-# then for each documented function all documented
-# functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES (the default)
-# then for each documented function all documented entities
-# called/used by that function will be listed.
-
-REFERENCES_RELATION    = NO
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS       = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
-# contains a lot of classes, structs, unions or interfaces.
-
-ALPHABETICAL_INDEX     = NO
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
-# in which this list will be split (can be a number in the range [1..20])
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
-
-HTML_OUTPUT            = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-# doxygen will generate files with .html extension.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard header.
-
-HTML_HEADER            =
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard footer.
-
-HTML_FOOTER            =
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
-# stylesheet in the HTML output directory as well, or it will be erased!
-
-HTML_STYLESHEET        =
-
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS     = YES
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP      = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
-# written to the html output directory.
-
-CHM_FILE               = tmw.chm
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
-# the HTML help compiler on the generated index.hhp.
-
-HHC_LOCATION           =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
-# it should be included in the master .chm file (NO).
-
-GENERATE_CHI           = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
-# normal table of contents (NO) in the .chm file.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
-# to the contents of the HTML help documentation and to the tree view.
-
-TOC_EXPAND             = NO
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
-# top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it.
-
-DISABLE_INDEX          = NO
-
-# This tag can be used to set the number of enum values (range [1..20])
-# that doxygen will group on one line in the generated HTML documentation.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
-# generated containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
-# probably better off using the HTML help feature.
-
-GENERATE_TREEVIEW      = NO
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
-# is shown.
-
-TREEVIEW_WIDTH         = 250
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-# generate Latex output.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked. If left blank `latex' will be used as the default command name.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
-# default command name.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, a4wide, letter, legal and
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE             = a4wide
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES         =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER           =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS         = NO
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
-# higher quality PDF documentation.
-
-USE_PDFLATEX           = NO
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE        = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
-# in the output.
-
-LATEX_HIDE_INDICES     = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimized for Word 97 and may not look very pretty with
-# other RTF readers or editors.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `rtf' will be used as the default path.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
-# Note: wordpad (write) and others do not support links.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an rtf document.
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE    =
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
-# generate man pages
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `man' will be used as the default path.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION          = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
-# the code including all documentation.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `xml' will be used as the default path.
-
-XML_OUTPUT             = xml
-
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_SCHEMA             =
-
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_DTD                =
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-# dump the program listings (including syntax highlighting
-# and cross-referencing information) to the XML output. Note that
-# enabling this will significantly increase the size of the XML output.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
-# and incomplete at the moment.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-# generate a Perl module file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
-# moment.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
-# to generate PDF and DVI output from the Perl module output.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader.  This is useful
-# if you want to understand what is going on.  On the other hand, if this
-# tag is set to NO the size of the Perl module output will be much smaller
-# and Perl will parse it just the same.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-# This is useful so different doxyrules.make files included by the same
-# Makefile don't overwrite each other's variables.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
-# files.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
-MACRO_EXPANSION        = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
-# PREDEFINED and EXPAND_AS_PREDEFINED tags.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
-# the preprocessor.
-
-INCLUDE_PATH           =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
-# be used.
-
-INCLUDE_FILE_PATTERNS  =
-
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed.
-
-PREDEFINED             =
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# this tag can be used to specify a list of macro names that should be expanded.
-# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition.
-
-EXPAND_AS_DEFINED      =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all function-like macros that are alone
-# on a line, have an all uppercase name, and do not end with a semicolon. Such
-# function macros are typically used for boiler-plate code, and will confuse the
-# parser if not removed.
-
-SKIP_FUNCTION_MACROS   = NO
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles.
-# Optionally an initial location of the external documentation
-# can be added for each tagfile. The format of a tag file without
-# this location is as follows:
-#   TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-#   TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths or
-# URLs. If a location is present for each tag, the installdox tool
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen
-# is run, you must also specify the path to the tagfile here.
-
-TAGFILES               =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE       =
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
-# will be listed.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
-# be listed.
-
-EXTERNAL_GROUPS        = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of `which perl').
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or
-# super classes. Setting the tag to NO turns the diagrams off. Note that this
-# option is superseded by the HAVE_DOT option below. This is only a fallback. It is
-# recommended to install and use dot, since it yields more powerful graphs.
-
-CLASS_DIAGRAMS         = YES
-
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
-# or is not a class.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
-# have no effect if this option is set to NO (the default)
-
-HAVE_DOT               = NO
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
-# the CLASS_DIAGRAMS tag to NO.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
-# class references variables) of the class with other documented classes.
-
-COLLABORATION_GRAPH    = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-
-UML_LOOK               = YES
-
-# If set to YES, the inheritance and collaboration graphs will show the
-# relations between templates and their instances.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
-# other documented files.
-
-INCLUDE_GRAPH          = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
-# indirectly include this file.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will
-# generate a call dependency graph for every global function or class method.
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command.
-
-CALL_GRAPH             = NO
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will graphical hierarchy of all classes instead of a textual one.
-
-GRAPHICAL_HIERARCHY    = NO
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
-
-DOT_IMAGE_FORMAT       = png
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found on the path.
-
-DOT_PATH               =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
-# \dotfile command).
-
-DOTFILE_DIRS           =
-
-# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than
-# this value, doxygen will try to truncate the graph, so that it fits within
-# the specified constraint. Beware that most browsers cannot cope with very
-# large images.
-
-MAX_DOT_GRAPH_WIDTH    = 1024
-
-# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than
-# this value, doxygen will try to truncate the graph, so that it fits within
-# the specified constraint. Beware that most browsers cannot cope with very
-# large images.
-
-MAX_DOT_GRAPH_HEIGHT   = 1024
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes that
-# lay further from the root node will be omitted. Note that setting this option to
-# 1 or 2 may greatly reduce the computation time needed for large code bases. Also
-# note that a graph may be further truncated if the graph's image dimensions are
-# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT).
-# If 0 is used for the depth value (the default), the graph is not depth-constrained.
-
-MAX_DOT_GRAPH_DEPTH    = 0
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
-# arrows in the dot generated graphs.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermediate dot files that are used to generate
-# the various graphs.
-
-DOT_CLEANUP            = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
-#---------------------------------------------------------------------------
-
-# The SEARCHENGINE tag specifies whether or not a search engine should be
-# used. If set to NO the values of all tags below this one will be ignored.
-
-SEARCHENGINE           = YES
diff --git a/docs/SOURCE/tmwdox.sh b/docs/SOURCE/tmwdox.sh
deleted file mode 100755
index 541f8bee..00000000
--- a/docs/SOURCE/tmwdox.sh
+++ /dev/null
@@ -1 +0,0 @@
-cd ../../src/ && doxygen ../docs/SOURCE/tmw.doxcfg
-- 
cgit v1.2.3-70-g09d2


From 0fd9aef8bf376d44132edded2cdcb41ba7ee5b2f Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Mon, 5 Jan 2009 21:16:23 +0100
Subject: Mostly whitespace and formatting changes

(merged from eAthena client)
---
 INSTALL                           |  7 +++---
 docs/FAQ.txt                      | 12 +++++-----
 docs/INSTALL/win32.txt            |  6 ++---
 po/POTFILES.in                    |  1 +
 src/Makefile.am                   | 10 ++++-----
 src/gui/browserbox.cpp            |  2 +-
 src/gui/browserbox.h              |  2 +-
 src/gui/buy.cpp                   | 13 +++++------
 src/gui/buy.h                     |  3 +--
 src/gui/char_select.cpp           |  1 -
 src/gui/inventorywindow.cpp       |  3 +--
 src/gui/item_amount.cpp           |  3 +--
 src/gui/item_amount.h             |  2 +-
 src/gui/login.cpp                 |  3 ++-
 src/gui/menuwindow.cpp            |  2 +-
 src/gui/npc_text.h                |  2 +-
 src/gui/playerbox.cpp             |  6 ++---
 src/gui/popupmenu.cpp             |  1 -
 src/gui/sell.cpp                  |  4 +---
 src/gui/setup.cpp                 |  2 +-
 src/gui/setup_keyboard.cpp        | 12 +++++-----
 src/gui/trade.cpp                 |  2 --
 src/gui/window.cpp                | 14 +++++-------
 src/gui/window.h                  | 23 ++++++++++----------
 src/main.cpp                      |  2 +-
 src/net/messagein.h               |  4 ++--
 src/net/network.cpp               | 46 ++++++++++++++++++---------------------
 src/resources/npcdb.cpp           |  1 -
 src/resources/resourcemanager.cpp |  6 ++++-
 src/utils/xml.cpp                 | 15 ++++++-------
 src/utils/xml.h                   | 10 ++++-----
 31 files changed, 103 insertions(+), 117 deletions(-)

(limited to 'docs')

diff --git a/INSTALL b/INSTALL
index 3b790ffd..fd921f59 100644
--- a/INSTALL
+++ b/INSTALL
@@ -12,9 +12,9 @@ IRC:       irc.freenode.net / #themanaworld
 1. Requirements
 ===============
 
-You are expected to have either checked out TMW from Subversion or you have
-downloaded a source release. To get The Mana World to compile, you need a
-compiler (GCC) and some libraries. The required libraries are:
+You are expected to have either checked out TMW from Git or you have downloaded
+a source release. To get The Mana World to compile, you need a compiler (GCC)
+and some libraries. The required libraries are:
 
 * SDL               http://www.libsdl.org/
 * SDL_mixer         http://www.libsdl.org/projects/SDL_mixer/
@@ -52,6 +52,7 @@ It should have installed The Mana World on your system now, and you can run it
 with "tmw". By default all files are installed to /usr/local, you can pass a
 different prefix to configure as usual.
 
+
   NOTE: It is possible to compile TMW without support for OpenGL rendering.
   To do this perform step 3 as follows:
 
diff --git a/docs/FAQ.txt b/docs/FAQ.txt
index 6055513c..2f1eee8b 100644
--- a/docs/FAQ.txt
+++ b/docs/FAQ.txt
@@ -12,7 +12,7 @@ A: The fastest way is to come on our IRC channel. There you can find a lot of
    http://forums.themanaworld.org. Ok, do you think forums are evil? Don't
    worry, send me an e-mail at elvenprogrammer@gmail.com and you're done.
    That's not enough? No, I won't give you my phone number! ;P
-   
+
 GAME
 
 Q: I always get "Unregistered ID" error message, why?
@@ -59,7 +59,7 @@ Q: What's SVN?
 A: It's a system where is stored the latest development version. It's not
    assured that it's stable, but surely it has the latest updates. (SVN version
    is updated quite frequently). If you want to check it out, read this guide
-   http://themanaworld.org/svn-tutorial.txt 
+   http://themanaworld.org/svn-tutorial.txt
 
 
 DEVELOPMENT
@@ -73,18 +73,18 @@ A: We have scheduled releases. Usually a new release is available every month.
 Q: How can I contribute?
 
 A: There are a lot of ways:
-   
+
    - If you're a programmer, an artist or just willing to help in any way, you
      can become part of the development team. Send an e-mail to
      elvenprogrammer@gmail.com explaining what you want to do, or join our irc
      channel: #themanaworld @ irc.freenode.net.
-   
+
    - You can donate money. Follow the link on the project page:
 	http://sourceforge.net/projects/themanaworld.
-   
+
    - You can be a beta tester. Just play with The Mana World and report every
      error to the tracker. Read for more infos on the project page:
 	http://themanaworld.org.
-   
+
    - Play with The Mana World: more players, more fun! Simple as that! ;-)
 
diff --git a/docs/INSTALL/win32.txt b/docs/INSTALL/win32.txt
index 7f6ee42a..1a1e527f 100644
--- a/docs/INSTALL/win32.txt
+++ b/docs/INSTALL/win32.txt
@@ -99,11 +99,11 @@ Install them all through the Dev-C++ package manager.
 
 **) For PhysFS copy the headers to your include directory, the libs to
     the lib directory and the dlls (in bin direcotry) to your tmw directory.
-	 
+
 ***) Download developer files and put headers and libs in to include and lib
      directories of Dev-Cpp. Download binaries and place the dll inside tmw
-	 folder.
-	 
+     folder.
+
 ****) Get latest win32 - mingw package and install as usual.
 
 You should now be fully equipped for compiling the latest TMW development
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 86b9de67..9d81dc29 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -21,6 +21,7 @@ src/gui/serverdialog.cpp
 src/gui/setup_audio.cpp
 src/gui/setup.cpp
 src/gui/setup_joystick.cpp
+src/gui/setup_keyboard.cpp
 src/gui/setup_video.cpp
 src/gui/trade.cpp
 src/resources/itemdb.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 5cf1a6e8..d3926a70 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -250,14 +250,14 @@ tmw_SOURCES = gui/widgets/avatar.cpp \
 	      resources/iteminfo.cpp \
 	      resources/mapreader.cpp \
 	      resources/mapreader.h \
-	      resources/monsterdb.h \
 	      resources/monsterdb.cpp \
-	      resources/monsterinfo.h \
+	      resources/monsterdb.h \
 	      resources/monsterinfo.cpp \
-	      resources/music.h \
+	      resources/monsterinfo.h \
 	      resources/music.cpp \
-	      resources/npcdb.h \
+	      resources/music.h \
 	      resources/npcdb.cpp \
+	      resources/npcdb.h \
 	      resources/resource.cpp \
 	      resources/resource.h \
 	      resources/resourcemanager.cpp \
@@ -276,8 +276,8 @@ tmw_SOURCES = gui/widgets/avatar.cpp \
 	      utils/minmax.h \
 	      utils/sha256.h \
 	      utils/sha256.cpp \
-	      utils/strprintf.h \
 	      utils/strprintf.cpp \
+	      utils/strprintf.h \
 	      utils/tostring.h \
 	      utils/trim.h \
 	      utils/mutex.h \
diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp
index b0b6f48e..03540d31 100644
--- a/src/gui/browserbox.cpp
+++ b/src/gui/browserbox.cpp
@@ -142,7 +142,7 @@ void BrowserBox::addRow(const std::string &row)
     {
         unsigned int y = 0;
         unsigned int nextChar;
-        char const *hyphen = "~";
+        const char *hyphen = "~";
         int hyphenWidth = font->getWidth(hyphen);
         int x = 0;
 
diff --git a/src/gui/browserbox.h b/src/gui/browserbox.h
index 465ff497..cb4c23ed 100644
--- a/src/gui/browserbox.h
+++ b/src/gui/browserbox.h
@@ -25,8 +25,8 @@
 #include <iosfwd>
 #include <vector>
 
-#include <guichan/widget.hpp>
 #include <guichan/mouselistener.hpp>
+#include <guichan/widget.hpp>
 
 #include "../guichanfwd.h"
 #include "../main.h"
diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index 008c7bb9..cc2262ec 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -165,15 +165,15 @@ void BuyDialog::action(const gcn::ActionEvent &event)
         Net::GameServer::Player::tradeWithNPC
             (mShopItems->at(selectedItem)->getId(), mAmountItems);
 
-        // Reset selection
-        mAmountItems = 1;
-        mSlider->setValue(1);
-        mSlider->gcn::Slider::setScale(1, mMaxItems);
-
         // Update money and adjust the max number of items that can be bought
         mMaxItems -= mAmountItems;
         setMoney(mMoney -
                 mAmountItems * mShopItems->at(selectedItem)->getPrice());
+
+        // Reset selection
+        mAmountItems = 1;
+        mSlider->setValue(1);
+        mSlider->gcn::Slider::setScale(1, mMaxItems);
     }
 }
 
@@ -187,8 +187,7 @@ void BuyDialog::valueChanged(const gcn::SelectionEvent &event)
     mSlider->gcn::Slider::setScale(1, mMaxItems);
 }
 
-void
-BuyDialog::updateButtonsAndLabels()
+void BuyDialog::updateButtonsAndLabels()
 {
     const int selectedItem = mShopItemList->getSelected();
     int price = 0;
diff --git a/src/gui/buy.h b/src/gui/buy.h
index 24f18742..a80ffed7 100644
--- a/src/gui/buy.h
+++ b/src/gui/buy.h
@@ -92,8 +92,7 @@ class BuyDialog : public Window, public gcn::ActionListener,
         /**
          * Updates the state of buttons and labels.
          */
-        void
-        updateButtonsAndLabels();
+        void updateButtonsAndLabels();
 
     private:
         gcn::Button *mBuyButton;
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 67cb3c7b..f800c266 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -134,7 +134,6 @@ CharSelectDialog::CharSelectDialog(LockedArray<LocalPlayer*> *charInfo,
     setVisible(true);
     mSelectButton->requestFocus();
     updatePlayerInfo();
-
 }
 
 void CharSelectDialog::action(const gcn::ActionEvent &event)
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 1765eeea..b4a96394 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -102,9 +102,8 @@ void InventoryWindow::logic()
 void InventoryWindow::action(const gcn::ActionEvent &event)
 {
     Item *item = mItems->getItem();
-    if (!item) {
+    if (!item)
         return;
-    }
 
     if (event.getId() == "use")
     {
diff --git a/src/gui/item_amount.cpp b/src/gui/item_amount.cpp
index c6763014..cae681d4 100644
--- a/src/gui/item_amount.cpp
+++ b/src/gui/item_amount.cpp
@@ -75,8 +75,7 @@ ItemAmountWindow::ItemAmountWindow(int usage, Window *parent, Item *item,
 
     resetAmount();
 
-    switch (usage)
-    {
+    switch (usage) {
         case AMOUNT_TRADE_ADD:
             setCaption(_("Select amount of items to trade."));
             okButton->setActionEventId("AddTrade");
diff --git a/src/gui/item_amount.h b/src/gui/item_amount.h
index dd1026b7..c0d2b2c0 100644
--- a/src/gui/item_amount.h
+++ b/src/gui/item_amount.h
@@ -38,7 +38,7 @@ class Item;
 #define AMOUNT_ITEM_SPLIT 3
 
 /**
- * Window used for selecting the amount of items to drop.
+ * Window used for selecting the amount of items to drop, trade or split.
  *
  * \ingroup Interface
  */
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index b4289984..615045b6 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -38,7 +38,8 @@
 
 #include "../utils/gettext.h"
 
-LoginDialog::LoginDialog(LoginData *loginData) : Window(_("Login")), mLoginData(loginData)
+LoginDialog::LoginDialog(LoginData *loginData):
+    Window(_("Login")), mLoginData(loginData)
 {
     gcn::Label *userLabel = new gcn::Label(_("Name:"));
     gcn::Label *passLabel = new gcn::Label(_("Password:"));
diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp
index f74dfa41..9415188e 100644
--- a/src/gui/menuwindow.cpp
+++ b/src/gui/menuwindow.cpp
@@ -58,7 +58,7 @@ MenuWindow::MenuWindow():
     setTitleBarHeight(0);
 
     // Buttons
-    static char const *buttonNames[] =
+    static const char *buttonNames[] =
     {
         N_("Status"),
         N_("Equipment"),
diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index 76161f88..b6eccf95 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.h
@@ -45,7 +45,7 @@ class NpcTextDialog : public Window, public gcn::ActionListener
         NpcTextDialog();
 
         /**
-         * Called when resizing the window
+         * Called when resizing the window.
          *
          * @param event The calling event
          */
diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp
index 0a0c8a17..6888d69a 100644
--- a/src/gui/playerbox.cpp
+++ b/src/gui/playerbox.cpp
@@ -74,8 +74,7 @@ PlayerBox::~PlayerBox()
     }
 }
 
-void
-PlayerBox::draw(gcn::Graphics *graphics)
+void PlayerBox::draw(gcn::Graphics *graphics)
 {
     if (mPlayer)
     {
@@ -87,8 +86,7 @@ PlayerBox::draw(gcn::Graphics *graphics)
     }
 }
 
-void
-PlayerBox::drawFrame(gcn::Graphics *graphics)
+void PlayerBox::drawFrame(gcn::Graphics *graphics)
 {
     int w, h, bs;
     bs = getFrameSize();
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 59ca0867..a430ff10 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -75,7 +75,6 @@ void PopupMenu::showPopup(int x, int y, Being *being)
                 // add as buddy will be options in this menu.
                 const std::string &name = mBeing->getName();
                 mBrowserBox->addRow(strprintf(_("@@trade|Trade With %s@@"), name.c_str()));
-
                 mBrowserBox->addRow(strprintf(_("@@attack|Attack %s@@"), name.c_str()));
                 //mBrowserBox->addRow("@@follow|Follow " + name + "@@");
                 //mBrowserBox->addRow("@@buddy|Add " + name + " to Buddy List@@");
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index 24391458..9aee4bee 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -202,8 +202,7 @@ void SellDialog::setMoney(int amount)
     mShopItemList->setPlayersMoney(amount);
 }
 
-void
-SellDialog::updateButtonsAndLabels()
+void SellDialog::updateButtonsAndLabels()
 {
     int selectedItem = mShopItemList->getSelected();
     int income = 0;
@@ -211,7 +210,6 @@ SellDialog::updateButtonsAndLabels()
     if (selectedItem > -1)
     {
         const ItemInfo &info = mShopItems->at(selectedItem)->getInfo();
-
         mItemDescLabel->setCaption
             (strprintf(_("Description: %s"), info.getDescription().c_str()));
         mItemEffectLabel->setCaption
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index e062f674..59b54be0 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -53,7 +53,7 @@ Setup::Setup():
     int height = 265;
     setContentSize(width, height);
 
-    static char const *buttonNames[] = {
+    static const char *buttonNames[] = {
         N_("Apply"), N_("Cancel"), N_("Reset Windows"), 0
     };
     int x = width;
diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp
index 270f4a0e..e4d1af0c 100644
--- a/src/gui/setup_keyboard.cpp
+++ b/src/gui/setup_keyboard.cpp
@@ -32,6 +32,7 @@
 #include "../configuration.h"
 #include "../keyboardconfig.h"
 
+#include "../utils/gettext.h"
 #include "../utils/tostring.h"
 
 #include <SDL_keyboard.h>
@@ -85,13 +86,13 @@ Setup_Keyboard::Setup_Keyboard():
     scrollArea->setDimension(gcn::Rectangle(10, 10, 200, 140));
     add(scrollArea);
 
-    mAssignKeyButton = new Button("Assign", "assign", this);
+    mAssignKeyButton = new Button(_("Assign"), "assign", this);
     mAssignKeyButton->setPosition(165, 155);
     mAssignKeyButton->addActionListener(this);
     mAssignKeyButton->setEnabled(false);
     add(mAssignKeyButton);
 
-    mMakeDefaultButton = new Button("Default", "makeDefault", this);
+    mMakeDefaultButton = new Button(_("Default"), "makeDefault", this);
     mMakeDefaultButton->setPosition(10, 155);
     mMakeDefaultButton->addActionListener(this);
     add(mMakeDefaultButton);
@@ -112,8 +113,9 @@ void Setup_Keyboard::apply()
 
     if (keyboard.hasConflicts())
     {
-        new OkDialog("Key Conflict(s) Detected.",
-            "Resolve them, or gameplay may result in strange behaviour.");
+        new OkDialog(_("Key Conflict(s) Detected."),
+                     _("Resolve them, or gameplay may result in strange "
+                       "behaviour."));
     }
     keyboard.setEnabled(true);
     keyboard.store();
@@ -171,7 +173,7 @@ void Setup_Keyboard::newKeyCallback(int index)
 
 void Setup_Keyboard::refreshKeys()
 {
-    for(int i = 0; i < keyboard.KEY_TOTAL; i++)
+    for (int i = 0; i < keyboard.KEY_TOTAL; i++)
     {
         refreshAssignedKey(i);
     }
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index 7d5051c7..0592c485 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -188,9 +188,7 @@ void TradeWindow::action(const gcn::ActionEvent &event)
     if (event.getId() == "add")
     {
         if (!item)
-        {
             return;
-        }
 
         if (mMyInventory->contains(item)) {
             chatWindow->chatLog("Failed adding item. You can not "
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 582e4a67..64607243 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -31,7 +31,6 @@
 #include "window.h"
 
 #include "gui.h"
-#include "gccontainer.h"
 #include "windowcontainer.h"
 
 #include "widgets/layout.h"
@@ -87,8 +86,7 @@ Window::Window(const std::string& caption, bool modal, Window *parent):
 {
     logger->log("Window::Window(\"%s\")", caption.c_str());
 
-    if (!windowContainer)
-    {
+    if (!windowContainer) {
         throw GCN_EXCEPTION("Window::Window(): no windowContainer set");
     }
 
@@ -128,17 +126,15 @@ Window::Window(const std::string& caption, bool modal, Window *parent):
 Window::~Window()
 {
     logger->log("UNLOAD: Window::~Window(\"%s\")", getCaption().c_str());
-
     const std::string &name = mWindowName;
-    if (!name.empty())
-    {
-        // Saving X, Y and Width and Height for resizables in the config
+
+    // Saving X, Y and Width and Height for resizables in the config
+    if (!name.empty()) {
         config.setValue(name + "WinX", getX());
         config.setValue(name + "WinY", getY());
         config.setValue(name + "Visible", isVisible());
 
-        if (mGrip)
-        {
+        if (mGrip) {
             config.setValue(name + "WinWidth", getWidth());
             config.setValue(name + "WinHeight", getHeight());
         }
diff --git a/src/gui/window.h b/src/gui/window.h
index 6f49e062..50a206f0 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -222,17 +222,6 @@ class Window : public gcn::Window, gcn::WidgetListener
          */
         void resetToDefaultSize();
 
-        enum ResizeHandles
-        {
-            TOP    = 0x01,
-            RIGHT  = 0x02,
-            BOTTOM = 0x04,
-            LEFT   = 0x08
-        };
-
-        /** The window container windows add themselves to. */
-        static WindowContainer *windowContainer;
-
         /**
          * Gets the layout handler for this window.
          */
@@ -263,7 +252,19 @@ class Window : public gcn::Window, gcn::WidgetListener
          */
         void loadSkin(const std::string &fileName);
 
+    protected:
+        /** The window container windows add themselves to. */
+        static WindowContainer *windowContainer;
+
     private:
+        enum ResizeHandles
+        {
+            TOP    = 0x01,
+            RIGHT  = 0x02,
+            BOTTOM = 0x04,
+            LEFT   = 0x08
+        };
+
         /**
          * Determines if the mouse is in a resize area and returns appropriate
          * resize handles. Also initializes drag offset in case the resize
diff --git a/src/main.cpp b/src/main.cpp
index 2d6b08a8..39a0fb37 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -315,7 +315,7 @@ void initEngine(const Options &options)
 
     if (!resman->setWriteDir(homeDir)) {
         std::cout << homeDir
-                  << " couldn't be set as home directory! Exitting."
+                  << " couldn't be set as home directory! Exiting."
                   << std::endl;
         exit(1);
     }
diff --git a/src/net/messagein.h b/src/net/messagein.h
index 444699c8..f2390baa 100644
--- a/src/net/messagein.h
+++ b/src/net/messagein.h
@@ -61,13 +61,13 @@ class MessageIn
          * Returns the message length.
          */
         unsigned int
-        getLength() { return mLength; }
+        getLength() const { return mLength; }
 
         /**
          * Returns the length of unread data.
          */
         unsigned int
-        getUnreadLength() { return mLength - mPos; }
+        getUnreadLength() const { return mLength - mPos; }
 
     private:
         const char* mData;             /**< The message data. */
diff --git a/src/net/network.cpp b/src/net/network.cpp
index a4ea3def..57e368e2 100644
--- a/src/net/network.cpp
+++ b/src/net/network.cpp
@@ -83,8 +83,7 @@ Net::Connection *Net::getConnection()
     return new Net::Connection(client);
 }
 
-void
-Net::registerHandler(MessageHandler *handler)
+void Net::registerHandler(MessageHandler *handler)
 {
     for (const Uint16 *i = handler->handledMessages; *i; i++)
     {
@@ -92,8 +91,7 @@ Net::registerHandler(MessageHandler *handler)
     }
 }
 
-void
-Net::unregisterHandler(MessageHandler *handler)
+void Net::unregisterHandler(MessageHandler *handler)
 {
     for (const Uint16 *i = handler->handledMessages; *i; i++)
     {
@@ -101,8 +99,7 @@ Net::unregisterHandler(MessageHandler *handler)
     }
 }
 
-void
-Net::clearHandlers()
+void Net::clearHandlers()
 {
     mMessageHandlers.clear();
 }
@@ -114,26 +111,25 @@ Net::clearHandlers()
  */
 namespace
 {
-    void
-        dispatchMessage(ENetPacket *packet)
-        {
-            MessageIn msg((const char *)packet->data, packet->dataLength);
-
-            MessageHandlerIterator iter = mMessageHandlers.find(msg.getId());
-
-            if (iter != mMessageHandlers.end()) {
-                //logger->log("Received packet %x (%i B)",
-                //        msg.getId(), msg.getLength());
-                iter->second->handleMessage(msg);
-            }
-            else {
-                logger->log("Unhandled packet %x (%i B)",
-                        msg.getId(), msg.getLength());
-            }
-
-            // Clean up the packet now that we're done using it.
-            enet_packet_destroy(packet);
+    void dispatchMessage(ENetPacket *packet)
+    {
+        MessageIn msg((const char *)packet->data, packet->dataLength);
+
+        MessageHandlerIterator iter = mMessageHandlers.find(msg.getId());
+
+        if (iter != mMessageHandlers.end()) {
+            //logger->log("Received packet %x (%i B)",
+            //        msg.getId(), msg.getLength());
+            iter->second->handleMessage(msg);
         }
+        else {
+            logger->log("Unhandled packet %x (%i B)",
+                    msg.getId(), msg.getLength());
+        }
+
+        // Clean up the packet now that we're done using it.
+        enet_packet_destroy(packet);
+    }
 }
 
 void Net::flush()
diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp
index 5cd6d20d..2f8d78d4 100644
--- a/src/resources/npcdb.cpp
+++ b/src/resources/npcdb.cpp
@@ -132,4 +132,3 @@ NPCDB::get(int id)
         return *(i->second);
     }
 }
-
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index bebd17f8..3d42d92e 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -95,11 +95,15 @@ ResourceManager::~ResourceManager()
 
 void ResourceManager::cleanUp(Resource *res)
 {
-    logger->log("ResourceManager::~ResourceManager() cleaning up %d "
+    if (res->mRefCount > 0)
+    {
+        logger->log("ResourceManager::~ResourceManager() cleaning up %d "
                 "reference%s to %s",
                 res->mRefCount,
                 (res->mRefCount == 1) ? "" : "s",
                 res->mIdPath.c_str());
+    }
+
     delete res;
 }
 
diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp
index 47f1bd04..05df9f1d 100644
--- a/src/utils/xml.cpp
+++ b/src/utils/xml.cpp
@@ -26,7 +26,7 @@
 namespace XML
 {
     Document::Document(const std::string &filename):
-        mDoc(NULL)
+        mDoc(0)
     {
         int size;
         ResourceManager *resman = ResourceManager::getInstance();
@@ -59,8 +59,7 @@ namespace XML
         return mDoc ? xmlDocGetRootElement(mDoc) : 0;
     }
 
-    int
-    getProperty(xmlNodePtr node, const char* name, int def)
+    int getProperty(xmlNodePtr node, const char* name, int def)
     {
         int &ret = def;
 
@@ -73,8 +72,7 @@ namespace XML
         return ret;
     }
 
-    double
-    getFloatProperty(xmlNodePtr node, const char* name, double def)
+    double getFloatProperty(xmlNodePtr node, const char* name, double def)
     {
         double &ret = def;
 
@@ -87,8 +85,8 @@ namespace XML
         return ret;
     }
 
-    std::string
-    getProperty(xmlNodePtr node, const char *name, const std::string &def)
+    std::string getProperty(xmlNodePtr node, const char *name,
+                            const std::string &def)
     {
         xmlChar *prop = xmlGetProp(node, BAD_CAST name);
         if (prop) {
@@ -108,4 +106,5 @@ namespace XML
 
         return NULL;
     }
-}
+
+} // namespace XML
diff --git a/src/utils/xml.h b/src/utils/xml.h
index 5a5c756b..d0aba62e 100644
--- a/src/utils/xml.h
+++ b/src/utils/xml.h
@@ -71,20 +71,18 @@ namespace XML
     /**
      * Gets an integer property from an xmlNodePtr.
      */
-    int
-    getProperty(xmlNodePtr node, const char *name, int def);
+    int getProperty(xmlNodePtr node, const char *name, int def);
 
     /**
      * Gets an floating point property from an xmlNodePtr.
      */
-    double
-    getFloatProperty(xmlNodePtr node, const char *name, double def);
+    double getFloatProperty(xmlNodePtr node, const char *name, double def);
 
     /**
      * Gets a string property from an xmlNodePtr.
      */
-    std::string
-    getProperty(xmlNodePtr node, const char *name, const std::string &def);
+    std::string getProperty(xmlNodePtr node, const char *name,
+                            const std::string &def);
 
     /**
      * Finds the first child node with the given name
-- 
cgit v1.2.3-70-g09d2