Merge branch 'update_hyperrogue' into 'master'

Update HyperRogue III to 4.4a (441)

Patch is a diff between https://bitbucket.org/dalb8/hyperrogue-iii-for-android/src and the 4.4a zip available at http://www.roguetemple.com/z/hyper/download.php

Build, install and functionality tested. Crashs on a 5.0 android device (probably due to an incompatibility?) but not on a 4.4 device.

See merge request !623
This commit is contained in:
Boris Kraut 2015-03-11 09:59:08 +00:00
commit e69694a09d
2 changed files with 44 additions and 4 deletions

View file

@ -27,8 +27,19 @@ Build:3.7,370
commit=2
buildjni=yes
Auto Update Mode:None
Update Check Mode:None
Current Version:3.7
Current Version Code:370
Build:4.4,440
commit=367a1e5a7cf10acb7a9a650a96ad8980d5146653
target=android-7
buildjni=yes
Build:4.4a,441
commit=367a1e5a7cf10acb7a9a650a96ad8980d5146653
target=android-7
buildjni=yes
patch=patch-4.4a.patch
Auto Update Mode:None
Update Check Mode:RepoManifest
Current Version:4.4
Current Version Code:440

View file

@ -0,0 +1,29 @@
diff -ur com.roguetemple.hyperroid/AndroidManifest.xml hyperroid/AndroidManifest.xml
--- com.roguetemple.hyperroid/AndroidManifest.xml 2015-03-11 09:59:01.070147132 +0100
+++ hyperroid/AndroidManifest.xml 2014-03-25 12:36:36.000000000 +0100
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.roguetemple.hyperroid"
- android:versionCode="440" android:versionName="4.4">
+ android:versionCode="441" android:versionName="4.4a">
<!-- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> -->
<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="7" />
<application android:label="@string/app_name"
diff -ur com.roguetemple.hyperroid/src/com/roguetemple/hyperroid/HyperRogue.java hyperroid/src/com/roguetemple/hyperroid/HyperRogue.java
--- com.roguetemple.hyperroid/src/com/roguetemple/hyperroid/HyperRogue.java 2015-03-11 09:52:11.282163474 +0100
+++ hyperroid/src/com/roguetemple/hyperroid/HyperRogue.java 2014-03-25 12:36:38.000000000 +0100
@@ -364,11 +364,12 @@
if(curvol < 1) {
curvol += delta;
if(curvol > 1) curvol = 1;
+ if(backgroundmusic != null)
backgroundmusic.setVolume(curvol, curvol);
}
}
else if(backgroundmusic == null) {
- int id = 0;
+ int id = R.raw.crossroads;
if(curland == 3) id = R.raw.desert;
if(curland == 4) id = R.raw.icyland;
if(curland == 5) id = R.raw.caves;