X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fmisc.c;h=4b25f65f5c05b387d3bfc359e76018411c30676f;hb=0568c1c0f6735509f2a1afea31ecb5dc28f26bf4;hp=a4781c9f72d90b848283c69433b7f75450c7a53f;hpb=caf7e50574dc4fb3756a386257863e5b8b42ad98;p=plomrogue diff --git a/src/misc.c b/src/misc.c index a4781c9..4b25f65 100644 --- a/src/misc.c +++ b/src/misc.c @@ -5,40 +5,38 @@ #include /* for unlink(), acess() */ #include /* for calloc(), free() */ #include /* for strlen(), strcmp(), memcpy() */ -#include /* for uint8_t */ -#include "windows.h" /* for suspend_win(), append_win(), reset_pad_offset(), - * resize_active_win(), cycle_active_win(), - * shift_active_win(), struct Win, struct WinMeta - */ -#include "keybindings.h" /* for get_action_key(), save_keybindings(), - * keyswin_move_selection(), keyswin_mod_key() - */ +#include /* for uint8_t, uint16_t */ #include "readwrite.h" /* for [read/write]_uint[8/16/32][_bigendian]() */ #include "map_objects.h" /* for struct Monster, write_map_objects(), */ #include "map_object_actions.h" /* for is_passable(), move_monster() */ -#include "map.h" /* for map_scroll(),map_center_player(), Map struct,dir enum */ +#include "map.h" /* for Map struct */ #include "main.h" /* for World struct */ -#include "yx_uint16.h" /* for yx_uint16 */ +#include "yx_uint16.h" /* for yx_uint16 struct */ #include "rrand.h" /* for rrand(), rrand_seed() */ #include "rexit.h" /* for exit_err() */ -extern void textfile_sizes(FILE * file, uint16_t * linemax_p, - uint16_t * n_lines_p) + +extern uint8_t textfile_sizes(FILE * file, uint16_t * linemax_p, + uint16_t * n_lines_p) { - uint16_t n_lines = 0; int c = 0; - uint16_t linemax = 0; uint16_t c_count = 0; - while (EOF != c) + uint16_t n_lines = 0; + uint16_t linemax = 0; + while (1) { - c_count++; c = getc(file); + if (EOF == c) + { + break; + } + c_count++; if ('\n' == c) { if (c_count > linemax) { - linemax = c_count + 1; + linemax = c_count; } c_count = 0; if (n_lines_p) @@ -47,22 +45,31 @@ extern void textfile_sizes(FILE * file, uint16_t * linemax_p, } } } - fseek(file, 0, SEEK_SET); + if (0 == linemax && 0 < c_count) /* Handle files that consist of only one */ + { /* line / lack newline chars. */ + linemax = c_count; + } + + if (-1 == fseek(file, 0, SEEK_SET)) + { + return 1; + } * linemax_p = linemax; if (n_lines_p) { * n_lines_p = n_lines; } + return 0; } extern void update_log(struct World * world, char * text) { - static char * last_msg; - if (0 == last_msg) - { - last_msg = calloc(1, sizeof(char)); + static char * last_msg; /* TODO: valgrind is dissatisfied */ + if (0 == last_msg) /* with this calloc'd pointer */ + { /* never being freed. */ + last_msg = calloc(1, sizeof(char)); /* Rectify this ? */ } char * new_text; uint16_t len_old = strlen(world->log); @@ -195,62 +202,6 @@ extern void save_game(struct World * world) -extern uint8_t toggle_window(struct WinMeta * win_meta, struct Win * win) -{ - if (0 != win->frame.curses_win) - { - return suspend_win(win_meta, win); - } - else - { - return append_win(win_meta, win); - } -} - - - -extern void scroll_pad(struct WinMeta * win_meta, char dir) -{ - if ('+' == dir) - { - reset_pad_offset(win_meta, win_meta->pad_offset + 1); - } - else if ('-' == dir) - { - reset_pad_offset(win_meta, win_meta->pad_offset - 1); - } -} - - - -extern uint8_t growshrink_active_window(struct WinMeta * win_meta, char change) -{ - if (0 != win_meta->active) - { - struct yx_uint16 size = win_meta->active->frame.size; - if (change == '-') - { - size.y--; - } - else if (change == '+') - { - size.y++; - } - else if (change == '_') - { - size.x--; - } - else if (change == '*') - { - size.x++; - } - return resize_active_win (win_meta, size); - } - return 0; -} - - - extern struct yx_uint16 find_passable_pos(struct Map * map) { struct yx_uint16 pos; @@ -261,115 +212,3 @@ extern struct yx_uint16 find_passable_pos(struct Map * map) } return pos; } - - - -extern uint8_t meta_keys(int key, struct World * world) -{ - struct WinMeta * win_meta = world->wins.meta; - struct Win * win_keys = world->wins.keys; - struct Win * win_map = world->wins.map; - struct Win * win_info = world->wins.info; - struct Win * win_log = world->wins.log; - char * err_toggle = "Trouble with toggle_window() in meta_keys()."; - char * err_shift = "Trouble with shift_active_win() in meta_keys()."; - char * err_resize = "Trouble with growshrink_active_window() in " - "meta_keys()."; - if (key == get_action_key(world->keybindings, "quit")) - { - return 1; - } - else if (key == get_action_key(world->keybindings, "scroll pad right")) - { - scroll_pad (win_meta, '+'); - } - else if (key == get_action_key(world->keybindings, "scroll pad left")) - { - scroll_pad (win_meta, '-'); - } - else if (key == get_action_key(world->keybindings, "toggle keys window")) - { - exit_err(toggle_window(win_meta, win_keys), world, err_toggle); - } - else if (key == get_action_key(world->keybindings, "toggle map window")) - { - exit_err(toggle_window(win_meta, win_map), world, err_toggle); - } - else if (key == get_action_key(world->keybindings, "toggle info window")) - { - exit_err(toggle_window(win_meta, win_info), world, err_toggle); - } - else if (key == get_action_key(world->keybindings, "toggle log window")) - { - exit_err(toggle_window(win_meta, win_log), world, err_toggle); - } - else if (key == get_action_key(world->keybindings, "cycle forwards")) - { - cycle_active_win(win_meta, 'f'); - } - else if (key == get_action_key(world->keybindings, "cycle backwards")) - { - cycle_active_win(win_meta, 'b'); - } - else if (key == get_action_key(world->keybindings, "shift forwards")) - { - exit_err(shift_active_win(win_meta, 'f'), world, err_shift); - } - else if (key == get_action_key(world->keybindings, "shift backwards")) - { - exit_err(shift_active_win(win_meta, 'b'), world, err_shift); - } - else if (key == get_action_key(world->keybindings, "grow horizontally")) - { - exit_err(growshrink_active_window(win_meta, '*'), world, err_resize); - } - else if (key == get_action_key(world->keybindings, "shrink horizontally")) - { - exit_err(growshrink_active_window(win_meta, '_'), world, err_resize); - } - else if (key == get_action_key(world->keybindings, "grow vertically")) - { - exit_err(growshrink_active_window(win_meta, '+'), world, err_resize); - } - else if (key == get_action_key(world->keybindings, "shrink vertically")) - { - exit_err(growshrink_active_window(win_meta, '-'), world, err_resize); - } - else if (key == get_action_key(world->keybindings, "save keys")) - { - save_keybindings(world); - } - else if (key == get_action_key(world->keybindings, "keys nav up")) - { - keyswin_move_selection (world, 'u'); - } - else if (key == get_action_key(world->keybindings, "keys nav down")) - { - keyswin_move_selection (world, 'd'); - } - else if (key == get_action_key(world->keybindings, "keys mod")) - { - keyswin_mod_key (world, win_meta); - } - else if (key == get_action_key(world->keybindings, "map up")) - { - map_scroll (world->map, NORTH, win_map->frame.size); - } - else if (key == get_action_key(world->keybindings, "map down")) - { - map_scroll (world->map, SOUTH, win_map->frame.size); - } - else if (key == get_action_key(world->keybindings, "map right")) - { - map_scroll (world->map, EAST, win_map->frame.size); - } - else if (key == get_action_key(world->keybindings, "map left")) - { - map_scroll (world->map, WEST, win_map->frame.size); - } - else if (key == get_action_key(world->keybindings, "map center player")) - { - map_center_player (world->map, world->player, win_map->frame.size); - } - return 0; -}