home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Client: Split off parts of misc.h into interface_conf.h.
[plomrogue]
/
src
/
client
/
cleanup.c
diff --git
a/src/client/cleanup.c
b/src/client/cleanup.c
index bcf52ac405e0a31ab41c5df4f85ea1e38d432d45..7611139a65b66e56190660c0d05bf262e884bad6 100644
(file)
--- a/
src/client/cleanup.c
+++ b/
src/client/cleanup.c
@@
-4,8
+4,9
@@
#include <ncurses.h> /* for endwin() */
#include <stdint.h> /* uint32_t */
#include <stdlib.h> /* free() */
#include <ncurses.h> /* for endwin() */
#include <stdint.h> /* uint32_t */
#include <stdlib.h> /* free() */
+#include "../common/readwrite.h" /* try_fclose() */
#include "command_db.h" /* free_command_db() */
#include "command_db.h" /* free_command_db() */
-#include "
misc
.h" /* unload_interface_conf() */
+#include "
interface_conf
.h" /* unload_interface_conf() */
#include "world.h" /* world global */
#include "world.h" /* world global */
@@
-17,6
+18,7
@@
static uint32_t cleanup_flags = 0x0000;
extern void cleanup()
{
extern void cleanup()
{
+ char * f_name = "cleanup()";
free(world.map.cells);
free(world.log);
free(world.player_inventory);
free(world.map.cells);
free(world.log);
free(world.player_inventory);
@@
-32,6
+34,14
@@
extern void cleanup()
{
free_command_db();
}
{
free_command_db();
}
+ if (cleanup_flags & CLEANUP_SERVER_IN)
+ {
+ try_fclose(world.file_server_in, f_name);
+ }
+ if (cleanup_flags & CLEANUP_SERVER_OUT)
+ {
+ try_fclose(world.file_server_out, f_name);
+ }
}
}