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

Comparing deliantra/server/server/spell_attack.C (file contents):
Revision 1.100 by root, Fri Apr 9 02:45:17 2010 UTC vs.
Revision 1.101 by root, Sat Apr 10 05:12:57 2010 UTC

1286 int dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 1286 int dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
1287 int dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 1287 int dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
1288 1288
1289 bool friendly = op->flag [FLAG_FRIENDLY] || op->is_player (); 1289 bool friendly = op->flag [FLAG_FRIENDLY] || op->is_player ();
1290 1290
1291 /* destruction doesn't use another spell object, so we need
1292 * update op's skill pointer so that exp is properly awarded.
1293 */
1294 const shstr skill = op->skill;
1295
1296 if (caster == op)
1297 op->skill = spell_ob->skill;
1298 else if (caster->skill)
1299 op->skill = caster->skill;
1300 else
1301 op->skill = 0;
1302
1303 op->change_skill (find_skill_by_name (op, op->skill));
1304
1305 dynbuf buf; 1291 dynbuf buf;
1306 unordered_mapwalk (buf, op, -range, -range, range, range) 1292 unordered_mapwalk (buf, op, -range, -range, range, range)
1307 { 1293 {
1308 mapspace &ms = m->at (nx, ny); 1294 mapspace &ms = m->at (nx, ny);
1309 1295
1334 } 1320 }
1335 } 1321 }
1336 } 1322 }
1337 } 1323 }
1338 1324
1339 op->skill = skill;
1340 return 1; 1325 return 1;
1341} 1326}
1342 1327
1343/*************************************************************************** 1328/***************************************************************************
1344 * 1329 *

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines