X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Frexit.h;h=ab8e8ec2aed7c53a6fbe342bd7e7c3825d419d94;hb=3edf207d99f9e6e7e4b6beb9939bb9618e4be597;hp=e4c2eb53584476da899e2e87a4e00627da3d928f;hpb=4d9b6ac142740aa337fc3e622902c9595c36f6d0;p=plomrogue

diff --git a/src/rexit.h b/src/rexit.h
index e4c2eb5..ab8e8ec 100644
--- a/src/rexit.h
+++ b/src/rexit.h
@@ -9,8 +9,7 @@
 
 
 
-struct World;
-struct Map;
+#include <stdint.h> /* for uint8_t */
 
 
 
@@ -20,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_MAPOBJACTS      = 0x0010,
+    CLEANUP_MAP_OBJECTS     = 0x0020,
+    CLEANUP_MAP_OBJECT_DEFS = 0x0040,
+    CLEANUP_INTERFACE       = 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(unsigned char err, struct World * world, char * msg);
+extern void exit_err(uint8_t err, char * msg);