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(-)

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