From af95a3bf7158f992c7c57a0fec2be2afd1880a11 Mon Sep 17 00:00:00 2001
From: Turid Dahl <turidcd@stud.ntnu.no>
Date: Wed, 15 Apr 2020 15:43:58 +0200
Subject: [PATCH] #86 Adds correct explanation for game
---
.../src/com/gameware/game/states/CreateNewTournamentState.java | 3 +--
.../com/gameware/game/states/SinglePlayerSelectGameState.java | 3 +--
.../core/src/com/gameware/game/states/ViewHighScoreState.java | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/frontend/core/src/com/gameware/game/states/CreateNewTournamentState.java b/frontend/core/src/com/gameware/game/states/CreateNewTournamentState.java
index 8797e56..8d9f30d 100644
--- a/frontend/core/src/com/gameware/game/states/CreateNewTournamentState.java
+++ b/frontend/core/src/com/gameware/game/states/CreateNewTournamentState.java
@@ -194,8 +194,7 @@ public class CreateNewTournamentState extends State {
Table innerInnerTable = new Table();
innerInnerTable.defaults().space(spacingLittle);
- //TODO: endre g.getName til g.getExplanation()
- innerInnerTable.add(makeRow(new Label(g.getName(), skin), makeDialog(new Label(g.getName(), skin)))).spaceBottom(spacingLittle);
+ innerInnerTable.add(makeRow(new Label(g.getName(), skin), makeDialog(new Label(g.getExplanation().replaceAll("\\\\n", "\n"), skin)))).spaceBottom(spacingLittle);
innerInnerTable.row();
CheckBox gameCB = new CheckBox("",skin);
diff --git a/frontend/core/src/com/gameware/game/states/SinglePlayerSelectGameState.java b/frontend/core/src/com/gameware/game/states/SinglePlayerSelectGameState.java
index f43e7dd..769737f 100644
--- a/frontend/core/src/com/gameware/game/states/SinglePlayerSelectGameState.java
+++ b/frontend/core/src/com/gameware/game/states/SinglePlayerSelectGameState.java
@@ -87,8 +87,7 @@ public class SinglePlayerSelectGameState extends State {
innerTable.add(new Image(GameWare.getInstance().getGameIdToPlayState().get(g.getId()).screenshot)).width(imageWidthAndHeigh).height(imageWidthAndHeigh).pad(spacingLittle);
Table innerInnerTable = new Table();
- //TODO: endre g.getName til g.getExplanation()
- innerInnerTable.add(makeRow(new Label(g.getName(), skin), makeDialog(new Label(g.getName(), skin)))).spaceBottom(spacingLittle);
+ innerInnerTable.add(makeRow(new Label(g.getName(), skin), makeDialog(new Label(g.getExplanation().replaceAll("\\\\n", "\n"), skin)))).spaceBottom(spacingLittle);
innerInnerTable.row();
TextButton gameBtn = new TextButton(playBtnText, skin);
diff --git a/frontend/core/src/com/gameware/game/states/ViewHighScoreState.java b/frontend/core/src/com/gameware/game/states/ViewHighScoreState.java
index da79f84..6ec43e8 100644
--- a/frontend/core/src/com/gameware/game/states/ViewHighScoreState.java
+++ b/frontend/core/src/com/gameware/game/states/ViewHighScoreState.java
@@ -100,8 +100,7 @@ public class ViewHighScoreState extends State {
innerTable.add(new Image(GameWare.getInstance().getGameIdToPlayState().get(g.getId()).screenshot)).width(imageWidthAndHeigh).height(imageWidthAndHeigh).pad(spacingLittle);
Table innerInnerTable = new Table();
- //TODO: endre g.getName til g.getExplanation()
- innerInnerTable.add(makeRow(new Label(g.getName(), skin), makeDialog(new Label(g.getName(), skin)))).spaceBottom(spacingLittle);
+ innerInnerTable.add(makeRow(new Label(g.getName(), skin), makeDialog(new Label(g.getExplanation().replaceAll("\\\\n", "\n"), skin)))).spaceBottom(spacingLittle);
innerInnerTable.row();
TextButton gameBtn = new TextButton(BtnText, skin);
--
GitLab