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

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.51 by root, Thu Apr 19 16:36:00 2007 UTC vs.
Revision 1.58 by root, Sat Apr 28 17:51:57 2007 UTC

 /*
- * CrossFire, A Multiplayer game for X-windows
+ * CrossFire, A Multiplayer game
  *
  * 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 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)
  * 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
         {
           SET_FLAG (op, FLAG_OBJ_ORIGINAL);
           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])
+    flag |= GT_ENVIRONMENT;
   if (tl->total_chance)
     create_one_treasure (tl, op, flag, difficulty, tries);
   else
     create_all_treasures (tl->items, op, flag, difficulty, tries);
   if (change->msg)
     op->msg = change->msg;
 }
 static int
-legal_artifact_combination (object *op, artifact * art)
+legal_artifact_combination (object *op, artifact *art)
 {
   int neg, success = 0;
   linked_char *tmp;
   const char *name;
-  if (art->allowed == (linked_char *) NULL)
+  if (!art->allowed)
     return 1;                   /* Ie, "all" */
   for (tmp = art->allowed; tmp; tmp = tmp->next)
     {
 #ifdef TREASURE_VERBOSE
       LOG (llevDebug, "legal_art: %s\n", &tmp->name);
 #endif
        * everything is allowed except what we match
        */
       else if (neg)
         success = 1;
     }
   return success;
 }
 /*
  * Fixes the given object, giving it the abilities and titles

Diff Legend

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

Comparing deliantra/server/common/treasure.C (file contents): Revision 1.51 by root, Thu Apr 19 16:36:00 2007 UTC vs. Revision 1.58 by root, Sat Apr 28 17:51:57 2007 UTC

Diff Legend

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.51 by root, Thu Apr 19 16:36:00 2007 UTC vs.
Revision 1.58 by root, Sat Apr 28 17:51:57 2007 UTC