Skip to content

Commit 970ae01

Browse files
committed
fix save game bug
1 parent 701f9e9 commit 970ae01

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

blade-engine/src/com/bladecoder/engine/model/World.java

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,6 @@
2121

2222
import javax.xml.parsers.ParserConfigurationException;
2323

24-
import com.bladecoder.engine.model.Dialog;
25-
import com.bladecoder.engine.model.Inventory;
26-
import com.bladecoder.engine.model.Scene;
27-
import com.bladecoder.engine.model.SceneCamera;
28-
import com.bladecoder.engine.model.Sprite3DRenderer;
29-
import com.bladecoder.engine.model.SpriteActor;
30-
import com.bladecoder.engine.model.TextManager;
31-
import com.bladecoder.engine.model.World;
3224
import org.xml.sax.SAXException;
3325

3426
import com.badlogic.gdx.Gdx;
@@ -46,7 +38,6 @@
4638
import com.bladecoder.engine.i18n.I18N;
4739
import com.bladecoder.engine.loader.WorldXMLLoader;
4840
import com.bladecoder.engine.util.EngineLogger;
49-
import com.bladecoder.engine.util.FileUtils;
5041

5142
public class World implements Serializable, AssetConsumer {
5243

@@ -222,7 +213,7 @@ public AssetState getAssetState() {
222213
* @throws ParserConfigurationException
223214
*/
224215
public void load() {
225-
if (FileUtils.exists(EngineAssetManager.getInstance().getUserFile(GAMESTATE_FILENAME))) {
216+
if (EngineAssetManager.getInstance().getUserFile(GAMESTATE_FILENAME).exists()) {
226217
// 2.- SAVEGAME EXISTS
227218
try {
228219
instance.loadGameState();
@@ -462,7 +453,7 @@ public void newGame() {
462453
}
463454

464455
public boolean savedGameExists() {
465-
return FileUtils.exists(EngineAssetManager.getInstance().getUserFile(GAMESTATE_FILENAME));
456+
return EngineAssetManager.getInstance().getUserFile(GAMESTATE_FILENAME).exists();
466457
}
467458

468459
// ********** JSON SERIALIZATION FOR GAME SAVING **********
@@ -492,7 +483,7 @@ public void loadGameState(FileHandle savedFile) {
492483

493484
init();
494485

495-
if (FileUtils.exists(savedFile)) {
486+
if (savedFile.exists()) {
496487
assetState = AssetState.LOAD_ASSETS;
497488

498489
new Json().fromJson(World.class, savedFile.reader("UTF-8"));

blade-engine/src/com/bladecoder/engine/ui/MenuScreenTextButtons.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public boolean keyUp(InputEvent event, int keycode) {
9797

9898
table.add(title).padBottom(DPIUtils.getMarginSize() * 2);
9999

100-
if (World.getInstance().savedGameExists()) {
100+
if (World.getInstance().savedGameExists() || World.getInstance().getCurrentScene() != null) {
101101
TextButton continueGame = new TextButton("Continue", ui.getSkin(), "menu");
102102

103103
continueGame.addListener(new ClickListener() {
@@ -161,7 +161,6 @@ public void clicked(InputEvent event, float x, float y) {
161161
TextButton quit = new TextButton("Quit Game", ui.getSkin(), "menu");
162162
quit.addListener(new ClickListener() {
163163
public void clicked(InputEvent event, float x, float y) {
164-
World.getInstance().dispose();
165164
Gdx.app.exit();
166165
}
167166
});

0 commit comments

Comments
 (0)