#include <unistd.h> /* for unlink(), acess() */
#include <stdlib.h> /* for calloc(), free() */
#include <string.h> /* for strlen(), strcmp(), memcpy() */
-#include <stdint.h> /* 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 <stdint.h> /* 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)
}
}
}
- 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);
-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;