[ViewVC] Diff of: cvs/deliantra/server/common/map.C

Comparing deliantra/server/common/map.C (file contents):
Revision 1.17 by root, Thu Aug 31 06:23:19 2006 UTC vs.
Revision 1.21 by root, Sun Sep 3 22:45:55 2006 UTC

 /*
  * static char *rcsid_map_c =
- *   "$Id: map.C,v 1.17 2006/08/31 06:23:19 root Exp $";
+ *   "$Id: map.C,v 1.21 2006/09/03 22:45:55 root Exp $";
  */
 /*
     CrossFire, A Multiplayer game for X-windows
                     op->x += tmp->x;
                     op->y += tmp->y;
                     op->head = tmp;
                     op->map = m;
                     last->more = op;
-                    if (tmp->name != op->name) {
-                        if (op->name) free_string(op->name);
-                        op->name = add_string(tmp->name);
+                    op->name = tmp->name;
-                    }
-                    if (tmp->title != op->title) {
-                        if (op->title) free_string(op->title);
-                        op->title = add_string(tmp->title);
+                    op->title = tmp->title;
-                    }
                     /* we could link all the parts onto tmp, and then just
                      * call insert_ob_in_map once, but the effect is the same,
                      * as insert_ob_in_map will call itself with each part, and
                      * the coding is simpler to just to it here with each part.
                      */
  * file pointer.
  * mapflags is the same as we get with load_original_map
  */
 void load_objects (mapstruct *m, object_thawer &fp, int mapflags) {
-    int i,j,bufstate=LO_NEWFILE;
+    int i,j;
     int unique;
     object *op, *prev=NULL,*last_more=NULL, *otmp;
     op=get_object();
     op->map = m; /* To handle buttons correctly */
-    while((i = load_object (fp, op, bufstate, mapflags))) {
+    while((i = load_object (fp, op, mapflags))) {
-        /* Since the loading of the map header does not load an object
-         * anymore, we need to pass LO_NEWFILE for the first object loaded,
-         * and then switch to LO_REPEAT for faster loading.
-         */
-        bufstate = LO_REPEAT;
         /* if the archetype for the object is null, means that we
          * got an invalid object.  Don't do anything with it - the game
          * or editor will not be able to do anything with it either.
          */
         if (op->arch==NULL) {
-            LOG(llevDebug,"Discarding object without arch: %s\n", op->name?op->name:"(null)");
+            LOG(llevDebug,"Discarding object without arch: %s\n", op->name?(const char *)op->name:"(null)");
             continue;
         }
         switch(i) {
  * Modified to no longer take a path option which was not being
  * used anyways.  MSW 2001-07-01
  */
 mapstruct *get_linked_map(void) {
-    mapstruct *map=(mapstruct *) calloc(1,sizeof(mapstruct));
+    mapstruct *map = new mapstruct;
     mapstruct *mp;
-    if(map==NULL)
-        fatal(OUT_OF_MEMORY);
     for(mp=first_map;mp!=NULL&&mp->next!=NULL;mp=mp->next);
     if(mp==NULL)
         first_map=map;
     else
          * what really should be used.
          */
         else if (!strcmp(key,"oid")) {
             fp.get (m, atoi(value));
         } else if (!strcmp(key, "attach")) {
-            m->attach = add_string (value);
+            m->attach = value;
         } else if (!strcmp(key,"hp") || !strcmp(key, "enter_x")) {
             m->enter_x = atoi(value);
         } else if (!strcmp(key,"sp") || !strcmp(key, "enter_y")) {
             m->enter_y = atoi(value);
         } else if (!strcmp(key,"x") || !strcmp(key, "width")) {
       return;
     m->in_memory=MAP_LOADING;
     if (m->tmpname == NULL)    /* if we have loaded unique items from */
       delete_unique_items(m); /* original map before, don't duplicate them */
-    load_object(thawer, NULL, LO_NOREAD,0);
     load_objects (m, thawer, 0);
     m->in_memory=MAP_IN_MEMORY;
 }
                     clean_object(op);
                 remove_ob(op);
                 free_object(op);
             }
         }
-#ifdef MANY_CORES
-    /* I see periodic cores on metalforge where a map has been swapped out, but apparantly
-     * an item on that map was not saved - look for that condition and die as appropriate -
-     * this leaves more of the map data intact for better debugging.
-     */
-    for (op=objects; op!=NULL; op=op->next) {
-        if (!QUERY_FLAG(op, FLAG_REMOVED) && op->map == m) {
-            LOG(llevDebug,"free_all_objects: object %s still on map after it should have been freed\n", op->name);
-            abort();
-        }
-    }
-#endif
 }
 /*
  * Frees everything allocated by the given mapstructure.
  * don't free tmpname - our caller is left to do that
                 m->path);
     }
     else
         last->next = m->next;
-    free (m);
+    delete m;
 }
 /*
         if (flags & MAP_PLAYER_UNIQUE)
             LOG(llevDebug, "Trying to load map %s.\n", name);
         else
             LOG(llevDebug, "Trying to load map %s.\n", create_pathname(name));
+        //0.427459955215454 /var/crossfire/players/Saladon/_scorn_apartment_apartments
+        //0.414906024932861
+        //0.427063941955566
+        eval_pv ("$x = Event::time", 1);//D
         if (!(m = load_original_map(name, (flags & MAP_PLAYER_UNIQUE))))
             return (NULL);
+        eval_pv ("warn \"LOAD \", Event::time - $x", 1);//D
         fix_auto_apply(m); /* Chests which open as default */
         /* If a player unique map, no extra unique object file to load.
          * if from the editor, likewise.

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/common/map.C (file contents): Revision 1.17 by root, Thu Aug 31 06:23:19 2006 UTC vs. Revision 1.21 by root, Sun Sep 3 22:45:55 2006 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.17 by root, Thu Aug 31 06:23:19 2006 UTC vs.
Revision 1.21 by root, Sun Sep 3 22:45:55 2006 UTC