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.115 by root, Sat Apr 10 05:12:57 2010 UTC vs.
Revision 1.116 by root, Sun Apr 11 00:34:06 2010 UTC

326{ 326{
327 if (OUT_OF_REAL_MAP (m, x, y)) 327 if (OUT_OF_REAL_MAP (m, x, y))
328 return 0; 328 return 0;
329 329
330 for (object *op = GET_MAP_OB (m, x, y); op; op = op->above) 330 for (object *op = GET_MAP_OB (m, x, y); op; op = op->above)
331 if (QUERY_FLAG (op, FLAG_REFL_SPELL) 331 if (op->flag [FLAG_REFL_SPELL]
332 && (!QUERY_FLAG (op, FLAG_ALIVE) 332 && (!op->flag [FLAG_ALIVE]
333 || (rndm (0, 99)) < 90 - (sp_op->level / 10))) 333 || (rndm (0, 99)) < 90 - (sp_op->level / 10)))
334 return 1; 334 return 1;
335 335
336 return 0; 336 return 0;
337} 337}
356 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 356 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
357 new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet."); 357 new_draw_info (NDI_UNIQUE, 0, op, "You cast it at your feet.");
358 dir = 0; 358 dir = 0;
359 } 359 }
360 360
361 SET_FLAG (new_op, FLAG_IDENTIFIED); 361 new_op->set_flag (FLAG_IDENTIFIED);
362 op->map->insert (new_op, 362 op->map->insert (new_op,
363 op->x + freearr_x[dir], op->y + freearr_y[dir], 363 op->x + freearr_x[dir], op->y + freearr_y[dir],
364 op, 364 op,
365 dir ? 0 : INS_BELOW_ORIGINATOR); 365 dir ? 0 : INS_BELOW_ORIGINATOR);
366 366
416 * on top of a counterwall spell (may hit the player before being 416 * on top of a counterwall spell (may hit the player before being
417 * removed.) On the other hand, it may be more dramatic for the 417 * removed.) On the other hand, it may be more dramatic for the
418 * spell to actually hit the counterwall and be sucked up. 418 * spell to actually hit the counterwall and be sucked up.
419 */ 419 */
420 if ((tmp->attacktype & AT_COUNTERSPELL) 420 if ((tmp->attacktype & AT_COUNTERSPELL)
421 && !QUERY_FLAG (tmp, FLAG_MONSTER) 421 && !tmp->flag [FLAG_MONSTER]
422 && (tmp->type != PLAYER) 422 && (tmp->type != PLAYER)
423 && (tmp->type != WEAPON) 423 && (tmp->type != WEAPON)
424 && (tmp->type != BOW) 424 && (tmp->type != BOW)
425 && (tmp->type != ARROW) 425 && (tmp->type != ARROW)
426 && (tmp->type != GOLEM) 426 && (tmp->type != GOLEM)
427 && !QUERY_FLAG (tmp, FLAG_IS_FLOOR) // XXX: 427 && !tmp->flag [FLAG_IS_FLOOR] // XXX:
428 // we special case floor here because there 428 // we special case floor here because there
429 // are sometimes spell effect floors 429 // are sometimes spell effect floors
430 // which are used to inflict damage 430 // which are used to inflict damage
431 // (and those shouldn't go away from 431 // (and those shouldn't go away from
432 // sanctuary) see also: permanent lava 432 // sanctuary) see also: permanent lava
514 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */ 514 /* needed for AT_HOLYWORD,AT_GODPOWER stuff */
515 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 515 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
516 if (!tailor_god_spell (tmp, op)) 516 if (!tailor_god_spell (tmp, op))
517 return 0; 517 return 0;
518 518
519 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 519 if (tmp->flag [FLAG_IS_TURNABLE])
520 SET_ANIMATION (tmp, dir); 520 SET_ANIMATION (tmp, dir);
521 521
522 if ((tmp = op->map->insert (tmp, x, y, op))) 522 if ((tmp = op->map->insert (tmp, x, y, op)))
523 move_spell_effect (tmp); 523 move_spell_effect (tmp);
524 524
562 { 562 {
563 tmp = op->owner; 563 tmp = op->owner;
564 /* If the owner does not exist, or is not a monster, than apply the spell 564 /* If the owner does not exist, or is not a monster, than apply the spell
565 * to the caster. 565 * to the caster.
566 */ 566 */
567 if (!tmp || !QUERY_FLAG (tmp, FLAG_MONSTER)) 567 if (!tmp || !tmp->flag [FLAG_MONSTER])
568 tmp = op; 568 tmp = op;
569 } 569 }
570 else 570 else
571 { 571 {
572 maptile *m = op->map; 572 maptile *m = op->map;
620 continue; 620 continue;
621 621
622 tmp = GET_MAP_OB (mp, nx, ny); 622 tmp = GET_MAP_OB (mp, nx, ny);
623 623
624 while (tmp != NULL && (((owner_type == PLAYER && 624 while (tmp != NULL && (((owner_type == PLAYER &&
625 !QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_GENERATOR)) || 625 !tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_GENERATOR]) ||
626 (owner_type != PLAYER && tmp->type != PLAYER)) || (tmp == exclude || (tmp->head && tmp->head == exclude)))) 626 (owner_type != PLAYER && tmp->type != PLAYER)) || (tmp == exclude || (tmp->head && tmp->head == exclude))))
627 tmp = tmp->above; 627 tmp = tmp->above;
628 628
629 if (tmp != NULL && can_see_monsterP (m, x, y, i)) 629 if (tmp != NULL && can_see_monsterP (m, x, y, i))
630 return freedir[i]; 630 return freedir[i];
965 } 965 }
966 966
967 /* if caster is a spell casting object, this normally shouldn't be 967 /* if caster is a spell casting object, this normally shouldn't be
968 * an issue, because they don't have any spellpaths set up. 968 * an issue, because they don't have any spellpaths set up.
969 */ 969 */
970 if (caster->path_denied & spell_ob->path_attuned && !QUERY_FLAG (caster, FLAG_WIZCAST)) 970 if (caster->path_denied & spell_ob->path_attuned && !caster->flag [FLAG_WIZCAST])
971 { 971 {
972 new_draw_info (NDI_UNIQUE, 0, op, "That spell path is denied to you."); 972 new_draw_info (NDI_UNIQUE, 0, op, "That spell path is denied to you.");
973 return 0; 973 return 0;
974 } 974 }
975 975
1026 } 1026 }
1027 1027
1028 /* If the caster is the wiz, they don't ever fail, and don't have 1028 /* If the caster is the wiz, they don't ever fail, and don't have
1029 * to have sufficient grace/mana. 1029 * to have sufficient grace/mana.
1030 */ 1030 */
1031 if (!QUERY_FLAG (op, FLAG_WIZCAST)) 1031 if (!op->flag [FLAG_WIZCAST])
1032 { 1032 {
1033 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) && 1033 if (SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) &&
1034 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp) 1034 SP_level_spellpoint_cost (caster, spell_ob, SPELL_MANA) > op->stats.sp)
1035 { 1035 {
1036 op->failmsg ("You don't have enough mana!"); 1036 op->failmsg ("You don't have enough mana!");
1084 * not alive, then this would mean that the mapmaker put the 1084 * not alive, then this would mean that the mapmaker put the
1085 * objects on the space - presume that they know what they are 1085 * objects on the space - presume that they know what they are
1086 * doing. 1086 * doing.
1087 */ 1087 */
1088 1088
1089 if ((mflags & P_SAFE) && !QUERY_FLAG (op, FLAG_WIZCAST)) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)! 1089 if ((mflags & P_SAFE) && !op->flag [FLAG_WIZCAST]) // There is _ABSOLUTELY_ no magic allowed here (except wizards :-)!
1090 { 1090 {
1091 op->speed_left -= 2 * op->speed; // freeze for two ticks, so we don't flood 1091 op->speed_left -= 2 * op->speed; // freeze for two ticks, so we don't flood
1092 op->failmsg ("This ground is sacred! The gods prevent any magical effects done by you here!"); 1092 op->failmsg ("This ground is sacred! The gods prevent any magical effects done by you here!");
1093 return 0; 1093 return 0;
1094 } 1094 }
1095 1095
1096 if ((spell_ob->type == SPELL) 1096 if ((spell_ob->type == SPELL)
1097 && (caster->type != POTION) 1097 && (caster->type != POTION)
1098 && !QUERY_FLAG (op, FLAG_WIZCAST) 1098 && !op->flag [FLAG_WIZCAST]
1099 && (QUERY_FLAG (caster, FLAG_ALIVE) 1099 && (caster->flag [FLAG_ALIVE]
1100 || QUERY_FLAG (op, FLAG_ALIVE)) 1100 || op->flag [FLAG_ALIVE])
1101 && (((mflags & P_NO_MAGIC) && spell_ob->stats.sp) || ((mflags & P_NO_CLERIC) && spell_ob->stats.grace))) 1101 && (((mflags & P_NO_MAGIC) && spell_ob->stats.sp) || ((mflags & P_NO_CLERIC) && spell_ob->stats.grace)))
1102 { 1102 {
1103 if (op->type != PLAYER) 1103 if (op->type != PLAYER)
1104 return 0; 1104 return 0;
1105 1105
1464apply_spell_effect (object *spell, object *victim) 1464apply_spell_effect (object *spell, object *victim)
1465{ 1465{
1466 switch (spell->subtype) 1466 switch (spell->subtype)
1467 { 1467 {
1468 case SP_CONE: 1468 case SP_CONE:
1469 if (QUERY_FLAG (victim, FLAG_ALIVE) && spell->has_active_speed () && spell->attacktype) 1469 if (victim->flag [FLAG_ALIVE] && spell->has_active_speed () && spell->attacktype)
1470 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 0); 1470 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 0);
1471 break; 1471 break;
1472 1472
1473 case SP_MAGIC_MISSILE: 1473 case SP_MAGIC_MISSILE:
1474 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1474 if (victim->flag [FLAG_ALIVE])
1475 { 1475 {
1476 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1476 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1477 spell->destroy (); 1477 spell->destroy ();
1478 } 1478 }
1479 break; 1479 break;
1480 1480
1481 case SP_MOVING_BALL: 1481 case SP_MOVING_BALL:
1482 if (QUERY_FLAG (victim, FLAG_ALIVE)) 1482 if (victim->flag [FLAG_ALIVE])
1483 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1); 1483 hit_player (victim, spell->stats.dam, spell, spell->attacktype, 1);
1484 else if (victim->material != MATERIAL_NULL) 1484 else if (victim->material != MATERIAL_NULL)
1485 save_throw_object (victim, spell->attacktype, spell); 1485 save_throw_object (victim, spell->attacktype, spell);
1486 1486
1487 break; 1487 break;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines