X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;ds=sidebyside;f=roguelike.c;h=6d75aa949ae181b5afd9ac783874905fde314d17;hb=33cce880190dd268fdb5dbf1be1c8a3e32b180d0;hp=c91140f428b71ba9b0af9a616609eab5f1e0e375;hpb=d21bba24b8b8b6ff574eed2ef8adbb213e9a9e65;p=plomrogue diff --git a/roguelike.c b/roguelike.c index c91140f..6d75aa9 100644 --- a/roguelike.c +++ b/roguelike.c @@ -40,7 +40,6 @@ void draw_with_linebreaks (struct Win * win, char * text, int start_y) { if (0 == toggle) { z++; if ('\n' == text[z]) { - mvwaddch(win->curses_win, y, x, ' '); toggle = 1; continue; } else @@ -50,9 +49,7 @@ void draw_with_linebreaks (struct Win * win, char * text, int start_y) { toggle = 1; } else if (0 == text[z+1]) { toggle = 1; - fin = 1; } } - else - mvwaddch(win->curses_win, y, x, ' '); } } } + fin = 1; } } } } } void draw_text_from_bottom (struct Win * win) { // Draw text in win->data from end/bottom to the top. @@ -73,11 +70,8 @@ void draw_text_from_bottom (struct Win * win) { break; } } z = -1; int start_y = 0; - if (y < win->height) { // Depending on what is bigger, determine start point in window or in text. + if (y < win->height) // Depending on what is bigger, determine start point in window or in text. start_y = win->height - y; - for (y = 0; y < start_y; y++) - for (x = 0; x < win->width; x++) - mvwaddch(win->curses_win, y, x, ' '); } else if (y > win->height) { offset = y - win->height; for (y = 0; y < offset; y++) @@ -106,9 +100,7 @@ void draw_map (struct Win * win) { mvwaddch(win->curses_win, y, x, '@'); else mvwaddch(win->curses_win, y, x, cells[z]); - z++; } - else - mvwaddch(win->curses_win, y, x, ' '); } } } + z++; } } } } void draw_info (struct Win * win) { // Draw info window by appending win->data integer value to "Turn: " display. @@ -216,37 +208,33 @@ void draw_keys_window (struct Win * win) { struct KeyBinding * keybindings = world->keybindings; int offset = 0; if (keyswindata->max >= win->height) { - if (keyswindata->select > win->height / 2) + if (keyswindata->select > win->height / 2) { if (keyswindata->select < (keyswindata->max - (win->height / 2))) offset = keyswindata->select - (win->height / 2); else - offset = keyswindata->max - win->height + 1; } - int keydescwidth = 9; // max length assured by get_keyname() - char * keydesc = malloc(keydescwidth + 1); + offset = keyswindata->max - win->height + 1; } } + int keydescwidth = 9 + 1; // max length assured by get_keyname() + \0 + char * keydesc = malloc(keydescwidth); attr_t attri; int y, x; char * keyname; - for (y = 0; 0 != keybindings[offset + y].name && y < win->height; y++) { + for (y = 0; y <= keyswindata->max && y < win->height; y++) { attri = 0; if (y == keyswindata->select - offset) { attri = A_REVERSE; if (1 == keyswindata->edit) attri = attri | A_BLINK; } keyname = get_keyname(keybindings[y + offset].key); - snprintf(keydesc, keydescwidth + 1, "%-9s", keyname); + snprintf(keydesc, keydescwidth, "%-9s", keyname); free(keyname); for (x = 0; x < win->width; x++) - if (strlen(keydesc) > x) + if (x < strlen(keydesc)) mvwaddch(win->curses_win, y, x, keydesc[x] | attri); else if (strlen(keydesc) < x && x < strlen(keybindings[y + offset].name) + strlen(keydesc) + 1) mvwaddch(win->curses_win, y, x, keybindings[y + offset].name[x - strlen(keydesc) - 1] | attri); else mvwaddch(win->curses_win, y, x, ' ' | attri); } - free(keydesc); - if (y < win->height) - for (; y < win->height; y++) - for (x = 0; x < win->width; x++) - mvwaddch(win->curses_win, y, x, ' '); } + free(keydesc); } void init_keybindings(struct World * world) { // Initialize keybindings from file "keybindings". @@ -266,15 +254,15 @@ void init_keybindings(struct World * world) { struct KeyBinding * keybindings = malloc(lines * sizeof(struct KeyBinding)); fseek(file, 0, SEEK_SET); char * command = malloc(linemax); - char commcount = 0; + int commcount = 0; char * digits = malloc(3); - char digicount = 0; + int digicount = 0; int key, digimax; int keycount = 0; c = getc(file); while (EOF != c) { if ('\n' == c) { - keybindings[keycount].name = calloc(commcount, sizeof(char)); + keybindings[keycount].name = calloc(commcount + 1, sizeof(char)); memcpy(keybindings[keycount].name, command, commcount); keybindings[keycount].key = key; keycount++; @@ -379,13 +367,13 @@ int main () { shift_window(&win_meta, 'f'); else if (key == get_action_key(world.keybindings, "shift backwards") && win_meta.active != 0) shift_window(&win_meta, 'b'); - else if (key == get_action_key(world.keybindings, "grow hor") && win_meta.active != 0) + else if (key == get_action_key(world.keybindings, "grow horizontally") && win_meta.active != 0) resize_window(&win_meta, '*'); - else if (key == get_action_key(world.keybindings, "shrink hor") && win_meta.active != 0) + else if (key == get_action_key(world.keybindings, "shrink horizontally") && win_meta.active != 0) resize_window(&win_meta, '_'); - else if (key == get_action_key(world.keybindings, "grow ver") && win_meta.active != 0) + else if (key == get_action_key(world.keybindings, "grow vertically") && win_meta.active != 0) resize_window(&win_meta, '+'); - else if (key == get_action_key(world.keybindings, "shrink ver") && win_meta.active != 0) + else if (key == get_action_key(world.keybindings, "shrink vertically") && win_meta.active != 0) resize_window(&win_meta, '-'); else if (key == get_action_key(world.keybindings, "save keys")) save_keybindings(&world); @@ -428,5 +416,13 @@ int main () { update_info (&win_info); update_log (&win_log, "\nYou wait."); } } + free(map.cells); + for (key = 0; key <= world.keyswindata->max; key++) + free(world.keybindings[key].name); + free(world.keybindings); + free(world.keyswindata); + free(win_info.data); + free(win_log.data); + endwin(); return 0; }