ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/treasure.C
(Generate patch)

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.92 by root, Sat Nov 7 18:30:05 2009 UTC vs.
Revision 1.93 by root, Tue Nov 10 04:38:45 2009 UTC

904 * again below */ 904 * again below */
905 } 905 }
906 } 906 }
907 907
908 /* materialtype modifications. Note we allow this on artifacts. */ 908 /* materialtype modifications. Note we allow this on artifacts. */
909 set_materialname (op, difficulty, NULL); 909 select_material (op, difficulty);
910 910
911 if (flags & GT_MINIMAL) 911 if (flags & GT_MINIMAL)
912 { 912 {
913 if (op->type == POTION) 913 if (op->type == POTION)
914 /* Handle healing and magic power potions */ 914 /* Handle healing and magic power potions */
1465 op->value *= change->value; 1465 op->value *= change->value;
1466 1466
1467 if (change->materials) 1467 if (change->materials)
1468 op->materials = change->materials; 1468 op->materials = change->materials;
1469 1469
1470 if (change->materialname) 1470 if (change->material != &material_null)
1471 op->materialname = change->materialname; 1471 op->material = change->material;
1472 1472
1473 if (change->slaying) 1473 if (change->slaying)
1474 op->slaying = change->slaying; 1474 op->slaying = change->slaying;
1475 1475
1476 if (change->race) 1476 if (change->race)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines