Difference for server/c_misc.c from version 1.11 to 1.12


version 1.11 version 1.12
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_c_misc_c =   * static char *rcsid_c_misc_c =
  *   "$Id: c_misc.c,v 1.11 2001/06/04 06:41:02 mwedel Exp $";   *   "$Id: c_misc.c,v 1.12 2001/07/14 04:11:18 mwedel Exp $";
  */   */
   
 /*  /*
Line 61
 
Line 61
               map_path, m->players,players_on_map(m),m->in_memory,m->timeout,                map_path, m->players,players_on_map(m),m->in_memory,m->timeout,
               m->difficulty);                m->difficulty);
 #else  #else
       sprintf(buf,"%-18.18s %2d %2d   %1d %4d %2d  %02ld:%02ld:%02ld",        sprintf(buf,"%-18.18s %2d %2d   %1d %4d %2d  %02d:%02d:%02d",
               map_path, m->players,players_on_map(m),                map_path, m->players,players_on_map(m),
               m->in_memory,m->timeout,m->difficulty,                m->in_memory,m->timeout,m->difficulty,
               (m->reset_time%86400)/3600,(m->reset_time%3600)/60,         (MAP_WHEN_RESET(m)%86400)/3600,(MAP_WHEN_RESET(m)%3600)/60,
               m->reset_time%60);                MAP_WHEN_RESET(m)%60);
 #endif  #endif
     new_draw_info(NDI_UNIQUE, 0,op,buf);      new_draw_info(NDI_UNIQUE, 0,op,buf);
   }    }
Line 123
 
Line 123
   
   for(pl=first_player,players=0;pl!=NULL;pl=pl->next,players++);    for(pl=first_player,players=0;pl!=NULL;pl=pl->next,players++);
   for(m=first_map,nrofmaps=0;m!=NULL;m=m->next,nrofmaps++)    for(m=first_map,nrofmaps=0;m!=NULL;m=m->next,nrofmaps++)
     if(m->in_memory == MAP_IN_MEMORY)   if(m->in_memory == MAP_IN_MEMORY) {
       mapmem+=m->map_object->x*m->map_object->y*(sizeof(object *)+sizeof(MapLook *)*3),       mapmem+=MAP_WIDTH(m)*MAP_HEIGHT(m)*(sizeof(object *)+sizeof(MapSpace));
       nrm++;        nrm++;
    }
   sprintf(errmsg,"Sizeof: object=%ld  player=%ld  map=%ld",    sprintf(errmsg,"Sizeof: object=%ld  player=%ld  map=%ld",
           (long)sizeof(object),(long)sizeof(player),(long)sizeof(mapstruct));            (long)sizeof(object),(long)sizeof(player),(long)sizeof(mapstruct));
   new_draw_info(NDI_UNIQUE, 0,op,errmsg);    new_draw_info(NDI_UNIQUE, 0,op,errmsg);
Line 192
 
Line 193
  return;   return;
   
     new_draw_info_format(NDI_UNIQUE, 0,op,         new_draw_info_format(NDI_UNIQUE, 0,op,   
  "%s (%s)", m->map_object->name, m->path);   "%s (%s)", m->name, m->path);
   
     if (QUERY_FLAG(op,FLAG_WIZ)) {      if (QUERY_FLAG(op,FLAG_WIZ)) {
  new_draw_info_format(NDI_UNIQUE, 0, op,   new_draw_info_format(NDI_UNIQUE, 0, op,
  "players:%d difficulty:%d size:%dx%d start:%dx%d timeout %ld",    "players:%d difficulty:%d size:%dx%d start:%dx%d timeout %ld",
  m->players, m->difficulty,    m->players, m->difficulty,
  m->map_object->x, m->map_object->y,    MAP_WIDTH(m), MAP_HEIGHT(m),
  EXIT_X(m->map_object), EXIT_Y(m->map_object),   MAP_ENTER_X(m), MAP_ENTER_Y(m),
  MAP_TIMEOUT(m));   MAP_TIMEOUT(m));
   
     }      }
     if (m->map_object->msg)      if (m->msg)
  new_draw_info(NDI_UNIQUE, NDI_NAVY, op, m->map_object->msg);   new_draw_info(NDI_UNIQUE, NDI_NAVY, op, m->msg);
 }  }
   
 #ifdef DEBUG_MALLOC_LEVEL  #ifdef DEBUG_MALLOC_LEVEL
Line 376
 
Line 377
   return 0;    return 0;
 }  }
   
 int command_dumplights (object *op, char *params)  
 {  
  if(op) dump_map_lights(op->map);  
         return 0;  
 }  
   
 int command_dumpallarchetypes (object *op, char *params)  int command_dumpallarchetypes (object *op, char *params)
 {  {
         dump_all_archetypes();          dump_all_archetypes();
Line 1068
 
Line 1063
   
     for (mp = styles; mp!=NULL; mp=mp->next) {      for (mp = styles; mp!=NULL; mp=mp->next) {
  maps_used++;   maps_used++;
  mapmem += mp->map_object->x*mp->map_object->y*(sizeof(object *)+sizeof(MapLook *)*3) + sizeof(mapstruct);   mapmem += MAP_WIDTH(mp)*MAP_HEIGHT(mp)*(sizeof(object *)+sizeof(MapSpace)) + sizeof(mapstruct);
  for (x=0; x<mp->map_object->x; x++) {   for (x=0; x<MAP_WIDTH(mp); x++) {
      for (y=0; y<mp->map_object->y; y++) {       for (y=0; y<MAP_HEIGHT(mp); y++) {
  for (tmp=get_map_ob(mp, x, y); tmp!=NULL; tmp=tmp->above)    for (tmp=get_map_ob(mp, x, y); tmp!=NULL; tmp=tmp->above)
      objects_used++;       objects_used++;
      }       }


Legend:
line(s) removed in v.1.11 
line(s) changed
 line(s) added in v.1.12

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