version 1.33 | | version 1.34 |
---|
| | |
/* | | /* |
* static char *rcsid_map_c = | | * static char *rcsid_map_c = |
* "$Id: map.c,v 1.33 2002/01/02 18:22:26 garbled Exp $"; | | * "$Id: map.c,v 1.34 2002/01/03 05:40:21 garbled Exp $"; |
*/ | | */ |
| | |
/* | | /* |
| | |
if (! (flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE))) | | if (! (flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE))) |
load_unique_objects(m); | | load_unique_objects(m); |
| | |
| | if (! (flags & (MAP_FLUSH|MAP_PLAYER_UNIQUE|MAP_OVERLAY))) { |
| | m=load_overlay_map(name, m); |
| | if (m==NULL) |
| | return NULL; |
| | } |
| | |
} else { | | } else { |
/* If in this loop, we found a temporary map, so load it up. */ | | /* If in this loop, we found a temporary map, so load it up. */ |
| | |
| | |
/* Below here is stuff common to both first time loaded maps and | | /* Below here is stuff common to both first time loaded maps and |
* temp maps. | | * temp maps. |
*/ | | */ |
m=load_overlay_map(name, m); | | |
if (m==NULL) | | |
return NULL; | | |
| | |
decay_objects(m); /* start the decay */ | | decay_objects(m); /* start the decay */ |
/* In case other objects press some buttons down */ | | /* In case other objects press some buttons down */ |