From: Christian Heller Date: Tue, 30 Jul 2013 01:51:12 +0000 (+0200) Subject: Put static functions at start instead of end of draw_wins library. X-Git-Tag: tce~1110 X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/%7B%7Bdb.prefix%7D%7D/static/foo.html?a=commitdiff_plain;h=ca94d7f8451c558a5a3f813466e92564da555a4e;p=plomrogue Put static functions at start instead of end of draw_wins library. --- diff --git a/src/draw_wins.c b/src/draw_wins.c index eca0f75..4dfd054 100644 --- a/src/draw_wins.c +++ b/src/draw_wins.c @@ -27,123 +27,6 @@ static void draw_map_objects(struct World * world, struct MapObj * start, -extern void draw_log_win(struct Win * win) -{ - struct World * world = (struct World *) win->data; - draw_text_from_bottom(win, world->log); -} - - - -extern void draw_map_win(struct Win * win) -{ - struct World * world = (struct World *) win->data; - struct Map * map = world->map; - struct Player * player = world->player; - char * cells = map->cells; - uint16_t width_map_av = map->size.x - map->offset.x; - uint16_t height_map_av = map->size.y - map->offset.y; - uint16_t x, y, z; - for (y = 0; y < win->frame.size.y; y++) - { - z = map->offset.x + (map->offset.y + y) * (map->size.x); - for (x = 0; x < win->frame.size.x; x++) - { - if (y < height_map_av && x < width_map_av) - { - mvwaddch(win->frame.curses_win, y, x, cells[z]); - z++; - } - } - } - draw_map_objects (world, (struct MapObj *) world->item, map, win); - draw_map_objects (world, (struct MapObj *) world->monster, map, win); - if ( player->pos.y >= map->offset.y - && player->pos.y < map->offset.y + win->frame.size.y - && player->pos.x >= map->offset.x - && player->pos.x < map->offset.x + win->frame.size.x) - { - mvwaddch(win->frame.curses_win, - player->pos.y - map->offset.y, player->pos.x - map->offset.x, - '@'); - } -} - - - -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); - draw_with_linebreaks(win, text, 0); -} - - - -extern void draw_keys_win(struct Win * win) -{ - struct World * world = (struct World *) win->data; - uint16_t offset, y, x; - offset = center_offset(world->keyswindata->select, world->keyswindata->max, - win->frame.size.y - 1); - uint8_t keydescwidth = 9 + 1; /* max length assured by get_keyname() + \0 */ - char * keydesc = malloc(keydescwidth), * keyname; - 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, '^'); - 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'); - continue; - } - attri = 0; - if (y == world->keyswindata->select - offset) - { - attri = A_REVERSE; - if (1 == world->keyswindata->edit) - { - attri = attri | A_BLINK; - } - } - keyname = get_keyname(world->keybindings[y + offset].key); - snprintf(keydesc, keydescwidth, "%-9s", keyname); - free(keyname); - 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) - { - mvwaddch(win->frame.curses_win, y, x, - world->keybindings[y + offset] - .name[x - strlen(keydesc) - 1] | attri); - } - else - { - mvwaddch(win->frame.curses_win, y, x, ' ' | attri); - } - } - } - free(keydesc); -} - - - static void draw_with_linebreaks(struct Win * win, char * text, uint16_t start_y) { @@ -273,3 +156,120 @@ static void draw_map_objects(struct World * world, struct MapObj * start, } } } + + + +extern void draw_log_win(struct Win * win) +{ + struct World * world = (struct World *) win->data; + draw_text_from_bottom(win, world->log); +} + + + +extern void draw_map_win(struct Win * win) +{ + struct World * world = (struct World *) win->data; + struct Map * map = world->map; + struct Player * player = world->player; + char * cells = map->cells; + uint16_t width_map_av = map->size.x - map->offset.x; + uint16_t height_map_av = map->size.y - map->offset.y; + uint16_t x, y, z; + for (y = 0; y < win->frame.size.y; y++) + { + z = map->offset.x + (map->offset.y + y) * (map->size.x); + for (x = 0; x < win->frame.size.x; x++) + { + if (y < height_map_av && x < width_map_av) + { + mvwaddch(win->frame.curses_win, y, x, cells[z]); + z++; + } + } + } + draw_map_objects (world, (struct MapObj *) world->item, map, win); + draw_map_objects (world, (struct MapObj *) world->monster, map, win); + if ( player->pos.y >= map->offset.y + && player->pos.y < map->offset.y + win->frame.size.y + && player->pos.x >= map->offset.x + && player->pos.x < map->offset.x + win->frame.size.x) + { + mvwaddch(win->frame.curses_win, + player->pos.y - map->offset.y, player->pos.x - map->offset.x, + '@'); + } +} + + + +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); + draw_with_linebreaks(win, text, 0); +} + + + +extern void draw_keys_win(struct Win * win) +{ + struct World * world = (struct World *) win->data; + uint16_t offset, y, x; + offset = center_offset(world->keyswindata->select, world->keyswindata->max, + win->frame.size.y - 1); + uint8_t keydescwidth = 9 + 1; /* max length assured by get_keyname() + \0 */ + char * keydesc = malloc(keydescwidth), * keyname; + 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, '^'); + 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'); + continue; + } + attri = 0; + if (y == world->keyswindata->select - offset) + { + attri = A_REVERSE; + if (1 == world->keyswindata->edit) + { + attri = attri | A_BLINK; + } + } + keyname = get_keyname(world->keybindings[y + offset].key); + snprintf(keydesc, keydescwidth, "%-9s", keyname); + free(keyname); + 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) + { + mvwaddch(win->frame.curses_win, y, x, + world->keybindings[y + offset] + .name[x - strlen(keydesc) - 1] | attri); + } + else + { + mvwaddch(win->frame.curses_win, y, x, ' ' | attri); + } + } + } + free(keydesc); +}