Difference for common/object.c from version 1.25 to 1.26


version 1.25 version 1.26
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_object_c =   * static char *rcsid_object_c =
  *   "$Id: object.c,v 1.25 2001/05/05 03:30:02 mwedel Exp $";   *   "$Id: object.c,v 1.26 2001/05/09 06:58:12 mwedel Exp $";
  */   */
   
 /*  /*
Line 39
 
Line 39
 #include <funcpoint.h>  #include <funcpoint.h>
 #include <skills.h>   #include <skills.h>
   
   #ifdef MEMORY_DEBUG
   int nroffreeobjects = 0;
   int nrofallocobjects = 0;
   #undef OBJ_EXPAND
   #define OBJ_EXPAND 1
   #else
 object objarray[STARTMAX]; /* All objects, allocated this way at first */  object objarray[STARTMAX]; /* All objects, allocated this way at first */
   int nroffreeobjects = STARTMAX;  /* How many OBs allocated and free (free) */
   int nrofallocobjects = STARTMAX; /* How many OBs allocated (free + used) */
   #endif
   
 object *objects;           /* Pointer to the list of used objects */  object *objects;           /* Pointer to the list of used objects */
 object *free_objects;      /* Pointer to the list of unused objects */  object *free_objects;      /* Pointer to the list of unused objects */
 object *active_objects; /* List of active objects that need to be processed */  object *active_objects; /* List of active objects that need to be processed */
   
 int nroffreeobjects = STARTMAX;  /* How many OBs allocated and free (free) */  
 int nrofallocobjects = STARTMAX; /* How many OBs allocated (free + used) */  
   
 int freearr_x[SIZEOFFREE]=  int freearr_x[SIZEOFFREE]=
   {0,0,1,1,1,0,-1,-1,-1,0,1,2,2,2,2,2,1,0,-1,-2,-2,-2,-2,-2,-1,    {0,0,1,1,1,0,-1,-1,-1,0,1,2,2,2,2,2,1,0,-1,-2,-2,-2,-2,-2,-1,
Line 311
 
Line 319
 void free_all_object_data() {  void free_all_object_data() {
     object *op, *next;      object *op, *next;
   
   #if 0
       /* Don't clean these up, so that properly allocated but 'lost' objects
        * still show up in memory debugging output.
        */
     for (op=objects; op!=NULL; op=next) {      for (op=objects; op!=NULL; op=next) {
  next=op->next;   next=op->next;
  if (!op->head && !QUERY_FLAG(op,FLAG_REMOVED))   if (!op->head && !QUERY_FLAG(op,FLAG_REMOVED))
Line 318
 
Line 330
  if (!op->head && !QUERY_FLAG(op,FLAG_FREED))   if (!op->head && !QUERY_FLAG(op,FLAG_FREED))
  free_object(op);   free_object(op);
     }      }
 #if 0  #endif
   
   #ifdef MEMORY_DEBUG
     /* In theory, we should do this.  In practice, it is fairly difficult      /* In theory, we should do this.  In practice, it is fairly difficult
      * because objects are created in groups of 100, and there is no record       * because objects are created in groups of 100, and there is no record
      * of those starting pointers.       * of those starting pointers.
Line 328
 
Line 342
  free(op);   free(op);
  nrofallocobjects--;   nrofallocobjects--;
  nroffreeobjects--;   nroffreeobjects--;
  last=op;  
  op=next;   op=next;
     }      }
 #endif  #endif


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

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