Fixed bug that led to endless loop in nearest_enemy_dir().

[plomrogue] / src / rexit.c

diff --git a/src/rexit.c b/src/rexit.c
index 1bc639f3a64ca147c6025f4943dddfb6d073a625..f79eac7582f25f0d5c7284a47198740b35015344 100644 (file)
--- a/src/rexit.c
+++ b/src/rexit.c
@@ -2,75 +2,60 @@
 
 #include "rexit.h"
 #include <stdlib.h> /* for exit(), free(), defines EXIT_SUCESS, EXIT_FAILURE */
-#include <stdio.h> /* for printf(), perror() */
+#include <stdio.h> /* for printf(), perror(), sprintf() */
 #include <stdint.h> /* for uint8_t */
-#include <ncurses.h> /* for endwin() */
+#include <string.h> /* for strlen() */
 #include <errno.h> /* for errno */
-#include "main.h" /* for World struct */
-#include "map.h" /* for Map struct */
-#include "keybindings.h" /* for free_keybindings() */
+#include "main.h" /* for world global */
+#include "map.h" /* for Map struct ("free(world.map->cells)") */
 #include "command_db.h" /* for free_command_db() */
-#include "windows.h" /* for Win struct, free_win(), free_winmeta() */
-#include "map_objects.h" /* for free_item_defs(), free_monster_defs() */
-#include "wincontrol.h" /* for free_winconfs() */
+#include "windows.h" /* for 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() */
 
 
 
 /* The clean-up routine and the flag resource by which it decides what to do. */
 static uint32_t cleanup_flags = 0x0000;
-static void cleanup(struct World * world);
+static void cleanup();
 
 
 
-static void cleanup(struct World * world)
+static void cleanup()
 {
-    if (cleanup_flags & CLEANUP_NCURSES)
-    {
-        endwin();
-    }
-    if (cleanup_flags & CLEANUP_MAP_OBJECTS)
-    {
-        free_items(world->item);
-        free_monsters(world->monster);
-    }
-    if (cleanup_flags & CLEANUP_MAP_OBJECT_DEFS)
-    {
-        free_item_defs(world->item_def);
-        free_monster_defs(world->monster_def);
-    }
     if (cleanup_flags & CLEANUP_LOG)
     {
-        free(world->log);
+        free(world.log);
     }
     if (cleanup_flags & CLEANUP_COMMAND_DB)
     {
-        free_command_db(world);
+        free_command_db();
     }
     if (cleanup_flags & CLEANUP_MAP)
     {
-        free(world->map->cells);
+        free(world.map->cells);
     }
-    if (cleanup_flags & CLEANUP_INTERFACE_CONF)
+    if (cleanup_flags & CLEANUP_MAP_OBJECTS)
     {
-        unload_interface_conf(world);
+        free_map_objects(world.map_objs);
     }
-    if (cleanup_flags & CLEANUP_WIN_META)
+    if (cleanup_flags & CLEANUP_MAP_OBJECT_DEFS)
     {
-        free_winmeta(world->wmeta);
+        free_map_object_defs(world.map_obj_defs);
     }
-/*
-    if (cleanup_flags & CLEANUP_KEYBINDINGS)
+    if (cleanup_flags & CLEANUP_MAP_OBJECT_ACTS)
     {
-        free_keybindings(world->kb_global.kbs);
-        free_keybindings(world->kb_wingeom.kbs);
-        free_keybindings(world->kb_winkeys.kbs);
+        free_map_object_actions(world.map_obj_acts);
     }
-    if (cleanup_flags & CLEANUP_WINCONFS)
-    {
-        free_winconfs(world);
+    if (cleanup_flags & CLEANUP_INTERFACE) /* Only cleaning-up order          */
+    {                                      /* dependency known so far:        */
+        unload_interface_conf();           /* unload_interface_conf() must    */
+    }                                      /* come before                     */
+    if (cleanup_flags & CLEANUP_NCURSES)   /* free_winmeta_and_endwin()       */
+    {                                      /* since it depends on world.wmeta */
+        free_winmeta_and_endwin();         /* for closing all windows.        */
     }
-*/
 }
 
 
@@ -82,21 +67,21 @@ extern void set_cleanup_flag(enum cleanup_flag flag)
 
 
 
-extern void exit_game(struct World * world)
+extern void exit_game()
 {
-    cleanup(world);
+    cleanup();
     exit(EXIT_SUCCESS);
 }
 
 
 
-extern void exit_err(uint8_t err, struct World * world, char * msg)
+extern void exit_err(uint8_t err, char * msg)
 {
     if (0 == err)
     {
         return;
     }
-    cleanup(world);
+    cleanup();
     if (NULL == msg)
     {
         msg = "Details unknown.";
@@ -109,3 +94,17 @@ extern void exit_err(uint8_t err, struct World * world, char * msg)
     }
     exit(EXIT_FAILURE);
 }
+
+
+
+extern void exit_trouble(uint8_t err, char * parent, char * child)
+{
+    char * p1 = "Trouble in ";
+    char * p2 = " with ";
+    char * p3 = ".";
+    uint16_t size = strlen(p1) + strlen(parent) + strlen(p2) + strlen(child)
+                    + strlen(p3) + 1;
+    char msg[size];
+    sprintf(msg, "%s%s%s%s%s", p1, parent, p2, child, p3);
+    exit_err(err, msg);
+}