Strongly overhauled keybinding managemment. Window-specific keybindings and a window...

[plomrogue] / src / rexit.h

diff --git a/src/rexit.h b/src/rexit.h
index ac85577ef6a53f1aacb9186ad8e1fc1d180e8b13..4738844b8922984323cb2d284b81769242921e95 100644 (file)
--- a/src/rexit.h
+++ b/src/rexit.h
@@ -11,7 +11,6 @@
 
 #include <stdint.h> /* for uint8_t */
 struct World;
-struct Map;
 
 
 
@@ -21,10 +20,15 @@ struct Map;
  */
 enum cleanup_flag
 {
-    CLEANUP_NCURSES     = 0x01,
-    CLEANUP_MAP         = 0x02,
-    CLEANUP_KEYBINDINGS = 0x04,
-    CLEANUP_LOG         = 0x08
+    CLEANUP_NCURSES         = 0x0001,
+    CLEANUP_MAP             = 0x0002,
+    CLEANUP_KEYBINDINGS     = 0x0004,
+    CLEANUP_LOG             = 0x0008,
+    CLEANUP_COMMAND_DB      = 0x0010,
+    CLEANUP_MAP_OBJECTS     = 0x0020,
+    CLEANUP_MAP_OBJECT_DEFS = 0x0040,
+    CLEANUP_WIN_META        = 0x0080,
+    CLEANUP_WINCONFS        = 0x0100
 };
 extern void set_cleanup_flag(enum cleanup_flag flag);
 
@@ -35,10 +39,10 @@ extern void exit_game(struct World * world);
 
 
 
-/* If "err" != 0, exit with an error message "msg" and clean up. If "msg" is a
- * NULL pointer, return generic error message. (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);