external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix loading transition

Browse Source
This commit is contained in:
Anthony Calosa
2022-02-21 06:56:34 +08:00
parent 13bb30a50d
commit 06a8daf02c
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-gui-mobile/src/forge/adventure/scene/GameScene.java
View File

@@ -2,6 +2,7 @@ package forge.adventure.scene;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.GL20; import com.badlogic.gdx.graphics.GL20;
import forge.Forge;
import forge.adventure.stage.WorldStage; import forge.adventure.stage.WorldStage;
/** /**
@@ -42,5 +43,11 @@ public class GameScene extends HudScene {
} }
@Override
public void enter() {
Forge.clearTransitionScreen();
super.enter();
}
} }

18
forge-gui-mobile/src/forge/adventure/scene/SaveLoadScene.java
View File

@@ -106,16 +106,18 @@ public class SaveLoadScene extends UIScene {
dialog.show(stage); dialog.show(stage);
stage.setKeyboardFocus(textInput); stage.setKeyboardFocus(textInput);
} else { } else {
Runnable runnable = new Runnable() { if (WorldSave.load(currentSlot)) {
@Override Runnable runnable = new Runnable() {
public void run() { @Override
if(WorldSave.load(currentSlot)) { public void run() {
Forge.clearTransitionScreen();
Forge.switchScene(SceneType.GameScene.instance); Forge.switchScene(SceneType.GameScene.instance);
} }
} };
}; Forge.setTransitionScreen(new TransitionScreen(runnable, null, false, true));
Forge.setTransitionScreen(new TransitionScreen(runnable, null, false, true)); } else {
Forge.clearTransitionScreen();
}
} }
} }

7
forge-gui-mobile/src/forge/adventure/world/WorldSave.java
View File

@@ -4,7 +4,6 @@ import forge.Forge;
import forge.adventure.data.DifficultyData; import forge.adventure.data.DifficultyData;
import forge.adventure.player.AdventurePlayer; import forge.adventure.player.AdventurePlayer;
import forge.adventure.pointofintrest.PointOfInterestChanges; import forge.adventure.pointofintrest.PointOfInterestChanges;
import forge.adventure.scene.SceneType;
import forge.adventure.stage.WorldStage; import forge.adventure.stage.WorldStage;
import forge.adventure.util.Config; import forge.adventure.util.Config;
import forge.adventure.util.SaveFileData; import forge.adventure.util.SaveFileData;
@@ -77,13 +76,9 @@ public class WorldSave {
currentSave.onLoadList.emit(); currentSave.onLoadList.emit();
} }
} catch (Exception e) { } catch (ClassNotFoundException | IOException e) {
e.printStackTrace(); e.printStackTrace();
Forge.clearTransitionScreen();
Forge.switchScene(SceneType.SaveLoadScene.instance);
return false; return false;
} finally {
} }
return true; return true;
} }