home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made single World struct a global variable, fitted a lot of code to this change,...
[plomrogue]
/
src
/
misc.h
diff --git
a/src/misc.h
b/src/misc.h
index 782a6fab0512a23a775515a6b4080f55d3b24669..ed906c2d0d72627e51babfde4c4165b9bc16ac42 100644
(file)
--- a/
src/misc.h
+++ b/
src/misc.h
@@
-7,40
+7,43
@@
#ifndef MISC_H
#define MISC_H
#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 */
#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) */
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.
*/
/* 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. */
/* 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. */
/* 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();
+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.
*/
/* 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);
@@
-55,12
+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.
*/
/* 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 current game data to file "savefile". */
-extern void save_game(struct World * world);
+/* Save or load current game data to / from file "savefile". */
+extern void save_game();
+extern void load_game();
@@
-71,4
+75,11
@@
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(char dir);
+
+
+
#endif
#endif