X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;ds=inline;f=src%2Frexit.h;h=47a9993eb6d92a50130548d350c4da92cbc7073d;hb=350ef2e2d17e8122e2991466f76a9a083a6303e7;hp=f020485f9d3c21c30bae196344a79fdc4a333bed;hpb=6ba18516a602b3d4ad95981887ad9c5eb40a335a;p=plomrogue

diff --git a/src/rexit.h b/src/rexit.h
index f020485..47a9993 100644
--- a/src/rexit.h
+++ b/src/rexit.h
@@ -10,8 +10,6 @@
 
 
 #include <stdint.h> /* for uint8_t */
-struct World;
-struct Map;
 
 
 
@@ -21,25 +19,28 @@ struct Map;
  */
 enum cleanup_flag
 {
-    CLEANUP_NCURSES     = 0x01,
-    CLEANUP_MAP         = 0x02,
-    CLEANUP_KEYBINDINGS = 0x04,
-    CLEANUP_LOG         = 0x08
+    CLEANUP_NCURSES         = 0x0001,
+    CLEANUP_MAP             = 0x0002,
+    CLEANUP_LOG             = 0x0004,
+    CLEANUP_COMMAND_DB      = 0x0008,
+    CLEANUP_MAP_OBJECTS     = 0x0010,
+    CLEANUP_MAP_OBJECT_DEFS = 0x0020,
+    CLEANUP_WIN_META        = 0x0040,
+    CLEANUP_INTERFACE_CONF  = 0x0080
 };
 extern void set_cleanup_flag(enum cleanup_flag flag);
 
 
 
 /* Exit orderly, clean up. */
-extern void exit_game(struct World * world);
+extern void exit_game();
 
-
-
-/* If "err" != 0, exit with an error message "msg" and clean up. (For "err",
- * pass the result of functions that return non-zero as an error status and
- * thereby avoid bloating up the code with if-error-conditionals.)
+/* 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);