diff options
| author |   Andrew Opalach <andrew@akon.city>
| 2019-04-23 23:23:46 -0400 |
|---|---|---|
| committer | Andrew Opalach <andrew@akon.city>
| 2019-04-23 23:23:46 -0400 |
| commit | 6152e965868f3e010c79d91ce3da0036758fda4d (patch) | |
| tree | ac8b1ca34f7f2f8d1eee05bdfd241889217daf54 /frontends | |
| parent | ab5a70d3b5769ee1f3e1f1bf380c6839915aaf15 (diff) | |
| download | cetris-6152e965868f3e010c79d91ce3da0036758fda4d.tar.gz cetris-6152e965868f3e010c79d91ce3da0036758fda4d.tar.bz2 cetris-6152e965868f3e010c79d91ce3da0036758fda4d.zip | |
cleanup curses ui
Diffstat (limited to 'frontends')
| -rw-r--r-- | frontends/curses/curses_ui.c | 57 |
1 files changed, 30 insertions, 27 deletions
diff --git a/frontends/curses/curses_ui.c b/frontends/curses/curses_ui.c index eb4750a..dffa69f 100644 --- a/frontends/curses/curses_ui.c +++ b/frontends/curses/curses_ui.c @@ -22,27 +22,27 @@ #ifdef ASCII_COMPATIBLE
#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"\
+#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"\
" \\--------------------/"
#else
#define BLOCK "[]"
@@ -70,8 +70,8 @@ " ┗━━━━━━━━━━━━━━━━━━━━┛ "
#endif
-#define X_OFFSET 8
-#define Y_OFFSET 0
+#define X_OFFSET 8
+#define Y_OFFSET 1
cetris_game game;
@@ -83,7 +83,9 @@ void curses_init() { keypad(stdscr, TRUE);
nodelay(stdscr, true);
+#ifdef _WIN32 // only resize manually on windows
resize_term(WIN_LINE, WIN_COL);
+#endif
start_color();
init_pair(COLOR_NONE, COLOR_BLACK, COLOR_BLACK);
@@ -120,20 +122,21 @@ void draw_board() { mvaddstr(0, 0, PLAY_FIELD_STR);
for (int x = 0; x < CETRIS_BOARD_X; x++) {
for (int y = CETRIS_BOARD_VISABLE; y < CETRIS_BOARD_Y; y++) {
- int draw_y = y - CETRIS_BOARD_VISABLE;
+ int draw_y = y - CETRIS_BOARD_VISABLE + Y_OFFSET;
+ int draw_x = x * 2 + X_OFFSET;
if (game.board[x][y].ghost) {
attron(A_DIM);
- mvaddstr(draw_y + 1, x * 2 + X_OFFSET, BLOCK);
+ mvaddstr(draw_y, draw_x, BLOCK);
attroff(A_DIM);
}
if (game.board[x][y].occupied) {
attron(COLOR_PAIR(game.board[x][y].c) | A_BOLD);
if (game.board[0][y].remove_tick) {
if (game.tick % 2 == 0) {
- mvaddstr(draw_y + 1, x * 2 + X_OFFSET, BLOCK);
+ mvaddstr(draw_y, draw_x, BLOCK);
}
} else {
- mvaddstr(draw_y + 1, x * 2 + X_OFFSET, BLOCK);
+ mvaddstr(draw_y, draw_x, BLOCK);
}
attroff(COLOR_PAIR(game.board[x][y].c) | A_BOLD);
}
|