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

Comparing deliantra/server/server/alchemy.C (file contents):
Revision 1.48 by root, Sun Nov 29 10:55:18 2009 UTC vs.
Revision 1.55 by root, Thu May 6 22:08:07 2010 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 1992 Frank Tore Johansen
  *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
  * Free Software Foundation, either version 3 of the License, or (at your
  * option) any later version.
 /** Returns a random selection from cauldron_effect[] */
 static const char *
 cauldron_sound ()
 {
-  int size = sizeof (cauldron_effect) / sizeof (char *);
+  return cauldron_effect [rndm (array_length (cauldron_effect))];
-  return cauldron_effect[rndm (0, size - 1)];
 }
 /**
  * Recipe value of the entire contents of a container.
  * This appears to just generate a hash value, which I guess for now works
  * ok, but the possibility of duplicate hashes is certainly possible - msw
   */
 static int
 content_recipe_value (object *op)
 {
-  char name[MAX_BUF];
   object *tmp = op->inv;
-  int tval = 0, formula = 0;
+  int formula = 0;
   while (tmp)
     {
-      tval = 0;
+      const char *name = tmp->title
-      assign (name, tmp->name);
-      if (tmp->title)
-        sprintf (name, "%s %s", &tmp->name, &tmp->title);
+        ? (const char *)format ("%s %s", &tmp->name, &tmp->title)
+        : tmp->name;
-      tval = (strtoint (name) * (tmp->nrof ? tmp->nrof : 1));
+      int tval = strtoint (name) * tmp->number_of ();
 #ifdef ALCHEMY_DEBUG
       LOG (llevDebug, "Got ingredient %d %s(%d)\n", tmp->nrof ? tmp->nrof : 1, name, tval);
 #endif
       formula += tval;
       tmp = tmp->below;
     }
 #ifdef ALCHEMY_DEBUG
   LOG (llevDebug, " Formula value=%d\n", formula);
 #endif
   return formula;
 }
 /**
  * Returns total number of items in op
       transmute_materialname (item, art->item);
       give_artifact_abilities (item, art->item);
     }
-  if (QUERY_FLAG (cauldron, FLAG_CURSED))
+  if (cauldron->flag [FLAG_CURSED])
-    SET_FLAG (item, FLAG_CURSED);
+    item->set_flag (FLAG_CURSED);
-  if (QUERY_FLAG (cauldron, FLAG_DAMNED))
+  if (cauldron->flag [FLAG_DAMNED])
-    SET_FLAG (item, FLAG_DAMNED);
+    item->set_flag (FLAG_DAMNED);
   return item;
 }
 /*
           tmp->value = 0;
           tmp->material = name_to_material (shstr_stone);
           tmp->name = shstr_slag;
           tmp->name_pl = shstr_slags;
           item = insert_ob_in_ob (tmp, cauldron);
-          CLEAR_FLAG (tmp, FLAG_CAN_ROLL);
+          tmp->clr_flag (FLAG_CAN_ROLL);
-          SET_FLAG   (tmp, FLAG_NO_DROP);
+          tmp->set_flag (FLAG_NO_DROP);
           tmp->move_block = 0;
         }
       remove_contents (cauldron->inv, item);
       new_draw_info_format (NDI_UNIQUE, 0, op, "The %s %s.", &cauldron->name, cauldron_sound ());
         if ((rp = get_random_recipe ((recipelist *) NULL)) == NULL)
           return;
       if ((tmp = attempt_recipe (op, cauldron, 1, rp, -1)))
         {
-          if (!QUERY_FLAG (tmp, FLAG_CURSED))   /* curse it */
+          if (!tmp->flag [FLAG_CURSED])   /* curse it */
-            SET_FLAG (tmp, FLAG_CURSED);
+            tmp->set_flag (FLAG_CURSED);
           /* the apply code for potions already deals with cursed
            * potions, so any code here is basically ignored.
            */
           if (tmp->type == FOOD)
       fb->destroy ();
       new_draw_info_format (NDI_UNIQUE, 0, op, "The %s erupts in flame!", &cauldron->name);
     }
   else if (level < 100)
     {                           /* WHAMMY the CAULDRON */
-      if (!QUERY_FLAG (cauldron, FLAG_CURSED))
+      if (!cauldron->flag [FLAG_CURSED])
-        SET_FLAG (cauldron, FLAG_CURSED);
+        cauldron->set_flag (FLAG_CURSED);
       else
         cauldron->magic--;
       cauldron->magic -= random_roll (0, 4, op, PREFER_LOW);
  * 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.
  */
 static int
-calc_alch_danger (object *caster, object *cauldron, recipe *rp)
+calc_alch_danger (object *caster, object *cauldron, object *skill, recipe *rp)
 {
-  object *item;
-  char name[MAX_BUF];
-  int danger = 0, nrofi = 0;
+  int danger = 0;
   /* Knowing alchemy skill reduces yer risk */
-  danger -= caster->chosen_skill ? caster->chosen_skill->level : caster->level;
+  danger -= skill->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 */
   /* Ingredients. Longer names usually mean rarer stuff.
    * Thus the backfire is worse. Also, more ingredients
    * means we are attempting a more powerfull potion,
    * and thus the backfire will be worse.  */
-  for (item = cauldron->inv; item; item = item->below)
+  for (object *item = cauldron->inv; item; item = item->below)
     {
-      assign (name, item->name);
+      const char *name = item->title
-      if (item->title)
-        sprintf (name, "%s %s", &item->name, &item->title);
+         ? format ("%s %s", &item->name, &item->title)
+         : &item->name;
-      danger += (strtoint (name) / 1000) + 3;
+      danger += strtoint (name) / 1000 + 3;
-      nrofi++;
     }
-  if (rp == NULL)
+  if (!rp)
     danger += 110;
   else
     danger += rp->diff * 3;
   /* Using a bad device is *majorly* stupid */
-  if (QUERY_FLAG (cauldron, FLAG_CURSED))
+  if (cauldron->flag [FLAG_CURSED]) danger +=  80;
-    danger += 80;
+  if (cauldron->flag [FLAG_DAMNED]) danger += 200;
-  if (QUERY_FLAG (cauldron, FLAG_DAMNED))
-    danger += 200;
 #ifdef ALCHEMY_DEBUG
   LOG (llevDebug, "calc_alch_danger() returned danger=%d\n", danger);
 #endif
     return;
   numb = numb_ob_inside (cauldron);
   if ((fl = get_formulalist (numb)))
     {
-      if (QUERY_FLAG (caster, FLAG_WIZ))
+      if (caster->flag [FLAG_WIZ])
         {
           rp = find_recipe (fl, formula, cauldron->inv);
           if (rp != NULL)
             {
 #ifdef ALCHEMY_DEBUG
           object *tmp;
           int attempt_shadow_alchemy;
           ave_chance = fl->total_chance / (float)fl->number;
-          ability += (int) (skill->level * ((4.0 + cauldron->magic) / 4.0));
+          ability += skill->level * ((4.0 + cauldron->magic) / 4.0);
           /* determine value of ingredients */
           value_ingredients = 0;
           for (tmp = cauldron->inv; tmp; tmp = tmp->below)
             value_ingredients += query_cost (tmp, NULL, F_TRUE);
                        "Forcing failure for shadow alchemy recipe because price of ingredients (%llu) is less than price of result (%llu).\n",
                        value_ingredients, value_item);
 #endif
                 }
               /* roll the dice */
-              else if ((float) (random_roll (0, 101, caster, PREFER_LOW)) <= 100.0 * success_chance)
+              else if (random_roll (0, 101, caster, PREFER_LOW) <= 100.0 * success_chance)
                 {
                   change_exp (caster, rp->exp, rp->skill, SK_EXP_NONE);
                   // let alchemy consume some time, so that exploits are less easy
                   caster->speed_left -= 1.0;
             }
         }
     }
   /* if we get here, we failed!! */
-  alchemy_failure_effect (caster, cauldron, rp, calc_alch_danger (caster, cauldron, rp));
+  alchemy_failure_effect (caster, cauldron, rp, calc_alch_danger (caster, cauldron, skill, rp));
 }

Diff Legend

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

Comparing deliantra/server/server/alchemy.C (file contents): Revision 1.48 by root, Sun Nov 29 10:55:18 2009 UTC vs. Revision 1.55 by root, Thu May 6 22:08:07 2010 UTC

Diff Legend

Comparing deliantra/server/server/alchemy.C (file contents):
Revision 1.48 by root, Sun Nov 29 10:55:18 2009 UTC vs.
Revision 1.55 by root, Thu May 6 22:08:07 2010 UTC