LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.6.0: added some safety checks to gamescene

Browse Source
This commit is contained in:
Evan Debenham 2017-05-28 22:59:59 -04:00
parent 4bdae1462c
commit fab0e02711
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
View File

@ -697,11 +697,11 @@ public class GameScene extends PixelScene {
}
public static void pickUp( Item item ) {
scene.toolbar.pickup( item );
if (scene != null) scene.toolbar.pickup( item );
}
public static void pickUpJournal( Item item ) {
scene.pane.pickup( item );
if (scene != null) scene.pane.pickup( item );
}
public static void resetMap() {
@ -748,8 +748,10 @@ public class GameScene extends PixelScene {
}
public static void show( Window wnd ) {
cancelCellSelector();
scene.addToFront( wnd );
if (scene != null) {
cancelCellSelector();
scene.addToFront(wnd);
}
}
public static void updateFog(){