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

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.54 by root, Sat Apr 21 17:34:23 2007 UTC vs.
Revision 1.62 by root, Mon Jun 4 12:19:08 2007 UTC

 /*
- * CrossFire, A Multiplayer game for X-windows
+ * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
  *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
- * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * This program is free software; you can redistribute it and/or modify
+ * Crossfire TRT is free software; you can redistribute it and/or modify it
- * it under the terms of the GNU General Public License as published by
+ * under the terms of the GNU General Public License as published by the Free
- * the Free Software Foundation; either version 2 of the License, or
+ * Software Foundation; either version 2 of the License, or (at your option)
- * (at your option) any later version.
+ * any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful, but
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * GNU General Public License for more details.
+ * for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License along
- * along with this program; if not, write to the Free Software
+ * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
- * The authors can be reached via e-mail at <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 /* TREASURE_DEBUG does some checking on the treasurelists after loading.
  * It is useful for finding bugs in the treasures file.  Since it only
  * slows the startup some (and not actual game play), it is by default
   /* This is a one of the many items on the list should be generated.
    * Add up the chance total, and check to make sure the yes & no
    * fields of the treasures are not being used.
    */
-  tl->total_chance = 0;
   if (one)
     {
       for (treasure *t = tl->items; t; t = t->next)
         {
           if (t->next_yes || t->next_no)
             {
-              LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name);
+              LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->archname : &t->name);
               LOG (llevError, "  the next_yes or next_no field is set\n");
             }
           tl->total_chance += t->chance;
         }
  * start with equipment, but only their abilities).
  */
 static void
 put_treasure (object *op, object *creator, int flags)
 {
+  if (flags & GT_ENVIRONMENT)
+    {
-  /* Bit of a hack - spells should never be put onto the map.  The entire
+      /* Bit of a hack - spells should never be put onto the map.  The entire
-   * treasure stuff is a problem - there is no clear idea of knowing
+       * treasure stuff is a problem - there is no clear idea of knowing
-   * this is the original object, or if this is an object that should be created
+       * this is the original object, or if this is an object that should be created
-   * by another object.
+       * by another object.
-   */
+       */
-  if (flags & GT_ENVIRONMENT && op->type != SPELL)
+      //TODO: flag such as objects... as such (no drop, anybody?)
-    {
+      if (op->type == SPELL)
+        {
+          op->destroy ();
+          return;
+        }
       op->expand_tail ();
       if (ob_blocked (op, creator->map, creator->x, creator->y))
         op->destroy ();
       else
           fix_generated_item (tmp, op, difficulty, t->magic, flag);
           change_treasure (t, tmp);
           put_treasure (tmp, op, flag);
         }
     }
+}
+void
+object::create_treasure (treasurelist *tl, int flags)
+{
+  ::create_treasure (tl, this, flags, map ? map->difficulty : 0);
 }
 /* This calls the appropriate treasure creation function.  tries is passed
  * to determine how many list transitions or attempts to create treasure
  * have been made.  It is really in place to prevent infinite loops with
   if (tries++ > 100)
     {
       LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
       return;
+    }
+  if (op->flag [FLAG_TREASURE_ENV])
+    {
+      // do not generate items when there already is something above the object
+      if (op->flag [FLAG_IS_FLOOR] && op->above)
+        return;
+      flag |= GT_ENVIRONMENT;
     }
   if (tl->total_chance)
     create_one_treasure (tl, op, flag, difficulty, tries);
   else
         case 2:
         case 3:
         case 4:
         case 5:
         case 6:
-          set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r)));
+          op->stats.stat (r) += bonus;
           break;
         case 7:
           op->stats.dam += bonus;
           break;
   fprintf (logfile, "\n");
   for (at = first_archetype; at != NULL; at = at->next)
     if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
       {
-        fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
+        fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->archname);
         if (at->clone.randomitems != NULL)
           dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
         else
           fprintf (logfile, "(nothing)\n");
 #endif
       op->face = change->face;
     }
   for (i = 0; i < NUM_STATS; i++)
-    change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i));
+    change_attr_value (&(op->stats), i, change->stats.stat (i));
   op->attacktype |= change->attacktype;
   op->path_attuned |= change->path_attuned;
   op->path_repelled |= change->path_repelled;
   op->path_denied |= change->path_denied;
         name = tmp->name + 1, neg = 1;
       else
         name = tmp->name, neg = 0;
       /* If we match name, then return the opposite of 'neg' */
-      if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->name)))
+      if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->archname)))
         return !neg;
       /* Set success as true, since if the match was an inverse, it means
        * everything is allowed except what we match
        */

Diff Legend

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

Comparing deliantra/server/common/treasure.C (file contents): Revision 1.54 by root, Sat Apr 21 17:34:23 2007 UTC vs. Revision 1.62 by root, Mon Jun 4 12:19:08 2007 UTC

Diff Legend

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.54 by root, Sat Apr 21 17:34:23 2007 UTC vs.
Revision 1.62 by root, Mon Jun 4 12:19:08 2007 UTC