From 4de2a2d0a1a72a7ad103696a2d459107340ca801 Mon Sep 17 00:00:00 2001
From: Sergii Pylypenko <x.pelya.x@gmail.com>
Date: Fri, 13 Dec 2013 07:26:27 +0200
Subject: [PATCH] Upodated OpenArena and TODO

---
 project/jni/application/openarena/AndroidAppSettings.cfg | 6 +++---
 project/jni/application/openarena/AndroidBuild.sh        | 2 +-
 project/jni/application/openarena/engine                 | 2 +-
 project/jni/boost/src                                    | 2 +-
 project/jni/guichan/Android.mk                           | 2 +-
 project/jni/guichan/src/contrib/sdl/sdltruetypefont.cpp  | 3 +++
 todo.txt                                                 | 4 ++--
 7 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/project/jni/application/openarena/AndroidAppSettings.cfg b/project/jni/application/openarena/AndroidAppSettings.cfg
index 9357e84fa..f99d005e7 100644
--- a/project/jni/application/openarena/AndroidAppSettings.cfg
+++ b/project/jni/application/openarena/AndroidAppSettings.cfg
@@ -164,16 +164,16 @@ FirstStartMenuOptions=''
 
 # Enable multi-ABI binary, with hardware FPU support - it will also work on old devices,
 # but .apk size is 2x bigger (y) / (n) / (x86) / (all)
-MultiABI=y
+MultiABI=all
 
 # Minimum amount of RAM application requires, in Mb, SDL will print warning to user if it's lower
 AppMinimumRAM=300
 
 # Application version code (integer)
-AppVersionCode=08823
+AppVersionCode=08824
 
 # Application user-visible version name (string)
-AppVersionName="0.8.8.23"
+AppVersionName="0.8.8.24"
 
 # Reset SDL config when updating application to the new version (y) / (n)
 ResetSdlConfigForThisVersion=n
diff --git a/project/jni/application/openarena/AndroidBuild.sh b/project/jni/application/openarena/AndroidBuild.sh
index 0e8e24176..1a17bd7a7 100755
--- a/project/jni/application/openarena/AndroidBuild.sh
+++ b/project/jni/application/openarena/AndroidBuild.sh
@@ -17,7 +17,7 @@ if [ "$1" = "armeabi" ]; then (
 ) || 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
+env NO_SHARED_LIBS=1 BUILD_EXECUTABLE=1 V=1 ../setEnvironment-$1.sh make -C vm -j8 PLATFORM=android ARCH=$1 USE_LOCAL_HEADERS=0 BUILD_MISSIONPACK=0 || exit 1
 
 # Do not generate shared game logic libs - QVM files are used instead
 # ../setEnvironment-armeabi.sh sh -c "cd vm/build/release-android-$1/baseq3 && \$STRIP --strip-unneeded *.so && zip ../../../../AndroidData/binaries.zip *.so"
diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine
index 30e98be35..ee58857e5 160000
--- a/project/jni/application/openarena/engine
+++ b/project/jni/application/openarena/engine
@@ -1 +1 @@
-Subproject commit 30e98be3582cca3009f371ca2f9a7334e24e1582
+Subproject commit ee58857e5086292e8f00b7ffaa523cddf317a850
diff --git a/project/jni/boost/src b/project/jni/boost/src
index 43d243584..82900d3d0 160000
--- a/project/jni/boost/src
+++ b/project/jni/boost/src
@@ -1 +1 @@
-Subproject commit 43d243584fc860688b725f399d15af53cc5d2f35
+Subproject commit 82900d3d0e9638172f7d65d130ca75f810cefb48
diff --git a/project/jni/guichan/Android.mk b/project/jni/guichan/Android.mk
index 30dedb31e..691c142b7 100644
--- a/project/jni/guichan/Android.mk
+++ b/project/jni/guichan/Android.mk
@@ -20,6 +20,6 @@ LOCAL_SHARED_LIBRARIES += sdl_image sdl_ttf
 
 LOCAL_STATIC_LIBRARIES := 
 
-LOCAL_LDLIBS := 
+LOCAL_LDLIBS := -llog
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/project/jni/guichan/src/contrib/sdl/sdltruetypefont.cpp b/project/jni/guichan/src/contrib/sdl/sdltruetypefont.cpp
index 1fc11ed99..675628302 100644
--- a/project/jni/guichan/src/contrib/sdl/sdltruetypefont.cpp
+++ b/project/jni/guichan/src/contrib/sdl/sdltruetypefont.cpp
@@ -52,6 +52,8 @@
 #include "guichan/graphics.hpp"
 #include "guichan/sdl/sdlgraphics.hpp"
 
+#include <android/log.h>
+
 namespace gcn
 {
     namespace contrib
@@ -68,6 +70,7 @@ namespace gcn
         
             if (mFont == NULL)
             {
+                __android_log_print(ANDROID_LOG_INFO, "GUICHAN", "Cannot open font %s: %s", filename.c_str(), TTF_GetError());
                 throw GCN_EXCEPTION("SDLTrueTypeFont::SDLTrueTypeFont. "+std::string(TTF_GetError()));
             }
         }
diff --git a/todo.txt b/todo.txt
index 16a38f54a..507dc82fe 100644
--- a/todo.txt
+++ b/todo.txt
@@ -17,6 +17,8 @@ Requested features, might never get implemented
 - Support of libjnigraphics (it will disable on-screen keyboard, only SW SDL screen surface supported).
   This is not relevant already, as every device around is fast enough with GL.
 
+- Cloud save support.
+
 TODO, which will get actually done
 ==================================
 
@@ -28,8 +30,6 @@ TODO, which will get actually done
 
 - OpenArena: Shift and Ctrl keys on USB keyboard do not work for text input.
 
-- OpenArena: Play silence if audio buffer underrun.
-
 - OpenArena: When entering with USB keyboard into chatbox, first 't' disappears.
 
 - OpenArena: enable mouse events, make mouse move with HOVER event, remove warnings.