konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.2.2b: changed how interlevelscene deals with exceptions

Browse Source
This commit is contained in:
Evan Debenham
2014-11-15 20:52:02 -05:00
parent 4d4959c40d
commit 1febc6b7e3
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java
View File

@@ -34,6 +34,7 @@ import com.watabou.noosa.audio.Music;
import com.watabou.noosa.audio.Sample; import com.watabou.noosa.audio.Sample;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
public class InterlevelScene extends PixelScene { public class InterlevelScene extends PixelScene {
@@ -76,7 +77,7 @@ public class InterlevelScene extends PixelScene {
@Override @Override
public void create() { public void create() {
super.create(); super.create();
String text = ""; String text = "";
switch (mode) { switch (mode) {
case DESCEND: case DESCEND:
@@ -107,7 +108,7 @@ public class InterlevelScene extends PixelScene {
phase = Phase.FADE_IN; phase = Phase.FADE_IN;
timeLeft = TIME_TO_FADE; timeLeft = TIME_TO_FADE;
thread = new Thread() { thread = new Thread() {
@Override @Override
public void run() { public void run() {
@@ -115,13 +116,13 @@ public class InterlevelScene extends PixelScene {
try { try {
Generator.reset(); Generator.reset();
Sample.INSTANCE.load( Sample.INSTANCE.load(
Assets.SND_OPEN, Assets.SND_OPEN,
Assets.SND_UNLOCK, Assets.SND_UNLOCK,
Assets.SND_ITEM, Assets.SND_ITEM,
Assets.SND_DEWDROP, Assets.SND_DEWDROP,
Assets.SND_HIT, Assets.SND_HIT,
Assets.SND_MISS, Assets.SND_MISS,
Assets.SND_STEP, Assets.SND_STEP,
Assets.SND_WATER, Assets.SND_WATER,
@@ -157,7 +158,7 @@ public class InterlevelScene extends PixelScene {
Assets.SND_GHOST, Assets.SND_GHOST,
Assets.SND_SECRET, Assets.SND_SECRET,
Assets.SND_BONES ); Assets.SND_BONES );
switch (mode) { switch (mode) {
case DESCEND: case DESCEND:
descend(); descend();
@@ -186,11 +187,11 @@ public class InterlevelScene extends PixelScene {
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
error = ERR_FILE_NOT_FOUND; error = ERR_FILE_NOT_FOUND;
} catch (Exception e ) { } catch (IOException e ) {
error = ERR_GENERIC; error = ERR_GENERIC;
} }
if (phase == Phase.STATIC && error == null) { if (phase == Phase.STATIC && error == null) {
@@ -246,8 +247,8 @@ public class InterlevelScene extends PixelScene {
break; break;
} }
} }
private void descend() throws Exception { private void descend() throws IOException {
Level level; Level level;
ArrayList<Item> fallingItems = new ArrayList<Item>(); ArrayList<Item> fallingItems = new ArrayList<Item>();
@@ -290,7 +291,7 @@ public class InterlevelScene extends PixelScene {
} }
private void fall() throws Exception { private void fall() throws IOException {
Level level = Dungeon.level; Level level = Dungeon.level;
@@ -321,7 +322,7 @@ public class InterlevelScene extends PixelScene {
Dungeon.switchLevel( level, fallIntoPit ? level.pitCell() : level.randomRespawnCell() ); Dungeon.switchLevel( level, fallIntoPit ? level.pitCell() : level.randomRespawnCell() );
} }
private void ascend() throws Exception { private void ascend() throws IOException {
Actor.fixTime(); Actor.fixTime();
Dungeon.saveLevel(); Dungeon.saveLevel();
@@ -330,7 +331,7 @@ public class InterlevelScene extends PixelScene {
Dungeon.switchLevel( level, level.exit ); Dungeon.switchLevel( level, level.exit );
} }
private void returnTo() throws Exception { private void returnTo() throws IOException {
Actor.fixTime(); Actor.fixTime();
@@ -340,7 +341,7 @@ public class InterlevelScene extends PixelScene {
Dungeon.switchLevel( level, Level.resizingNeeded ? level.adjustPos( returnPos ) : returnPos ); Dungeon.switchLevel( level, Level.resizingNeeded ? level.adjustPos( returnPos ) : returnPos );
} }
private void restore() throws Exception { private void restore() throws IOException {
Actor.fixTime(); Actor.fixTime();
@@ -354,7 +355,7 @@ public class InterlevelScene extends PixelScene {
} }
} }
private void resurrect() throws Exception { private void resurrect() throws IOException {
Actor.fixTime(); Actor.fixTime();