From 39216db3fb93650777288efe7455e740318b56b5 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Mon, 4 Mar 2019 20:37:29 -0500 Subject: add unicode to ncurses_ui --- cetris.c | 1 - frontend/ncurses/ncurses_ui.c | 29 ++++++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/cetris.c b/cetris.c index 875b8ab..d1cea14 100644 --- a/cetris.c +++ b/cetris.c @@ -250,7 +250,6 @@ void rotate_matrix(struct cetris_game* g, int clockwise) { g->current.pos.y += cardinal_movements[i].y; if (check_new_matrix(g, m) == 1) { did_tspin = 0; - break; } g->current.pos.x -= cardinal_movements[i].x; g->current.pos.y -= cardinal_movements[i].y; diff --git a/frontend/ncurses/ncurses_ui.c b/frontend/ncurses/ncurses_ui.c index 3810cb8..5a3d252 100644 --- a/frontend/ncurses/ncurses_ui.c +++ b/frontend/ncurses/ncurses_ui.c @@ -5,6 +5,7 @@ #include "cetris.h" +#ifdef ASCII_COMPATIBLE #define BLOCK "[]" #define PLAY_FIELD_STR " /--------------------\\ /----------------\\\n"\ " | | | |\n"\ @@ -28,6 +29,31 @@ " | | \n"\ " | | \n"\ " \\--------------------/" +#else +#define BLOCK "[]" +#define PLAY_FIELD_STR " ┏━━━━━━━━━━━━━━━━━━━━┓ ┏━━━━━━━━━━━━━━━━┓ \n"\ + " ┃ ┃ ┃ ┃ \n"\ + " ┃ ┃ ┗━━━━━━━━━━━━━━━━┛ \n"\ + " ┃ ┃ \n"\ + " ┃ ┃ \n"\ + " ┃ ┃ ┏━━━━━━━━━━━━┓ \n"\ + " ┃ ┃ ┃ ┃ \n"\ + " ┃ ┃ ┃ ┃ \n"\ + " ┃ ┃ ┃ ┃ \n"\ + " ┃ ┃ ┃ ┃ \n"\ + " ┃ ┃ ┗━━━━━━━━━━━━┛ \n"\ + " ┃ ┃ \n"\ + " ┃ ┃ \n"\ + " ┃ ┃ \n"\ + " ┃ ┃ \n"\ + " ┃ ┃ \n"\ + " ┃ ┃ \n"\ + " ┃ ┃ \n"\ + " ┃ ┃ \n"\ + " ┃ ┃ \n"\ + " ┃ ┃ \n"\ + " ┗━━━━━━━━━━━━━━━━━━━━┛ " +#endif #define X_OFFSET 8 #define Y_OFFSET 0 @@ -85,7 +111,8 @@ void draw_board(struct cetris_game* g) { attroff(COLOR_PAIR(g->piece_queue[index].c)); char level[20]; - sprintf(level, "Level: %i", g->level); + sprintf(level, "%i", g->level); + mvaddstr(3, 36, "Level"); mvaddstr(4, 36, level); } } -- cgit v1.2.3-101-g0448