Merged the tmwserv client with the eAthena client

This merge involved major changes on both sides, and as such took
several weeks. Lots of things are expected to be broken now, however, we
now have a single code base to improve and extend, which can be compiled
to support either eAthena or tmwserv.

In the coming months, the plan is to work towards a client that supports
both eAthena and tmwserv, without needing to be recompiled.

Conflicts:
	Everywhere!

1 files changed, 31 insertions, 10 deletions

diff --git a/src/gui/progressbar.cpp b/src/gui/progressbar.cpp
index 0f59371a..85f21604 100644
--- a/src/gui/progressbar.cpp
+++ b/src/gui/progressbar.cpp
@@ -41,6 +41,9 @@ ProgressBar::ProgressBar(float progress,
     mRed(red), mGreen(green), mBlue(blue),
     mRedToGo(red), mGreenToGo(green), mBlueToGo(blue)
 {
+    mProgressToGo = mProgress = 0.0f;
+    mSmoothProgress = mSmoothColorChange = true;
+
     setProgress(progress);
     setWidth(width);
     setHeight(height);
@@ -90,13 +93,31 @@ ProgressBar::~ProgressBar()
 
 void ProgressBar::logic()
 {
-    // Smoothly changing the color for a nicer effect.
-    if (mRedToGo > mRed) mRed++;
-    if (mRedToGo < mRed) mRed--;
-    if (mGreenToGo > mGreen) mGreen++;
-    if (mGreenToGo < mGreen) mGreen--;
-    if (mBlueToGo > mBlue) mBlue++;
-    if (mBlueToGo < mBlue) mBlue--;
+    if (mSmoothColorChange)
+    {
+        // Smoothly changing the color for a nicer effect.
+        if (mRedToGo > mRed) mRed++;
+        if (mRedToGo < mRed) mRed--;
+        if (mGreenToGo > mGreen) mGreen++;
+        if (mGreenToGo < mGreen) mGreen--;
+        if (mBlueToGo > mBlue) mBlue++;
+        if (mBlueToGo < mBlue) mBlue--;
+    }
+    else
+    {
+        mRed = mRedToGo;
+        mGreen = mGreenToGo;
+        mBlue = mBlueToGo;
+    }
+
+    if (mSmoothProgress)
+    {
+        // Smoothly showing the progressbar changes.
+        if (mProgressToGo > mProgress) mProgress = mProgress + 0.005f;
+        if (mProgressToGo < mProgress) mProgress = mProgress - 0.005f;
+    }
+    else
+        mProgress = mProgressToGo;
 }
 
 void ProgressBar::draw(gcn::Graphics *graphics)
@@ -149,9 +170,9 @@ void ProgressBar::draw(gcn::Graphics *graphics)
 
 void ProgressBar::setProgress(float progress)
 {
-    if (progress < 0.0f) mProgress = 0.0;
-    else if (progress > 1.0f) mProgress = 1.0;
-    else mProgress = progress;
+    if (progress < 0.0f) mProgressToGo = 0.0;
+    else if (progress > 1.0f) mProgressToGo = 1.0;
+    else mProgressToGo = progress;
 }
 
 void ProgressBar::setColor(Uint8 red, Uint8 green, Uint8 blue)