diff --git a/ChangeAppSettings.sh b/ChangeAppSettings.sh index b4bcf9211..6611e0a9b 100755 --- a/ChangeAppSettings.sh +++ b/ChangeAppSettings.sh @@ -430,7 +430,7 @@ fi echo Patching project/jni/Application.mk cat project/jni/Application.mk | \ - sed "s/APP_MODULES := .*/APP_MODULES := application sdl-$LibSdlVersion sdl_main stlport ogg flac tremor vorbis png jpeg freetype xerces $CompiledLibraries/" | \ + sed "s/APP_MODULES := .*/APP_MODULES := application sdl-$LibSdlVersion sdl_main stlport jpeg png ogg flac vorbis freetype $CompiledLibraries/" | \ sed "s/APP_ABI := .*/APP_ABI := $MultiABI/" > \ project/jni/Application.mk.1 if [ -n "`diff -w project/jni/Application.mk.1 project/jni/Application.mk`" ] ; then diff --git a/project/AndroidManifest.xml b/project/AndroidManifest.xml index 34529bd51..6cea5821c 100644 --- a/project/AndroidManifest.xml +++ b/project/AndroidManifest.xml @@ -1,8 +1,8 @@ - enigma + Commander Genius Initializing diff --git a/project/src/Accelerometer.java b/project/src/Accelerometer.java index 1f7bca4bb..4c4c44a26 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 org.enigmagame.enigma; +package net.sourceforge.clonekeenplus; import android.app.Activity; import android.content.Context; diff --git a/project/src/Audio.java b/project/src/Audio.java index aa297b09c..210a7f040 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 org.enigmagame.enigma; +package net.sourceforge.clonekeenplus; import android.app.Activity; diff --git a/project/src/DataDownloader.java b/project/src/DataDownloader.java index 1510b32d4..d9d8ad87a 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 org.enigmagame.enigma; +package net.sourceforge.clonekeenplus; import android.app.Activity; import android.content.Context; diff --git a/project/src/GLSurfaceView_SDL.java b/project/src/GLSurfaceView_SDL.java index 613821999..eec731f61 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 org.enigmagame.enigma; +package net.sourceforge.clonekeenplus; import java.io.Writer; import java.util.ArrayList; diff --git a/project/src/Globals.java b/project/src/Globals.java index 91464785a..689c6b06d 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 org.enigmagame.enigma; +package net.sourceforge.clonekeenplus; import android.app.Activity; import android.content.Context; class Globals { - public static String ApplicationName = "enigma"; + public static String ApplicationName = "CommanderGenius"; // Should be zip file - public static String DataDownloadUrl = "Enigma Game Data (6.5 MiB)|http://sourceforge.net/projects/libsdl-android/files/Enigma/enigma-data32.zip/download|http://sites.google.com/site/droidsdl/data/enigma-data32.zip?attredirects=0%26d=1"; + public static String DataDownloadUrl = "Data files are 2 Mb|https://sourceforge.net/projects/libsdl-android/files/CommanderGenius/commandergenius-data.zip/download^High-quality GFX and music - 40 Mb|https://sourceforge.net/projects/libsdl-android/files/CommanderGenius/commandergenius-hqp.zip/download"; // 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; @@ -17,26 +17,26 @@ class Globals { public static boolean HorizontalOrientation = true; // prevent device from going to suspend mode - public static boolean InhibitSuspend = true; + public static boolean InhibitSuspend = false; // Readme text to be shown on download page - public static String ReadmeText = "^You can press \"Home\" now - the data will be downloaded in background^Have fun playing enigma!^".replace("^","\n"); + public static String ReadmeText = "^You may press \"Home\" now - the data will be downloaded in background".replace("^","\n"); - public static boolean AppUsesMouse = true; + public static boolean AppUsesMouse = false; - public static boolean AppNeedsArrowKeys = false; + public static boolean AppNeedsArrowKeys = true; public static boolean AppUsesJoystick = true; - public static boolean AppHandlesJoystickSensitivity = true; + public static boolean AppHandlesJoystickSensitivity = false; public static boolean AppUsesMultitouch = false; public static boolean NonBlockingSwapBuffers = false; - public static int AppTouchscreenKeyboardKeysAmount = 0; + public static int AppTouchscreenKeyboardKeysAmount = 4; - public static int AppTouchscreenKeyboardKeysAmountAutoFire = 0; + public static int AppTouchscreenKeyboardKeysAmountAutoFire = 1; // Phone-specific config // It will download app data to /sdcard/alienblaster if set to true, @@ -56,5 +56,5 @@ class Globals { } class LoadLibrary { - public LoadLibrary() { System.loadLibrary("sdl-1.2"); System.loadLibrary("sdl_mixer"); System.loadLibrary("sdl_image"); System.loadLibrary("sdl_ttf"); System.loadLibrary("intl"); System.loadLibrary("lua"); }; + public LoadLibrary() { System.loadLibrary("sdl-1.2"); }; } diff --git a/project/src/MainActivity.java b/project/src/MainActivity.java index 7288b45f7..ee2b912fc 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 org.enigmagame.enigma; +package net.sourceforge.clonekeenplus; import android.app.Activity; import android.content.Context; diff --git a/project/src/Settings.java b/project/src/Settings.java index 9bff5d278..a53597e78 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 org.enigmagame.enigma; +package net.sourceforge.clonekeenplus; import android.app.Activity; import android.content.Context; diff --git a/project/src/Video.java b/project/src/Video.java index cf7463d6e..c7daee6df 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 org.enigmagame.enigma; +package net.sourceforge.clonekeenplus; import javax.microedition.khronos.opengles.GL10;