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

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.23 by root, Tue Dec 12 20:53:02 2006 UTC vs.
Revision 1.31 by pippijn, Sat Jan 6 14:42:29 2007 UTC

 /*
     CrossFire, A Multiplayer game for X-windows
+    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
     Copyright (C) 2002 Mark Wedel & Crossfire Development Team
     Copyright (C) 1992 Frank Tore Johansen
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
  * so that the treasure name can be printed out
  */
 static void
 check_treasurelist (const treasure *t, const treasurelist * tl)
 {
-  if (t->item == NULL && t->name == NULL)
-    LOG (llevError, "Treasurelist %s has element with no name or archetype\n", &tl->name);
   if (t->chance >= 100 && t->next_yes && (t->next || t->next_no))
     LOG (llevError, "Treasurelist %s has element that has 100%% generation, next_yes field as well as next or next_no\n", &tl->name);
   /* find_treasurelist will print out its own error message */
   if (t->name && *t->name)
-    (void) find_treasurelist (t->name);
+    find_treasurelist (t->name);
   if (t->next)
     check_treasurelist (t->next, tl);
   if (t->next_yes)
     check_treasurelist (t->next_yes, tl);
   if (t->next_no)
   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;
    * this is the original object, or if this is an object that should be created
    * by another object.
    */
   if (flags & GT_ENVIRONMENT && op->type != SPELL)
     {
-      op->x = creator->x;
-      op->y = creator->y;
       SET_FLAG (op, FLAG_OBJ_ORIGINAL);
-      insert_ob_in_map (op, creator->map, op, INS_NO_MERGE | INS_NO_WALK_ON);
+      op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
     }
   else
     {
-      op = insert_ob_in_ob (op, creator);
+      op = creator->insert (op);
       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)
+          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->item->clone.invisible != 0 || !(flag & GT_INVISIBLE))
+          if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE)))
             {
               tmp = arch_to_object (t->item);
               if (t->nrof && tmp->nrof <= 1)
                 tmp->nrof = RANDOM () % ((int) t->nrof) + 1;
               fix_generated_item (tmp, op, difficulty, t->magic, flag);
       return;
     }
   if (t->name)
     {
-      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;
     }
-  if ((t->item && t->item->clone.invisible != 0) || flag != GT_INVISIBLE)
+  if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE))
     {
       object *tmp = arch_to_object (t->item);
       if (!tmp)
         return;
  * list transitions, or so that excessively good treasure will not be
  * created on weak maps, because it will exceed the number of allowed tries
  * to do that.
  */
 void
-create_treasure (treasurelist * t, object *op, int flag, int difficulty, int tries)
+create_treasure (treasurelist *tl, object *op, int flag, int difficulty, int tries)
 {
   if (tries++ > 100)
     {
       LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
       return;
     }
-  if (t->total_chance)
+  if (tl->total_chance)
-    create_one_treasure (t, op, flag, difficulty, tries);
+    create_one_treasure (tl, op, flag, difficulty, tries);
   else
-    create_all_treasures (t->items, op, flag, difficulty, tries);
+    create_all_treasures (tl->items, op, flag, difficulty, tries);
 }
 /* This is similar to the old generate treasure function.  However,
  * 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 *tl, 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);
+  create_treasure (tl, ob, 0, difficulty, 0);
   /* Don't want to free the object we are about to return */
   tmp = ob->inv;
   if (tmp != NULL)
     tmp->remove ();
   if (ob->inv)
     LOG (llevError, "In generate treasure, created multiple objects.\n");
-  ob->destroy (0);
+  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)
               {
-                op->remove ();
-                op->destroy (0);
+                op->destroy ();
-                op = NULL;
+                op = 0;
                 break;
               }
             if (op->arch != ring_arch && op->arch != amulet_arch)       /* It's a special artifact! */
               break;
  */
 static artifactlist *
 get_empty_artifactlist (void)
 {
-  artifactlist *tl = (artifactlist *) malloc (sizeof (artifactlist));
+  artifactlist *al = (artifactlist *) malloc (sizeof (artifactlist));
-  if (tl == NULL)
+  if (al == NULL)
     fatal (OUT_OF_MEMORY);
-  tl->next = NULL;
+  al->next = NULL;
-  tl->items = NULL;
+  al->items = NULL;
-  tl->total_chance = 0;
+  al->total_chance = 0;
-  return tl;
+  return al;
 }
 /*
  * Allocate and return the pointer to an empty artifact structure.
  */
 static artifact *
 get_empty_artifact (void)
 {
-  artifact *t = (artifact *) malloc (sizeof (artifact));
+  artifact *a = (artifact *) malloc (sizeof (artifact));
-  if (t == NULL)
+  if (a == NULL)
     fatal (OUT_OF_MEMORY);
-  t->item = NULL;
+  a->item = NULL;
-  t->next = NULL;
+  a->next = NULL;
-  t->chance = 0;
+  a->chance = 0;
-  t->difficulty = 0;
+  a->difficulty = 0;
-  t->allowed = NULL;
+  a->allowed = NULL;
-  return t;
+  return a;
 }
 /*
  * Searches the artifact lists and returns one that has the same type
  * of objects on it.
   treasurelist *tl;
   int i;
   if (depth > 100)
     return;
-  while (t != NULL)
+  while (t)
     {
-      if (t->name != NULL)
+      if (t->name)
         {
           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
         {
           for (i = 0; i < depth; i++)
             fprintf (logfile, "  ");
-          if (t->item->clone.type == FLESH)
+          if (t->item && t->item->clone.type == FLESH)
             fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
           else
             fprintf (logfile, "%s\n", &t->item->clone.name);
         }
-      if (t->next_yes != NULL)
+      if (t->next_yes)
         {
           for (i = 0; i < depth; i++)
             fprintf (logfile, "  ");
           fprintf (logfile, " (if yes)\n");
           dump_monster_treasure_rec (name, t->next_yes, depth + 1);
         }
-      if (t->next_no != NULL)
+      if (t->next_no)
         {
           for (i = 0; i < depth; i++)
             fprintf (logfile, "  ");
           fprintf (logfile, " (if no)\n");
           dump_monster_treasure_rec (name, t->next_no, depth + 1);
         }
       t = t->next;
     }
 }
 /*
         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)
-            {
-              tmp_obj = op->inv;
-              tmp_obj->remove ();
-              tmp_obj->destroy (0);
+            op->inv->destroy ();
-            }
           tmp_obj = arch_to_object (change->other_arch);
           insert_ob_in_ob (tmp_obj, op);
         }
       /* No harm setting this for potions/horns */
 /* special_potion() - so that old potion code is still done right. */
 int
 special_potion (object *op)
 {
-  int i;
   if (op->attacktype)
     return 1;
   if (op->stats.Str || op->stats.Dex || op->stats.Con || op->stats.Pow || op->stats.Wis || op->stats.Int || op->stats.Cha)
     return 1;
-  for (i = 0; i < NROFATTACKS; i++)
+  for (int i = 0; i < NROFATTACKS; i++)
     if (op->resist[i])
       return 1;
   return 0;
 }

Diff Legend

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

Comparing deliantra/server/common/treasure.C (file contents): Revision 1.23 by root, Tue Dec 12 20:53:02 2006 UTC vs. Revision 1.31 by pippijn, Sat Jan 6 14:42:29 2007 UTC

Diff Legend

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.23 by root, Tue Dec 12 20:53:02 2006 UTC vs.
Revision 1.31 by pippijn, Sat Jan 6 14:42:29 2007 UTC