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.83 by root, Mon Sep 29 11:52:34 2008 UTC vs.
Revision 1.86 by root, Tue Sep 30 10:49:58 2008 UTC

918 */ 918 */
919int 919int
920cast_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg) 920cast_spell (object *op, object *caster, int dir, object *spell_ob, char *stringarg)
921{ 921{
922 const char *godname; 922 const char *godname;
923 int success = 0, cast_level = 0; 923 int success = 0;
924 object *skill = NULL; 924 object *skill = NULL;
925 925
926 if (!spell_ob) 926 if (!spell_ob)
927 { 927 {
928 LOG (llevError, "cast_spell: null spell object passed\n"); 928 LOG (llevError, "cast_spell: null spell object passed\n");
976 976
977 int caster_level = skill->level; 977 int caster_level = skill->level;
978 978
979 if (op->path_attuned & spell_ob->path_attuned) 979 if (op->path_attuned & spell_ob->path_attuned)
980 { 980 {
981 caster_level += min (cast_level * 2, ATTUNE_REPELL); 981 caster_level += min (caster_level, ATTUNE_REPELL);
982 msg = " (attuned)"; 982 msg = " (attuned)";
983 } 983 }
984 984
985 if (op->path_repelled & spell_ob->path_attuned) 985 if (op->path_repelled & spell_ob->path_attuned)
986 { 986 {
987 caster_level = ATTUNE_REPELL; // negative is ok 987 caster_level -= ATTUNE_REPELL; // negative is ok
988 msg = " (repelled)"; 988 msg = " (repelled)";
989 } 989 }
990 990
991 if (spell_ob->level > caster_level) 991 if (spell_ob->level > caster_level)
992 { 992 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines