From 729b5a2f880f4f124d438a0442372ed268dba558 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 2 Sep 2016 23:01:05 -0400 Subject: [PATCH] v0.4.2: fixed a couple lint warnings/errors --- SPD-classes/src/main/java/com/watabou/noosa/Game.java | 5 +++-- .../com/shatteredpixel/shatteredpixeldungeon/Dungeon.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/SPD-classes/src/main/java/com/watabou/noosa/Game.java b/SPD-classes/src/main/java/com/watabou/noosa/Game.java index 94d964e8e..7b923de5a 100644 --- a/SPD-classes/src/main/java/com/watabou/noosa/Game.java +++ b/SPD-classes/src/main/java/com/watabou/noosa/Game.java @@ -285,11 +285,12 @@ public class Game extends Activity implements GLSurfaceView.Renderer, View.OnTou try { requestedScene = sceneClass.newInstance(); switchScene(); - } catch (InstantiationException | IllegalAccessException e) { + } catch (InstantiationException e){ + e.printStackTrace(); + } catch (IllegalAccessException e) { e.printStackTrace(); } - } update(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java index 99a819c28..0a2f8d506 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java @@ -426,7 +426,7 @@ public class Dungeon { bundle.put( DEPTH, depth ); for (int d : droppedItems.keyArray()) { - bundle.put(String.format(DROPPED, d), droppedItems.get(d)); + bundle.put(Messages.format(DROPPED, d), droppedItems.get(d)); } quickslot.storePlaceholders( bundle ); @@ -589,7 +589,7 @@ public class Dungeon { droppedItems = new SparseArray>(); for (int i=2; i <= Statistics.deepestFloor + 1; i++) { ArrayList dropped = new ArrayList(); - for (Bundlable b : bundle.getCollection( String.format( DROPPED, i ) ) ) { + for (Bundlable b : bundle.getCollection( Messages.format( DROPPED, i ) ) ) { dropped.add( (Item)b ); } if (!dropped.isEmpty()) {