Merge pull request #114 from john0312/chiffon-tetris

Fix tetris's testing binary and scoring function
john0312 · Aug 17, 2024 · 30accc3 · 30accc3
2 parents 1c60fd4 + ad1b11e
commit 30accc3
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 43 deletions.
diff --git a/fw/Core/Hitcon/App/TetrisGame.cc b/fw/Core/Hitcon/App/TetrisGame.cc
@@ -12,11 +12,12 @@ void TetrisGame::clear_full_line() {
   int to = BOARD_HEIGHT - 1;
   int cleared_lines = 0;
   for (; from >= 0; from--) {
-    if (board[from] && board[from] != 0b11111111u) {
+    if (board[from] == 0b11111111u) {
+      cleared_lines++;
+    } else {
       board[to] = board[from];
       if (to != from) {
         board[from] = 0;
-        cleared_lines++;
       }
       to--;
     }

diff --git a/fw/Core/Hitcon/App/test-tetris.cc b/fw/Core/Hitcon/App/test-tetris.cc
@@ -16,6 +16,8 @@ std::mutex game_mutex;
 hitcon::tetris::TetrisGame game([]() { return static_cast<unsigned>(rand()); });
 
 void print_buf_90(display_buf_t* buf_) {
+  printf("Score: %d\n", game.game_get_score());
+
   // will rotate 90 degree since tetris is portrait
   uint8_t buf[DISPLAY_WIDTH * DISPLAY_HEIGHT];
   display_buf_unpack(buf, buf_);
@@ -63,6 +65,7 @@ void gameFunction() {
       game.game_fall_down_tetromino();
       prev_update = now;
       if (game.game_get_state() == hitcon::tetris::GAME_STATE_GAME_OVER) {
+        exit(0);
         break;
       }
     }
@@ -89,48 +92,46 @@ void ioFunction() {
       }
     }
 
-    if (std::fgetc(stdin) != EOF) {
-      char ch = std::fgetc(stdin);
-      switch (ch) {
-        case 'a': {
-          std::lock_guard<std::mutex> lock(game_mutex);
-          game.game_on_input(hitcon::tetris::DIRECTION_LEFT);
-          break;
-        }
-
-        case 'd': {
-          std::lock_guard<std::mutex> lock(game_mutex);
-          game.game_on_input(hitcon::tetris::DIRECTION_RIGHT);
-          break;
-        }
-
-        case 's': {
-          std::lock_guard<std::mutex> lock(game_mutex);
-          game.game_on_input(hitcon::tetris::DIRECTION_DOWN);
-          break;
-        }
-
-        case 'w': {
-          std::lock_guard<std::mutex> lock(game_mutex);
-          game.game_on_input(hitcon::tetris::DIRECTION_UP);
-          break;
-        }
-
-        case 't': {
-          std::lock_guard<std::mutex> lock(game_mutex);
-          game.game_enemy_attack(2);
-          break;
-        }
-
-        case 'f': {
-          std::lock_guard<std::mutex> lock(game_mutex);
-          game.game_on_input(hitcon::tetris::DIRECTION_FAST_DOWN);
-          break;
-        }
-
-        default:
-          break;
+    char ch = std::fgetc(stdin);
+    switch (ch) {
+      case 'a': {
+        std::lock_guard<std::mutex> lock(game_mutex);
+        game.game_on_input(hitcon::tetris::DIRECTION_LEFT);
+        break;
+      }
+
+      case 'd': {
+        std::lock_guard<std::mutex> lock(game_mutex);
+        game.game_on_input(hitcon::tetris::DIRECTION_RIGHT);
+        break;
+      }
+
+      case 's': {
+        std::lock_guard<std::mutex> lock(game_mutex);
+        game.game_on_input(hitcon::tetris::DIRECTION_DOWN);
+        break;
       }
+
+      case 'w': {
+        std::lock_guard<std::mutex> lock(game_mutex);
+        game.game_on_input(hitcon::tetris::DIRECTION_UP);
+        break;
+      }
+
+      case 't': {
+        std::lock_guard<std::mutex> lock(game_mutex);
+        game.game_enemy_attack(2);
+        break;
+      }
+
+      case 'f': {
+        std::lock_guard<std::mutex> lock(game_mutex);
+        game.game_on_input(hitcon::tetris::DIRECTION_FAST_DOWN);
+        break;
+      }
+
+      default:
+        break;
     }
   }
 }