X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Frexit.h;h=1c5c59d17fc0109a8e1cb5e7f6eb8968c8cf8369;hb=ea9dd0ae82153bf07b6c0fe2927548afea57e833;hp=6336788ddf8c19012cdea8cbc771517de834f7bc;hpb=c1a7e6cdb13cd7d883424afdf0fe08e9a10fbc28;p=plomrogue

diff --git a/src/rexit.h b/src/rexit.h
index 6336788..1c5c59d 100644
--- a/src/rexit.h
+++ b/src/rexit.h
@@ -7,11 +7,7 @@
 #ifndef REXIT_H
 #define REXIT_H
 
-
-
 #include <stdint.h> /* for uint8_t */
-struct World;
-struct Map;
 
 
 
@@ -21,32 +17,31 @@ struct Map;
  */
 enum cleanup_flag
 {
-    CLEANUP_NCURSES         = 0x0001,
-    CLEANUP_MAP             = 0x0002,
-    CLEANUP_KEYBINDINGS     = 0x0004,
-    CLEANUP_LOG             = 0x0008,
-    CLEANUP_COMMAND_DB      = 0x0010,
-    CLEANUP_MAP_OBJECT_DEFS = 0x0020,
-    CLEANUP_WIN_INFO        = 0x0040,
-    CLEANUP_WIN_LOG         = 0x0080,
-    CLEANUP_WIN_MAP         = 0x0100,
-    CLEANUP_WIN_KEYS        = 0x0200
+    CLEANUP_LOG             = 0x0001,
+    CLEANUP_COMMAND_DB      = 0x0002,
+    CLEANUP_MAP             = 0x0004,
+    CLEANUP_MAP_OBJECTS     = 0x0008,
+    CLEANUP_MAP_OBJECT_DEFS = 0x0010,
+    CLEANUP_MAP_OBJECT_ACTS = 0x0020,
+    CLEANUP_INTERFACE       = 0x0040,
+    CLEANUP_NCURSES         = 0x0080
 };
 extern void set_cleanup_flag(enum cleanup_flag flag);
 
 
 
-/* Exit orderly, clean up. */
-extern void exit_game(struct World * world);
-
-
+/* Exit orderly, clean up in an order respecting resource dependencies. */
+extern void exit_game();
 
 /* If "err" == 0, do nothing. Else, clean up and exit with an error message that
  * consists, first, of "msg" or (if "msg" is a NULL pointer) a generic "Details
  * unknown", secondly of "err" as the "internal error code", and thirdly of
  * errno if it is non-zero.
  */
-extern void exit_err(uint8_t err, struct World * world, char * msg);
+extern void exit_err(uint8_t err, char * msg);
+
+/* Do exit_err() with "msg" as: "Trouble in ".parent." with ".child."." */
+extern void exit_trouble(uint8_t err, char * parent, char * child);