[CF-Devel] CVS update: crossfire/common

[Crossfire CVS devel]

Date:	Thursday October 12, 2000 @ 10:17
Author:	peterm

Update of /home/cvs/CVS/crossfire/common
In directory boltzmann.eecs.berkeley.edu:/tmp/cvs-serv16607/common

Modified Files:
	map.c 
Log Message:
Fixes for RECYCLE_TMP_MAPS + random maps crashing interaction.
--PeterM


****************************************

Index: crossfire/common/map.c
diff -u crossfire/common/map.c:1.8 crossfire/common/map.c:1.9
--- crossfire/common/map.c:1.8	Thu Apr 27 00:34:56 2000
+++ crossfire/common/map.c	Thu Oct 12 10:17:04 2000
@@ -1,6 +1,6 @@
 /*
  * static char *rcsid_map_c =
- *   "$Id: map.c,v 1.8 2000/04/27 07:34:56 cvs Exp $";
+ *   "$Id: map.c,v 1.9 2000/10/12 17:17:04 peterm Exp $";
  */
 
 /*
@@ -818,6 +818,7 @@
 	strcpy(buf, m->path);
 	delete_map(m);
         m = load_original_map(buf,0);
+	if(m==NULL) return NULL;
 	(*fix_auto_apply_func)(m); /* Chests which open as default */
 	return m;
     }
@@ -828,6 +829,7 @@
 	strcpy(buf, m->path);
 	delete_map(m);
         m = load_original_map(buf,0);
+	if(m==NULL) return NULL;
 	(*fix_auto_apply_func)(m); /* Chests which open as default */
 	return m;
     }
@@ -1385,6 +1387,7 @@
 	/* If in this loop, we found a temporary map, so load it up. */
 
 	m=load_temporary_map (m);
+        if(m==NULL) return NULL;
 	load_unique_objects(m);
 
 	clean_tmp_map(m);