diff --git a/alienblaster/project/AndroidManifest.xml b/alienblaster/project/AndroidManifest.xml index d0e2f53ed..8672682c5 100644 --- a/alienblaster/project/AndroidManifest.xml +++ b/alienblaster/project/AndroidManifest.xml @@ -1,8 +1,8 @@ Update(this); // Redraw only if necessary: - if (m_redraw) + //if (m_redraw) m_stateStack.back()->Draw(this); m_redraw = false; @@ -277,7 +277,7 @@ void Engine::InitSDL() // Set the video mode: if((m_screen = SDL_SetVideoMode(SCREEN_WIDTH, SCREEN_HEIGHT, vidInfo->vfmt->BitsPerPixel, - SDL_HWSURFACE|SDL_HWPALETTE|0)) == 0) /* The code does not support SDL_DOUBLEBUF, I wonder how it worked before */ + SDL_HWSURFACE|SDL_DOUBLEBUF)) == 0) /* The code does not support SDL_DOUBLEBUF, I wonder how it worked before */ { ERR("Engine::InitSDL() - SDL_SetVideoMode failed (" << SDL_GetError() << ")"); } @@ -306,6 +306,14 @@ void Engine::ShowLoadingScreen() TRAP(surface == NULL, "Engine::ShowLoadingScreen() - File not found"); SDL_FillRect(m_screen, NULL, 0x000000); + + SDL_Surface *surface2 = SDL_DisplayFormat(surface); + SDL_FreeSurface(surface); + surface = surface2; + + SDL_BlitSurface(surface, NULL, m_screen, NULL); + + SDL_Flip(m_screen); SDL_BlitSurface(surface, NULL, m_screen, NULL); diff --git a/alienblaster/project/jni/application/src b/alienblaster/project/jni/application/src index 4de17cd97..d69d77ceb 120000 --- a/alienblaster/project/jni/application/src +++ b/alienblaster/project/jni/application/src @@ -1 +1 @@ -alienblaster \ No newline at end of file +jooleem_0.1.4 \ No newline at end of file diff --git a/alienblaster/project/jni/sdl b/alienblaster/project/jni/sdl index d92c7931b..73bcf85be 120000 --- a/alienblaster/project/jni/sdl +++ b/alienblaster/project/jni/sdl @@ -1 +1 @@ -../sdl/sdl-1.3 \ No newline at end of file +../sdl/sdl-1.2 \ No newline at end of file diff --git a/alienblaster/project/res/values/strings.xml b/alienblaster/project/res/values/strings.xml index be07da4d5..daed1f911 100644 --- a/alienblaster/project/res/values/strings.xml +++ b/alienblaster/project/res/values/strings.xml @@ -1,4 +1,4 @@ - Alien Blaster + Jooleem diff --git a/alienblaster/project/src/Accelerometer.java b/alienblaster/project/src/Accelerometer.java index dd696158e..1407cae3c 100644 --- a/alienblaster/project/src/Accelerometer.java +++ b/alienblaster/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 net.sourceforge.jooleem; import android.app.Activity; import android.content.Context; diff --git a/alienblaster/project/src/Audio.java b/alienblaster/project/src/Audio.java index f386f4a34..3977b7b9e 100644 --- a/alienblaster/project/src/Audio.java +++ b/alienblaster/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 net.sourceforge.jooleem; import android.app.Activity; diff --git a/alienblaster/project/src/DataDownloader.java b/alienblaster/project/src/DataDownloader.java index 7aaf328a1..79e64a3df 100644 --- a/alienblaster/project/src/DataDownloader.java +++ b/alienblaster/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 net.sourceforge.jooleem; import android.app.Activity; import android.content.Context; diff --git a/alienblaster/project/src/GLSurfaceView_SDL.java b/alienblaster/project/src/GLSurfaceView_SDL.java index 9c241fb74..05d9b2f11 100644 --- a/alienblaster/project/src/GLSurfaceView_SDL.java +++ b/alienblaster/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 net.sourceforge.jooleem; import java.io.Writer; import java.util.ArrayList; diff --git a/alienblaster/project/src/Globals.java b/alienblaster/project/src/Globals.java index 8966479e2..0578cea52 100644 --- a/alienblaster/project/src/Globals.java +++ b/alienblaster/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 net.sourceforge.jooleem; import android.app.Activity; import android.content.Context; class Globals { - public static String ApplicationName = "AlienBlaster"; + public static String ApplicationName = "Jooleem"; // Should be zip file - public static String DataDownloadUrl = "http://sites.google.com/site/xpelyax/Home/alienblaster110_data.zip?attredirects=0%26d=1|http://sitesproxy.goapk.com/site/xpelyax/Home/alienblaster110_data.zip"; // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount + public static String DataDownloadUrl = "http://sites.google.com/site/xpelyax/Home/jooleem_0.1.4_data.zip?attredirects=0%26d=1|http://sitesproxy.goapk.com/site/xpelyax/Home/jooleem_0.1.4_data.zip"; // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount // Set DownloadToSdcard to true if your app data is bigger than 5 megabytes. // It will download app data to /sdcard/alienblaster then, @@ -23,12 +23,12 @@ 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^If your phone doesnt have joystick or trackball the accelerometer will be used".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; // We have to use accelerometer as arrow keys - public static boolean AppNeedsArrowKeys = true; + public static boolean AppNeedsArrowKeys = false; public static boolean AppUsesJoystick = false; @@ -36,5 +36,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_mixer"); System.loadLibrary("sdl_image"); System.loadLibrary("sdl_ttf"); }; } diff --git a/alienblaster/project/src/MainActivity.java b/alienblaster/project/src/MainActivity.java index 166660a88..7933ce596 100644 --- a/alienblaster/project/src/MainActivity.java +++ b/alienblaster/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 net.sourceforge.jooleem; import android.app.Activity; import android.content.Context; diff --git a/alienblaster/project/src/Settings.java b/alienblaster/project/src/Settings.java index b00768ba5..140b72702 100644 --- a/alienblaster/project/src/Settings.java +++ b/alienblaster/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 net.sourceforge.jooleem; import android.app.Activity; import android.content.Context; @@ -14,6 +14,8 @@ import java.io.*; import android.app.AlertDialog; import android.content.DialogInterface; import android.content.res.Configuration; +import android.os.Environment; +import android.os.StatFs; class Settings { @@ -53,7 +55,16 @@ class Settings "Unknown" ) ); */ - final CharSequence[] items = {"Phone storage", "SD card"}; + long freeSdcard = 0; + long freePhone = 0; + try { + StatFs sdcard = new StatFs(Environment.getExternalStorageDirectory().getPath()); + StatFs phone = new StatFs(Environment.getDataDirectory().getPath()); + freeSdcard = sdcard.getAvailableBlocks() * sdcard.getBlockSize() / 1024 / 1024; + freePhone = phone.getAvailableBlocks() * phone.getBlockSize() / 1024 / 1024; + }catch(Exception e) {} + + final CharSequence[] items = {"Phone storage - " + String.valueOf(freePhone) + " Mb free", "SD card - " + String.valueOf(freeSdcard) + " Mb free"}; AlertDialog.Builder builder = new AlertDialog.Builder(p); builder.setTitle("Where to download application data"); diff --git a/alienblaster/project/src/Video.java b/alienblaster/project/src/Video.java index a79d480eb..592005d21 100644 --- a/alienblaster/project/src/Video.java +++ b/alienblaster/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 net.sourceforge.jooleem; import javax.microedition.khronos.opengles.GL10;