Some code-stylistic improvements to rexit library; also moved exit_trouble() into it.

[plomrogue] / src / misc.h

diff --git a/src/misc.h b/src/misc.h
index 4d26f10baa25a26386c8a99936f71766c6e7ea4d..24f36b5ad6ae5d3ab15d089fe2953f428ff6dc01 100644 (file)
--- a/src/misc.h
+++ b/src/misc.h
@@ -7,95 +7,66 @@
 #ifndef MISC_H
 #define MISC_H
 
-
-
-#include <stdint.h>    /* for uint16_t, uint32_t */
-#include <stdio.h>     /* for FILE typedef */
+#include <stdlib.h>    /* for size_t */
+#include <stdint.h>    /* for uint16_t */
 #include "yx_uint16.h" /* for yx_uint16 coordinates */
-struct World;
-struct WinMeta;
-struct Win;
 struct Map;
 
 
 
-/* Reset terminal (end ncurses), clean up memory and exit. */
-extern void exit_game(struct World * world, struct Map * map);
-
-
+/* Return 16-bit number pseudo-randomly generated via Linear Congruential
+ * Generator algorithm with some proven constants. Use instead of rand() to
+ * ensure portability of the same pseudo-randomness across systems.
+ */
+extern uint16_t rrand();
 
-/* 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.
+/* Wrappers to malloc(), calloc() from function called "f" calling exit_err()
+ * with trouble_msg() error message if necessary.
  */
-extern void textfile_sizes(FILE * file, uint16_t * linemax_p,
-                           uint16_t * n_lines_p);
+extern void * try_malloc(size_t size, char * f);
+extern void * try_calloc(size_t nmemb, size_t size, char * f);
+
+/* Check if tempfile "path" exists, and if so, exit with explanation that. */
+extern void check_tempfile(char * path);
 
+/* If one and only one of files at "p1", "p2" exists, fail with explanation. */
+extern void check_files_xor(char * p1, char * p2);
 
+/* Save / load / unload (free) / reload interface configuration data. */
+extern void save_interface_conf();
+extern void load_interface_conf();
+extern void unload_interface_conf();
+extern void reload_interface_conf();
 
 /* Update game log by appending "text", or by appending a "." if "text" is the
  * same as the last one passed.
  */
-extern void update_log(struct World * world, char * text);
-
+extern void update_log(char * text);
 
-
-/* Return the offset necessary to center "map" on position "pos" in a frame of
- * "framesize.
+/* Return the offset necessary to center a map of "mapsize" on position "pos" in
+ * a frame of "framesize.
  */
-extern uint16_t center_offset(uint16_t pos, uint16_t mapsize,
-                              uint16_t framesize);
-
-
+extern uint16_t center_offset(uint16_t pos,
+                              uint16_t mapsize, uint16_t framesize);
 
 /* Record last player "action" in game record file "record, increment the game
  * turn and trigger enemy movement.
  */
-extern void turn_over(struct World * world, char action);
-
-
-
-/* Save current game data to file "savefile". */
-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);
-
+extern void turn_over(char action);
 
+/* Save or load current game data to / from file "savefile". */
+extern void save_game();
+extern void load_game();
 
 /* Return a random position on the map "map" that is passable (as determined by
  * is_passable().
  */
 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.
+/* Navigate (as far as possible) up (dir=='u') or (else) down in player's
+ * inventory selection.
  */
-extern unsigned char 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);
+extern void nav_inventory(char dir);