home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Each map object action now take different numbers of turns to complete. Re-wrote...
[plomrogue]
/
src
/
rexit.c
diff --git
a/src/rexit.c
b/src/rexit.c
index e39a9feaa658fae15e8e9a40568e0b8994546d32..0b673af4c2934a2e0457aa91d3c4019d5af60374 100644
(file)
--- a/
src/rexit.c
+++ b/
src/rexit.c
@@
-6,70
+6,60
@@
#include <stdint.h> /* for uint8_t */
#include <ncurses.h> /* for endwin() */
#include <errno.h> /* for errno */
#include <stdint.h> /* for uint8_t */
#include <ncurses.h> /* for endwin() */
#include <errno.h> /* for errno */
-#include "main.h" /* for
World struct
*/
+#include "main.h" /* for
world global
*/
#include "map.h" /* for Map 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 "windows.h" /* for Win struct, free_win(), free_winmeta() */
#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 get_win_by_id(), free_winconfs(), free_wins() */
+#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;
/* 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_NCURSES)
{
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)
{
- free(world
->
log);
+ free(world
.
log);
}
if (cleanup_flags & CLEANUP_COMMAND_DB)
{
}
if (cleanup_flags & CLEANUP_COMMAND_DB)
{
- free_command_db(
world
);
+ free_command_db();
}
}
- if (cleanup_flags & CLEANUP_MAP
_OBJE
CTS)
+ if (cleanup_flags & CLEANUP_MAP
OBJA
CTS)
{
{
- free_items(world->item);
- free_monsters(world->monster);
+ free_map_object_actions(world.map_obj_acts);
}
}
- if (cleanup_flags & CLEANUP_MAP_OBJECT_DEFS)
- {
- free_item_defs(world->item_def);
- free_monster_defs(world->monster_def);
- }
- if (cleanup_flags & CLEANUP_WINS)
+ if (cleanup_flags & CLEANUP_MAP)
{
{
- free
_wins(world
);
+ free
(world.map->cells
);
}
}
- if (cleanup_flags & CLEANUP_
WINCONFS
)
+ if (cleanup_flags & CLEANUP_
INTERFACE_CONF
)
{
{
-
free_winconfs(world
);
+
unload_interface_conf(
);
}
if (cleanup_flags & CLEANUP_WIN_META)
{
}
if (cleanup_flags & CLEANUP_WIN_META)
{
- free_winmeta(
world->wmeta
);
+ free_winmeta();
}
}
}
}
@@
-82,21
+72,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);
}
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;
}
{
if (0 == err)
{
return;
}
- cleanup(
world
);
+ cleanup();
if (NULL == msg)
{
msg = "Details unknown.";
if (NULL == msg)
{
msg = "Details unknown.";