From 8a8d4c37bce00a64bd784c7650974cf01b1afffe Mon Sep 17 00:00:00 2001
From: ivarnm <36505347+ivarnm@users.noreply.github.com>
Date: Tue, 7 Apr 2020 15:14:36 +0200
Subject: [PATCH] #79 Change player_id to player object
---
.../core/src/com/gameware/game/GameWare.java | 19 ++++++-------------
.../gameware/game/models/LocalStorage.java | 11 +++++------
2 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/frontend/core/src/com/gameware/game/GameWare.java b/frontend/core/src/com/gameware/game/GameWare.java
index 7e4f250..9818b00 100644
--- a/frontend/core/src/com/gameware/game/GameWare.java
+++ b/frontend/core/src/com/gameware/game/GameWare.java
@@ -76,10 +76,11 @@ public class GameWare extends ApplicationAdapter {
music.setVolume(0.1f);
musicOn = true;
- // Local Storage
- gsm.push(new LoginState(gsm));
+ // Local Storage
readFromLocalStorage();
- if(player != null) {
+ if(player == null) {
+ gsm.push(new LoginState(gsm));
+ } else {
gsm.push(new MenuState(gsm));
}
if(musicOn){music.play();}
@@ -194,11 +195,7 @@ public class GameWare extends ApplicationAdapter {
FileHandle file = Gdx.files.local(localStorageFilePath);
Json json = new Json();
json.setUsePrototypes(false);
- String playerId = null;
- if(player != null) {
- playerId = player.getId();
- }
- LocalStorage ls = new LocalStorage(playerId, musicOn, soundEffects, includeFin);
+ LocalStorage ls = new LocalStorage(player, musicOn, soundEffects, includeFin);
String lsString = json.toJson(ls);
file.writeString(lsString, false);
System.out.println(file.readString());
@@ -210,11 +207,7 @@ public class GameWare extends ApplicationAdapter {
if(!file.exists()) { return; }
String fileOutput = file.readString();
LocalStorage ls = new Json().fromJson(LocalStorage.class, fileOutput);
- if(ls.get_id() != null) {
- try {
- player = QueryIntermediate.getPlayerById(ls.get_id());
- } catch (IOException e) {e.printStackTrace();}
- }
+ if(ls.getPlayer() != null) { player = ls.getPlayer(); }
if(ls.getMusicOn() != null) { musicOn = ls.getMusicOn(); }
if(ls.getSoundEffects()!=null){ soundEffects = ls.getSoundEffects(); }
if(ls.getIncludeFin() != null) { includeFin = ls.getIncludeFin(); }
diff --git a/frontend/core/src/com/gameware/game/models/LocalStorage.java b/frontend/core/src/com/gameware/game/models/LocalStorage.java
index 0260c3c..74ddb05 100644
--- a/frontend/core/src/com/gameware/game/models/LocalStorage.java
+++ b/frontend/core/src/com/gameware/game/models/LocalStorage.java
@@ -1,8 +1,7 @@
package com.gameware.game.models;
public class LocalStorage {
-// private Player player;
- private String _id; //playerId
+ private Player player;
private Boolean musicOn;
private Boolean soundEffects;
private Boolean includeFin;
@@ -10,15 +9,15 @@ public class LocalStorage {
public LocalStorage() {
}
- public LocalStorage(String _id, Boolean musicOn, Boolean soundEffects, Boolean includeFin) {
- this._id = _id;
+ public LocalStorage(Player player, Boolean musicOn, Boolean soundEffects, Boolean includeFin) {
+ this.player = player;
this.musicOn = musicOn;
this.soundEffects = soundEffects;
this.includeFin = includeFin;
}
- public String get_id() {
- return _id;
+ public Player getPlayer() {
+ return player;
}
public Boolean getMusicOn() {
--
GitLab