Changeset 1443 for trunk

Timestamp:

06/15/09 12:47:15 (15 months ago)

Author:

ajps

Message:

Fix for bug reported on oook by zen0 where charged items bought from shops had too many charges. We now calculate the charges on a copied item using the relevant parts of distribute_charges().

Files:

• trunk/src/object/obj-util.c (modified) (1 diff)

trunk/src/object/obj-util.c

@@ -1790 +1790 @@
         /* Modify quantity */
         dst->number = amt;
-        
-        /* If the item has charges, set them to the correct level too */
-        reduce_charges(dst, src->number - amt);
+
+        /* 
+         * If the item has charges/timeouts, set them to the correct level 
+         * too. We split off the same amount as distribute_charges.
+         */
+        if (src->tval == TV_WAND || src->tval == TV_STAFF)
+        {
+                dst->pval = src->pval * amt / src->number;
+        }
+
+        if (src->tval == TV_ROD)
+        {
+                int max_time = k_info[src->k_idx].time_base * amt;
+
+                if (src->timeout > max_time)
+                        dst->timeout = max_time;
+                else
+                        dst->timeout = src->timeout;
+        }
 }