diff --git a/project/AndroidManifest.xml b/project/AndroidManifest.xml index 942be78f8..790306167 100644 --- a/project/AndroidManifest.xml +++ b/project/AndroidManifest.xml @@ -1,8 +1,8 @@ #include #include +#ifdef ANDROID +#include +#endif #include "libs/threadlib.h" #ifndef MAX_LOG_ENTRY_SIZE @@ -190,6 +193,9 @@ log_addV (log_Level level, const char *fmt, va_list list) if ((int)level <= maxStreamLevel) { fprintf (streamOut, "%s\n", full_msg); +#ifdef ANDROID + __android_log_print( ANDROID_LOG_INFO, "Ur-Quan Masters", "%s", full_msg ); +#endif } if ((int)level <= maxLevel) @@ -226,6 +232,9 @@ log_add_nothreadV (log_Level level, const char *fmt, va_list list) if ((int)level <= maxStreamLevel) { fprintf (streamOut, "%s\n", full_msg); +#ifdef ANDROID + __android_log_print( ANDROID_LOG_INFO, "Ur-Quan Masters", "%s", full_msg ); +#endif } if ((int)level <= maxLevel) diff --git a/project/jni/application/sc2/src/options.c b/project/jni/application/sc2/src/options.c index 1ea483cb6..d8306dfa1 100644 --- a/project/jni/application/sc2/src/options.c +++ b/project/jni/application/sc2/src/options.c @@ -131,7 +131,7 @@ findFileInDirs (const char *locs[], int numLocs, const char *file) void prepareContentDir (const char *contentDirName, const char* addonDirName, const char *execFile) { - const char *testFile = "uqm-0.6.0-content.uqm"; + const char *testFile = "version"; const char *loc; if (contentDirName == NULL) diff --git a/project/jni/application/src b/project/jni/application/src index 7fa7b8f4e..706424f94 120000 --- a/project/jni/application/src +++ b/project/jni/application/src @@ -1 +1 @@ -opentyrian \ No newline at end of file +sc2 \ No newline at end of file diff --git a/project/res/values/strings.xml b/project/res/values/strings.xml index bdeb1e31a..8834ce584 100644 --- a/project/res/values/strings.xml +++ b/project/res/values/strings.xml @@ -1,4 +1,4 @@ - OpenTyrian + Ur-Quan Masters diff --git a/project/src/Accelerometer.java b/project/src/Accelerometer.java index b46b829e0..8fa80d363 100644 --- a/project/src/Accelerometer.java +++ b/project/src/Accelerometer.java @@ -1,5 +1,5 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package com.googlecode.opentyrian; +package com.sourceforge.sc2; import android.app.Activity; import android.content.Context; diff --git a/project/src/Audio.java b/project/src/Audio.java index 8e2da1863..0c25623e1 100644 --- a/project/src/Audio.java +++ b/project/src/Audio.java @@ -1,5 +1,5 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package com.googlecode.opentyrian; +package com.sourceforge.sc2; import android.app.Activity; diff --git a/project/src/DataDownloader.java b/project/src/DataDownloader.java index 7668c0e49..1b395b854 100644 --- a/project/src/DataDownloader.java +++ b/project/src/DataDownloader.java @@ -1,5 +1,5 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package com.googlecode.opentyrian; +package com.sourceforge.sc2; import android.app.Activity; import android.content.Context; diff --git a/project/src/GLSurfaceView_SDL.java b/project/src/GLSurfaceView_SDL.java index b37c5722a..b7b2300d2 100644 --- a/project/src/GLSurfaceView_SDL.java +++ b/project/src/GLSurfaceView_SDL.java @@ -18,7 +18,7 @@ fixed with a hammer and rasp to work with libSDL port */ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package com.googlecode.opentyrian; +package com.sourceforge.sc2; import java.io.Writer; import java.util.ArrayList; diff --git a/project/src/Globals.java b/project/src/Globals.java index ccec1c5ba..8bd27d0e3 100644 --- a/project/src/Globals.java +++ b/project/src/Globals.java @@ -1,14 +1,14 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount anywhere -package com.googlecode.opentyrian; +package com.sourceforge.sc2; import android.app.Activity; import android.content.Context; class Globals { - public static String ApplicationName = "OpenTyrian"; + public static String ApplicationName = "Ur-QuanMasters"; // Should be zip file - public static String DataDownloadUrl = "^Data files size is 11 Mb|http://sites.google.com/site/xpelyax/Home/tyrian21-data.zip?attredirects=0%26d=1|http://sitesproxy.goapk.com/site/xpelyax/Home/tyrian21-data.zip"; + public static String DataDownloadUrl = "Game data is 60 Mb|https://sites.google.com/site/xpelyax/Home/sc2-data.zip?attredirects=0%26d=1|http://sitesproxy.goapk.com/site/xpelyax/Home/sc2-data.zip"; // Set this value to true if you're planning to render 3D using OpenGL - it eats some GFX resources, so disabled for 2D public static boolean NeedDepthBuffer = false; @@ -27,7 +27,7 @@ class Globals { public static boolean AppUsesMultitouch = false; - public static int AppTouchscreenKeyboardKeysAmount = 4; + public static int AppTouchscreenKeyboardKeysAmount = 2; // Phone-specific config // It will download app data to /sdcard/alienblaster if set to true, @@ -45,5 +45,5 @@ class Globals { } class LoadLibrary { - public LoadLibrary() { System.loadLibrary("sdl"); System.loadLibrary("sdl_net"); }; + public LoadLibrary() { System.loadLibrary("sdl"); System.loadLibrary("sdl_image"); }; } diff --git a/project/src/MainActivity.java b/project/src/MainActivity.java index 9820d3578..94aa8bd7c 100644 --- a/project/src/MainActivity.java +++ b/project/src/MainActivity.java @@ -1,5 +1,5 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package com.googlecode.opentyrian; +package com.sourceforge.sc2; import android.app.Activity; import android.content.Context; diff --git a/project/src/Settings.java b/project/src/Settings.java index 4b70f2230..fb97dd5cf 100644 --- a/project/src/Settings.java +++ b/project/src/Settings.java @@ -1,5 +1,5 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package com.googlecode.opentyrian; +package com.sourceforge.sc2; import android.app.Activity; import android.content.Context; @@ -176,6 +176,8 @@ class Settings String [] downloadFiles = Globals.DataDownloadUrl.split("\\^"); if(downloadFiles.length <= 1) { + Globals.OptionalDataDownload = new boolean[1]; + Globals.OptionalDataDownload[0] = true; showKeyboardConfig(p); return; } diff --git a/project/src/Video.java b/project/src/Video.java index ea81d4b79..e9c4cf7a6 100644 --- a/project/src/Video.java +++ b/project/src/Video.java @@ -1,5 +1,5 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package com.googlecode.opentyrian; +package com.sourceforge.sc2; import javax.microedition.khronos.opengles.GL10;