X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=roguelike.c;h=a9d355383386d87653cd214553ffc37d53474167;hb=838e77016ac35c89125f6885f82938d8d7d7080a;hp=fc4f5d16f511e44f01ade0c31cd692ede62d4ecf;hpb=9eab10241df1b871d23c5eb6da896b39048b39c8;p=plomrogue diff --git a/roguelike.c b/roguelike.c index fc4f5d1..a9d3553 100644 --- a/roguelike.c +++ b/roguelike.c @@ -2,7 +2,6 @@ #include #include #include -#include #include "windows.h" struct Map { @@ -24,6 +23,7 @@ struct KeysWinData { int select; }; struct World { + char * log; int turn; struct KeyBinding * keybindings; struct KeysWinData * keyswindata; }; @@ -44,7 +44,7 @@ void draw_with_linebreaks (struct Win * win, char * text, int start_y) { toggle = 1; continue; } else - mvwaddch(win->curses_win, y, x, text[z]); + mvwaddch(win->curses, y, x, text[z]); if ('\n' == text[z+1]) { z++; toggle = 1; } @@ -52,18 +52,17 @@ void draw_with_linebreaks (struct Win * win, char * text, int start_y) { toggle = 1; fin = 1; } } } } } -void draw_text_from_bottom (struct Win * win) { -// Draw text in win->data from end/bottom to the top. - char * text = (char *) win->data; +void draw_text_from_bottom (struct Win * win, char * text) { +// Draw text from end/bottom to the top. char toggle = 0; int x, y, offset; int z = -1; - for (y = 0; 0 == toggle; y++) // Determine number of lines text would have in a window of - for (x = 0; x < win->width; x++) { // available width, but infinite height. + for (y = 0; 0 == toggle; y++) // Determine number of lines text would have in + for (x = 0; x < win->width; x++) { // a window of available width, but infinite height. z++; - if ('\n' == text[z]) // Treat \n and \0 as control characters for incrementing y and - break; // stopping the loop. Make sure they don't count as cell space - if ('\n' == text[z+1]) { // themselves. + if ('\n' == text[z]) // Treat \n and \0 as control characters for incrementing y and stopping + break; // the loop. Make sure they don't count as cell space themselves. + if ('\n' == text[z+1]) { z++; break; } else if (0 == text[z+1]) { @@ -86,6 +85,11 @@ void draw_text_from_bottom (struct Win * win) { text = text + (sizeof(char) * (z + 1)); } draw_with_linebreaks(win, text, start_y); } +void draw_log (struct Win * win) { +// Draw log text from world struct in win->data from bottom to top. + struct World world = * (struct World *) win->data; + draw_text_from_bottom(win, world.log); } + void draw_map (struct Win * win) { // Draw map determined by win->data Map struct into window. Respect offset. struct Map map = * (struct Map *) win->data; @@ -98,9 +102,9 @@ void draw_map (struct Win * win) { for (x = 0; x < win->width; x++) { if (y < height_map_av && x < width_map_av) { if (z == (map.width * map.player_y) + map.player_x) - mvwaddch(win->curses_win, y, x, '@'); + mvwaddch(win->curses, y, x, '@'); else - mvwaddch(win->curses_win, y, x, cells[z]); + mvwaddch(win->curses, y, x, cells[z]); z++; } } } } void draw_info (struct Win * win) { @@ -113,7 +117,7 @@ void draw_info (struct Win * win) { void toggle_window (struct WinMeta * win_meta, struct Win * win) { // Toggle display of window win. - if (0 != win->curses_win) + if (0 != win->curses) suspend_window(win_meta, win); else append_window(win_meta, win); } @@ -141,17 +145,17 @@ void update_info (struct World * world) { // Update info data by incrementing turn value. world->turn++; } -void update_log (struct Win * win, char * text) { +void update_log (struct World * world, char * text) { // Update log with new text to be appended. char * new_text; - int len_old = strlen(win->data); + int len_old = strlen(world->log); int len_new = strlen(text); int len_whole = len_old + len_new + 1; new_text = calloc(len_whole, sizeof(char)); - memcpy(new_text, win->data, len_old); + memcpy(new_text, world->log, len_old); memcpy(new_text + len_old, text, len_new); - free(win->data); - win->data = new_text; } + free(world->log); + world->log = new_text; } int get_action_key (struct KeyBinding * keybindings, char * name) { // Return key matching name in keybindings. @@ -231,11 +235,11 @@ void draw_keys_window (struct Win * win) { free(keyname); for (x = 0; x < win->width; x++) if (x < strlen(keydesc)) - mvwaddch(win->curses_win, y, x, keydesc[x] | attri); + mvwaddch(win->curses, 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); + mvwaddch(win->curses, y, x, keybindings[y + offset].name[x - strlen(keydesc) - 1] | attri); else - mvwaddch(win->curses_win, y, x, ' ' | attri); } + mvwaddch(win->curses, y, x, ' ' | attri); } free(keydesc); } void init_keybindings(struct World * world) { @@ -250,43 +254,22 @@ void init_keybindings(struct World * world) { c = getc(file); if ('\n' == c) { if (c_count > linemax) - linemax = c_count; + linemax = c_count + 1; c_count = 0; lines++; } } struct KeyBinding * keybindings = malloc(lines * sizeof(struct KeyBinding)); fseek(file, 0, SEEK_SET); char * command = malloc(linemax); int commcount = 0; - char * digits = malloc(3); - int digicount = 0; - int key, digimax; - int keycount = 0; - c = getc(file); - while (EOF != c) { - if ('\n' == c) { - keybindings[keycount].name = calloc(commcount + 1, sizeof(char)); - memcpy(keybindings[keycount].name, command, commcount); - keybindings[keycount].key = key; - keycount++; - digicount = 0; - commcount = 0; } - else if (-1 != digicount) - if (' ' == c) { - key = 0; - digimax = digicount - 1; - while (digicount > 0) { - digicount--; - key = key + ((digits[digicount] - 48) * pow(10, digimax - digicount)); } - digicount = -1; } - else { - digits[digicount] = c; - digicount++; } - else { - command[commcount] = c; - commcount++; } - c = getc(file); } + char * cmdptr; + while (fgets(command, linemax, file)) { + keybindings[commcount].key = atoi(command); + cmdptr = strchr(command, ' ') + 1; + keybindings[commcount].name = malloc(strlen(cmdptr)); + memcpy(keybindings[commcount].name, cmdptr, strlen(cmdptr) - 1); + keybindings[commcount].name[strlen(cmdptr) - 1] = '\0'; + commcount++; } free(command); - free(digits); fclose(file); struct KeysWinData * keyswindata = malloc(sizeof(struct KeysWinData)); keyswindata->max = lines - 1; @@ -305,7 +288,7 @@ void save_keybindings(struct World * world) { for (i = 0; i <= keyswindata->max; i++) if (strlen(keybindings[i].name) > linemax) linemax = strlen(keybindings[i].name); - linemax = linemax + 6; // + 6 = + 3 digits + whitespace + newline + null byte + linemax = linemax + 6; // + 6 = + 3 digits + whitespace + newline + null byte char * line = malloc(linemax); for (i = 0; i <= keyswindata->max; i++) { snprintf(line, linemax, "%d %s\n", keybindings[i].key, keybindings[i].name); @@ -338,10 +321,11 @@ int main () { win_info.draw = draw_info; win_info.data = &world; + world.log = calloc(1, sizeof(char)); struct Win win_log = init_window(&win_meta, "Log"); - win_log.draw = draw_text_from_bottom; - win_log.data = calloc(1, sizeof(char)); - update_log (&win_log, "Start!"); + win_log.draw = draw_log; + win_log.data = &world; + update_log (&world, "Start!"); int key; while (1) { @@ -400,30 +384,30 @@ int main () { map.offset_x--; else if (key == get_action_key(world.keybindings, "player down") && map.player_y < map.height - 1) { update_info (&world); - update_log (&win_log, "\nYou move south."); + update_log (&world, "\nYou move south."); map.player_y++; } else if (key == get_action_key(world.keybindings, "player up") && map.player_y > 0) { update_info (&world); - update_log (&win_log, "\nYou move north."); + update_log (&world, "\nYou move north."); map.player_y--; } else if (key == get_action_key(world.keybindings, "player right") && map.player_x < map.width - 1) { update_info (&world); - update_log (&win_log, "\nYou move east."); + update_log (&world, "\nYou move east."); map.player_x++; } else if (key == get_action_key(world.keybindings, "player left") && map.player_x > 0) { update_info (&world); - update_log (&win_log, "\nYou move west."); + update_log (&world, "\nYou move west."); map.player_x--; } else if (key == get_action_key(world.keybindings, "wait") ) { update_info (&world); - update_log (&win_log, "\nYou wait."); } } + update_log (&world, "\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_log.data); + free(world.log); endwin(); return 0; }