--- deliantra/server/common/glue.C	2006/08/13 17:16:00	1.1
+++ deliantra/server/common/glue.C	2007/01/06 14:42:28	1.6
@@ -1,11 +1,7 @@
 /*
- * static char *rcsid_glue_c =
- *   "$Id: glue.C,v 1.1 2006/08/13 17:16:00 elmex Exp $";
- */
-
-/*
     CrossFire, A Multiplayer game for X-windows
 
+    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
     Copyright (C) 2002 Mark Wedel & Crossfire Development Team
     Copyright (C) 1992 Frank Tore Johansen
 
@@ -23,7 +19,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    The authors can be reached via e-mail at crossfire-devel@real-time.com
+    The authors can be reached via e-mail at <crossfire@schmorp.de>
 */
 
 #include <global.h>
@@ -38,7 +34,7 @@
  * Ryo 2005-07-15
  */
 
-static const char* const fatalmsgs[80]={
+static const char *const fatalmsgs[80] = {
   "Failed to allocate memory",
   "Failed repeatedly to load maps",
   "Hashtable for archetypes is too small",
@@ -49,10 +45,10 @@
  * fatal() is meant to be called whenever a fatal signal is intercepted.
  * It will call the emergency_save and the clean_tmp_files functions.
  */
-void fatal(int err) {
-  fprintf(logfile,"Fatal: %s\n",fatalmsgs[err]);
-  emergency_save(0);
-  clean_tmp_files();
-  fprintf(logfile,"Exiting...\n");
-  exit(err);
+void
+fatal (int err)
+{
+  fprintf (logfile, "Fatal: %s\n", fatalmsgs[err]);
+  cleanup (fatalmsgs[err], 1);
 }
+