commit 1462115f79d53521e43f7b77c0dde4ed4e6410d5
Merge: 04911de6 63b550c0
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Mon Jul 13 23:36:48 2009 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Mon Jul 13 23:36:48 2009 +0000
Merge from trunk.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1626
NEWS | 2 +
src/i_system.c | 105 ++++++++++++++++++++++++++++++++++++++++++-----------
src/w_file_win32.c | 2 +
src/z_native.c | 5 +++
src/z_zone.c | 5 +++
src/z_zone.h | 2 +-
6 files changed, 99 insertions(+), 22 deletions(-)
diff --cc src/i_system.c
index c6deb905,f37b5bec..cd8ddcee
--- a/src/i_system.c
+++ b/src/i_system.c
@@@ -55,32 -59,10 +55,32 @@@
#include "w_wad.h"
#include "z_zone.h"
- #define MIN_RAM 4 /* MiB */
+ #define DEFAULT_RAM 16 /* MiB */
+ #define MIN_RAM 4 /* MiB */
- int mb_used = 16;
-int show_endoom = 1;
+
+typedef struct atexit_listentry_s atexit_listentry_t;
+
+struct atexit_listentry_s
+{
+ atexit_func_t func;
+ boolean run_on_error;
+ atexit_listentry_t *next;
+};
+
+static atexit_listentry_t *exit_funcs = NULL;
+
+void I_AtExit(atexit_func_t func, boolean run_on_error)
+{
+ atexit_listentry_t *entry;
+
+ entry = malloc(sizeof(*entry));
+
+ entry->func = func;
+ entry->run_on_error = run_on_error;
+ entry->next = exit_funcs;
+ exit_funcs = entry;
+}
// Tactile feedback function, probably used for the Logitech Cyberman