]> git.earman.xyz Git - sensor-watch.git/commitdiff
Changed order of how cards are displayed for player
authorDavid Volovskiy <devolov@gmail.com>
Wed, 3 Sep 2025 01:57:42 +0000 (21:57 -0400)
committerDavid Volovskiy <devolov@gmail.com>
Wed, 3 Sep 2025 01:57:42 +0000 (21:57 -0400)
watch-faces/complication/blackjack_face.c

index ee3d274a3d2a65f5afee88c9d881e5395cfa091a..b0f78b09dfa139b5349a7ce449db0225f1cdb332 100755 (executable)
@@ -53,12 +53,6 @@ uint8_t hand_dealer[BLACKJACK_MAX_HAND_SIZE] = {0xFF};
 uint8_t idx_player = 0;\r
 uint8_t idx_dealer = 0;\r
 \r
-typedef enum {\r
-    BJ_HIT,\r
-    BJ_STAND,\r
-    BJ_BUST,\r
-} guess_t;\r
-\r
 typedef enum {\r
     BJ_TITLE_SCREEN,\r
     BJ_PLAYING,\r
@@ -66,7 +60,7 @@ typedef enum {
     BJ_RESULT,\r
 } game_state_t;\r
 \r
-static game_state_t game_state = BJ_TITLE_SCREEN;\r
+static game_state_t game_state;\r
 static uint8_t deck[DECK_SIZE] = {0};\r
 static uint8_t current_card = 0;\r
 \r
@@ -138,11 +132,11 @@ static void give_dealer_card(void) {
 \r
 static void display_player_hand(void) { \r
     uint8_t cards_to_display = idx_player > MAX_PLAYER_CARDS_DISPLAY ? MAX_PLAYER_CARDS_DISPLAY : idx_player;\r
-    for (uint8_t i=0; i<cards_to_display; i++) {\r
-        uint8_t card = hand_player[i];\r
+    for (uint8_t i=cards_to_display; i>0; i--) {\r
+        uint8_t card = hand_player[idx_player-i];\r
         if (card == 10) card = 0;\r
         const char display_char = card + '0';\r
-        watch_display_character(display_char, BOARD_DISPLAY_START + i);\r
+        watch_display_character(display_char, BOARD_DISPLAY_START + cards_to_display - i);\r
     }\r
 }\r
 \r
@@ -167,7 +161,7 @@ static void display_dealer_score(void) {
 \r
 static void display_win(void) {\r
     game_state = BJ_RESULT;\r
-    watch_display_text(WATCH_POSITION_BOTTOM, " WIN");\r
+    watch_display_text_with_fallback(WATCH_POSITION_BOTTOM, "WlN ", " WIN");\r
     display_player_score();\r
     display_dealer_score();\r
 }\r
@@ -181,13 +175,13 @@ static void display_lose(void) {
 \r
 static void display_tie(void) {\r
     game_state = BJ_RESULT;\r
-    watch_display_text(WATCH_POSITION_BOTTOM, " TIE");\r
+    watch_display_text_with_fallback(WATCH_POSITION_BOTTOM, "TlE ", " TIE");\r
     display_player_score();\r
 }\r
 \r
 static void display_bust(void) {\r
     game_state = BJ_RESULT;\r
-    watch_display_text(WATCH_POSITION_BOTTOM, "BUST");\r
+    watch_display_text_with_fallback(WATCH_POSITION_BOTTOM, "8UST ", " BUST");\r
     display_player_score();\r
 }\r
 \r