From a6d67aa87e56c9e003cdea64d2058fb939c4cb32 Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Fri, 7 Dec 2012 22:19:44 +0200
Subject: [PATCH] Updated OpenArena

---
 .../jni/application/openarena/AndroidBuild.sh | 24 +++++++-------
 project/jni/application/openarena/engine      |  2 +-
 .../application/openarena/oa-reupload-vm.sh   |  1 +
 project/jni/application/openarena/vm          |  2 +-
 .../application/pachi/AndroidAppSettings.cfg  | 32 +++++++++++++++----
 5 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/project/jni/application/openarena/AndroidBuild.sh b/project/jni/application/openarena/AndroidBuild.sh
index 009d1364b..1465d4060 100755
--- a/project/jni/application/openarena/AndroidBuild.sh
+++ b/project/jni/application/openarena/AndroidBuild.sh
@@ -3,17 +3,19 @@
 LOCAL_PATH=`dirname $0`
 LOCAL_PATH=`cd $LOCAL_PATH && pwd`
 
-[ "$1" = "armeabi" ] && (
-mkdir -p AndroidData
-[ -e libapplication.so ] || ln -s libapplication-armeabi.so libapplication.so
-make -j8 -C vm BUILD_MISSIONPACK=0 || exit 1
-cd vm/build/release-linux-`uname -m`/baseq3
-#rm -f ../../../../AndroidData/binaries.zip ../../../../AndroidData/pak7-android.pk3
-zip -r ../../../../AndroidData/pak7-android.pk3 vm
-cd ../../../android
-zip ../../AndroidData/pak7-android.pk3 *
-ln -sf ../engine/misc/quake3-tango.png ../../AndroidData/logo.png
-)
+if [ "$1" = "armeabi" ]; then (
+	mkdir -p AndroidData
+	[ -e libapplication.so ] || ln -s libapplication-armeabi.so libapplication.so
+	make -j8 -C vm BUILD_MISSIONPACK=0 || exit 1
+	cd vm/build/release-linux-`uname -m`/baseq3
+	#rm -f ../../../../AndroidData/binaries.zip ../../../../AndroidData/pak7-android.pk3
+	zip -r ../../../../AndroidData/pak7-android.pk3 vm
+	cd ../../../android
+	zip ../../AndroidData/pak7-android.pk3 *
+	ln -sf ../engine/misc/quake3-tango.png ../../AndroidData/logo.png
+	exit 0
+) || exit 1
+fi
 
 env NO_SHARED_LIBS=1 BUILD_EXECUTABLE=1 V=1 ../setEnvironment-armeabi.sh make -C vm -j8 PLATFORM=android ARCH=$1 USE_LOCAL_HEADERS=0 BUILD_MISSIONPACK=0 || exit 1
 
diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine
index 951d3515a..e722a68a0 160000
--- a/project/jni/application/openarena/engine
+++ b/project/jni/application/openarena/engine
@@ -1 +1 @@
-Subproject commit 951d3515a9e42ad62bd33db2a814664d2881c5d4
+Subproject commit e722a68a0eaa6c6db0104dc1d0591c30b9af1e1a
diff --git a/project/jni/application/openarena/oa-reupload-vm.sh b/project/jni/application/openarena/oa-reupload-vm.sh
index ee9faa0ce..58e4829ae 100755
--- a/project/jni/application/openarena/oa-reupload-vm.sh
+++ b/project/jni/application/openarena/oa-reupload-vm.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
 adb shell rm /sdcard/Android/data/ws.openarena.sdl/files/libsdl-DownloadFinished-10.flag
+adb shell rm -r /sdcard/Android/data/ws.openarena.sdl/files/.openarena
diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm
index 1efdd0036..3500cf1b0 160000
--- a/project/jni/application/openarena/vm
+++ b/project/jni/application/openarena/vm
@@ -1 +1 @@
-Subproject commit 1efdd0036e8c5e75f6709ac89b73de687f5d331a
+Subproject commit 3500cf1b09093804a5869431f4ebb34a9adb6ffa
diff --git a/project/jni/application/pachi/AndroidAppSettings.cfg b/project/jni/application/pachi/AndroidAppSettings.cfg
index 3ab564891..a5055b48c 100644
--- a/project/jni/application/pachi/AndroidAppSettings.cfg
+++ b/project/jni/application/pachi/AndroidAppSettings.cfg
@@ -1,34 +1,54 @@
 # The application settings for Android libSDL port
-AppSettingVersion=16
+AppSettingVersion=17
 LibSdlVersion=1.2
 AppName="Pachi el marciano"
 AppFullName=net.sourceforge.dragontech.pachi
 ScreenOrientation=h
 InhibitSuspend=n
 AppDataDownloadUrl="Game data is 30 Mb|http://sourceforge.net/projects/libsdl-android/files/Pachi/pachi.zip/download"
+VideoDepthBpp=16
+NeedDepthBuffer=n
+NeedStencilBuffer=n
+NeedGles2=n
+SwVideoMode=y
 SdlVideoResize=y
 SdlVideoResizeKeepAspect=n
-NeedDepthBuffer=n
+CompatibilityHacks=n
+CompatibilityHacksStaticInit=n
+CompatibilityHacksTextInputEmulatesHwKeyboard=n
+CompatibilityHacksPreventAudioChopping=n
+CompatibilityHacksAppIgnoresAudioBufferSize=n
 AppUsesMouse=n
 AppNeedsTwoButtonMouse=n
+ShowMouseCursor=n
+ForceRelativeMouseMode=n
 AppNeedsArrowKeys=y
 AppNeedsTextInput=y
 AppUsesJoystick=n
-AppHandlesJoystickSensitivity=n
+AppUsesAccelerometer=n
 AppUsesMultitouch=n
 NonBlockingSwapBuffers=n
 RedefinedKeys="SPACE RETURN"
 AppTouchscreenKeyboardKeysAmount=1
 AppTouchscreenKeyboardKeysAmountAutoFire=0
 RedefinedKeysScreenKb="SPACE RETURN"
+StartupMenuButtonTimeout=3000
+HiddenMenuOptions=''
+FirstStartMenuOptions=''
 MultiABI=n
-AppVersionCode=104
-AppVersionName="1.04"
+AppMinimumRAM=0
+AppVersionCode=106
+AppVersionName="1.06"
+ResetSdlConfigForThisVersion=y
+DeleteFilesOnUpgrade="%"
 CompiledLibraries="sdl_mixer"
 CustomBuildScript=n
 AppCflags='-O2 -finline-functions -Wno-write-strings'
 AppLdflags=''
 AppSubdirsBuild=''
-AppUseCrystaXToolchain=n
 AppCmdline=''
 ReadmeText='^You may press "Home" now - the data will be downloaded in background'
+MinimumScreenSize=n
+AdmobPublisherId=n
+AdmobTestDeviceId=
+AdmobBannerSize=