Made get_name_to_keycode() code a little less ugly/redundant by outsourcing to try_ke...

[plomrogue] / src / rexit.h

diff --git a/src/rexit.h b/src/rexit.h
index 6336788ddf8c19012cdea8cbc771517de834f7bc..3ccd4707d4f7905a4b7a5128f44c96c2feede609 100644 (file)
--- a/src/rexit.h
+++ b/src/rexit.h
@@ -10,8 +10,6 @@
 
 
 #include <stdint.h> /* for uint8_t */
-struct World;
-struct Map;
 
 
 
@@ -23,21 +21,19 @@ enum cleanup_flag
 {
     CLEANUP_NCURSES         = 0x0001,
     CLEANUP_MAP             = 0x0002,
-    CLEANUP_KEYBINDINGS     = 0x0004,
-    CLEANUP_LOG             = 0x0008,
-    CLEANUP_COMMAND_DB      = 0x0010,
+    CLEANUP_LOG             = 0x0004,
+    CLEANUP_COMMAND_DB      = 0x0008,
+    CLEANUP_MAP_OBJECTS     = 0x0010,
     CLEANUP_MAP_OBJECT_DEFS = 0x0020,
-    CLEANUP_WIN_INFO        = 0x0040,
-    CLEANUP_WIN_LOG         = 0x0080,
-    CLEANUP_WIN_MAP         = 0x0100,
-    CLEANUP_WIN_KEYS        = 0x0200
+    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();
 
 
 
@@ -46,7 +42,7 @@ extern void exit_game(struct World * world);
  * 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);