From 4cc4ba6bc250e8981a6fb3f6e6b96945a16628e5 Mon Sep 17 00:00:00 2001 From: Louie S Date: Tue, 24 Oct 2023 13:31:17 -0400 Subject: Working controls --- src/main.c | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index 54d375f..4039aa3 100644 --- a/src/main.c +++ b/src/main.c @@ -84,6 +84,26 @@ void draw_body() { mvprintw(getcury(wmain)+1, 10, " ======= "); mvprintw(getcury(wmain)+1, 10, "---------"); */ + + // DEBUG + mvprintw(0, 0, "tower 1: %c %c %c", (towers[0].rings[0] ? 'X' : '_'), (towers[0].rings[1] ? 'X' : '_'), (towers[0].rings[2] ? 'X' : '_')); + mvprintw(1, 0, "tower 2: %c %c %c", (towers[1].rings[0] ? 'X' : '_'), (towers[1].rings[1] ? 'X' : '_'), (towers[1].rings[2] ? 'X' : '_')); + mvprintw(2, 0, "tower 3: %c %c %c", (towers[2].rings[0] ? 'X' : '_'), (towers[2].rings[1] ? 'X' : '_'), (towers[2].rings[2] ? 'X' : '_')); + mvprintw(3, 0, "ring 1:"); + mvprintw(4, 2, "location: %d", rings[0].location); + mvprintw(5, 2, "held: %d", rings[0].held); + mvprintw(6, 2, "size: %d", rings[0].size); + mvprintw(7, 2, "ascii: %s", rings[0].ascii); + mvprintw(8, 0, "ring 2:"); + mvprintw(9, 2, "location: %d", rings[1].location); + mvprintw(10, 2, "held: %d", rings[1].held); + mvprintw(11, 2, "size: %d", rings[1].size); + mvprintw(12, 2, "ascii: %s", rings[1].ascii); + mvprintw(13, 0, "ring 3:"); + mvprintw(14, 2, "location: %d", rings[2].location); + mvprintw(15, 2, "held: %d", rings[2].held); + mvprintw(16, 2, "size: %d", rings[2].size); + mvprintw(17, 2, "ascii: %s", rings[2].ascii); } void draw_tower(int ring_index, int startx, int starty) { @@ -136,12 +156,18 @@ void input_loop() { // pickup a ring case ' ': // spacebar - // TODO check if a ring is already held, in which case we need to do something else - pickup_ring(); - draw_body(); - wrefresh(wbody); + if(held == NULL) { + pickup_ring(); + draw_body(); + wrefresh(wbody); + } + else { + if(drop_ring()) { + draw_body(); + wrefresh(wbody); + } + } break; - } } } -- cgit