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

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.22 by root, Sun Dec 10 20:15:57 2006 UTC vs.
Revision 1.28 by root, Tue Dec 26 08:54:59 2006 UTC

   shstr_cmp name_ (name);
   if (!name_)
     return 0;
-  for (treasurelist * tl = first_treasurelist; tl != 0; tl = tl->next)
+  for (treasurelist *tl = first_treasurelist; tl != 0; tl = tl->next)
     if (name_ == tl->name)
       return tl;
   if (first_treasurelist)
     LOG (llevError, "Couldn't find treasurelist %s\n", name);
  * being generated.
  * If flag is GT_INVISIBLE, only invisible objects are generated (ie, only
  * abilities.  This is used by summon spells, thus no summoned monsters
  * start with equipment, but only their abilities).
  */
 static void
 put_treasure (object *op, object *creator, int flags)
 {
   object *tmp;
       insert_ob_in_map (op, creator->map, op, INS_NO_MERGE | INS_NO_WALK_ON);
     }
   else
     {
       op = insert_ob_in_ob (op, creator);
       if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
         monster_check_apply (creator, op);
-      if ((flags & GT_UPDATE_INV) && (tmp = is_player_inv (creator)) != NULL)
+      if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ()))
         esrv_send_item (tmp, op);
     }
 }
 /* if there are change_xxx commands in the treasure, we include the changes
   if ((int) t->chance >= 100 || (RANDOM () % 100 + 1) < (int) t->chance)
     {
       if (t->name)
         {
           if (strcmp (t->name, "NONE") && difficulty >= t->magic)
+            {
+              treasurelist *tl = find_treasurelist (t->name);
+              if (tl)
-            create_treasure (find_treasurelist (t->name), op, flag, difficulty, tries);
+                create_treasure (tl, op, flag, difficulty, tries);
+            }
         }
       else
         {
           if (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE))
             {
     {
       if (!strcmp (t->name, "NONE"))
         return;
       if (difficulty >= t->magic)
+        {
+          treasurelist *tl = find_treasurelist (t->name);
+          if (tl)
-        create_treasure (find_treasurelist (t->name), op, flag, difficulty, tries);
+            create_treasure (tl, op, flag, difficulty, tries);
+        }
       else if (t->nrof)
         create_one_treasure (tl, op, flag, difficulty, tries);
       return;
     }
  * it instead takes a treasurelist.  It is really just a wrapper around
  * create_treasure.  We create a dummy object that the treasure gets
  * inserted into, and then return that treausre
  */
 object *
-generate_treasure (treasurelist * t, int difficulty)
+generate_treasure (treasurelist *t, int difficulty)
 {
+  difficulty = clamp (difficulty, 1, settings.max_level);
-  object *ob = get_object (), *tmp;
+  object *ob = object::create (), *tmp;
   create_treasure (t, ob, 0, difficulty, 0);
   /* Don't want to free the object we are about to return */
   tmp = ob->inv;
   if (tmp != NULL)
-    remove_ob (tmp);
+    tmp->remove ();
   if (ob->inv)
     LOG (llevError, "In generate treasure, created multiple objects.\n");
-  free_object (ob);
+  ob->destroy ();
   return tmp;
 }
 /*
  * This is a new way of calculating the chance for an item to have
               op->value *= 5;   /* Since it's not just decoration */
           case RING:
             if (op->arch == NULL)
               {
-                remove_ob (op);
+                op->destroy ();
-                free_object (op);
-                op = NULL;
+                op = 0;
                 break;
               }
             if (op->arch != ring_arch && op->arch != amulet_arch)       /* It's a special artifact! */
               break;
         {
           for (i = 0; i < depth; i++)
             fprintf (logfile, "  ");
           fprintf (logfile, "{   (list: %s)\n", &t->name);
           tl = find_treasurelist (t->name);
+          if (tl)
-          dump_monster_treasure_rec (name, tl->items, depth + 2);
+            dump_monster_treasure_rec (name, tl->items, depth + 2);
           for (i = 0; i < depth; i++)
             fprintf (logfile, "  ");
           fprintf (logfile, "}   (end of list: %s)\n", &t->name);
         }
       else
         art->chance = (uint16) value;
       else if (sscanf (cp, "difficulty %d", &value))
         art->difficulty = (uint8) value;
       else if (!strncmp (cp, "Object", 6))
         {
-          art->item = get_object ();
+          art->item = object::create ();
           if (!load_object (thawer, art->item, 0))
             LOG (llevError, "Init_Artifacts: Could not load object.\n");
           art->item->name = strchr (cp, ' ') + 1;
       CLEAR_FLAG (op, FLAG_ANIMATE);
       /* so artifacts will join */
       if (!QUERY_FLAG (op, FLAG_ALIVE))
         op->speed = 0.0;
-      update_ob_speed (op);
+      op->set_speed (op->speed);
     }
   if (change->nrof)
     op->nrof = RANDOM () % ((int) change->nrof) + 1;
         {
           object *tmp_obj;
           /* Remove any spells this object currently has in it */
           while (op->inv)
-            {
+            op->inv->destroy ();
-              tmp_obj = op->inv;
-              remove_ob (tmp_obj);
-              free_object (tmp_obj);
-            }
           tmp_obj = arch_to_object (change->other_arch);
           insert_ob_in_ob (tmp_obj, op);
         }
       /* No harm setting this for potions/horns */

Diff Legend

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

Comparing deliantra/server/common/treasure.C (file contents): Revision 1.22 by root, Sun Dec 10 20:15:57 2006 UTC vs. Revision 1.28 by root, Tue Dec 26 08:54:59 2006 UTC

Diff Legend

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.22 by root, Sun Dec 10 20:15:57 2006 UTC vs.
Revision 1.28 by root, Tue Dec 26 08:54:59 2006 UTC