home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't use ncurses windows besides the virtual screen pad. Eliminated some ncurses...
[plomrogue]
/
src
/
rexit.c
diff --git
a/src/rexit.c
b/src/rexit.c
index 2497c034014a6e3d6b585b9d6a9b306aa6cc41c8..5fa660ea2175e925855bf6c6323ab18312a9335c 100644
(file)
--- a/
src/rexit.c
+++ b/
src/rexit.c
@@
-8,13
+8,17
@@
#include <errno.h> /* for errno */
#include "main.h" /* for World struct */
#include "map.h" /* for Map struct */
#include <errno.h> /* for errno */
#include "main.h" /* for World struct */
#include "map.h" /* for Map struct */
-#include "keybindings.h" /* for
KeysWinData, KeyBinding structs
*/
+#include "keybindings.h" /* for
free_keybindings()
*/
#include "command_db.h" /* for free_command_db() */
#include "command_db.h" /* for free_command_db() */
+#include "windows.h" /* for Win struct, free_win(), free_winmeta() */
+#include "map_objects.h" /* for free_map_objects, free_map_object_defs() */
+#include "wincontrol.h" /* for free_winconfs() */
+#include "misc.h" /* for unload_interface_conf() */
/* The clean-up routine and the flag resource by which it decides what to do. */
/* The clean-up routine and the flag resource by which it decides what to do. */
-static uint
8_t cleanup_flags = 0x
00;
+static uint
32_t cleanup_flags = 0x00
00;
static void cleanup(struct World * world);
static void cleanup(struct World * world);
@@
-25,19
+29,13
@@
static void cleanup(struct World * world)
{
endwin();
}
{
endwin();
}
- if (cleanup_flags & CLEANUP_MAP)
+ if (cleanup_flags & CLEANUP_MAP
_OBJECTS
)
{
{
- free
(world->map->cell
s);
+ free
_map_objects(world->map_obj
s);
}
}
- if (cleanup_flags & CLEANUP_
KEYBINDING
S)
+ if (cleanup_flags & CLEANUP_
MAP_OBJECT_DEF
S)
{
{
- uint16_t key;
- for (key = 0; key <= world->keyswindata->max; key++)
- {
- free(world->keybindings[key].name);
- }
- free(world->keybindings);
- free(world->keyswindata);
+ free_map_object_defs(world->map_obj_defs);
}
if (cleanup_flags & CLEANUP_LOG)
{
}
if (cleanup_flags & CLEANUP_LOG)
{
@@
-47,6
+45,18
@@
static void cleanup(struct World * world)
{
free_command_db(world);
}
{
free_command_db(world);
}
+ if (cleanup_flags & CLEANUP_MAP)
+ {
+ free(world->map->cells);
+ }
+ if (cleanup_flags & CLEANUP_INTERFACE_CONF)
+ {
+ unload_interface_conf(world);
+ }
+ if (cleanup_flags & CLEANUP_WIN_META)
+ {
+ free_winmeta(world->wmeta);
+ }
}
}