From d64514659c38c672e65ffccd6f44a64143a4dbfd Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Mon, 19 Aug 2019 15:53:22 -0400 Subject: remove das code and simplify some other stuff --- frontends/curses/curses_ui.c | 16 ++++++++-------- frontends/curses/meson.build | 1 + 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'frontends/curses') diff --git a/frontends/curses/curses_ui.c b/frontends/curses/curses_ui.c index fb58e4d..8456438 100644 --- a/frontends/curses/curses_ui.c +++ b/frontends/curses/curses_ui.c @@ -47,12 +47,12 @@ " \\--------------------/" #else #define BLOCK "[]" -#define PLAY_FIELD_STR " ┏━━━━━━━━━━━━━━━━━━━━┓ ┏━━━━━━━━━━━━━━━┓ \n"\ +#define PLAY_FIELD_STR " ┏━━━━━━━━━━━━━━━━━━━━┓ ┏━━━━━score━━━━━┓ \n"\ " ┃ ┃ ┃ ┃ \n"\ " ┃ ┃ ┗━━━━━━━━━━━━━━━┛ \n"\ " ┃ ┃ \n"\ " ┃ ┃ \n"\ - " ┃ ┃ ┏━━━━━━━━━━━┓ \n"\ + " ┃ ┃ ┏━━━queue━━━┓ \n"\ " ┃ ┃ ┃ ┃ \n"\ " ┃ ┃ ┃ ┃ \n"\ " ┃ ┃ ┃ ┃ \n"\ @@ -212,19 +212,19 @@ int main(void) { if (is_paused) continue; // dont allow input if paused switch (keys[i]) { case KEY_LEFT: - move_piece(&game, LEFT, false); break; + move_piece(&game, LEFT); break; case KEY_RIGHT: - move_piece(&game, RIGHT, false); break; + move_piece(&game, RIGHT); break; case KEY_DOWN: - move_piece(&game, DOWN, false); break; + move_piece(&game, USER_DOWN); break; case KEY_UP: case 'x': - move_piece(&game, ROTATE_CW, false); break; + move_piece(&game, ROTATE_CW); break; case '^': case 'z': - move_piece(&game, ROTATE_CCW, false); break; + move_piece(&game, ROTATE_CCW); break; case ' ': - move_piece(&game, HARD_DROP, false); break; + move_piece(&game, HARD_DROP); break; case KEY_SLEFT: case 'c': hold_piece(&game); break; diff --git a/frontends/curses/meson.build b/frontends/curses/meson.build index 8dd1d00..b254239 100644 --- a/frontends/curses/meson.build +++ b/frontends/curses/meson.build @@ -8,6 +8,7 @@ if host_machine.system() == 'windows' deps += compiler.find_library('pdcurses', dirs: meson.current_source_dir() + '/win') else deps += dependency('ncursesw') + deps += dependency('tinfow') deps += dependency('threads') endif -- cgit v1.2.3-101-g0448