Merging 1.7.5 Source: scenes changes

src/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java

@@ -119,48 +119,6 @@ public class InterlevelScene extends PixelScene {
 					
 					Generator.reset();
 
-					Sample.INSTANCE.load(
-						Assets.SND_OPEN,
-						Assets.SND_UNLOCK,
-						Assets.SND_ITEM,
-						Assets.SND_DEWDROP,
-						Assets.SND_HIT,
-						Assets.SND_MISS,
-						Assets.SND_STEP,
-						Assets.SND_WATER,
-						Assets.SND_DESCEND,
-						Assets.SND_EAT,
-						Assets.SND_READ,
-						Assets.SND_LULLABY,
-						Assets.SND_DRINK,
-						Assets.SND_SHATTER,
-						Assets.SND_ZAP,
-						Assets.SND_LIGHTNING,
-						Assets.SND_LEVELUP,
-						Assets.SND_DEATH,
-						Assets.SND_CHALLENGE,
-						Assets.SND_CURSED,
-						Assets.SND_EVOKE,
-						Assets.SND_TRAP,
-						Assets.SND_TOMB,
-						Assets.SND_ALERT,
-						Assets.SND_MELD,
-						Assets.SND_BOSS,
-						Assets.SND_BLAST,
-						Assets.SND_PLANT,
-						Assets.SND_RAY,
-						Assets.SND_BEACON,
-						Assets.SND_TELEPORT,
-						Assets.SND_CHARMS,
-						Assets.SND_MASTERY,
-						Assets.SND_PUFF,
-						Assets.SND_ROCKS,
-						Assets.SND_BURNING,
-						Assets.SND_FALLING,
-						Assets.SND_GHOST,
-						Assets.SND_SECRET,
-						Assets.SND_BONES );
-
 					switch (mode) {
 					case DESCEND:
 						descend();
@@ -366,7 +324,7 @@ public class InterlevelScene extends PixelScene {
 		if (Dungeon.level.locked) {
 			Dungeon.hero.resurrect( Dungeon.depth );
 			Dungeon.depth--;
-			Level level = Dungeon.newLevel(/* true */);
+			Level level = Dungeon.newLevel();
 			Dungeon.switchLevel( level, level.entrance );
 		} else {
 			Dungeon.hero.resurrect( -1 );
@@ -376,5 +334,6 @@ public class InterlevelScene extends PixelScene {
 	
 	@Override
 	protected void onBackPressed() {
+		//Do nothing
 	}
 }