missytake/fdroiddata
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update Pixel Dungeon to 1.7.5a (70)

Browse source
This commit is contained in:
Boris Kraut 2015-01-25 15:03:44 +01:00
parent b085d785b4
commit a6461c54be
2 changed files with 47 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
metadata/com.watabou.pixeldungeon.txt
View file

@ -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

39
metadata/com.watabou.pixeldungeon/types-175a.patch Normal file
View file

@ -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<Item>( (Collection<? extends Item>) bundle.getCollection( ITEMS ) );
+ items = new ArrayList<Item>( (Collection<Item>) ((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<Item>( (Collection<? extends Item>) bundle.getCollection( ITEMS ) );
+ items = new LinkedList<Item>( (Collection<Item>) ((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<Room>( (Collection<? extends Room>) bundle.getCollection( "rooms" ) );
+ rooms = new HashSet<Room>( (Collection<Room>) ((Collection<?>) bundle.getCollection( "rooms" )) );
for (Room r : rooms) {
if (r.type == Type.WEAK_FLOOR) {
weakFloorCreated = true;