Merge branch 'main' into alx-dev

john0312 · Aug 17, 2024 · 480aa57 · 480aa57
2 parents 7ac9262 + 91d10a4
commit 480aa57
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/fw/Core/Hitcon/App/SnakeApp.cc b/fw/Core/Hitcon/App/SnakeApp.cc
@@ -93,6 +93,12 @@ void SnakeApp::OnButton(button_t button) {
       break;
     case BUTTON_BACK:
     case BUTTON_LONG_BACK:
+      // local leave
+      if (mode == MODE_MULTIPLAYER) {
+        uint8_t code = PACKET_GAME_LEAVE;
+        g_xboard_logic.QueueDataForTx(&code, 1, SNAKE_RECV_ID);
+      }
+      // leave action 2
       badge_controller.BackToMenu(this);
       break;
     default:
@@ -118,8 +124,13 @@ void SnakeApp::OnXBoardRecv(void* arg) {
   PacketCallbackArg* packet = reinterpret_cast<PacketCallbackArg*>(arg);
   switch (packet->data[0]) {
     case PACKET_GAME_OVER:
+      // remote game over
       _game_over = true;
-      display_set_mode_scroll_text("Game Over");
+      // game over screen
+      show_score_app.SetScore(_score);
+      g_game_score.MarkScore(GameScoreType::GAME_SNAKE, _score);
+      badge_controller.change_app(&show_score_app);
+
       break;
     case PACKET_GET_FOOD:
       _len++;
@@ -130,6 +141,12 @@ void SnakeApp::OnXBoardRecv(void* arg) {
         InitGame();
       }
       break;
+    case PACKET_GAME_LEAVE:
+      // remote leave
+      _game_over = true;
+      // leave action
+      badge_controller.change_app(&main_menu);
+      break;
   }
 }
 
@@ -188,12 +205,14 @@ void SnakeApp::Routine(void* unused) {
   if (OnSnake(new_head)) _game_over = true;
 
   if (_game_over) {
-    show_score_app.SetScore(_score);
-    g_game_score.MarkScore(GameScoreType::GAME_SNAKE, _score);
+    // local game over
     if (mode == MODE_MULTIPLAYER) {
       uint8_t code = PACKET_GAME_OVER;
       g_xboard_logic.QueueDataForTx(&code, 1, SNAKE_RECV_ID);
     }
+    // game over screen
+    show_score_app.SetScore(_score);
+    g_game_score.MarkScore(GameScoreType::GAME_SNAKE, _score);
     badge_controller.change_app(&show_score_app);
     return;
   }

diff --git a/fw/Core/Hitcon/App/SnakeApp.h b/fw/Core/Hitcon/App/SnakeApp.h
@@ -24,6 +24,7 @@ enum {  // XBOARD
   PACKET_GET_FOOD = 1,
   PACKET_GAME_START,
   PACKET_GAME_OVER,
+  PACKET_GAME_LEAVE,
 };
 
 enum {