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, 18 insertions, 1 deletions

diff --git a/src/gui/progressbar.h b/src/gui/progressbar.h
index 2c1b22da..49bc3edd 100644
--- a/src/gui/progressbar.h
+++ b/src/gui/progressbar.h
@@ -102,10 +102,27 @@ class ProgressBar : public gcn::Widget
         const std::string &text() const
         { return mText; }
 
+        /**
+         * Set wether the progress is moved smoothly.
+         */
+        void setSmoothProgress(bool smoothProgress)
+        { mSmoothProgress = smoothProgress; }
+
+        /**
+         * Set wether the color changing is made smoothly.
+         */
+        void setSmoothColorChange(bool smoothColorChange)
+        { mSmoothColorChange = smoothColorChange; }
+
+
     private:
-        float mProgress;
+        float mProgress, mProgressToGo;
+        bool mSmoothProgress;
+
         Uint8 mRed, mGreen, mBlue;
         Uint8 mRedToGo, mGreenToGo, mBlueToGo;
+        bool mSmoothColorChange;
+
         std::string mText;
 
         static ImageRect mBorder;