From 527d9d1aea2b840e98dd0976f7bd3426703a886a Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 3 Feb 2015 22:13:28 +0300
Subject: Fix compilation for Android with SDL2.

---
 src/client.cpp | 33 ++++-----------------------------
 1 file changed, 4 insertions(+), 29 deletions(-)

(limited to 'src/client.cpp')

diff --git a/src/client.cpp b/src/client.cpp
index f433746e0..198fadc1d 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -161,12 +161,6 @@
 
 #include "debug.h"
 
-#ifdef ANDROID
-#ifdef USE_SDL2
-int loadingProgressCounter = 1;
-#endif
-#endif
-
 std::string errorMessage;
 LoginData loginData;
 
@@ -556,27 +550,6 @@ void Client::initGraphics()
     mainGraphics->beginDraw();
 }
 
-#ifdef ANDROID
-#ifdef USE_SDL2
-static void updateProgress(int cnt)
-{
-    const int progress = cnt + loadingProgressCounter;
-    const int h = mainGraphics->mHeight;
-    mainGraphics->setColor(Color(255, 255, 255));
-    const int maxSize = mainGraphics->mWidth - 100;
-    const int width = maxSize * progress / 450;
-    mainGraphics->fillRectangle(Rect(50, h - 100, width, 50));
-    mainGraphics->updateScreen();
-}
-
-static void setProgress(const int val)
-{
-    loadingProgressCounter = val;
-    updateProgress(loadingProgressCounter);
-}
-#endif
-#endif
-
 void Client::setEnv(const char *const name, const char *const value)
 {
     if (!name || !value)
@@ -1813,6 +1786,7 @@ void Client::logVars()
 
 #ifdef ANDROID
 #ifdef USE_SDL2
+/*
 void Client::extractAssets()
 {
     if (!getenv("APPDIR"))
@@ -1840,7 +1814,7 @@ void Client::extractAssets()
             logger->log("asset size: %d", size2);
             fwrite(buf, 1, size2, file);
             SDL_RWclose(rw);
-            setProgress(loadingProgressCounter + 1);
+            Dirs::setProgress();
         }
         else
         {
@@ -1859,11 +1833,12 @@ void Client::extractAssets()
         int size2 = SDL_RWread(rw, buf, 1, size);
         fwrite(buf, 1, size2, file2);
         SDL_RWclose(rw);
-        setProgress(loadingProgressCounter + 1);
+        setProgress();
     }
     fclose(file2);
 
     delete [] buf;
 }
+*/
 #endif
 #endif
-- 
cgit v1.2.3-70-g09d2