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.65 by root, Mon Sep 29 10:20:49 2008 UTC vs.
Revision 1.74 by root, Sun Dec 28 07:48:44 2008 UTC

… …
165 sint16 x, y; 165 sint16 x, y;
166 maptile *m; 166 maptile *m;
167 167
168 if (--op->duration < 0) 168 if (--op->duration < 0)
169 { 169 {
170 op->destroy_inv (true); // be explicit about dropping
171 op->destroy (true); 170 op->drop_and_destroy ();
172 return; 171 return;
173 } 172 }
174 173
175 hit_map (op, 0, op->attacktype, 1); 174 hit_map (op, 0, op->attacktype, 1);
176 175
… …
308 307
309 maptile *newmap; 308 maptile *newmap;
310 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y); 309 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
311 if (mflags & P_OUT_OF_MAP) 310 if (mflags & P_OUT_OF_MAP)
312 { 311 {
313 tmp->destroy_inv (true); // be explicit about dropping
314 tmp->destroy (true); 312 tmp->drop_and_destroy ();
315 return 0; 313 return 0;
316 } 314 }
317 315
318 tmp->map = newmap; 316 tmp->map = newmap;
319 317
320 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 318 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
321 { 319 {
322 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 320 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
323 { 321 {
324 tmp->destroy_inv (true); // be explicit about dropping
325 tmp->destroy (true); 322 tmp->drop_and_destroy ();
326 return 0; 323 return 0;
327 } 324 }
328 325
329 tmp->x = op->x; 326 tmp->x = op->x;
330 tmp->y = op->y; 327 tmp->y = op->y;
… …
354 maptile *m = op->map; 351 maptile *m = op->map;
355 int i; 352 int i;
356 353
357 if (--op->duration < 0) 354 if (--op->duration < 0)
358 { 355 {
359 op->destroy (true); 356 op->destroy ();
360 return; 357 return;
361 } 358 }
362 359
363 hit_map (op, 0, op->attacktype, 0); 360 hit_map (op, 0, op->attacktype, 0);
364 361
… …
399 object *tmp, *owner; 396 object *tmp, *owner;
400 397
401 if (!op->other_arch) 398 if (!op->other_arch)
402 { 399 {
403 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n"); 400 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");
404 op->destroy (true); 401 op->destroy ();
405 return; 402 return;
406 } 403 }
407 404
408 if (op->env) 405 if (op->env)
409 { 406 {
410 object *env = op->outer_env (); 407 object *env = op->outer_env ();
411 408
412 if (!env->map || out_of_map (env->map, env->x, env->y)) 409 if (!env->map || out_of_map (env->map, env->x, env->y))
413 { 410 {
414 LOG (llevError, "BUG: explode_bullet(): env out of map\n"); 411 LOG (llevError, "BUG: explode_bullet(): env out of map\n");
415 op->destroy (true); 412 op->destroy ();
416 return; 413 return;
417 } 414 }
418 415
419 op->insert_at (env, op, INS_NO_MERGE | INS_NO_WALK_ON); 416 op->insert_at (env, op, INS_NO_MERGE | INS_NO_WALK_ON);
420 } 417 }
421 else if (out_of_map (op->map, op->x, op->y)) 418 else if (out_of_map (op->map, op->x, op->y))
422 { 419 {
423 LOG (llevError, "BUG: explode_bullet(): op out of map\n"); 420 LOG (llevError, "BUG: explode_bullet(): op out of map\n");
424 op->destroy (true); 421 op->destroy ();
425 return; 422 return;
426 } 423 }
427 424
428 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps 425 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps
429 // NOTE: If this breaks something important: remove this. I can't think of anything 426 // NOTE: If this breaks something important: remove this. I can't think of anything
430 // bad at the moment that might happen from this. 427 // bad at the moment that might happen from this.
431 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 428 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
432 { 429 {
433 op->destroy (true); 430 op->destroy ();
434 return; 431 return;
435 } 432 }
436 433
437 if (op->attacktype) 434 if (op->attacktype)
438 { 435 {
… …
453 if ((tmp->attacktype & AT_HOLYWORD 450 if ((tmp->attacktype & AT_HOLYWORD
454 || tmp->attacktype & AT_GODPOWER) 451 || tmp->attacktype & AT_GODPOWER)
455 && owner 452 && owner
456 && !tailor_god_spell (tmp, owner)) 453 && !tailor_god_spell (tmp, owner))
457 { 454 {
458 op->destroy (true); 455 op->destroy ();
459 return; 456 return;
460 } 457 }
461 458
462 /* special for bombs - it actually has sane values for these */ 459 /* special for bombs - it actually has sane values for these */
463 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB) 460 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB)
… …
491 488
492 tmp->insert_at (op, op); 489 tmp->insert_at (op, op);
493 tmp->play_sound (tmp->sound); 490 tmp->play_sound (tmp->sound);
494 491
495 /* remove the firebullet */ 492 /* remove the firebullet */
496 op->destroy (true); 493 op->destroy ();
497} 494}
498 495
499/* checks to see what op should do, given the space it is on 496/* checks to see what op should do, given the space it is on
500 * (eg, explode, damage player, etc) 497 * (eg, explode, damage player, etc)
501 */ 498 */
… …
532 // TODO: can't understand the following if's 529 // TODO: can't understand the following if's
533 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0) 530 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
534 { 531 {
535 if (!QUERY_FLAG (op, FLAG_REMOVED)) 532 if (!QUERY_FLAG (op, FLAG_REMOVED))
536 { 533 {
537 op->destroy (true); 534 op->destroy ();
538 return; 535 return;
539 } 536 }
540 } 537 }
541 } 538 }
542 } 539 }
… …
571 if (--op->range <= 0) 568 if (--op->range <= 0)
572 { 569 {
573 if (op->other_arch) 570 if (op->other_arch)
574 explode_bullet (op); 571 explode_bullet (op);
575 else 572 else
576 op->destroy (true); 573 op->destroy ();
577 574
578 return; 575 return;
579 } 576 }
580 577
581 new_x = op->x + DIRX (op); 578 new_x = op->x + DIRX (op);
… …
583 m = op->map; 580 m = op->map;
584 mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y); 581 mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y);
585 582
586 if (mflags & P_OUT_OF_MAP) 583 if (mflags & P_OUT_OF_MAP)
587 { 584 {
588 op->destroy (true); 585 op->destroy ();
589 return; 586 return;
590 } 587 }
591 588
592 if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))) 589 if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y)))
593 { 590 {
594 if (op->other_arch) 591 if (op->other_arch)
595 explode_bullet (op); 592 explode_bullet (op);
596 else 593 else
597 op->destroy (true); 594 op->destroy ();
598 595
599 return; 596 return;
600 } 597 }
601 598
602 if (!(op = m->insert (op, new_x, new_y, op))) 599 if (!(op = m->insert (op, new_x, new_y, op)))
… …
658 655
659 maptile *newmap; 656 maptile *newmap;
660 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y); 657 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
661 if (mflags & P_OUT_OF_MAP) 658 if (mflags & P_OUT_OF_MAP)
662 { 659 {
663 tmp->destroy (true); 660 tmp->destroy ();
664 return 0; 661 return 0;
665 } 662 }
666 663
667 tmp->map = newmap; 664 tmp->map = newmap;
668 665
669 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 666 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
670 { 667 {
671 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 668 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
672 { 669 {
673 tmp->destroy (true); 670 tmp->destroy ();
674 return 0; 671 return 0;
675 } 672 }
676 673
677 tmp->x = op->x; 674 tmp->x = op->x;
678 tmp->y = op->y; 675 tmp->y = op->y;
… …
733 * when their cone dies when they die. 730 * when their cone dies when they die.
734 */ 731 */
735 /* If no owner left, the spell dies out. */ 732 /* If no owner left, the spell dies out. */
736 if (op->owner == NULL) 733 if (op->owner == NULL)
737 { 734 {
738 op->destroy (true); 735 op->destroy ();
739 return; 736 return;
740 } 737 }
741#endif 738#endif
742 739
743 hit_map (op, 0, op->attacktype, 0); 740 hit_map (op, 0, op->attacktype, 0);
741
742 if (!op->is_on_map ())
743 return;
744 744
745 /* Check to see if we should push anything. 745 /* Check to see if we should push anything.
746 * Spell objects with weight push whatever they encounter to some 746 * Spell objects with weight push whatever they encounter to some
747 * degree. 747 * degree.
748 */ 748 */
749 if (op->weight) 749 if (op->weight)
750 {
750 check_spell_knockback (op); 751 check_spell_knockback (op);
751 752
752 if (op->destroyed ()) 753 if (!op->is_on_map ())
753 return; 754 return;
755 }
754 756
755 if (op->duration-- < 0) 757 if (op->duration-- < 0)
756 { 758 {
757 op->destroy (true); 759 op->destroy ();
758 return; 760 return;
759 } 761 }
760 /* Object has hit maximum range, so don't have it move 762 /* Object has hit maximum range, so don't have it move
761 * any further. When the duration above expires, 763 * any further. When the duration above expires,
762 * then the object will get removed. 764 * then the object will get removed.
… …
961 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding 963 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding
962 // on a safe map. I don't like this special casing, but it seems to be neccessary 964 // on a safe map. I don't like this special casing, but it seems to be neccessary
963 // as bombs can be carried. 965 // as bombs can be carried.
964 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 966 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
965 { 967 {
966 op->destroy (true); 968 op->destroy ();
967 return; 969 return;
968 } 970 }
969 971
970 /* This copies a lot of the code from the fire bullet, 972 /* This copies a lot of the code from the fire bullet,
971 * but using the cast_bullet isn't really feasible, 973 * but using the cast_bullet isn't really feasible,
… …
1006 int mflags; 1008 int mflags;
1007 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir]; 1009 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir];
1008 maptile *m; 1010 maptile *m;
1009 1011
1010 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy); 1012 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy);
1013
1014 // when creating a bomb below ourself it should always work, even
1015 // when movement is blocked (somehow we got here, somehow we are here,
1016 // so we should also be able to make a bomb here). (originally added
1017 // to fix create bomb traps in doors, which cast with dir=0).
1018 if (dir)
1019 {
1011 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK)) 1020 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
1012 { 1021 {
1013 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1022 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
1014 return 0; 1023 return 0;
1024 }
1015 } 1025 }
1016 1026
1017 tmp = arch_to_object (spell->other_arch); 1027 tmp = arch_to_object (spell->other_arch);
1018 1028
1019 /* level dependencies for bomb */ 1029 /* level dependencies for bomb */
… …
1153 } 1163 }
1154 else 1164 else
1155 { 1165 {
1156 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target)); 1166 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target));
1157 target->stats.hp = target->stats.maxhp * 2; 1167 target->stats.hp = target->stats.maxhp * 2;
1158 effect->destroy (true); 1168 effect->destroy ();
1159 return 0; 1169 return 0;
1160 } 1170 }
1161 } 1171 }
1162 } 1172 }
1163 else 1173 else
… …
1186void 1196void
1187move_missile (object *op) 1197move_missile (object *op)
1188{ 1198{
1189 if (op->range-- <= 0) 1199 if (op->range-- <= 0)
1190 { 1200 {
1191 op->destroy_inv (true); // be explicit about dropping
1192 op->destroy (true); 1201 op->drop_and_destroy ();
1193 return; 1202 return;
1194 } 1203 }
1195 1204
1196 mapxy pos (op); 1205 mapxy pos (op);
1197 pos.move (op->direction); 1206 pos.move (op->direction);
1198 1207
1199 if (!pos.normalise ()) 1208 if (!pos.normalise ())
1200 { 1209 {
1201 op->destroy (true); 1210 op->destroy ();
1202 return; 1211 return;
1203 } 1212 }
1204 1213
1205 mapspace &ms = pos.ms (); 1214 mapspace &ms = pos.ms ();
1206 1215
… …
1208 { 1217 {
1209 hit_map (op, op->direction, AT_MAGIC, 1); 1218 hit_map (op, op->direction, AT_MAGIC, 1);
1210 /* Basically, missile only hits one thing then goes away. 1219 /* Basically, missile only hits one thing then goes away.
1211 * we need to remove it if someone hasn't already done so. 1220 * we need to remove it if someone hasn't already done so.
1212 */ 1221 */
1213 op->destroy (true); 1222 op->destroy ();
1214 return; 1223 return;
1215 } 1224 }
1216 1225
1217 if (!op->direction) 1226 if (!op->direction)
1218 { 1227 {
1219 op->destroy (true); 1228 op->destroy ();
1220 return; 1229 return;
1221 } 1230 }
1222 1231
1223 int i = spell_find_dir (pos.m, pos.x, pos.y, op->owner); 1232 int i = spell_find_dir (pos.m, pos.x, pos.y, op->owner);
1224 if (i > 0 && i != op->direction) 1233 if (i > 0 && i != op->direction)
… …
1249 1258
1250 object *tmp = get_archetype (FORCE_NAME); 1259 object *tmp = get_archetype (FORCE_NAME);
1251 tmp->speed = 0.01; 1260 tmp->speed = 0.01;
1252 tmp->stats.food = time; 1261 tmp->stats.food = time;
1253 SET_FLAG (tmp, FLAG_IS_USED_UP); 1262 SET_FLAG (tmp, FLAG_IS_USED_UP);
1254 tmp->glow_radius = radius;
1255 if (tmp->glow_radius > MAX_LIGHT_RADII)
1256 tmp->glow_radius = MAX_LIGHT_RADII; 1263 tmp->glow_radius = min (MAX_LIGHT_RADIUS, radius);
1257
1258 tmp = insert_ob_in_ob (tmp, op); 1264 tmp = insert_ob_in_ob (tmp, op);
1259 1265
1260 if (tmp->glow_radius > op->glow_radius) 1266 if (tmp->glow_radius > op->glow_radius)
1261 op->glow_radius = tmp->glow_radius; 1267 op->glow_radius = tmp->glow_radius;
1262 1268
… …
1264} 1270}
1265 1271
1266int 1272int
1267cast_destruction (object *op, object *caster, object *spell_ob) 1273cast_destruction (object *op, object *caster, object *spell_ob)
1268{ 1274{
1269 int i, j, range, mflags, friendly = 0, dam, dur;
1270 sint16 sx, sy;
1271 maptile *m;
1272 object *tmp;
1273 const char *skill;
1274
1275 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob); 1275 int range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
1276 dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 1276 int dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
1277 dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob); 1277 int dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
1278 if (QUERY_FLAG (op, FLAG_FRIENDLY) || op->type == PLAYER) 1278
1279 friendly = 1; 1279 bool friendly = op->flag [FLAG_FRIENDLY] || op->is_player ();
1280 1280
1281 /* destruction doesn't use another spell object, so we need 1281 /* destruction doesn't use another spell object, so we need
1282 * update op's skill pointer so that exp is properly awarded. 1282 * update op's skill pointer so that exp is properly awarded.
1283 * We do some shortcuts here - since this is just temporary
1284 * and we'll reset the values back, we don't need to go through
1285 * the full share string/free_string route.
1286 */ 1283 */
1287 skill = op->skill; 1284 const shstr skill = op->skill;
1285
1288 if (caster == op) 1286 if (caster == op)
1289 op->skill = spell_ob->skill; 1287 op->skill = spell_ob->skill;
1290 else if (caster->skill) 1288 else if (caster->skill)
1291 op->skill = caster->skill; 1289 op->skill = caster->skill;
1292 else 1290 else
1293 op->skill = NULL; 1291 op->skill = 0;
1294 1292
1295 op->change_skill (find_skill_by_name (op, op->skill)); 1293 op->change_skill (find_skill_by_name (op, op->skill));
1296 1294
1297 for (i = -range; i <= range; i++) 1295 unordered_mapwalk (op, -range, -range, range, range)
1298 { 1296 {
1299 for (j = -range; j <= range; j++) 1297 mapspace &ms = m->at (nx, ny);
1300 {
1301 m = op->map;
1302 sx = op->x + i;
1303 sy = op->y + j;
1304 1298
1305 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
1306 if (mflags & P_OUT_OF_MAP)
1307 continue;
1308
1309 if (mflags & P_IS_ALIVE) 1299 if (ms.flags () & P_IS_ALIVE)
1300 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1301 if (tmp->flag [FLAG_ALIVE] || tmp->is_player ())
1310 { 1302 {
1311 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 1303 tmp = tmp->head_ ();
1312 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER)
1313 break;
1314 1304
1315 if (tmp) 1305 if ((friendly && !tmp->flag [FLAG_FRIENDLY] && !tmp->is_player ())
1306 || (!friendly && (tmp->flag [FLAG_FRIENDLY] || tmp->is_player ())))
1316 { 1307 {
1317 if (tmp->head) 1308 if (spell_ob->subtype == SP_DESTRUCTION)
1318 tmp = tmp->head;
1319
1320 if ((friendly && !QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->type != PLAYER) ||
1321 (!friendly && (QUERY_FLAG (tmp, FLAG_FRIENDLY) || tmp->type == PLAYER)))
1322 { 1309 {
1323 if (spell_ob->subtype == SP_DESTRUCTION)
1324 {
1325 hit_player (tmp, dam, op, spell_ob->attacktype, 0); 1310 hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1326 1311
1327 if (spell_ob->other_arch) 1312 if (spell_ob->other_arch)
1328 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op); 1313 m->insert (arch_to_object (spell_ob->other_arch), nx, ny, op);
1329 } 1314 }
1330 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100) 1315 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist [ATNR_MAGIC] != 100)
1331 { 1316 {
1332 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch) 1317 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1333 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op); 1318 m->insert (arch_to_object (spell_ob->other_arch), nx, ny, op);
1334 }
1335 } 1319 }
1336 } 1320 }
1337 } 1321 }
1338 }
1339 } 1322 }
1340 1323
1341 op->skill = skill; 1324 op->skill = skill;
1342 return 1; 1325 return 1;
1343} 1326}
… …
1491 /* If there is nothing living on this space, no need to go further */ 1474 /* If there is nothing living on this space, no need to go further */
1492 if (!(mflags & P_IS_ALIVE)) 1475 if (!(mflags & P_IS_ALIVE))
1493 continue; 1476 continue;
1494 1477
1495 // players can only affect spaces that they can actually see 1478 // players can only affect spaces that they can actually see
1479 if (caster
1496 if (caster && caster->contr 1480 && caster->contr
1497 && caster->contr->visibility_at (m, nx, ny) < 70) 1481 && caster->contr->darkness_at (m, nx, ny) == LOS_BLOCKED)
1498 continue; 1482 continue;
1499 1483
1500 for (tmp = GET_MAP_TOP (m, nx, ny); tmp; tmp = tmp->below) 1484 for (tmp = GET_MAP_TOP (m, nx, ny); tmp; tmp = tmp->below)
1501 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 1485 if (QUERY_FLAG (tmp, FLAG_MONSTER))
1502 break; 1486 break;
… …
1612 } /* for y */ 1596 } /* for y */
1613 1597
1614 return 1; 1598 return 1;
1615} 1599}
1616 1600
1617
1618/* Move_ball_spell: This handles ball type spells that just sort of wander 1601/* Move_ball_spell: This handles ball type spells that just sort of wander
1619 * about. was called move_ball_lightning, but since more than the ball 1602 * about. was called move_ball_lightning, but since more than the ball
1620 * lightning spell used it, that seemed misnamed. 1603 * lightning spell used it, that seemed misnamed.
1621 * op is the spell effect. 1604 * op is the spell effect.
1622 * note that duration is handled by process_object() in time.c 1605 * note that duration is handled by process_object() in time.c
… …
1647 for (i = 1; i < 9; i++) 1630 for (i = 1; i < 9; i++)
1648 { 1631 {
1649 /* i bit 0: alters sign of offset 1632 /* i bit 0: alters sign of offset
1650 * other bits (i / 2): absolute value of offset 1633 * other bits (i / 2): absolute value of offset
1651 */ 1634 */
1652
1653 int offset = ((i ^ j) & 1) ? (i / 2) : -(i / 2); 1635 int offset = ((i ^ j) & 1) ? (i / 2) : -(i / 2);
1654 int tmpdir = absdir (op->direction + offset); 1636 int tmpdir = absdir (op->direction + offset);
1655 1637
1656 nx = op->x + freearr_x[tmpdir]; 1638 nx = op->x + freearr_x[tmpdir];
1657 ny = op->y + freearr_y[tmpdir]; 1639 ny = op->y + freearr_y[tmpdir];
… …
1659 { 1641 {
1660 dir = tmpdir; 1642 dir = tmpdir;
1661 break; 1643 break;
1662 } 1644 }
1663 } 1645 }
1646
1664 if (dir == 0) 1647 if (dir == 0)
1665 { 1648 {
1666 nx = op->x; 1649 nx = op->x;
1667 ny = op->y; 1650 ny = op->y;
1668 m = op->map; 1651 m = op->map;
… …
1741 object *owner = op->env; 1724 object *owner = op->env;
1742 1725
1743 if (!owner) // MUST not happen, remove when true TODO 1726 if (!owner) // MUST not happen, remove when true TODO
1744 { 1727 {
1745 LOG (llevError, "swarm spell found outside inventory: %s\n", op->debug_desc ()); 1728 LOG (llevError, "swarm spell found outside inventory: %s\n", op->debug_desc ());
1746 op->destroy (true); 1729 op->destroy ();
1747 return; 1730 return;
1748 } 1731 }
1749 1732
1750 if (!op->duration || !owner->is_on_map ()) 1733 if (!op->duration || !owner->is_on_map ())
1751 { 1734 {
1752 op->destroy_inv (true); // be explicit about dropping
1753 op->destroy (true); 1735 op->drop_and_destroy ();
1754 return; 1736 return;
1755 } 1737 }
1756 1738
1757 op->duration--; 1739 op->duration--;
1758 1740
… …
1890 int dam, mflags; 1872 int dam, mflags;
1891 maptile *m; 1873 maptile *m;
1892 1874
1893 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1875 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1894 1876
1895 if (!dir) 1877 if (dir)
1896 {
1897 new_draw_info (NDI_UNIQUE, 0, op, "In what direction?");
1898 return 0;
1899 } 1878 {
1900
1901 x = op->x + freearr_x[dir]; 1879 x = op->x + freearr_x[dir];
1902 y = op->y + freearr_y[dir]; 1880 y = op->y + freearr_y[dir];
1903 m = op->map; 1881 m = op->map;
1904 1882
1905 mflags = get_map_flags (m, &m, x, y, &x, &y); 1883 mflags = get_map_flags (m, &m, x, y, &x, &y);
1906 1884
1907 if (mflags & P_OUT_OF_MAP) 1885 if (mflags & P_OUT_OF_MAP)
1908 { 1886 {
1909 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there."); 1887 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there.");
1910 return 0; 1888 return 0;
1911 } 1889 }
1912 1890
1913 if (mflags & P_IS_ALIVE && spell->attacktype) 1891 if (mflags & P_IS_ALIVE && spell->attacktype)
1914 { 1892 {
1915 for (target = GET_MAP_OB (m, x, y); target; target = target->above) 1893 for (target = GET_MAP_OB (m, x, y); target; target = target->above)
1916 if (QUERY_FLAG (target, FLAG_MONSTER)) 1894 if (QUERY_FLAG (target, FLAG_MONSTER))
1917 { 1895 {
1918 /* oky doky. got a target monster. Lets make a blinding attack */ 1896 /* oky doky. got a target monster. Lets make a blinding attack */
1919 if (target->head) 1897 if (target->head)
1920 target = target->head; 1898 target = target->head;
1921 1899
1922 hit_player (target, dam, op, spell->attacktype, 1); 1900 hit_player (target, dam, op, spell->attacktype, 1);
1923 return 1; /* one success only! */ 1901 return 1; /* one success only! */
1902 }
1924 } 1903 }
1925 }
1926 1904
1927 /* no live target, perhaps a wall is in the way? */ 1905 /* no live target, perhaps a wall is in the way? */
1928 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y))) 1906 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)))
1929 { 1907 {
1930 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 1908 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
1931 return 0; 1909 return 0;
1910 }
1932 } 1911 }
1933 1912
1934 /* ok, looks groovy to just insert a new light on the map */ 1913 /* ok, looks groovy to just insert a new light on the map */
1935 tmp = arch_to_object (spell->other_arch); 1914 tmp = arch_to_object (spell->other_arch);
1936 if (!tmp) 1915 if (!tmp)
1937 { 1916 {
1938 LOG (llevError, "Error: spell arch for cast_light() missing.\n"); 1917 LOG (llevError, "Error: spell arch for cast_light() missing.\n");
1939 return 0; 1918 return 0;
1940 } 1919 }
1920
1941 tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell); 1921 tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell);
1922
1942 if (tmp->glow_radius) 1923 if (tmp->glow_radius)
1943 {
1944 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell); 1924 tmp->glow_radius = min (MAX_LIGHT_RADIUS, spell->range + SP_level_range_adjust (caster, spell));
1945 if (tmp->glow_radius > MAX_LIGHT_RADII)
1946 tmp->glow_radius = MAX_LIGHT_RADII;
1947 }
1948 1925
1926 if (dir)
1949 m->insert (tmp, x, y, op); 1927 m->insert (tmp, x, y, op);
1928 else
1929 caster->outer_env ()->insert (tmp);
1930
1950 return 1; 1931 return 1;
1951} 1932}
1952 1933
1953/* cast_cause_disease: this spell looks along <dir> from the 1934/* cast_cause_disease: this spell looks along <dir> from the
1954 * player and infects someone. 1935 * player and infects someone.
… …
2061 2042
2062 if (infect_object (walk, disease, 1)) 2043 if (infect_object (walk, disease, 1))
2063 { 2044 {
2064 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name); 2045 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
2065 2046
2066 disease->destroy (true); /* don't need this one anymore */ 2047 disease->destroy (); /* don't need this one anymore */
2067 walk->map->insert (get_archetype ("detect_magic"), x, y, op); 2048 walk->map->insert (get_archetype ("detect_magic"), x, y, op);
2068 return 1; 2049 return 1;
2069 } 2050 }
2070 2051
2071 disease->destroy (true); 2052 disease->destroy ();
2072 } 2053 }
2073 } /* if living creature */ 2054 } /* if living creature */
2074 } /* for range of spaces */ 2055 } /* for range of spaces */
2075 2056
2076 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!"); 2057 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!");

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines