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

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.47 by root, Tue Apr 17 18:24:30 2007 UTC vs.
Revision 1.53 by root, Sat Apr 21 16:56:30 2007 UTC

 > tl_map_t;
 static tl_map_t tl_map;
 /*
- * Initialize global archtype pointers:
- */
-void
-init_archetype_pointers ()
-{
-  int prev_warn = warn_archetypes;
-  warn_archetypes = 1;
-  if (ring_arch == NULL)
-    ring_arch = archetype::find ("ring");
-  if (amulet_arch == NULL)
-    amulet_arch = archetype::find ("amulet");
-  if (staff_arch == NULL)
-    staff_arch = archetype::find ("staff");
-  if (crown_arch == NULL)
-    crown_arch = archetype::find ("crown");
-  warn_archetypes = prev_warn;
-}
-/*
  * Searches for the given treasurelist
  */
 treasurelist *
 treasurelist::find (const char *name)
 {
       coroapi::cede_to_tick_every (10);
       switch (f.kw)
         {
           case KW_arch:
-            if (!(t->item = archetype::find (f.get_str ())))
+            t->item = archetype::get (f.get_str ());
-              LOG (llevError, "%s:%d treasure references unknown archetype '%s', skipping.\n", f.name, f.linenum, f.get_str ());
             break;
           case KW_list:           f.get (t->name);                break;
           case KW_change_name:    f.get (t->change_arch.name);    break;
           case KW_change_title:   f.get (t->change_arch.title);   break;
  * start with equipment, but only their abilities).
  */
 static void
 put_treasure (object *op, object *creator, int flags)
 {
-  object *tmp;
   /* 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
    * 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->deactivate_recursive ();
+      op->expand_tail ();
+      if (ob_blocked (op, creator->map, creator->x, creator->y))
+        op->destroy ();
+      else
+        {
-      SET_FLAG (op, FLAG_OBJ_ORIGINAL);
+          SET_FLAG (op, FLAG_OBJ_ORIGINAL);
-      op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
+          op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
+        }
     }
   else
     {
       op = creator->insert (op);
       if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
         monster_check_apply (creator, op);
-      if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ()))
+      if (flags & GT_UPDATE_INV)
+        if (object *tmp = creator->in_player ())
-        esrv_send_item (tmp, op);
+          esrv_send_item (tmp, op);
     }
 }
 /* if there are change_xxx commands in the treasure, we include the changes
  * in the generated object
 object *
 generate_treasure (treasurelist *tl, int difficulty)
 {
   difficulty = clamp (difficulty, 1, settings.max_level);
-  object *ob = object::create (), *tmp;
+  object *ob = object::create ();
   create_treasure (tl, ob, 0, difficulty, 0);
   /* Don't want to free the object we are about to return */
-  tmp = ob->inv;
+  object *tmp = ob->inv;
-  if (tmp != NULL)
+  if (tmp)
     tmp->remove ();
   if (ob->inv)
     LOG (llevError, "In generate treasure, created multiple objects.\n");
  * The array has two arguments, the difficulty of the level, and the
  * magical bonus "wanted".
  */
 static int difftomagic_list[DIFFLEVELS][MAXMAGIC + 1] = {
 //    chance of magic        difficulty
 // +0  +1  +2  +3   +4
   {95,  2,  2,  1,   0}, //  1
   {92,  5,  2,  1,   0}, //  2
   {85, 10,  4,  1,   0}, //  3
   { 0,  0,  0,  3,  97}, // 29
   { 0,  0,  0,  0, 100}, // 30
   { 0,  0,  0,  0, 100}, // 31
 };
 /* calculate the appropriate level for wands staves and scrolls.
  * This code presumes that op has had its spell object created (in op->inv)
  *
  * elmex Wed Aug  9 17:44:59 CEST 2006:
  *        Removed multiplicator, too many high-level items were generated on low-difficulty maps.
  */
 int
 level_for_item (const object *op, int difficulty)
 {
   int olevel = 0;
   save_item_power = op->item_power;
   op->item_power = 0;
   if (op->randomitems && op->type != SPELL)
     {
-      create_treasure (op->randomitems, op, flags, difficulty, 0);
+      create_treasure (op->randomitems, op, flags & ~GT_ENVIRONMENT, difficulty, 0);
-      if (!op->inv)
-        LOG (llevDebug, "fix_generated_item: Unable to generate treasure for %s\n", op->debug_desc ());
       /* So the treasure doesn't get created again */
       op->randomitems = 0;
     }
   if (difficulty < 1)
             break;
           case KW_object:
             {
               art->item = object::create ();
+              f.get (art->item->name);
+              f.next ();
               if (!art->item->parse_kv (f))
                 LOG (llevError, "Init_Artifacts: Could not load object.\n");
               al = find_artifactlist (art->item->type);
   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.47 by root, Tue Apr 17 18:24:30 2007 UTC vs. Revision 1.53 by root, Sat Apr 21 16:56:30 2007 UTC

Diff Legend

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.47 by root, Tue Apr 17 18:24:30 2007 UTC vs.
Revision 1.53 by root, Sat Apr 21 16:56:30 2007 UTC