X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=src%2Fmisc.h;h=ed906c2d0d72627e51babfde4c4165b9bc16ac42;hb=7290dec4219eaa2325aa00ef6139f715743dba3a;hp=c823af6223c590fddf9a41efbdbbfdba2dc0659f;hpb=657d5dbc6d362d7b20693c63b38d8d99f3d2dbbd;p=plomrogue
diff --git a/src/misc.h b/src/misc.h
index c823af6..ed906c2 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -7,47 +7,43 @@
#ifndef MISC_H
#define MISC_H
-
-
#include /* for size_t */
#include /* 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);
+extern char * trouble_msg(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);
+extern void check_files_xor(char * p1, char * p2);
/* 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 save_interface_conf();
+extern void load_interface_conf();
+extern void unload_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);
@@ -62,13 +58,13 @@ extern uint16_t center_offset(uint16_t pos,
/* 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();
@@ -82,7 +78,7 @@ 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);