fix wrong wipe behaviour

game-ctrl/game.c

@@ -21,17 +21,12 @@ static uint8_t delayFactor(uint8_t level) {
   return MAX_LEVEL + 1 - level;
 }
 
-typedef enum {
-  e_Phase_Game, e_Phase_GameOver 
-} phase_t;
-
 typedef enum { 
   e_Start, e_NewStone, e_Down, e_DownDelay, e_ClearRows,
   e_GameOver, e_GameOverFill, e_GameOverWipe, e_GameOverDelay 
 } state_t;
 
 void gameExec(void *handle) {
-  static phase_t phase;
   static state_t state = e_Start;
   static uint8_t gameOverDelay;
   static uint8_t rowIndex;
@@ -41,6 +36,8 @@ void gameExec(void *handle) {
   static uint16_t score;
   static bool newHighScoreAchieved;
 
+  bool wipedLines = false;
+
 // --- engine begin -------------------------------------------------------
   switch (state) {
 // --- phase: game --------------------------------------------------------
@@ -51,7 +48,6 @@ void gameExec(void *handle) {
       filledLines = 0;
       score = 0;
       newHighScoreAchieved = false;
-      phase = e_Phase_Game;
       state = e_NewStone;
       break;
 
@@ -69,29 +65,56 @@ void gameExec(void *handle) {
       proceedDelay--;
       if (proceedDelay == 0) {
         rowIndex = 0;
-        state = e_ClearRows;
+        state = e_Down;
       }
       break;
 
-    case e_ClearRows:
-      state = e_Down;
-      break;
-      
     case e_Down:
       if (! stoneMoveDown()) {
         soundCtrl(SOUND_LOCK);
-        state = e_NewStone;
+        stoneLock();
+        state = e_ClearRows;
       } else {
         proceedDelay = delayFactor(level);
         state = e_DownDelay;
       }
       break;
 
+    case e_ClearRows:
+      // clear filled lines
+      for (uint8_t r = 0; r < CANVAS_HEIGHT; r++) {
+        if (canvasIsRowFilled(r)) {
+          score += level;
+          if (score > eepromReadHighScore()) {
+            newHighScoreAchieved = true;
+            eepromWriteHighScore(score);
+          }
+          displaySetValue(score);
+          canvasWipeRow(r);
+          canvasShow();
+          wipedLines = true;
+          filledLines += 1;
+        }
+      }
+
+      if (wipedLines) {
+        soundCtrl(SOUND_PLING);
+      }
+
+      if (wipedLines && (filledLines > 0) && ((filledLines % 10) == 0)) {
+        if (level < MAX_LEVEL) {
+          level += 1;
+        }
+        soundCtrl(SOUND_FANFARE); 
+      }
+
+      state = e_NewStone;
+      break;
+
 // --- phase: game over ---------------------------------------------------
     case e_GameOver:
       soundCtrl(SOUND_GAMEOVER);
       rowIndex = CANVAS_HEIGHT;
-      phase = e_Phase_GameOver;
       state = e_GameOverFill;
       break;
 
@@ -121,36 +144,7 @@ void gameExec(void *handle) {
   }
 // --- engine end ---------------------------------------------------------
 
-  bool wipedLines = false;
   canvasShow();
-  if (phase == e_Phase_Game) {
-    for (uint8_t r = 0; r < CANVAS_HEIGHT; r++) {
-      if (canvasIsRowFilled(r)) {
-        score += level;
-        if (score > eepromReadHighScore()) {
-          newHighScoreAchieved = true;
-          eepromWriteHighScore(score);
-        }
-        displaySetValue(score);
-        canvasWipeRow(r);
-        canvasShow();
-        wipedLines = true;
-        filledLines += 1;
-      }
-    }
-  }
-
-  if (wipedLines) {
-    soundCtrl(SOUND_PLING);
-  }
-
-  if (wipedLines && (filledLines > 0) && ((filledLines % 10) == 0)) {
-    if (level < MAX_LEVEL) {
-      level += 1;
-    }
-    soundCtrl(SOUND_FANFARE); 
-  }
-
 
   if (isGameActive()) {
     displaySetValue(score);

game-ctrl/shapes.c

@@ -1,6 +1,7 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <stdlib.h>
+#include <stdbool.h>
 
 #include "shapes.h"
 #include "myrand.h"
@@ -19,6 +20,7 @@ typedef struct {
   orientation_t orientation;
   uint8_t x; // column
   uint8_t y; // row
+  bool locked;
 } stone_t;
 
 typedef struct {
@@ -363,6 +365,11 @@ void stoneCreate() {
   stone.orientation = e_0;
   stone.x = 4;
   stone.y = 0;
+  stone.locked = false;
+}
+
+void stoneLock() {
+  stone.locked = true;
 }
 
 uint8_t stoneIsValid() {
@@ -376,6 +383,12 @@ static uint8_t move(direction_t direction) {
   if (motions[stone.shape].nullRotation && (direction == e_RotateLeft || direction == e_RotateRight)) {
     return 1;
   }
+
+  // if the stone is already locked, do nothing
+  if (stone.locked) {
+    return 0;
+  }
+
   // check whether the pixels to move to are free
   if (canvasIsPixelFree(stone.x + motions[stone.shape].motion[direction][stone.orientation].set[0].x, 
                         stone.y + motions[stone.shape].motion[direction][stone.orientation].set[0].y) &&

game-ctrl/shapes.h

@@ -5,6 +5,7 @@
 
 void shapesInit();
 void stoneCreate();
+void stoneLock();
 uint8_t stoneIsValid();
 uint8_t stoneDraw();
 uint8_t stoneMoveDown();