Difference for server/swap.c from version 1.15 to 1.16


version 1.15 version 1.16
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_swap_c =   * static char *rcsid_swap_c =
  *    "$Id: swap.c,v 1.15 2005/10/16 22:51:21 qal21 Exp $";   *    "$Id: swap.c,v 1.16 2005/10/18 16:54:31 gros Exp $";
  */   */
   
 /*  /*
Line 125
 
Line 125
   
 void swap_map(mapstruct *map) {  void swap_map(mapstruct *map) {
     player *pl;      player *pl;
     int evtid;  
     CFParm CFP;  
   
     if(map->in_memory != MAP_IN_MEMORY) {      if(map->in_memory != MAP_IN_MEMORY) {
  LOG(llevError,"Tried to swap out map which was not in memory.\n");   LOG(llevError,"Tried to swap out map which was not in memory.\n");
Line 153
 
Line 151
  mapstruct *oldmap = map;   mapstruct *oldmap = map;
   
  LOG(llevDebug,"Resetting map %s.\n",map->path);   LOG(llevDebug,"Resetting map %s.\n",map->path);
  /* GROS : Here we handle the MAPRESET global event */          /* Lauwenmark : Here we handle the MAPRESET global event */
  evtid = EVENT_MAPRESET;          execute_global_event(EVENT_MAPRESET, map->path);
  CFP.Value[0] = (void *)(&evtid);  
  CFP.Value[1] = (void *)(map->path);  
  GlobalEvent(&CFP);  
  map = map->next;   map = map->next;
  delete_map(oldmap);   delete_map(oldmap);
  return;   return;
Line 264
 
Line 259
   
     mapstruct *m, *oldmap;      mapstruct *m, *oldmap;
     long sec;      long sec;
     int evtid;  
     CFParm CFP;  
     sec = seconds();      sec = seconds();
   
     m= first_map;      m= first_map;
Line 300
 
Line 293
  }   }
  else {   else {
      LOG(llevDebug,"Resetting map %s.\n",m->path);       LOG(llevDebug,"Resetting map %s.\n",m->path);
      /* GROS : Here we handle the MAPRESET global event */              /* Lauwenmark : Here we handle the MAPRESET global event */
      evtid = EVENT_MAPRESET;              execute_global_event(EVENT_MAPRESET, m->path);
      CFP.Value[0] = (void *)(&evtid);  
      CFP.Value[1] = (void *)(m->path);  
      GlobalEvent(&CFP);  
  clean_tmp_map(m);   clean_tmp_map(m);
  oldmap = m;   oldmap = m;
  m = m->next;   m = m->next;


Legend:
line(s) removed in v.1.15 
line(s) changed
 line(s) added in v.1.16

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