Difference for common/map.c from version 1.33 to 1.34


version 1.33 version 1.34
Line 1
 
Line 1
 /*  /*
  * 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 $";
  */   */
   
 /*  /*
Line 1399
 
Line 1399
  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. */
   
Line 1422
 
Line 1428
     /* 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 */


Legend:
line(s) removed in v.1.33 
line(s) changed
 line(s) added in v.1.34

File made using version 1.98 of cvs2html by leaf at 2011-07-21 17:13