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.46 by root, Wed Aug 1 00:52:38 2007 UTC vs.
Revision 1.47 by root, Wed Aug 15 18:06:32 2007 UTC

1373 { 1373 {
1374 new_draw_info (NDI_UNIQUE, 0, op, "There is no one in that direction to curse."); 1374 new_draw_info (NDI_UNIQUE, 0, op, "There is no one in that direction to curse.");
1375 return 0; 1375 return 0;
1376 } 1376 }
1377 1377
1378 tmp = tmp->head_ ();
1379
1378 /* If we've already got a force of this type, don't add a new one. */ 1380 /* If we've already got a force of this type, don't add a new one. */
1379 for (force = tmp->inv; force != NULL; force = force->below) 1381 for (force = tmp->inv; force; force = force->below)
1380 { 1382 {
1381 if (force->type == FORCE && force->subtype == FORCE_CHANGE_ABILITY) 1383 if (force->type == FORCE && force->subtype == FORCE_CHANGE_ABILITY)
1382 { 1384 {
1383 if (force->name == spell_ob->name) 1385 if (force->name == spell_ob->name)
1384 { 1386 {
1390 return 0; 1392 return 0;
1391 } 1393 }
1392 } 1394 }
1393 } 1395 }
1394 1396
1395 if (force == NULL) 1397 if (!force)
1396 { 1398 {
1397 force = get_archetype (FORCE_NAME); 1399 force = get_archetype (FORCE_NAME);
1398 force->subtype = FORCE_CHANGE_ABILITY; 1400 force->subtype = FORCE_CHANGE_ABILITY;
1401
1399 if (spell_ob->race) 1402 if (spell_ob->race)
1400 force->name = spell_ob->race; 1403 force->name = spell_ob->race;
1401 else 1404 else
1402 force->name = spell_ob->name; 1405 force->name = spell_ob->name;
1403 1406
1413 { 1416 {
1414 force->duration = duration; 1417 force->duration = duration;
1415 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect."); 1418 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
1416 } 1419 }
1417 else 1420 else
1418 {
1419 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect."); 1421 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1420 } 1422
1421 return 1; 1423 return 1;
1422 } 1424 }
1425
1423 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; 1426 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1424 force->speed = 1.f; 1427 force->speed = 1.f;
1425 force->speed_left = -1.f; 1428 force->speed_left = -1.f;
1426 SET_FLAG (force, FLAG_APPLIED); 1429 SET_FLAG (force, FLAG_APPLIED);
1427 1430

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines