X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fmisc.h;h=ddc6be6617c8b691fd06dd57365f5b1afa71b9d4;hb=3f1efd2140c58164d692a107aa468048e756036c;hp=c823af6223c590fddf9a41efbdbbfdba2dc0659f;hpb=657d5dbc6d362d7b20693c63b38d8d99f3d2dbbd;p=plomrogue

diff --git a/src/misc.h b/src/misc.h
index c823af6..ddc6be6 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -7,49 +7,44 @@
 #ifndef MISC_H
 #define MISC_H
 
-
-
 #include <stdlib.h>    /* for size_t */
 #include <stdint.h>    /* for uint16_t */
 #include "yx_uint16.h" /* for yx_uint16 coordinates */
-struct World;
 struct Map;
 
 
 
-/* Returns message: "Trouble in ".parent." with ".child."." (try_*() helper) */
-extern char * trouble_msg(struct World * w, char * parent, char * child);
+/* 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();
+
+/* Do exit_err() with message: "Trouble in ".parent." with ".child."." */
+extern void exit_trouble(uint8_t test, char * parent, char * child);
 
 /* Wrappers to malloc(), calloc() from function called "f" calling exit_err()
  * with trouble_msg() error message if necessary.
  */
-extern void * try_malloc(size_t size, struct World * w, char * f);
-extern void * try_calloc(size_t nmemb, size_t size,
-                         struct World * w, char * f);
-
-
+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, struct World * f);
+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, struct World * w);
-
-
-
-/* Save / load / unload (free) interface configuration data. */
-extern void save_interface_conf(struct World * world);
-extern void load_interface_conf(struct World * world);
-extern void unload_interface_conf(struct World * world);
-
+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 a map of "mapsize" on position "pos" in
  * a frame of "framesize.
@@ -57,32 +52,24 @@ extern void update_log(struct World * world, char * text);
 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);
-
-
+extern void turn_over(char action);
 
 /* Save or load current game data to / from file "savefile". */
-extern void save_game(struct World * world);
-extern void load_game(struct World * world);
-
-
+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);
 
-
-
 /* Navigate (as far as possible) up (dir=='u') or (else) down in player's
  * inventory selection.
  */
-extern void nav_inventory(struct World * world, char dir);
+extern void nav_inventory(char dir);