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

Comparing deliantra/server/server/alchemy.C (file contents):
Revision 1.20 by root, Mon Feb 5 02:07:40 2007 UTC vs.
Revision 1.24 by root, Mon May 28 21:28:35 2007 UTC

 /*
- * CrossFire, A Multiplayer game for X-windows
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  *
- * 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>
  */
 /* March 96 - Laid down original code. -b.t. thomas@astro.psu.edu */
 #include <global.h>
       if (rndm (0, 2))
         {                       /* slag created */
           object *tmp = cauldron->inv;
           int weight = 0;
-          uint16 material = M_STONE;
-          while (tmp)
-            {                   /* slag has coadded ingredient properties */
-              weight += tmp->weight;
-              if (!(material & tmp->material))
-                material |= tmp->material;
-              tmp = tmp->below;
-            }
           tmp = get_archetype ("rock");
           tmp->weight = weight;
           tmp->value = 0;
-          tmp->material = material;
           tmp->materialname = "stone";
           tmp->name = "slag";
           tmp->name_pl = "slags";
           item = insert_ob_in_ob (tmp, cauldron);
           CLEAR_FLAG (tmp, FLAG_CAN_ROLL);
           CLEAR_FLAG (tmp, FLAG_NO_PICK);
           tmp->move_block = 0;
         }
       remove_contents (cauldron->inv, item);
       new_draw_info_format (NDI_UNIQUE, 0, op, "The %s %s.", &cauldron->name, cauldron_sound ());
       return;
     }
   else if (level < 40)
       tmp->destroy ();
       tmp = next;
     }
 }
 /**
  *"Danger" level, will determine how bad the backfire
  * could be if the user fails to concoct a recipe properly. Factors include
  * the number of ingredients, the length of the name of each ingredient,
  * the user's effective level, the user's Int and the enchantment on the
  * mixing device (aka "cauldron"). Higher values of 'danger' indicate more
  * danger. Note that we assume that we have had the caster ready the alchemy
  * skill *before* this routine is called. (no longer auto-readies that skill)
  * -b.t.
  */
 int
 calc_alch_danger (object *caster, object *cauldron, recipe *rp)
 {
   object *item;
   char name[MAX_BUF];
   int danger = 0, nrofi = 0;
   /* Knowing alchemy skill reduces yer risk */
   danger -= caster->chosen_skill ? caster->chosen_skill->level : caster->level;
+  if (!caster->chosen_skill)
+    LOG (llevError | logBacktrace, "calc_alch_danger called without a chosen skill, caster %s, cauldron %s\n",
+         caster->debug_desc (), cauldron->debug_desc ());
   /* better cauldrons reduce risk */
   danger -= cauldron->magic;
   /* Higher Int, lower the risk */
       if (item->title)
         sprintf (name, "%s %s", &item->name, &item->title);
       danger += (strtoint (name) / 1000) + 3;
       nrofi++;
     }
   if (rp == NULL)
     danger += 110;
   else
     danger += rp->diff * 3;
 #endif
   return danger;
 }
 /**
  * Determines if ingredients in a container match the
  * proper ingredients for a recipe.
  *
  * rp is the recipe to check
  * cauldron is the container that holds the ingredients
   LOG (llevDebug, "looking for formula %d:\n", formula);
 #endif
   result = NULL;
   recipes_matching = 0;
   transmute_found = 0;
-  for (rp = fl->items; rp != NULL; rp = rp->next)
+  for (rp = fl->items; rp; rp = rp->next)
     {
       /* check if recipe matches at all */
       if (formula % rp->index != 0)
         {
 #ifdef EXTREME_ALCHEMY_DEBUG

Diff Legend

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

Comparing deliantra/server/server/alchemy.C (file contents): Revision 1.20 by root, Mon Feb 5 02:07:40 2007 UTC vs. Revision 1.24 by root, Mon May 28 21:28:35 2007 UTC

Diff Legend

Comparing deliantra/server/server/alchemy.C (file contents):
Revision 1.20 by root, Mon Feb 5 02:07:40 2007 UTC vs.
Revision 1.24 by root, Mon May 28 21:28:35 2007 UTC