Improved and defined more precisely textfile_sizes().

[plomrogue] / src / misc.h

diff --git a/src/misc.h b/src/misc.h
index 39efe6ac0ef64032b78a82b14889810e34862e2d..568c56d432c5d9d572fb37c4f22f2025a86ac825 100644 (file)
--- a/src/misc.h
+++ b/src/misc.h
@@ -9,21 +9,23 @@
 
 
 
-#include <stdint.h>    /* for uint8_t, uint16_t, uint32_t */
+#include <stdint.h>    /* for uint8_t, uint16_t */
 #include <stdio.h>     /* for FILE typedef */
 #include "yx_uint16.h" /* for yx_uint16 coordinates */
 struct World;
-struct WinMeta;
-struct Win;
 struct Map;
 
 
 
-/* Learn from "file" the largest line length (pointed to by "linemax_p") and
- * (pointed to by "n_lines_p" if it is not set to NULL) the number of lines.
+/* Learn from "file" the largest line length (pointed to by "linemax_p"; length
+ * includes newline chars) and (pointed to by "n_lines_p" if it is not set to
+ * NULL) the number of lines (= number of newline chars).
+ *
+ * Returns 0 on success, 1 on error of fseek() (called to return to initial file
+ * reading position).
  */
-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);
 
 
 
@@ -54,27 +56,6 @@ extern void save_game(struct World * world);
 
 
 
-/* Toggle display of a window "win". */
-extern void toggle_window(struct WinMeta * win_meta, struct Win * win);
-
-
-
-/* Try to scroll virtual screen left ("dir" = "-") or right ("dir" = "+"),
- * subject to the limitations provided by the window manager via
- * reset_pad_offset().
- */
-extern void scroll_pad(struct WinMeta * win_meta, char dir);
-
-
-
-/* Try to grow or shrink the active window horizontally ("change" = "*"/"_") or
- * vertically ("change = "+"/"-") by one cell size, subject to the limitations
- * provided by the window manager via resize_active_win().
- */
-extern void growshrink_active_window(struct WinMeta * win_meta, char change);
-
-
-
 /* Return a random position on the map "map" that is passable (as determined by
  * is_passable().
  */
@@ -82,14 +63,4 @@ extern struct yx_uint16 find_passable_pos(struct Map * map);
 
 
 
-/* Call some meta game / window management actions dependent on key. If the
- * "quit" action is called, return 1 only instead of doing anything directly.
- */
-extern uint8_t meta_keys(int key, struct World * world,
-                               struct WinMeta * win_meta, struct Win * win_keys,
-                               struct Win * win_map, struct Win * win_info,
-                               struct Win * win_log);
-
-
-
 #endif