X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fdraw_wins.c;h=a72978cee1003393859ea7a3f4dc76936113e069;hb=9ea97fca7b7de4de9ed61680de4bb08cd19ff206;hp=4dfd054a8149bf578736c25c14a32dbec7cdddaf;hpb=ca94d7f8451c558a5a3f813466e92564da555a4e;p=plomrogue diff --git a/src/draw_wins.c b/src/draw_wins.c index 4dfd054..a72978c 100644 --- a/src/draw_wins.c +++ b/src/draw_wins.c @@ -11,6 +11,7 @@ #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() */ @@ -222,21 +223,24 @@ 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; 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;