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

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.27 by root, Sat Dec 23 06:41:39 2006 UTC vs.
Revision 1.31 by root, Sat Dec 30 10:16:10 2006 UTC

     SET_FLAG (op, flag);        \
   else                          \
     CLEAR_FLAG (op, flag)       \
 int
-parse_object (object *op, object_thawer & thawer, int map_flags)
+parse_object (object *op, object_thawer &thawer, int map_flags)
 {
   bool ismore = 0;
   object *op_inv = op->inv;
   for (;;)
         {
           case KW_Object:    // uppercase alias
           case KW_object:
             thawer.get (op->name);
-            if (op->arch != NULL)
+            if (op->arch)
               op->arch->name = op->name;
             break;
           case KW_uuid:
           case KW_speed:
             thawer.get (op->speed);
             //TODO: maybe do in check_object
-            if (!(map_flags & MAP_STYLE))
+            // removed check for style maps
-              {
-                if (op->speed < 0)
+            if (op->speed < 0)
-                  op->speed_left = op->speed_left - RANDOM () % 100 / 100.0;
+              op->speed_left = op->speed_left - RANDOM () % 100 / 100.0;
-                update_ob_speed (op);
-              }
             break;
           case KW_slow_move:
             op->move_slow |= MOVE_WALK;
           case KW_randomitems:
             op->randomitems = find_treasurelist (thawer.get_str ());
             break;
           case KW_msg:
-            {
-              thawer.get_ml (KW_endmsg, op->msg);
+            thawer.get_ml (KW_endmsg, op->msg);
-              //TODO: allow longer messages
+            //TODO: allow longer messages
-              if (strlen (op->msg) >= HUGE_BUF)
+            if (strlen (op->msg) >= HUGE_BUF)
-                {
+              {
-                  LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg);
+                LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg);
-                  op->msg = "ERROR, please report: string too long, winged.\n";
+                op->msg = "ERROR, please report: string too long, winged.\n";
-                }
+              }
-            }
             break;
           case KW_lore:
-            {
-              shstr msgbuf;
-              thawer.get_ml (KW_endlore, op->lore);
+            thawer.get_ml (KW_endlore, op->lore);
-              //TODO: allow longer messages
+            //TODO: allow longer messages
-              /* Just print a warning so we can be reasonably safe
+            /* Just print a warning so we can be reasonably safe
-               * about not overflowing the buffer.
+             * about not overflowing the buffer.
-               */
+             */
-              if (strlen (op->lore) > (HUGE_BUF / 2))
+            if (strlen (op->lore) > (HUGE_BUF / 2))
-                LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
+              LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
-                     HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
+                   HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
-            }
             break;
           case KW_editable:
           case KW_editor_folder:
             break;
           case KW_EOF:
             return LL_EOF;
           case KW_ERROR:
-            set_ob_key_value (op, thawer.line, thawer.last_value, true);
+            set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true);
-            //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D
+            //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D
-            //TODO: skip line, ugly, factor parsing better
-            if (thawer.last_value)
-              thawer.line = thawer.last_value;
-            thawer.line += strlen (thawer.line) + 1;
             break;
           default:
             LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]);
             break;
  *  LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
  *      be reset.
  *  LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
  *
  */
 int
-load_object (object_thawer & fp, object *op, int map_flags)
+load_object (object_thawer &fp, object *op, int map_flags)
 {
+  // cede every 500 objects loaded
+  {
+    static int cede_counter = 0;
+    if (++cede_counter >= 500)
+      {
+        cede_counter = 0;
+        if (coroapi::nready ())
+          coroapi::cede ();
+      }
+  }
   return parse_object (op, fp, map_flags);
 }
 /* This takes a buffer, scans it for variables, and sets those variables
  * as appropriate in op.
  *
  * This function appears to be used in only 2 places - in crossedit to
 /*
  * Dumps all variables in an object to a file.
  * If bit 0 of flag is set, unpaid objects will be saved.  As of now,
  * the only place this is not set is when saving the player.
- * If bit 1 of flag is set, don't remove the object after save.  As of now,
- * all of the callers are setting this.
  */
 void
-save_object (object_freezer & fp, object *op, int flag)
+save_object (object_freezer &fp, object *op, int flag)
 {
-  archetype *at;
-  object *tmp, *old;
   /* Even if the object does have an owner, it would seem that we should
    * still save it.
    */
   if (op->owner)
     return;
   /* If it is unpaid and we don't want to save those, just return. */
-  if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID)))
+  if (!(flag & 1) && op->flag [FLAG_UNPAID])
     return;
-  if ((at = op->arch) == NULL)
+  archetype *at = op->arch ? (archetype *)op->arch : empty_archetype;
-    at = empty_archetype;
   fp.put (KW_arch, at->name);
   put (fp, op, &at->clone);
   /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
-  old = NULL;
-  if (flag & 2)
-    for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
+  for (object *tmp = op->inv; tmp; tmp = tmp->below)
-      save_object (fp, tmp, flag);
+    save_object (fp, tmp, flag);
-  else
-    /* Slightly different logic because tmp/op will be removed by
-     * the save_object we call.  So we just keep looking at op->inv
-     * until there is nothing left.  In theory, the variable old
-     * should not be needed, as recursive loops shouldn't happen.
-     */
-    while ((tmp = op->inv) != NULL)
-      {
-        if (old == tmp)
-          {
-            LOG (llevError, " Recursive loop in inventory\n");
-            break;
-          }
-        save_object (fp, tmp, flag);
-        old = tmp;
-      }
-  if (!(flag & 2))
-    op->destroy ();
   fp.put (op);
-  fprintf (fp, "end\n");
+  fp.put (KW_end, 0);
 }

Diff Legend

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

Comparing deliantra/server/common/loader.C (file contents): Revision 1.27 by root, Sat Dec 23 06:41:39 2006 UTC vs. Revision 1.31 by root, Sat Dec 30 10:16:10 2006 UTC

Diff Legend

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.27 by root, Sat Dec 23 06:41:39 2006 UTC vs.
Revision 1.31 by root, Sat Dec 30 10:16:10 2006 UTC