From a0c98546b11040576f368d2d5e5f3b71c235bed1 Mon Sep 17 00:00:00 2001 From: pelya Date: Mon, 30 Aug 2010 15:55:09 +0300 Subject: [PATCH] Mouse enabled in Tyrian, not finished yet (also nasty bug with keyboard repeat fixed) --- ChangeAppSettings.sh | 3 +-- project/AndroidManifest.xml | 6 +++--- project/jni/Android.mk | 8 ++++---- project/jni/Application.mk | 2 +- project/jni/application/opentyrian/AppSettings.cfg | 2 +- project/jni/application/opentyrian/src/keyboard.cpp | 2 ++ project/jni/application/src | 2 +- project/jni/sdl | 2 +- project/res/values/strings.xml | 2 +- project/src/Accelerometer.java | 2 +- project/src/Audio.java | 2 +- project/src/DataDownloader.java | 2 +- project/src/GLSurfaceView_SDL.java | 2 +- project/src/Globals.java | 12 ++++++------ project/src/MainActivity.java | 2 +- project/src/Settings.java | 2 +- project/src/Video.java | 2 +- 17 files changed, 28 insertions(+), 27 deletions(-) diff --git a/ChangeAppSettings.sh b/ChangeAppSettings.sh index 9b01df64e..589e8612e 100755 --- a/ChangeAppSettings.sh +++ b/ChangeAppSettings.sh @@ -351,8 +351,7 @@ echo Forcing rebuild of specific files rm -rf project/libs/* rm -rf project/bin/ndk/local/*/objs/sdl_main/* project/bin/ndk/local/*/libsdl_main.so rm -rf project/bin/ndk/local/*/libsdl.so -rm -rf project/bin/ndk/local/*/objs/sdl/src/audio/android -rm -rf project/bin/ndk/local/*/objs/sdl/src/video/android/*.o +rm -rf project/bin/ndk/local/*/objs/sdl/src/*/android rm -rf project/bin/ndk/local/*/objs/sdl/src/video/SDL_video.o rm -rf project/bin/ndk/local/*/objs/sdl/SDL_renderer_gles.o if [ "$LibSdlVersionOld" '!=' "$LibSdlVersion" ]; then diff --git a/project/AndroidManifest.xml b/project/AndroidManifest.xml index 2b223cf0f..93bf87984 100644 --- a/project/AndroidManifest.xml +++ b/project/AndroidManifest.xml @@ -1,8 +1,8 @@ - Alien Blaster + OpenTyrian diff --git a/project/src/Accelerometer.java b/project/src/Accelerometer.java index 8218593d2..b46b829e0 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 de.schwardtnet.alienblaster; +package com.googlecode.opentyrian; import android.app.Activity; import android.content.Context; diff --git a/project/src/Audio.java b/project/src/Audio.java index 6a861b18e..8e2da1863 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 de.schwardtnet.alienblaster; +package com.googlecode.opentyrian; import android.app.Activity; diff --git a/project/src/DataDownloader.java b/project/src/DataDownloader.java index 7fe4bb6e4..13c2dafe4 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 de.schwardtnet.alienblaster; +package com.googlecode.opentyrian; import android.app.Activity; import android.content.Context; diff --git a/project/src/GLSurfaceView_SDL.java b/project/src/GLSurfaceView_SDL.java index 9c241fb74..b37c5722a 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 de.schwardtnet.alienblaster; +package com.googlecode.opentyrian; import java.io.Writer; import java.util.ArrayList; diff --git a/project/src/Globals.java b/project/src/Globals.java index 4a48484e5..57eb31bdd 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 de.schwardtnet.alienblaster; +package com.googlecode.opentyrian; import android.app.Activity; import android.content.Context; class Globals { - public static String ApplicationName = "AlienBlaster"; + public static String ApplicationName = "OpenTyrian"; // Should be zip file - public static String DataDownloadUrl = "Data size is 2 Mb|http://sites.google.com/site/xpelyax/Home/alienblaster110_data.zip?attredirects=0%26d=1|http://sitesproxy.goapk.com/site/xpelyax/Home/alienblaster110_data.zip"; + 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"; // 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,9 +17,9 @@ class Globals { public static boolean HorizontalOrientation = true; // Readme text to be shown on download page - public static String ReadmeText = "^You can press \"Home\" now - the data will be downloaded in background^In game press \"Menu\" for secondary fire, \"Volume Up/Down\" to cycle weapons".replace("^","\n"); + public static String ReadmeText = "^You may press \"Home\" now - the data will be downloaded in background".replace("^","\n"); - public static boolean AppUsesMouse = false; + public static boolean AppUsesMouse = true; public static boolean AppNeedsArrowKeys = true; @@ -48,5 +48,5 @@ class Globals { } class LoadLibrary { - public LoadLibrary() { System.loadLibrary("sdl"); System.loadLibrary("sdl_mixer"); System.loadLibrary("sdl_image"); }; + public LoadLibrary() { System.loadLibrary("sdl"); System.loadLibrary("sdl_net"); }; } diff --git a/project/src/MainActivity.java b/project/src/MainActivity.java index 1ef50a51f..41860c2b0 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 de.schwardtnet.alienblaster; +package com.googlecode.opentyrian; import android.app.Activity; import android.content.Context; diff --git a/project/src/Settings.java b/project/src/Settings.java index 2eb1d5167..8fed049a8 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 de.schwardtnet.alienblaster; +package com.googlecode.opentyrian; import android.app.Activity; import android.content.Context; diff --git a/project/src/Video.java b/project/src/Video.java index f1415a732..05d4f0e7c 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 de.schwardtnet.alienblaster; +package com.googlecode.opentyrian; import javax.microedition.khronos.opengles.GL10;