forbidd game movement when its solved

References #46
djschilling · Aug 24, 2015 · 235d0a4 · 235d0a4
1 parent bb7da5b
commit 235d0a4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/app/src/main/java/de/sopa/model/game/GameServiceImpl.java b/app/src/main/java/de/sopa/model/game/GameServiceImpl.java
@@ -44,11 +44,13 @@ public boolean lostLevel() {
     @Override
     public void shiftLine(boolean horizontal, int row, int steps, boolean silent) {
 
-        gameFieldService.shiftLine(level, horizontal, row, steps);
-        solvedPuzzle = gameFieldService.solvedPuzzle(level);
+        if (!solvedPuzzle) {
+            gameFieldService.shiftLine(level, horizontal, row, steps);
+            solvedPuzzle = gameFieldService.solvedPuzzle(level);
 
-        if (!silent) {
-            notifyAllObserver();
+            if (!silent) {
+                notifyAllObserver();
+            }
         }
     }
 

diff --git a/app/src/main/java/de/sopa/scene/game/GameScene.java b/app/src/main/java/de/sopa/scene/game/GameScene.java
@@ -54,12 +54,6 @@ public GameScene(Level level) {
     @Override
     public void updateGameScene() {
 
-        if (!gameFieldView.isActive()) {
-            updateTiles(gameService.solvedPuzzle());
-        }
-
-        scoreText.setText(String.valueOf(gameService.getLevel().getMovesCount()));
-
         if (gameService.solvedPuzzle()) {
             setOnSceneTouchListener(null);
             gameService.detatch(this);
@@ -72,7 +66,11 @@ public void onTimePassed(final TimerHandler pTimerHandler) {
                             onSolvedGame();
                         }
                     }));
+        } else {
+            scoreText.setText(String.valueOf(gameService.getLevel().getMovesCount()));
         }
+
+        updateTiles(gameService.solvedPuzzle());
     }