diff --git a/ChangeAppSettings.sh b/ChangeAppSettings.sh index 069707374..1ff50ef17 100755 --- a/ChangeAppSettings.sh +++ b/ChangeAppSettings.sh @@ -1,6 +1,6 @@ #!/bin/sh -CHANGE_APP_SETTINGS_VERSION=4 +CHANGE_APP_SETTINGS_VERSION=5 AUTO= if [ "X$1" = "X-a" ]; then @@ -46,9 +46,9 @@ if [ -n "$var" ] ; then ScreenOrientation="$var" fi -echo -n "\nSpecify path to download application data in zip archive in the form 'Description|URL|BackupURL|...'" -echo -n "\nYou may specify paths to optional game content delimited by newlines (empty line to finish)" -echo -n "\nIf the URL starts with '-' symbol it will be downloaded as-is to game dir and not unzipped\n\n" +echo -n "\nSpecify path to download application data in zip archive in the form 'Description|http://URL|http://BackupURL|...'" +echo -n "\nYou may specify additional paths to optional game content delimited by newlines (empty line to finish)" +echo -n "\nIf the URL in in the form ':dir/file.dat:http://URL/' it will be downloaded as-is to game dir and not unzipped\n\n" echo -n "`echo $AppDataDownloadUrl | tr '^' '\\n'`" echo AppDataDownloadUrl1="" diff --git a/project/AndroidManifest.xml b/project/AndroidManifest.xml index 6aa3f5dc2..a9baa7c5e 100644 --- a/project/AndroidManifest.xml +++ b/project/AndroidManifest.xml @@ -1,8 +1,8 @@ 0 ? - downloadUrls[downloadUrlIndex].indexOf("?") : - downloadUrls[downloadUrlIndex].length() )); + path = getOutFilePath(downloadUrls[downloadUrlIndex].substring( 1, + downloadUrls[downloadUrlIndex].indexOf(":", 1) )); OutputStream out = null; try { out = new FileOutputStream( path ); diff --git a/project/src/Globals.java b/project/src/Globals.java index 8bd27d0e3..4698d71e7 100644 --- a/project/src/Globals.java +++ b/project/src/Globals.java @@ -8,7 +8,7 @@ class Globals { public static String ApplicationName = "Ur-QuanMasters"; // Should be zip file - 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"; + 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)|: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)|: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"; // 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;