Small improvements in save_win_config() code and comments.

[plomrogue] / src / rexit.c

diff --git a/src/rexit.c b/src/rexit.c
index 6f14663cb8bbac5caac205177430c1b8ff20a11e..691cb6840f575e1caac142e49ce8f7d8e33ad6fa 100644 (file)
--- a/src/rexit.c
+++ b/src/rexit.c
@@ -4,15 +4,15 @@
 #include <stdlib.h> /* for exit(), free(), defines EXIT_SUCESS, EXIT_FAILURE */
 #include <stdio.h> /* for printf(), perror() */
 #include <stdint.h> /* for uint8_t */
-#include <ncurses.h> /* for endwin() */
 #include <errno.h> /* for errno */
 #include "main.h" /* for world global */
 #include "map.h" /* for Map struct */
 #include "keybindings.h" /* for free_keybindings() */
 #include "command_db.h" /* for free_command_db() */
-#include "windows.h" /* for Win struct, free_win(), free_winmeta() */
+#include "windows.h" /* for Win struct, free_winmeta_and_endwin() */
 #include "map_objects.h" /* for free_map_objects, free_map_object_defs() */
 #include "misc.h" /* for unload_interface_conf() */
+#include "map_object_actions.h" /* for free_map_object_actions() */
 
 
 
@@ -24,10 +24,6 @@ static void cleanup();
 
 static void cleanup()
 {
-    if (cleanup_flags & CLEANUP_NCURSES)
-    {
-        endwin();
-    }
     if (cleanup_flags & CLEANUP_MAP_OBJECTS)
     {
         free_map_objects(world.map_objs);
@@ -44,17 +40,21 @@ static void cleanup()
     {
         free_command_db();
     }
+    if (cleanup_flags & CLEANUP_MAPOBJACTS)
+    {
+        free_map_object_actions(world.map_obj_acts);
+    }
     if (cleanup_flags & CLEANUP_MAP)
     {
         free(world.map->cells);
     }
-    if (cleanup_flags & CLEANUP_INTERFACE_CONF)
+    if (cleanup_flags & CLEANUP_INTERFACE)
     {
-        unload_interface_conf(/*&world*/);
+        unload_interface_conf();
     }
-    if (cleanup_flags & CLEANUP_WIN_META)
+    if (cleanup_flags & CLEANUP_NCURSES)
     {
-        free_winmeta(world.wmeta);
+        free_winmeta_and_endwin();
     }
 }