From d193f01c1bf70e630cbbe617383195770553aab7 Mon Sep 17 00:00:00 2001 From: Faisal Hameed Date: Wed, 18 May 2016 20:09:06 +0500 Subject: [PATCH] Fixing squid:S2131, squid:S2178, squid:S1700 --- app/src/main/java/de/sopa/scene/game/GameFieldView.java | 2 +- app/src/main/java/de/sopa/scene/justplay/JustPlayLostScene.java | 2 +- .../main/java/de/sopa/scene/justplay/JustPlayScoreScene.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/de/sopa/scene/game/GameFieldView.java b/app/src/main/java/de/sopa/scene/game/GameFieldView.java index 34cc452f..8bdeaa0b 100644 --- a/app/src/main/java/de/sopa/scene/game/GameFieldView.java +++ b/app/src/main/java/de/sopa/scene/game/GameFieldView.java @@ -225,7 +225,7 @@ private void oneModifierFinished(boolean now) { modifierFinished++; - if (modifierFinished == countModifier | now) { + if (modifierFinished == countModifier || now) { active = false; gameService.notifyAllObserver(); } diff --git a/app/src/main/java/de/sopa/scene/justplay/JustPlayLostScene.java b/app/src/main/java/de/sopa/scene/justplay/JustPlayLostScene.java index 3ab6841b..0afa31a0 100644 --- a/app/src/main/java/de/sopa/scene/justplay/JustPlayLostScene.java +++ b/app/src/main/java/de/sopa/scene/justplay/JustPlayLostScene.java @@ -166,7 +166,7 @@ private void addTexts(int[] currentScore) { attachChild(scoreText); score = new Text((float) (camera.getWidth() * 0.6), (float) (camera.getHeight() * 0.45), - resourcesManager.justPlayScoreFont, "" + currentScore[0], 8, vbom); + resourcesManager.justPlayScoreFont, Integer.toString(currentScore[0]), 8, vbom); score.setColor(BLACK); attachChild(score); diff --git a/app/src/main/java/de/sopa/scene/justplay/JustPlayScoreScene.java b/app/src/main/java/de/sopa/scene/justplay/JustPlayScoreScene.java index 58a5cbe2..332eeac2 100644 --- a/app/src/main/java/de/sopa/scene/justplay/JustPlayScoreScene.java +++ b/app/src/main/java/de/sopa/scene/justplay/JustPlayScoreScene.java @@ -96,7 +96,7 @@ private void addTexts(int[] currentScore) { attachChild(scoreText); score = new Text((float) (camera.getWidth() * 0.65), (float) (camera.getHeight() * 0.45), - resourcesManager.justPlayScoreFont, "" + currentScore[0], 8, vbom); + resourcesManager.justPlayScoreFont, Integer.toString(currentScore[0]), 8, vbom); score.setColor(BLACK); attachChild(score);