Merge branch 'master' of ssh://wg.reiner-h.de:30022/data/src/oxen

1 files changed, 30 insertions, 12 deletions

diff --git a/src/display.c b/src/display.c
index 11e9470..09c69ef 100644
--- a/src/display.c
+++ b/src/display.c
@@ -14,27 +14,45 @@ void display_draw_card(WINDOW *w, const uint32_t row, const uint32_t col, const
 	mvwaddch(w, row+4, col+6, ACS_LRCORNER); // Lower right corner
 	mvwprintw(w, row+1, col+1, " %3d ", c); // Card number, 3 digits wide, filled with spaces, if number has fewer digits
 
+	// Clear the rest of the card first
+	mvwprintw(w, row+2, col+1, "     ");
+	mvwprintw(w, row+3, col+1, "     ");
+
 	switch (card_get_points(c))
 	{
 		case 7:
-			mvwprintw(w, row+2, col+1, "** **");
-			mvwprintw(w, row+3, col+1, " *** ");
+			// "** **"
+			// " *** "
+			mvwhline(w, row+2, col+1, ACS_DIAMOND, 2);
+			mvwhline(w, row+2, col+4, ACS_DIAMOND, 2);
+			mvwhline(w, row+3, col+2, ACS_DIAMOND, 3);
 			break;
 		case 5:
-			mvwprintw(w, row+2, col+1, "* * *");
-			mvwprintw(w, row+3, col+1, " * * ");
+			// "* * *"
+			// " * * "
+			mvwaddch(w, row+2, col+1, ACS_DIAMOND);
+			mvwaddch(w, row+2, col+3, ACS_DIAMOND);
+			mvwaddch(w, row+2, col+5, ACS_DIAMOND);
+			mvwaddch(w, row+3, col+2, ACS_DIAMOND);
+			mvwaddch(w, row+3, col+4, ACS_DIAMOND);
 			break;
 		case 3:
-			mvwprintw(w, row+2, col+1, " * * ");
-			mvwprintw(w, row+3, col+1, "  *  ");
+			// " * * "
+			// "  *  "
+			mvwaddch(w, row+2, col+2, ACS_DIAMOND);
+			mvwaddch(w, row+2, col+4, ACS_DIAMOND);
+			mvwaddch(w, row+3, col+3, ACS_DIAMOND);
 			break;
 		case 2:
-			mvwprintw(w, row+2, col+1, " * * ");
-			mvwprintw(w, row+3, col+1, "     ");
+			// " * * "
+			// "     "
+			mvwaddch(w, row+2, col+2, ACS_DIAMOND);
+			mvwaddch(w, row+2, col+4, ACS_DIAMOND);
 			break;
 		default:
-			mvwprintw(w, row+2, col+1, "  *  ");
-			mvwprintw(w, row+3, col+1, "     ");
+			// "  *  "
+			// "     "
+			mvwaddch(w, row+2, col+3, ACS_DIAMOND);
 	}
 }
 
@@ -48,10 +66,10 @@ void display_init(void)
 
 	clear();
 	refresh();
-	for (int i = 0; i < 105; i++)
+	for (int i = 45; i < 70; i++)
 	{
 		display_draw_card(stdscr, 0, 0, i+1);
-		usleep(75000);
+		usleep(500000);
 		refresh();
 	}
 }