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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.16 by root, Wed Aug 30 16:30:37 2006 UTC vs.
Revision 1.23 by root, Mon Sep 4 15:51:24 2006 UTC

 /*
  * static char *rcsid_map_c =
- *   "$Id: map.C,v 1.16 2006/08/30 16:30:37 root Exp $";
+ *   "$Id: map.C,v 1.23 2006/09/04 15:51:24 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
                     value = NULL;
                     break;
                 }
             }
         }
         if (!end) {
             LOG(llevError, "Error loading map header - did not find a newline - perhaps file is truncated?  Buf=%s\n",
                 buf);
             return 1;
         }
         /* key is the field name, value is what it should be set
          * to.  We've already done the work to null terminate key,
          * and strip off any leading spaces for both of these.
          * We have not touched the newline at the end of the line -
          * 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")) {
 mapstruct *load_original_map(const char *filename, int flags) {
     mapstruct *m;
     char pathname[MAX_BUF];
-    LOG(llevDebug, "load_original_map: %s (%x)\n", filename,flags);
     if (flags & MAP_PLAYER_UNIQUE)
         strcpy(pathname, filename);
     else if (flags & MAP_OVERLAY)
         strcpy(pathname, create_overlay_pathname(filename));
     else
         strcpy(pathname, create_pathname(filename));
+    LOG(llevDebug, "load_original_map(%x): %s (%s)\n", flags, filename, pathname);
     object_thawer thawer (pathname);
     if (!thawer)
       return 0;
       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;
 }
     }
   else
     {
       if (!m->tmpname)
         m->tmpname = tempnam_local (settings.tmpdir, NULL);
       strcpy (filename, m->tmpname);
     }
   LOG (llevDebug, "Saving map %s to %s\n", m->path, filename);
   m->in_memory = MAP_SAVING;
-  object_freezer fp (filename);
+  object_freezer freezer;
   /* legacy */
-  fprintf (fp, "arch map\n");
+  fprintf (freezer, "arch map\n");
   if (m->name)
-    fprintf (fp, "name %s\n", m->name);
+    fprintf (freezer, "name %s\n", m->name);
   if (!flag)
-    fprintf (fp, "swap_time %d\n", m->swap_time);
+    fprintf (freezer, "swap_time %d\n", m->swap_time);
   if (m->reset_timeout)
-    fprintf (fp, "reset_timeout %d\n", m->reset_timeout);
+    fprintf (freezer, "reset_timeout %d\n", m->reset_timeout);
   if (m->fixed_resettime)
-    fprintf (fp, "fixed_resettime %d\n", m->fixed_resettime);
+    fprintf (freezer, "fixed_resettime %d\n", m->fixed_resettime);
   /* we unfortunately have no idea if this is a value the creator set
    * or a difficulty value we generated when the map was first loaded
    */
   if (m->difficulty)
-    fprintf (fp, "difficulty %d\n", m->difficulty);
+    fprintf (freezer, "difficulty %d\n", m->difficulty);
   if (m->region)
-    fprintf (fp, "region %s\n", m->region->name);
+    fprintf (freezer, "region %s\n", m->region->name);
   if (m->shopitems)
     {
       print_shop_string (m, shop);
-      fprintf (fp, "shopitems %s\n", shop);
+      fprintf (freezer, "shopitems %s\n", shop);
     }
   if (m->shopgreed)
-    fprintf (fp, "shopgreed %f\n", m->shopgreed);
+    fprintf (freezer, "shopgreed %f\n", m->shopgreed);
 #ifndef WIN32
   if (m->shopmin)
-    fprintf (fp, "shopmin %llu\n", m->shopmin);
+    fprintf (freezer, "shopmin %llu\n", m->shopmin);
   if (m->shopmax)
-    fprintf (fp, "shopmax %llu\n", m->shopmax);
+    fprintf (freezer, "shopmax %llu\n", m->shopmax);
 #else
   if (m->shopmin)
-    fprintf (fp, "shopmin %I64u\n", m->shopmin);
+    fprintf (freezer, "shopmin %I64u\n", m->shopmin);
   if (m->shopmax)
-    fprintf (fp, "shopmax %I64u\n", m->shopmax);
+    fprintf (freezer, "shopmax %I64u\n", m->shopmax);
 #endif
   if (m->shoprace)
-    fprintf (fp, "shoprace %s\n", m->shoprace);
+    fprintf (freezer, "shoprace %s\n", m->shoprace);
   if (m->darkness)
