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

Comparing deliantra/server/server/spell_util.C (file contents):
Revision 1.68 by root, Sun May 4 10:32:28 2008 UTC vs.
Revision 1.69 by root, Sun May 4 11:12:41 2008 UTC

438 /* 438 /*
439 * Combine similar spell effects into one spell effect. Needed for 439 * Combine similar spell effects into one spell effect. Needed for
440 * performance reasons with meteor swarm and the like, but also for 440 * performance reasons with meteor swarm and the like, but also for
441 * playability reasons. 441 * playability reasons.
442 */ 442 */
443 if (tmp->arch == op->arch 443 if (tmp->arch == op->arch /* no harm if not comparing by name here */
444 && tmp->type == op->type 444 && tmp->type == op->type
445 && tmp->subtype == op->subtype 445 && tmp->subtype == op->subtype
446 && tmp->owner == op->owner 446 && tmp->owner == op->owner
447 && ((tmp->subtype == SP_EXPLOSION) || (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp))) 447 && ((tmp->subtype == SP_EXPLOSION) || (tmp->subtype == SP_CONE && tmp->stats.sp == op->stats.sp)))
448 { 448 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines