summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/stuff.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-06-15 20:09:19 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-06-15 20:09:19 +0000
commit141a6b8304cb7a55cad08cd1de379e43ca83b38b (patch)
tree56a1e039e771a49242d2c3ae3a3c4e3ceecb598f /crawl-ref/source/stuff.cc
parentceb4c8964c99e64f6adebad119e1bbbafafedd62 (diff)
downloadcrawl-ref-141a6b8304cb7a55cad08cd1de379e43ca83b38b.tar.gz
crawl-ref-141a6b8304cb7a55cad08cd1de379e43ca83b38b.zip
Apply my recent commits to trunk.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9984 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/stuff.cc')
-rw-r--r--crawl-ref/source/stuff.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/crawl-ref/source/stuff.cc b/crawl-ref/source/stuff.cc
index 6359f10f42..4fb4d9234f 100644
--- a/crawl-ref/source/stuff.cc
+++ b/crawl-ref/source/stuff.cc
@@ -9,6 +9,7 @@
#include "AppHdr.h"
REVISION("$Rev$");
+#include "beam.h"
#include "cio.h"
#include "database.h"
#include "directn.h"
@@ -734,10 +735,17 @@ void cio_cleanup()
#endif
msg::deinitialise_mpr_streams();
-
+ clear_globals_on_exit();
crawl_state.io_inited = false;
}
+// Clear some globally defined variables.
+void clear_globals_on_exit()
+{
+ clear_rays_on_exit();
+ clear_zap_info_on_exit();
+}
+
void end(int exit_code, bool print_error, const char *format, ...)
{
std::string error = print_error? strerror(errno) : "";