Difference for server/main.c from version 1.24 to 1.25


version 1.24 version 1.25
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_main_c =   * static char *rcsid_main_c =
  *    "$Id: main.c,v 1.24 2001/02/09 07:30:37 cvs Exp $";   *    "$Id: main.c,v 1.25 2001/02/11 09:12:14 cvs Exp $";
  */   */
   
 /*  /*
Line 314
 
Line 314
     if (oldmap && oldmap != newmap) {      if (oldmap && oldmap != newmap) {
  oldmap->players--;   oldmap->players--;
  if (oldmap->players <= 0) { /* can be less than zero due to errors in tracking this */   if (oldmap->players <= 0) { /* can be less than zero due to errors in tracking this */
        set_map_timeout(oldmap);
    }
       }
       swap_below_max (EXIT_PATH(newmap->map_object));
   }
   
   void set_map_timeout(mapstruct *oldmap)
   {
 #if MAP_MAXTIMEOUT  #if MAP_MAXTIMEOUT
      oldmap->timeout = MAP_TIMEOUT(oldmap);       oldmap->timeout = MAP_TIMEOUT(oldmap);
      /* Do MINTIMEOUT first, so that MAXTIMEOUT is used if that is       /* Do MINTIMEOUT first, so that MAXTIMEOUT is used if that is
Line 328
 
Line 335
      if (oldmap->timeout > MAP_MAXTIMEOUT) {       if (oldmap->timeout > MAP_MAXTIMEOUT) {
  oldmap->timeout = MAP_MAXTIMEOUT;   oldmap->timeout = MAP_MAXTIMEOUT;
      }       }
  }  
  /* Swap out the oldest map if low on mem */  
  swap_below_max (EXIT_PATH(newmap->map_object));  
 #else  #else
       /* save out the map */        /* save out the map */
       swap_map(oldmap);        swap_map(oldmap);
 #endif /* MAP_MAXTIMEOUT */  #endif /* MAP_MAXTIMEOUT */
     }      }
 }  
   
   
 /* clean_path takes a path and replaces all / with _  /* clean_path takes a path and replaces all / with _
Line 534
 
Line 537
  x=EXIT_X(newmap->map_object);   x=EXIT_X(newmap->map_object);
  y=EXIT_Y(newmap->map_object);   y=EXIT_Y(newmap->map_object);
  LOG(llevDebug,"enter_exit: Exit %s (%d,%d) on map %s is 0 destination coordinates\n",   LOG(llevDebug,"enter_exit: Exit %s (%d,%d) on map %s is 0 destination coordinates\n",
      exit_ob->name, exit_ob->x, exit_ob->y, exit_ob->map->path);       exit_ob->name?exit_ob->name:"(none)", exit_ob->x, exit_ob->y,
        exit_ob->map?exit_ob->map->path:"(none)");
      }       }
      if (newmap)        if (newmap)
  enter_map(op, newmap, x, y);   enter_map(op, newmap, x, y);


Legend:
line(s) removed in v.1.24 
line(s) changed
 line(s) added in v.1.25

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