Merge branch 'master' into strippedstripped1.1.9.4

Conflicts:
	data/fonts/mplus-1p-bold.ttf
	data/fonts/mplus-1p-regular.ttf
	src/guichan/basiccontainer.cpp
	src/guichan/include/guichan/basiccontainer.hpp
	src/guichan/widgets/window.cpp

1 files changed, 12 insertions, 1 deletions

diff --git a/src/gui/updaterwindow.h b/src/gui/updaterwindow.h
index a1dc556d5..e9a45241f 100644
--- a/src/gui/updaterwindow.h
+++ b/src/gui/updaterwindow.h
@@ -146,7 +146,9 @@ private:
         UPDATE_COMPLETE,
         UPDATE_NEWS,
         UPDATE_RESOURCES,
-        UPDATE_PATCH
+        UPDATE_PATCH,
+        UPDATE_LIST2,
+        UPDATE_RESOURCES2
     };
 
     /** Status of the current download. */
@@ -158,6 +160,8 @@ private:
     /** Place where the updates are stored (absolute path). */
     std::string mUpdatesDir;
 
+    std::string mUpdatesDirReal;
+
     /** The file currently downloading. */
     std::string mCurrentFile;
 
@@ -194,9 +198,15 @@ private:
     /** List of files to download. */
     std::vector<updateFile> mUpdateFiles;
 
+    /** List of temp files to download. */
+    std::vector<updateFile> mTempUpdateFiles;
+
     /** Index of the file to be downloaded. */
     unsigned int mUpdateIndex;
 
+    /** Index offset for disaplay downloaded file. */
+    unsigned int mUpdateIndexOffset;
+
     /** Tells ~UpdaterWindow() if it should load updates */
     bool mLoadUpdates;
 
@@ -208,6 +218,7 @@ private:
     ProgressBar *mProgressBar;    /**< Update progress bar. */
     BrowserBox *mBrowserBox;      /**< Box to display news. */
     ScrollArea *mScrollArea;      /**< Used to scroll news box. */
+    std::string mUpdateServerPath;
 };
 
 #endif