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.44 by root, Sun Jul 22 14:17:58 2007 UTC vs.
Revision 1.47 by root, Wed Aug 15 18:06:32 2007 UTC

343 * BULLET/BALL CODE 343 * BULLET/BALL CODE
344 * 344 *
345 ***************************************************************************/ 345 ***************************************************************************/
346 346
347/* expands an explosion. op is a piece of the 347/* expands an explosion. op is a piece of the
348 * explosion - this expans it in the different directions. 348 * explosion - this expands it in the different directions.
349 * At least that is what I think this does. 349 * At least that is what I think this does.
350 */ 350 */
351void 351void
352explosion (object *op) 352explosion (object *op)
353{ 353{
483 483
484 /* Prevent recursion */ 484 /* Prevent recursion */
485 op->move_on = 0; 485 op->move_on = 0;
486 486
487 tmp->insert_at (op, op); 487 tmp->insert_at (op, op);
488 tmp->play_sound (tmp->sound);
489
488 /* remove the firebullet */ 490 /* remove the firebullet */
489 op->destroy (); 491 op->destroy ();
490} 492}
491 493
492/* checks to see what op should do, given the space it is on 494/* checks to see what op should do, given the space it is on
1171 /* ok, tell it where to be, and insert! */ 1173 /* ok, tell it where to be, and insert! */
1172 effect->insert_at (target, op); 1174 effect->insert_at (target, op);
1173 1175
1174 return 1; 1176 return 1;
1175} 1177}
1176
1177 1178
1178/**************************************************************************** 1179/****************************************************************************
1179 * 1180 *
1180 * MAGIC MISSILE code. 1181 * MAGIC MISSILE code.
1181 * note that the fire_bullet is used to fire the missile. The 1182 * note that the fire_bullet is used to fire the missile. The
1372 { 1373 {
1373 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.");
1374 return 0; 1375 return 0;
1375 } 1376 }
1376 1377
1378 tmp = tmp->head_ ();
1379
1377 /* 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. */
1378 for (force = tmp->inv; force != NULL; force = force->below) 1381 for (force = tmp->inv; force; force = force->below)
1379 { 1382 {
1380 if (force->type == FORCE && force->subtype == FORCE_CHANGE_ABILITY) 1383 if (force->type == FORCE && force->subtype == FORCE_CHANGE_ABILITY)
1381 { 1384 {
1382 if (force->name == spell_ob->name) 1385 if (force->name == spell_ob->name)
1383 { 1386 {
1389 return 0; 1392 return 0;
1390 } 1393 }
1391 } 1394 }
1392 } 1395 }
1393 1396
1394 if (force == NULL) 1397 if (!force)
1395 { 1398 {
1396 force = get_archetype (FORCE_NAME); 1399 force = get_archetype (FORCE_NAME);
1397 force->subtype = FORCE_CHANGE_ABILITY; 1400 force->subtype = FORCE_CHANGE_ABILITY;
1401
1398 if (spell_ob->race) 1402 if (spell_ob->race)
1399 force->name = spell_ob->race; 1403 force->name = spell_ob->race;
1400 else 1404 else
1401 force->name = spell_ob->name; 1405 force->name = spell_ob->name;
1402 1406
1412 { 1416 {
1413 force->duration = duration; 1417 force->duration = duration;
1414 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.");
1415 } 1419 }
1416 else 1420 else
1417 {
1418 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.");
1419 } 1422
1420 return 1; 1423 return 1;
1421 } 1424 }
1425
1422 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;
1423 force->speed = 1.f; 1427 force->speed = 1.f;
1424 force->speed_left = -1.f; 1428 force->speed_left = -1.f;
1425 SET_FLAG (force, FLAG_APPLIED); 1429 SET_FLAG (force, FLAG_APPLIED);
1426 1430

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines