Permalink
Browse files

Fixed another bug in Data Downloader

  • Loading branch information...
1 parent 4f3afa5 commit 802e8340d746277b9399b3e630633a86cb9d1781 @pelya pelya committed Aug 27, 2010
View
2 ChangeAppSettings.sh
@@ -357,7 +357,7 @@ 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
# Internal types are different in SDL 1.2 and 1.3, namely SDL_Rect, so all libs using it have to be recompiled
- rm -rf project/bin/ndk/local/*/objs/sdl*
+ rm -rf project/bin/ndk/local/*/objs/sdl* project/bin/ndk/local/*/libsdl*
rm -rf project/bin/ndk/local/*/objs/application project/bin/ndk/local/*/libapplication.so
fi
# Do not rebuild libraries that do not need that
View
6 project/AndroidManifest.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.sourceforge.sc2"
- android:versionCode="1005"
- android:versionName="1.0.05"
+ package="de.schwardtnet.alienblaster"
+ android:versionCode="110008"
+ android:versionName="1.1.0.08"
android:installLocation="preferExternal"
>
<application android:label="@string/app_name"
View
12 project/jni/Android.mk
@@ -1,6 +1,6 @@
# The namespace in Java file, with dots replaced with underscores
-SDL_JAVA_PACKAGE_PATH := com_sourceforge_sc2
+SDL_JAVA_PACKAGE_PATH := de_schwardtnet_alienblaster
# Path to shared libraries - Android 1.6 cannot load them properly, thus we have to specify absolute path here
# SDL_SHARED_LIBRARIES_PATH := /data/data/de.schwardtnet.alienblaster/lib
@@ -10,7 +10,7 @@ SDL_JAVA_PACKAGE_PATH := com_sourceforge_sc2
# Typically /sdcard/alienblaster
# Or /data/data/de.schwardtnet.alienblaster/files if you're planning to unpack data in application private folder
# Your application will just set current directory there
-SDL_CURDIR_PATH := com.sourceforge.sc2
+SDL_CURDIR_PATH := de.schwardtnet.alienblaster
# Android Dev Phone G1 has trackball instead of cursor keys, and
# sends trackball movement events as rapid KeyDown/KeyUp events,
@@ -23,13 +23,13 @@ SDL_TRACKBALL_KEYUP_DELAY := 1
# resized in HW-accelerated way, however it eats a tiny bit of CPU
SDL_VIDEO_RENDER_RESIZE := 1
-COMPILED_LIBRARIES := sdl_image
+COMPILED_LIBRARIES := sdl_mixer sdl_image
-APPLICATION_ADDITIONAL_CFLAGS := -O0 -DTHREADLIB_SDL=1 -DTIMELIB=SDL -DOVCODEC_TREMOR=1 -DNETPLAY=1 -DHAVE_REGEX=1 -DHAVE_GETOPT_LONG=1 -DHAVE_ZIP=1
+APPLICATION_ADDITIONAL_CFLAGS := -finline-functions -O2
-APPLICATION_ADDITIONAL_LDFLAGS := -Lbin/ndk/local/armeabi -ltremor
+APPLICATION_ADDITIONAL_LDFLAGS :=
-SDL_ADDITIONAL_CFLAGS := -DSDL_ANDROID_KEYCODE_MOUSE=UNKNOWN -DSDL_ANDROID_KEYCODE_0=RETURN -DSDL_ANDROID_KEYCODE_1=RSHIFT -DSDL_ANDROID_KEYCODE_2=KP_PLUS -DSDL_ANDROID_KEYCODE_3=KP_MINUS -DSDL_ANDROID_KEYCODE_4=ESCAPE -DSDL_ANDROID_KEYCODE_5=F10
+SDL_ADDITIONAL_CFLAGS := -DSDL_ANDROID_KEYCODE_MOUSE=UNKNOWN -DSDL_ANDROID_KEYCODE_0=RETURN -DSDL_ANDROID_KEYCODE_1=LCTRL -DSDL_ANDROID_KEYCODE_2=PAGEUP -DSDL_ANDROID_KEYCODE_3=PAGEDOWN -DSDL_ANDROID_KEYCODE_4=LCTRL
# If SDL_Mixer should link to libMAD
SDL_MIXER_USE_LIBMAD :=
View
2 project/jni/Application.mk
@@ -5,6 +5,6 @@ APP_PROJECT_PATH := $(call my-dir)/..
# sdl_image depends on png and jpeg
# sdl_ttf depends on freetype
-APP_MODULES := application sdl sdl_main stlport tremor png jpeg freetype sdl_image
+APP_MODULES := application sdl sdl_main stlport tremor png jpeg freetype sdl_mixer sdl_image
APP_ABI := armeabi
View
7 project/jni/application/alienblaster/AppSettings.cfg
@@ -1,4 +1,4 @@
-AppSettingVersion=4
+AppSettingVersion=6
LibSdlVersion=1.3
AppName="Alien Blaster"
AppFullName=de.schwardtnet.alienblaster
@@ -12,9 +12,10 @@ AppUsesJoystick=n
AppUsesMultitouch=n
RedefinedKeys="RETURN LCTRL PAGEUP PAGEDOWN LCTRL"
AppTouchscreenKeyboardKeysAmount=4
+AppTouchscreenKeyboardKeysAmountAutoFire=1
MultiABI=n
-AppVersionCode=110007
-AppVersionName="1.1.0.07"
+AppVersionCode=110008
+AppVersionName="1.1.0.08"
CompiledLibraries="sdl_mixer sdl_image"
AppCflags='-finline-functions -O2'
AppLdflags=''
View
2 project/jni/application/src
View
2 project/jni/sdl
View
2 project/res/values/strings.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <string name="app_name">Ur-Quan Masters</string>
+ <string name="app_name">Alien Blaster</string>
</resources>
View
2 project/src/Accelerometer.java
@@ -1,5 +1,5 @@
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
-package com.sourceforge.sc2;
+package de.schwardtnet.alienblaster;
import android.app.Activity;
import android.content.Context;
View
2 project/src/Audio.java
@@ -1,5 +1,5 @@
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
-package com.sourceforge.sc2;
+package de.schwardtnet.alienblaster;
import android.app.Activity;
View
8 project/src/DataDownloader.java
@@ -1,5 +1,5 @@
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
-package com.sourceforge.sc2;
+package de.schwardtnet.alienblaster;
import android.app.Activity;
import android.content.Context;
@@ -243,6 +243,8 @@ public boolean DownloadDataFile(final String DataDownloadUrl, final String Downl
System.out.println("Failed to connect to " + url);
downloadUrlIndex++;
}
+ else
+ break;
}
}
if( response == null )
@@ -267,6 +269,10 @@ public boolean DownloadDataFile(final String DataDownloadUrl, final String Downl
downloadUrls[downloadUrlIndex].indexOf(":", 1) ));
OutputStream out = null;
try {
+ try {
+ (new File( path.substring(0, path.lastIndexOf("/") ))).mkdirs();
+ } catch( SecurityException e ) { };
+
out = new FileOutputStream( path );
} catch( FileNotFoundException e ) {
} catch( SecurityException e ) { };
View
2 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.sourceforge.sc2;
+package de.schwardtnet.alienblaster;
import java.io.Writer;
import java.util.ArrayList;
View
14 project/src/Globals.java
@@ -1,14 +1,14 @@
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount anywhere
-package com.sourceforge.sc2;
+package de.schwardtnet.alienblaster;
import android.app.Activity;
import android.content.Context;
class Globals {
- public static String ApplicationName = "Ur-QuanMasters";
+ public static String ApplicationName = "AlienBlaster";
// Should be zip file
- public static String DataDownloadUrl = "Game data is 14 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^3DO remixed music (19 Mb) - enable it in Setup->Sound Options->3DO Remixes|:addons/3domusic/3domusic.zip:https://sites.google.com/site/xpelyax/Home/3domusic.zip?attredirects=0%26d=1|:addons/3domusic/3domusic.zip:http://sitesproxy.goapk.com/site/xpelyax/Home/3domusic.zip^UQM music remix pack 1 (50 Mb) - enable it in Setup->Sound Options->UQM Remixes|:addons/remix/uqm-remix-pack1.zip:http://sourceforge.net/projects/sc2/files/UQM%20Remix%20Packs/UQM%20Remix%20Pack%201/uqm-remix-pack1.zip/download^UQM music remix pack 2 (60 Mb)|:addons/remix/uqm-remix-pack2.zip:http://sourceforge.net/projects/sc2/files/UQM%20Remix%20Packs/UQM%20Remix%20Pack%202/uqm-remix-pack2.zip/download^UQM music remix pack 3 (40 Mb)|:addons/remix/uqm-remix-pack3.zip:http://sourceforge.net/projects/sc2/files/UQM%20Remix%20Packs/UQM%20Remix%20Pack%203/uqm-remix-pack3.zip/download";
+ 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";
// 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,7 +17,7 @@
public static boolean HorizontalOrientation = true;
// Readme text to be shown on download page
- public static String ReadmeText = "^You may press \"Home\" now - the data will be downloaded in background".replace("^","\n");
+ 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 boolean AppUsesMouse = false;
@@ -27,9 +27,9 @@
public static boolean AppUsesMultitouch = false;
- public static int AppTouchscreenKeyboardKeysAmount = 2;
+ public static int AppTouchscreenKeyboardKeysAmount = 4;
- public static int AppTouchscreenKeyboardKeysAmountAutoFire = 2;
+ public static int AppTouchscreenKeyboardKeysAmountAutoFire = 1;
// Phone-specific config
// It will download app data to /sdcard/alienblaster if set to true,
@@ -48,5 +48,5 @@
}
class LoadLibrary {
- public LoadLibrary() { System.loadLibrary("sdl"); System.loadLibrary("sdl_image"); };
+ public LoadLibrary() { System.loadLibrary("sdl"); System.loadLibrary("sdl_mixer"); System.loadLibrary("sdl_image"); };
}
View
2 project/src/MainActivity.java
@@ -1,5 +1,5 @@
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
-package com.sourceforge.sc2;
+package de.schwardtnet.alienblaster;
import android.app.Activity;
import android.content.Context;
View
12 project/src/Settings.java
@@ -1,5 +1,5 @@
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
-package com.sourceforge.sc2;
+package de.schwardtnet.alienblaster;
import android.app.Activity;
import android.content.Context;
@@ -213,15 +213,21 @@ static void showOptionalDownloadConfig(final MainActivity p) {
{
public void onClick(DialogInterface dialog, int item, boolean isChecked)
{
+ System.out.println("Globals.OptionalDataDownload: set item " + String.valueOf(item + 1) + " to " + String.valueOf(isChecked));
Globals.OptionalDataDownload[item+1] = isChecked;
}
});
builder.setPositiveButton("Done", new DialogInterface.OnClickListener()
{
public void onClick(DialogInterface dialog, int item)
{
- dialog.dismiss();
- showKeyboardConfig(p);
+
+ System.out.println("Globals.OptionalDataDownload len" + String.valueOf(Globals.OptionalDataDownload.length));
+ for(int i = 0; i < Globals.OptionalDataDownload.length; i++)
+ System.out.println("Globals.OptionalDataDownload[" + String.valueOf(i) + "] = '" + String.valueOf(Globals.OptionalDataDownload[i]) + "'");
+
+ dialog.dismiss();
+ showKeyboardConfig(p);
}
});
View
2 project/src/Video.java
@@ -1,5 +1,5 @@
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
-package com.sourceforge.sc2;
+package de.schwardtnet.alienblaster;
import javax.microedition.khronos.opengles.GL10;

0 comments on commit 802e834

Please sign in to comment.