Minor fix to data downloader, updated OpenArena project

project/java/DataDownloader.java

@@ -462,6 +462,7 @@ class DataDownloader extends Thread
 
 				OutputStream out = null;
 				path = getOutFilePath(entry.getName());
+				float percent = 0.0f;
 
 				System.out.println("Saving file '" + path + "'");
 
@@ -482,6 +483,9 @@ class DataDownloader extends Thread
 						throw new Exception();
 					}
 					System.out.println("File '" + path + "' exists and passed CRC check - not overwriting it");
+					if( totalLen > 0 )
+						percent = stream.getBytesRead() * 100.0f / totalLen;
+					Status.setText( downloadCount + "/" + downloadTotal + ": " + res.getString(R.string.dl_progress, percent, path) );
 					continue;
 				} catch( Exception e ) { }
 
@@ -499,7 +503,6 @@ class DataDownloader extends Thread
 					return false;
 				}
 
-				float percent = 0.0f;
 				if( totalLen > 0 )
 					percent = stream.getBytesRead() * 100.0f / totalLen;
 				Status.setText( downloadCount + "/" + downloadTotal + ": " + res.getString(R.string.dl_progress, percent, path) );

project/jni/application/openarena/AndroidAppSettings.cfg

@@ -5,7 +5,7 @@ AppName="OpenArena"
 AppFullName=ws.openarena.sdl
 ScreenOrientation=h
 InhibitSuspend=n
-AppDataDownloadUrl="Game data|http://10.0.2.2/up/oa-0.8.8-1.zip"
+AppDataDownloadUrl="Game data|http://172.17.57.25/oa-0.8.8-1.zip|http://10.0.2.2/up/oa-0.8.8-1.zip"
 VideoDepthBpp=24
 NeedDepthBuffer=y
 NeedStencilBuffer=y
@@ -31,7 +31,7 @@ AppTouchscreenKeyboardKeysAmount=0
 AppTouchscreenKeyboardKeysAmountAutoFire=0
 RedefinedKeysScreenKb="0 1 2 3 4 5 6 7 8 9"
 StartupMenuButtonTimeout=3000
-HiddenMenuOptions='OptionalDownloadConfig'
+HiddenMenuOptions='OptionalDownloadConfig DisplaySizeConfig'
 FirstStartMenuOptions=''
 MultiABI=n
 AppVersionCode=101

project/jni/application/openarena/AndroidBuild.sh

@@ -4,7 +4,7 @@ LOCAL_PATH=`dirname $0`
 LOCAL_PATH=`cd $LOCAL_PATH && pwd`
 
 ../setEnvironment.sh make -j8 -C engine \
-PLATFORM=android ARCH=arm USE_LOCAL_HEADERS=0 \
+PLATFORM=android ARCH=arm USE_GLES=1 USE_LOCAL_HEADERS=0 \
 USE_OPENAL=0 USE_CURL=1 USE_CURL_DLOPEN=0 USE_CODEC_VORBIS=0 USE_MUMBLE=0 USE_FREETYPE=1 \
 USE_RENDERER_DLOPEN=0 USE_INTERNAL_ZLIB=0 USE_INTERNAL_JPEG=1 HAVE_VM_COMPILED=1 &&
 mv -f engine/build/release-android-arm/openarena.arm libapplication.so

project/jni/application/setEnvironment-r5b.sh

@@ -52,7 +52,6 @@ MISSING_LIB=
 #fi
 
 CFLAGS="\
--fexceptions -frtti \
 -fpic -ffunction-sections -funwind-tables -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__  -Wno-psabi \
 -march=armv5te -mtune=xscale -msoft-float -mthumb -Os -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 \
 -isystem$NDK/platforms/$PLATFORMVER/arch-arm/usr/include -Wa,--noexecstack \
@@ -94,7 +93,7 @@ $MISSING_LIB $LDFLAGS"
 
 env PATH=$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin:$LOCAL_PATH:$PATH \
 CFLAGS="$CFLAGS" \
-CXXFLAGS="$CFLAGS" \
+CXXFLAGS="-fexceptions -frtti $CFLAGS" \
 LDFLAGS="$LDFLAGS" \
 CC="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-gcc" \
 CXX="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-g++" \

project/jni/application/setEnvironment-r8b.sh

@@ -44,7 +44,6 @@ MISSING_INCLUDE=
 MISSING_LIB=
 
 CFLAGS="\
--fexceptions -frtti \
 -fpic -ffunction-sections -funwind-tables -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__  -Wno-psabi \
 -march=armv5te -mtune=xscale -msoft-float -mthumb -Os -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 \
 -isystem$NDK/platforms/$PLATFORMVER/arch-arm/usr/include -Wa,--noexecstack \
@@ -86,7 +85,7 @@ $MISSING_LIB $LDFLAGS"
 
 env PATH=$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin:$LOCAL_PATH:$PATH \
 CFLAGS="$CFLAGS" \
-CXXFLAGS="$CFLAGS" \
+CXXFLAGS="-fexceptions -frtti $CFLAGS" \
 LDFLAGS="$LDFLAGS" \
 CC="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-gcc" \
 CXX="$NDK/toolchains/$GCCPREFIX-$GCCVER/prebuilt/$MYARCH/bin/$GCCPREFIX-g++" \

readme.txt

@@ -35,6 +35,13 @@ create file project/bin/DemoActivity-debug.apk and install it on your device or
 Then you can test it by launching Ballfield icon from Android applications menu.
 It's designed for 320x240, so if you have bigger screen it will be resized.
 
+There are other applications inside project/jni/application directory,
+some of them are referenced using Git submodule mechanism, you may download them using command
+git submodule update --init
+Some of them may be outdated and won't compile, some contain only patch file and no sources,
+so you should check out Git logs before compiling some app:
+gitk project/jni/application/<directory>
+
 The game enforces horizontal screen orientation, you may slide-open your keyboard if you have it
 and use it for additional keys - the device will just keep current screen orientation.
 Recent Android phone models like HTC Evo have no keyboard at all, on-screen keyboard built into SDL