From a6461c54bebf0e4c0518b946be086072f3c6fc9f Mon Sep 17 00:00:00 2001 From: Boris Kraut Date: Sun, 25 Jan 2015 15:03:44 +0100 Subject: [PATCH] Update Pixel Dungeon to 1.7.5a (70) --- metadata/com.watabou.pixeldungeon.txt | 8 ++++ .../com.watabou.pixeldungeon/types-175a.patch | 39 +++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 metadata/com.watabou.pixeldungeon/types-175a.patch diff --git a/metadata/com.watabou.pixeldungeon.txt b/metadata/com.watabou.pixeldungeon.txt index 67b5efb9cb..75bed713b5 100644 --- a/metadata/com.watabou.pixeldungeon.txt +++ b/metadata/com.watabou.pixeldungeon.txt @@ -31,6 +31,14 @@ Build:1.7.2a,61 echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties target=android-19 +Build:1.7.5a,70 + commit=8760fd8f4a33676aff70f7442c8fc4c4774dfbb6 + patch=types-175a.patch + srclibs=PDClasses@2a7faeb1cfb2a8143887392eb209e0d102ba35a4 + prebuild=cp -R $$PDClasses$$/com/watabou/* src/com/watabou/ && \ + echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties + target=android-19 + Auto Update Mode:None Update Check Mode:RepoManifest Current Version:1.7.5a diff --git a/metadata/com.watabou.pixeldungeon/types-175a.patch b/metadata/com.watabou.pixeldungeon/types-175a.patch new file mode 100644 index 0000000000..cec1c4ffdc --- /dev/null +++ b/metadata/com.watabou.pixeldungeon/types-175a.patch @@ -0,0 +1,39 @@ +diff --git a/src/com/watabou/pixeldungeon/actors/mobs/Mimic.java b/src/com/watabou/pixeldungeon/actors/mobs/Mimic.java +index 0cfdf51..f320b33 100644 +--- a/src/com/watabou/pixeldungeon/actors/mobs/Mimic.java ++++ b/src/com/watabou/pixeldungeon/actors/mobs/Mimic.java +@@ -64,7 +64,7 @@ public class Mimic extends Mob { + @Override + public void restoreFromBundle( Bundle bundle ) { + super.restoreFromBundle( bundle ); +- items = new ArrayList( (Collection) bundle.getCollection( ITEMS ) ); ++ items = new ArrayList( (Collection) ((Collection) bundle.getCollection( ITEMS )) ); + adjustStats( bundle.getInt( LEVEL ) ); + } + +diff --git a/src/com/watabou/pixeldungeon/items/Heap.java b/src/com/watabou/pixeldungeon/items/Heap.java +index 70c9d8c..deac89d 100644 +--- a/src/com/watabou/pixeldungeon/items/Heap.java ++++ b/src/com/watabou/pixeldungeon/items/Heap.java +@@ -360,7 +360,7 @@ public class Heap implements Bundlable { + public void restoreFromBundle( Bundle bundle ) { + pos = bundle.getInt( POS ); + type = Type.valueOf( bundle.getString( TYPE ) ); +- items = new LinkedList( (Collection) bundle.getCollection( ITEMS ) ); ++ items = new LinkedList( (Collection) ((Collection) bundle.getCollection( ITEMS )) ); + } + + @Override +diff --git a/src/com/watabou/pixeldungeon/levels/RegularLevel.java b/src/com/watabou/pixeldungeon/levels/RegularLevel.java +index fa86652..9d5d102 100644 +--- a/src/com/watabou/pixeldungeon/levels/RegularLevel.java ++++ b/src/com/watabou/pixeldungeon/levels/RegularLevel.java +@@ -682,7 +682,7 @@ public abstract class RegularLevel extends Level { + public void restoreFromBundle( Bundle bundle ) { + super.restoreFromBundle( bundle ); + +- rooms = new HashSet( (Collection) bundle.getCollection( "rooms" ) ); ++ rooms = new HashSet( (Collection) ((Collection) bundle.getCollection( "rooms" )) ); + for (Room r : rooms) { + if (r.type == Type.WEAK_FLOOR) { + weakFloorCreated = true;