-    fprintf (fp, "darkness %d\n", m->darkness);
+    fprintf (freezer, "darkness %d\n", m->darkness);
   if (m->width)
-    fprintf (fp, "width %d\n", m->width);
+    fprintf (freezer, "width %d\n", m->width);
   if (m->height)
-    fprintf (fp, "height %d\n", m->height);
+    fprintf (freezer, "height %d\n", m->height);
   if (m->enter_x)
-    fprintf (fp, "enter_x %d\n", m->enter_x);
+    fprintf (freezer, "enter_x %d\n", m->enter_x);
   if (m->enter_y)
-    fprintf (fp, "enter_y %d\n", m->enter_y);
+    fprintf (freezer, "enter_y %d\n", m->enter_y);
   if (m->msg)
-    fprintf (fp, "msg\n%sendmsg\n", m->msg);
+    fprintf (freezer, "msg\n%sendmsg\n", m->msg);
   if (m->maplore)
-    fprintf (fp, "maplore\n%sendmaplore\n", m->maplore);
+    fprintf (freezer, "maplore\n%sendmaplore\n", m->maplore);
   if (m->unique)
-    fprintf (fp, "unique %d\n", m->unique);
+    fprintf (freezer, "unique %d\n", m->unique);
   if (m->templatemap)
-    fprintf (fp, "template %d\n", m->templatemap);
+    fprintf (freezer, "template %d\n", m->templatemap);
   if (m->outdoor)
-    fprintf (fp, "outdoor %d\n", m->outdoor);
+    fprintf (freezer, "outdoor %d\n", m->outdoor);
   if (m->temp)
-    fprintf (fp, "temp %d\n", m->temp);
+    fprintf (freezer, "temp %d\n", m->temp);
   if (m->pressure)
-    fprintf (fp, "pressure %d\n", m->pressure);
+    fprintf (freezer, "pressure %d\n", m->pressure);
   if (m->humid)
-    fprintf (fp, "humid %d\n", m->humid);
+    fprintf (freezer, "humid %d\n", m->humid);
   if (m->windspeed)
-    fprintf (fp, "windspeed %d\n", m->windspeed);
+    fprintf (freezer, "windspeed %d\n", m->windspeed);
   if (m->winddir)
-    fprintf (fp, "winddir %d\n", m->winddir);
+    fprintf (freezer, "winddir %d\n", m->winddir);
   if (m->sky)
-    fprintf (fp, "sky %d\n", m->sky);
+    fprintf (freezer, "sky %d\n", m->sky);
   if (m->nosmooth)
-    fprintf (fp, "nosmooth %d\n", m->nosmooth);
+    fprintf (freezer, "nosmooth %d\n", m->nosmooth);
   /* Save any tiling information, except on overlays */
   if (flag != 2)
     for (i = 0; i < 4; i++)
       if (m->tile_path[i])
-        fprintf (fp, "tile_path_%d %s\n", i + 1, m->tile_path[i]);
+        fprintf (freezer, "tile_path_%d %s\n", i + 1, m->tile_path[i]);
-  fp.put (m);
+  freezer.put (m);
-  fprintf (fp, "end\n");
+  fprintf (freezer, "end\n");
   /* In the game save unique items in the different file, but
    * in the editor save them to the normal map file.
    * If unique map, save files in the proper destination (set by
    * player)
    */
   if ((flag == 0 || flag == 2) && !m->unique && !m->templatemap)
     {
+      object_freezer unique;
+      if (flag == 2)
+        save_objects (m, freezer, unique, 2);
+      else
+        save_objects (m, freezer, unique, 0);
       sprintf (buf, "%s.v00", create_items_path (m->path));
-      object_freezer fp2 (buf);
+      unique.save (buf);
-      if (flag == 2)
-        save_objects (m, fp, fp2, 2);
-      else
-        save_objects (m, fp, fp2, 0);
     }
   else
     {                                /* save same file when not playing, like in editor */
-      save_objects (m, fp, fp, 0);
+      save_objects (m, freezer, freezer, 0);
     }
+  freezer.save (filename);
   return 0;
 }
                     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.16 by root, Wed Aug 30 16:30:37 2006 UTC vs. Revision 1.23 by root, Mon Sep 4 15:51:24 2006 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.16 by root, Wed Aug 30 16:30:37 2006 UTC vs.
Revision 1.23 by root, Mon Sep 4 15:51:24 2006 UTC