X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fdraw_wins.c;h=b15e1742d75aab610c6e29e97c34159c28a0f4ba;hb=f8325a4ea617b15315183d7a8027c0b913c91034;hp=81cc26138efe8406727215bbf98e48506d5c3167;hpb=56bd66b2302f09e9b8f39e9c059c1eb0d105b9fa;p=plomrogue diff --git a/src/draw_wins.c b/src/draw_wins.c index 81cc261..b15e174 100644 --- a/src/draw_wins.c +++ b/src/draw_wins.c @@ -1,3 +1,5 @@ +/* draw_wins.c */ + #include "draw_wins.h" #include /* for malloc(), free() */ #include /* for uint16_t */ @@ -9,8 +11,17 @@ #include "map_objects.h" /* for structs MapObj, Player */ #include "map.h" /* for Map struct */ #include "main.h" /* for World struct */ +#include "rexit.h" /* for err_exit() */ +#include "command_db.h" /* for get_command_longdesc() */ + + +/* Write "text" into window "win" as far as possible. Start on row "start_y". */ +static void draw_with_linebreaks(struct Win * win, char * text, + uint16_t start_y); +/* Write "text" not starting from the top but from the bottom of "win". */ +static void draw_text_from_bottom(struct Win * win, char * text); /* Draw onto "map" in "win" the objects in the chain at "start". */ static void draw_map_objects(struct World * world, struct MapObj * start, @@ -18,7 +29,7 @@ static void draw_map_objects(struct World * world, struct MapObj * start, -extern void draw_with_linebreaks(struct Win * win, char * text, +static void draw_with_linebreaks(struct Win * win, char * text, uint16_t start_y) { uint16_t x, y; @@ -62,7 +73,7 @@ extern void draw_with_linebreaks(struct Win * win, char * text, -extern void draw_text_from_bottom (struct Win * win, char * text) +static void draw_text_from_bottom (struct Win * win, char * text) { /* Determine number of lines text would have in a window of win's width, * but infinite height. Treat \n and \0 as control chars for incrementing @@ -127,6 +138,29 @@ extern void draw_text_from_bottom (struct Win * win, char * text) +static void draw_map_objects(struct World * world, struct MapObj * start, + struct Map * map, struct Win * win) +{ + struct MapObj * o; + struct MapObjDef * d; + char c; + for (o = start; o != 0; o = o->next) + { + if ( o->pos.y >= map->offset.y + && o->pos.y < map->offset.y + win->frame.size.y + && o->pos.x >= map->offset.x + && o->pos.x < map->offset.x + win->frame.size.x) + { + d = get_map_obj_def (world, o->type); + c = d->mapchar; + mvwaddch(win->frame.curses_win, + o->pos.y - map->offset.y, o->pos.x - map->offset.x, c); + } + } +} + + + extern void draw_log_win(struct Win * win) { struct World * world = (struct World *) win->data; @@ -174,10 +208,18 @@ extern void draw_map_win(struct Win * win) extern void draw_info_win(struct Win * win) { struct World * world = (struct World *) win->data; - char text[100]; - snprintf(text, 100, - "Turn: %d\nHitpoints: %d", world->turn, world->player->hitpoints); + char * dsc_turn = "Turn: "; + char * dsc_hitpoints = "\nHitpoints: "; + char * dsc_score = "\nScore: "; + uint16_t maxl = strlen(dsc_turn) + strlen(dsc_hitpoints) + strlen(dsc_score) + + 10 + 5 + 10; /* max strlens of numbers to be used */ + char * text = malloc(maxl + 1); + sprintf(text, "%s%d%s%d%s%d", + dsc_turn, world->turn, + dsc_hitpoints, world->player->hitpoints, + dsc_score, world->score); draw_with_linebreaks(win, text, 0); + free(text); } @@ -190,21 +232,25 @@ extern void draw_keys_win(struct Win * win) win->frame.size.y - 1); uint8_t keydescwidth = 9 + 1; /* max length assured by get_keyname() + \0 */ char * keydesc = malloc(keydescwidth), * keyname; + char * err_hint = "Trouble with draw_scroll_hint() in draw_keys_win()."; attr_t attri; + char * cmd_dsc; for (y = 0; y <= world->keyswindata->max && y < win->frame.size.y; y++) { if (0 == y && offset > 0) { - draw_scroll_hint(&win->frame, y, offset + 1, '^'); + exit_err(draw_scroll_hint(&win->frame, y, offset + 1, '^'), + world, err_hint); continue; } else if (win->frame.size.y == y + 1 && 0 < world->keyswindata->max - (win->frame.size.y + offset - 1)) { - draw_scroll_hint(&win->frame, y, - world->keyswindata->max - - (offset + win->frame.size.y) + 2, 'v'); + exit_err(draw_scroll_hint(&win->frame, y, + world->keyswindata->max + - (offset + win->frame.size.y) + 2, 'v'), + world, err_hint); continue; } attri = 0; @@ -219,19 +265,19 @@ extern void draw_keys_win(struct Win * win) keyname = get_keyname(world->keybindings[y + offset].key); snprintf(keydesc, keydescwidth, "%-9s", keyname); free(keyname); + cmd_dsc = get_command_longdsc(world, + world->keybindings[y + offset].name); for (x = 0; x < win->frame.size.x; x++) { if (x < strlen(keydesc)) { mvwaddch(win->frame.curses_win, y, x, keydesc[x] | attri); } - else if (strlen(keydesc) < x - && x < strlen(world->keybindings[y + offset].name) - + strlen(keydesc) + 1) + else if ( strlen(keydesc) < x + && x < strlen(cmd_dsc) + strlen(keydesc) + 1) { mvwaddch(win->frame.curses_win, y, x, - world->keybindings[y + offset] - .name[x - strlen(keydesc) - 1] | attri); + cmd_dsc[x - strlen(keydesc) - 1] | attri); } else { @@ -241,26 +287,3 @@ extern void draw_keys_win(struct Win * win) } free(keydesc); } - - - -static void draw_map_objects(struct World * world, struct MapObj * start, - struct Map * map, struct Win * win) -{ - struct MapObj * o; - struct MapObjDef * d; - char c; - for (o = start; o != 0; o = o->next) - { - if ( o->pos.y >= map->offset.y - && o->pos.y < map->offset.y + win->frame.size.y - && o->pos.x >= map->offset.x - && o->pos.x < map->offset.x + win->frame.size.x) - { - d = get_map_obj_def (world, o->type); - c = d->mapchar; - mvwaddch(win->frame.curses_win, - o->pos.y - map->offset.y, o->pos.x - map->offset.x, c); - } - } -}