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.10 by root, Sun Sep 10 23:24:12 2006 UTC vs.
Revision 1.23 by root, Mon Dec 25 11:25:50 2006 UTC

1
2/*
3 * static char *rcsid_spell_attack_c =
4 * "$Id: spell_attack.C,v 1.10 2006/09/10 23:24:12 root Exp $";
5 */
6
7
8/* 1/*
9 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
10 3
11 Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team 4 Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team
12 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
23 16
24 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
25 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
26 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
27 20
28 The authors can be reached via e-mail at crossfire-devel@real-time.com 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
29*/ 22*/
30 23
31/* This file contains all the spell attack code. Grouping this code 24/* This file contains all the spell attack code. Grouping this code
32 * together should hopefully make it easier to find the relevent bits 25 * together should hopefully make it easier to find the relevent bits
33 * of code 26 * of code
… …
64 { 57 {
65 weight_move = op->weight + (op->weight * op->level) / 3; 58 weight_move = op->weight + (op->weight * op->level) / 3;
66 /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */ 59 /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */
67 } 60 }
68 61
69 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 62 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
70 { 63 {
71 int num_sections = 1; 64 int num_sections = 1;
72 65
73 /* don't move DM */ 66 /* don't move DM */
74 if (QUERY_FLAG (tmp, FLAG_WIZ)) 67 if (QUERY_FLAG (tmp, FLAG_WIZ))
… …
124void 117void
125forklightning (object *op, object *tmp) 118forklightning (object *op, object *tmp)
126{ 119{
127 int new_dir = 1; /* direction or -1 for left, +1 for right 0 if no new bolt */ 120 int new_dir = 1; /* direction or -1 for left, +1 for right 0 if no new bolt */
128 int t_dir; /* stores temporary dir calculation */ 121 int t_dir; /* stores temporary dir calculation */
129 mapstruct *m; 122 maptile *m;
130 sint16 sx, sy; 123 sint16 sx, sy;
131 object *new_bolt; 124 object *new_bolt;
132 125
133 /* pick a fork direction. tmp->stats.Con is the left bias 126 /* pick a fork direction. tmp->stats.Con is the left bias
134 * i.e., the chance in 100 of forking LEFT 127 * i.e., the chance in 100 of forking LEFT
… …
147 140
148 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, sx, sy))) 141 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, sx, sy)))
149 return; 142 return;
150 143
151 /* OK, we made a fork */ 144 /* OK, we made a fork */
152 new_bolt = get_object (); 145 new_bolt = tmp->clone ();
153 copy_object (tmp, new_bolt);
154 146
155 /* reduce chances of subsequent forking */ 147 /* reduce chances of subsequent forking */
156 new_bolt->stats.Dex -= 10; 148 new_bolt->stats.Dex -= 10;
157 tmp->stats.Dex -= 10; /* less forks from main bolt too */ 149 tmp->stats.Dex -= 10; /* less forks from main bolt too */
158 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */ 150 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */
… …
177move_bolt (object *op) 169move_bolt (object *op)
178{ 170{
179 object *tmp; 171 object *tmp;
180 int mflags; 172 int mflags;
181 sint16 x, y; 173 sint16 x, y;
182 mapstruct *m; 174 maptile *m;
183 175
184 if (--(op->duration) < 0) 176 if (--(op->duration) < 0)
185 { 177 {
186 remove_ob (op); 178 op->destroy ();
187 free_object (op);
188 return; 179 return;
189 } 180 }
181
190 hit_map (op, 0, op->attacktype, 1); 182 hit_map (op, 0, op->attacktype, 1);
191 183
192 if (!op->direction) 184 if (!op->direction)
193 return; 185 return;
194 186
… …
256 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */ 248 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */
257 return; 249 return;
258 } 250 }
259 else 251 else
260 { /* Create a copy of this object and put it ahead */ 252 { /* Create a copy of this object and put it ahead */
261 tmp = get_object (); 253 tmp = op->clone ();
262 copy_object (op, tmp); 254
263 tmp->speed_left = -0.1; 255 tmp->speed_left = -0.1;
264 tmp->x += DIRX (tmp), tmp->y += DIRY (tmp); 256 tmp->x += DIRX (tmp), tmp->y += DIRY (tmp);
265 tmp = insert_ob_in_map (tmp, op->map, op, 0); 257 tmp = insert_ob_in_map (tmp, op->map, op, 0);
266 /* To make up for the decrease at the top of the function */ 258 /* To make up for the decrease at the top of the function */
267 tmp->duration++; 259 tmp->duration++;
… …
288 * we remove the magic flag - that can be derived from 280 * we remove the magic flag - that can be derived from
289 * spob->attacktype. 281 * spob->attacktype.
290 * This function sets up the appropriate owner and skill 282 * This function sets up the appropriate owner and skill
291 * pointers. 283 * pointers.
292 */ 284 */
293
294int 285int
295fire_bolt (object *op, object *caster, int dir, object *spob, object *skill) 286fire_bolt (object *op, object *caster, int dir, object *spob, object *skill)
296{ 287{
297 object *tmp = NULL; 288 object *tmp = NULL;
298 int mflags; 289 int mflags;
… …
316 307
317 tmp->direction = dir; 308 tmp->direction = dir;
318 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 309 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
319 SET_ANIMATION (tmp, dir); 310 SET_ANIMATION (tmp, dir);
320 311
321 set_owner (tmp, op); 312 tmp->set_owner (op);
322 set_spell_skill (op, caster, spob, tmp); 313 set_spell_skill (op, caster, spob, tmp);
323 314
324 tmp->x = op->x + DIRX (tmp); 315 tmp->x = op->x + DIRX (tmp);
325 tmp->y = op->y + DIRY (tmp); 316 tmp->y = op->y + DIRY (tmp);
326 tmp->map = op->map; 317 tmp->map = op->map;
327 318
319 maptile *newmap;
328 mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y); 320 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
329 if (mflags & P_OUT_OF_MAP) 321 if (mflags & P_OUT_OF_MAP)
330 { 322 {
331 free_object (tmp); 323 tmp->destroy ();
332 return 0; 324 return 0;
333 } 325 }
326
327 tmp->map = newmap;
328
334 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 329 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
335 { 330 {
336 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 331 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
337 { 332 {
338 free_object (tmp); 333 tmp->destroy ();
339 return 0; 334 return 0;
340 } 335 }
336
341 tmp->x = op->x; 337 tmp->x = op->x;
342 tmp->y = op->y; 338 tmp->y = op->y;
343 tmp->direction = absdir (tmp->direction + 4); 339 tmp->direction = absdir (tmp->direction + 4);
344 tmp->map = op->map; 340 tmp->map = op->map;
345 } 341 }
342
346 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL) 343 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL)
347 move_bolt (tmp); 344 move_bolt (tmp);
345
348 return 1; 346 return 1;
349} 347}
350 348
351 349
352 350
… …
362 */ 360 */
363void 361void
364explosion (object *op) 362explosion (object *op)
365{ 363{
366 object *tmp; 364 object *tmp;
367 mapstruct *m = op->map; 365 maptile *m = op->map;
368 int i; 366 int i;
369 367
370 if (--(op->duration) < 0) 368 if (--(op->duration) < 0)
371 { 369 {
372 remove_ob (op); 370 op->destroy ();
373 free_object (op);
374 return; 371 return;
375 } 372 }
373
376 hit_map (op, 0, op->attacktype, 0); 374 hit_map (op, 0, op->attacktype, 0);
377 375
378 if (op->range > 0) 376 if (op->range > 0)
379 { 377 {
380 for (i = 1; i < 9; i++) 378 for (i = 1; i < 9; i++)
… …
386 /* ok_to_put_more already does things like checks for walls, 384 /* ok_to_put_more already does things like checks for walls,
387 * out of map, etc. 385 * out of map, etc.
388 */ 386 */
389 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype)) 387 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype))
390 { 388 {
391 tmp = get_object (); 389 tmp = op->clone ();
392 copy_object (op, tmp);
393 tmp->state = 0; 390 tmp->state = 0;
394 tmp->speed_left = -0.21; 391 tmp->speed_left = -0.21;
395 tmp->range--; 392 tmp->range--;
396 tmp->value = 0; 393 tmp->value = 0;
397 tmp->x = dx; 394 tmp->x = dx;
… …
408 * explode. 405 * explode.
409 */ 406 */
410void 407void
411explode_bullet (object *op) 408explode_bullet (object *op)
412{ 409{
413 tag_t op_tag = op->count;
414 object *tmp, *owner; 410 object *tmp, *owner;
415 411
416 if (op->other_arch == NULL) 412 if (op->other_arch == NULL)
417 { 413 {
418 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n"); 414 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");
419 remove_ob (op); 415 op->destroy ();
420 free_object (op);
421 return; 416 return;
422 } 417 }
423 418
424 if (op->env) 419 if (op->env)
425 { 420 {
… …
427 422
428 env = object_get_env_recursive (op); 423 env = object_get_env_recursive (op);
429 if (env->map == NULL || out_of_map (env->map, env->x, env->y)) 424 if (env->map == NULL || out_of_map (env->map, env->x, env->y))
430 { 425 {
431 LOG (llevError, "BUG: explode_bullet(): env out of map\n"); 426 LOG (llevError, "BUG: explode_bullet(): env out of map\n");
432 remove_ob (op); 427 op->destroy ();
433 free_object (op);
434 return; 428 return;
435 } 429 }
430
436 remove_ob (op); 431 op->remove ();
437 op->x = env->x; 432 op->x = env->x;
438 op->y = env->y; 433 op->y = env->y;
439 insert_ob_in_map (op, env->map, op, INS_NO_MERGE | INS_NO_WALK_ON); 434 insert_ob_in_map (op, env->map, op, INS_NO_MERGE | INS_NO_WALK_ON);
440 } 435 }
441 else if (out_of_map (op->map, op->x, op->y)) 436 else if (out_of_map (op->map, op->x, op->y))
442 { 437 {
443 LOG (llevError, "BUG: explode_bullet(): op out of map\n"); 438 LOG (llevError, "BUG: explode_bullet(): op out of map\n");
444 remove_ob (op); 439 op->destroy ();
445 free_object (op);
446 return; 440 return;
447 } 441 }
448 442
449 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps 443 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps
450 // NOTE: If this breaks something important: remove this. I can't think of anything 444 // NOTE: If this breaks something important: remove this. I can't think of anything
451 // bad at the moment that might happen from this. 445 // bad at the moment that might happen from this.
452 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 446 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
453 { 447 {
454 remove_ob (op); 448 op->destroy ();
455 free_object (op);
456 return; 449 return;
457 } 450 }
458 451
459 if (op->attacktype) 452 if (op->attacktype)
460 { 453 {
461 hit_map (op, 0, op->attacktype, 1); 454 hit_map (op, 0, op->attacktype, 1);
462 if (was_destroyed (op, op_tag)) 455 if (op->destroyed ())
463 return; 456 return;
464 } 457 }
465 458
466 /* other_arch contains what this explodes into */ 459 /* other_arch contains what this explodes into */
467 tmp = arch_to_object (op->other_arch); 460 tmp = arch_to_object (op->other_arch);
468 461
469 copy_owner (tmp, op); 462 tmp->set_owner (op);
470 tmp->skill = op->skill; 463 tmp->skill = op->skill;
471 464
472 owner = get_owner (op); 465 owner = op->owner;
473 466
474 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner)) 467 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner))
475 { 468 {
476 remove_ob (op); 469 op->destroy ();
477 free_object (op);
478 return; 470 return;
479 } 471 }
480 472
481 tmp->x = op->x; 473 tmp->x = op->x;
482 tmp->y = op->y; 474 tmp->y = op->y;
… …
510 /* Prevent recursion */ 502 /* Prevent recursion */
511 op->move_on = 0; 503 op->move_on = 0;
512 504
513 insert_ob_in_map (tmp, op->map, op, 0); 505 insert_ob_in_map (tmp, op->map, op, 0);
514 /* remove the firebullet */ 506 /* remove the firebullet */
515 if (!was_destroyed (op, op_tag)) 507 if (!op->destroyed ())
516 { 508 {
517 remove_ob (op); 509 op->destroy ();
518 free_object (op);
519 } 510 }
520} 511}
521 512
522 513
523 514
… …
526 */ 517 */
527 518
528void 519void
529check_bullet (object *op) 520check_bullet (object *op)
530{ 521{
531 tag_t op_tag = op->count, tmp_tag;
532 object *tmp; 522 object *tmp;
533 int dam, mflags; 523 int dam, mflags;
534 mapstruct *m; 524 maptile *m;
535 sint16 sx, sy; 525 sint16 sx, sy;
536 526
537 mflags = get_map_flags (op->map, &m, op->x, op->y, &sx, &sy); 527 mflags = get_map_flags (op->map, &m, op->x, op->y, &sx, &sy);
538 528
539 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy))) 529 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy)))
… …
548 538
549 /* If nothing alive on this space, no reason to do anything further */ 539 /* If nothing alive on this space, no reason to do anything further */
550 if (!(mflags & P_IS_ALIVE)) 540 if (!(mflags & P_IS_ALIVE))
551 return; 541 return;
552 542
553 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 543 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
554 { 544 {
555 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 545 if (QUERY_FLAG (tmp, FLAG_ALIVE))
556 { 546 {
557 tmp_tag = tmp->count;
558 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 547 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
559 if (was_destroyed (op, op_tag) || !was_destroyed (tmp, tmp_tag) || (op->stats.dam -= dam) < 0) 548 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
560 { 549 {
561 if (!QUERY_FLAG (op, FLAG_REMOVED)) 550 if (!QUERY_FLAG (op, FLAG_REMOVED))
562 { 551 {
563 remove_ob (op); 552 op->destroy ();
564 free_object (op);
565 return; 553 return;
566 } 554 }
567 } 555 }
568 } 556 }
569 } 557 }
570} 558}
571
572 559
573/* Basically, we move 'op' one square, and if it hits something, 560/* Basically, we move 'op' one square, and if it hits something,
574 * call check_bullet. 561 * call check_bullet.
575 * This function is only applicable to bullets, but not to all 562 * This function is only applicable to bullets, but not to all
576 * fired arches (eg, bolts). 563 * fired arches (eg, bolts).
577 */ 564 */
578
579void 565void
580move_bullet (object *op) 566move_bullet (object *op)
581{ 567{
582 sint16 new_x, new_y; 568 sint16 new_x, new_y;
583 int mflags; 569 int mflags;
584 mapstruct *m; 570 maptile *m;
585 571
586#if 0 572#if 0
587 /* We need a better general purpose way to do this */ 573 /* We need a better general purpose way to do this */
588 574
589 /* peterm: added to make comet leave a trail of burnouts 575 /* peterm: added to make comet leave a trail of burnouts
590 it's an unadulterated hack, but the effect is cool. */ 576 it's an unadulterated hack, but the effect is cool. */
591 if (op->stats.sp == SP_METEOR) 577 if (op->stats.sp == SP_METEOR)
592 { 578 {
593 replace_insert_ob_in_map ("fire_trail", op); 579 replace_insert_ob_in_map ("fire_trail", op);
594 if (was_destroyed (op, op_tag)) 580 if (op->destroyed ())
595 return; 581 return;
596 } /* end addition. */ 582 } /* end addition. */
597#endif 583#endif
598 584
599 /* Reached the end of its life - remove it */ 585 /* Reached the end of its life - remove it */
600 if (--op->range <= 0) 586 if (--op->range <= 0)
601 { 587 {
602 if (op->other_arch) 588 if (op->other_arch)
603 {
604 explode_bullet (op); 589 explode_bullet (op);
605 }
606 else 590 else
607 { 591 op->destroy ();
608 remove_ob (op); 592
609 free_object (op);
610 }
611 return; 593 return;
612 } 594 }
613 595
614 new_x = op->x + DIRX (op); 596 new_x = op->x + DIRX (op);
615 new_y = op->y + DIRY (op); 597 new_y = op->y + DIRY (op);
616 m = op->map; 598 m = op->map;
617 mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y); 599 mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y);
618 600
619 if (mflags & P_OUT_OF_MAP) 601 if (mflags & P_OUT_OF_MAP)
620 { 602 {
621 remove_ob (op); 603 op->destroy ();
622 free_object (op);
623 return; 604 return;
624 } 605 }
625 606
626 if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))) 607 if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y)))
627 { 608 {
628 if (op->other_arch) 609 if (op->other_arch)
629 {
630 explode_bullet (op); 610 explode_bullet (op);
631 }
632 else 611 else
633 { 612 op->destroy ();
634 remove_ob (op); 613
635 free_object (op);
636 }
637 return; 614 return;
638 } 615 }
639 616
640 remove_ob (op); 617 op->remove ();
641 op->x = new_x; 618 op->x = new_x;
642 op->y = new_y; 619 op->y = new_y;
643 if ((op = insert_ob_in_map (op, m, op, 0)) == NULL) 620 if ((op = insert_ob_in_map (op, m, op, 0)) == NULL)
644 return; 621 return;
645 622
… …
647 { 624 {
648 op->direction = absdir (op->direction + 4); 625 op->direction = absdir (op->direction + 4);
649 update_turn_face (op); 626 update_turn_face (op);
650 } 627 }
651 else 628 else
652 {
653 check_bullet (op); 629 check_bullet (op);
654 }
655} 630}
656 631
657 632
658 633
659 634
… …
694 669
695 tmp->direction = dir; 670 tmp->direction = dir;
696 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 671 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
697 SET_ANIMATION (tmp, dir); 672 SET_ANIMATION (tmp, dir);
698 673
699 set_owner (tmp, op); 674 tmp->set_owner (op);
700 set_spell_skill (op, caster, spob, tmp); 675 set_spell_skill (op, caster, spob, tmp);
701 676
702 tmp->x = op->x + freearr_x[dir]; 677 tmp->x = op->x + freearr_x[dir];
703 tmp->y = op->y + freearr_y[dir]; 678 tmp->y = op->y + freearr_y[dir];
704 tmp->map = op->map; 679 tmp->map = op->map;
705 680
681 maptile *newmap;
706 mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y); 682 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
707 if (mflags & P_OUT_OF_MAP) 683 if (mflags & P_OUT_OF_MAP)
708 { 684 {
709 free_object (tmp); 685 tmp->destroy ();
710 return 0; 686 return 0;
711 } 687 }
688
689 tmp->map = newmap;
690
712 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 691 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
713 { 692 {
714 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 693 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
715 { 694 {
716 free_object (tmp); 695 tmp->destroy ();
717 return 0; 696 return 0;
718 } 697 }
698
719 tmp->x = op->x; 699 tmp->x = op->x;
720 tmp->y = op->y; 700 tmp->y = op->y;
721 tmp->direction = absdir (tmp->direction + 4); 701 tmp->direction = absdir (tmp->direction + 4);
722 tmp->map = op->map; 702 tmp->map = op->map;
723 } 703 }
704
724 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL) 705 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)))
725 {
726 check_bullet (tmp); 706 check_bullet (tmp);
727 } 707
728 return 1; 708 return 1;
729} 709}
730 710
731 711
732 712
… …
745 object *new_ob = arch_to_object (op->other_arch); 725 object *new_ob = arch_to_object (op->other_arch);
746 726
747 new_ob->x = op->x; 727 new_ob->x = op->x;
748 new_ob->y = op->y; 728 new_ob->y = op->y;
749 new_ob->level = op->level; 729 new_ob->level = op->level;
750 set_owner (new_ob, op->owner); 730 new_ob->set_owner (op->owner);
751 731
752 /* preserve skill ownership */ 732 /* preserve skill ownership */
753 if (op->skill && op->skill != new_ob->skill) 733 if (op->skill && op->skill != new_ob->skill)
754 { 734 {
755 new_ob->skill = op->skill; 735 new_ob->skill = op->skill;
… …
762 742
763void 743void
764move_cone (object *op) 744move_cone (object *op)
765{ 745{
766 int i; 746 int i;
767 tag_t tag;
768 747
769 /* if no map then hit_map will crash so just ignore object */ 748 /* if no map then hit_map will crash so just ignore object */
770 if (!op->map) 749 if (!op->map)
771 { 750 {
772 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown"); 751 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown");
… …
785#if 0 764#if 0
786 /* Disable this - enabling it makes monsters easier, as 765 /* Disable this - enabling it makes monsters easier, as
787 * when their cone dies when they die. 766 * when their cone dies when they die.
788 */ 767 */
789 /* If no owner left, the spell dies out. */ 768 /* If no owner left, the spell dies out. */
790 if (get_owner (op) == NULL) 769 if (op->owner == NULL)
791 { 770 {
792 remove_ob (op); 771 op->destroy ();
793 free_object (op);
794 return; 772 return;
795 } 773 }
796#endif 774#endif
797 775
798 tag = op->count;
799 hit_map (op, 0, op->attacktype, 0); 776 hit_map (op, 0, op->attacktype, 0);
800 777
801 /* Check to see if we should push anything. 778 /* Check to see if we should push anything.
802 * Spell objects with weight push whatever they encounter to some 779 * Spell objects with weight push whatever they encounter to some
803 * degree. 780 * degree.
804 */ 781 */
805 if (op->weight) 782 if (op->weight)
806 check_spell_knockback (op); 783 check_spell_knockback (op);
807 784
808 if (was_destroyed (op, tag)) 785 if (op->destroyed ())
809 return; 786 return;
810 787
811 if ((op->duration--) < 0) 788 if ((op->duration--) < 0)
812 { 789 {
813 remove_ob (op); 790 op->destroy ();
814 free_object (op);
815 return; 791 return;
816 } 792 }
817 /* Object has hit maximum range, so don't have it move 793 /* Object has hit maximum range, so don't have it move
818 * any further. When the duration above expires, 794 * any further. When the duration above expires,
819 * then the object will get removed. 795 * then the object will get removed.
… …
828 { 804 {
829 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)]; 805 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)];
830 806
831 if (ok_to_put_more (op->map, x, y, op, op->attacktype)) 807 if (ok_to_put_more (op->map, x, y, op, op->attacktype))
832 { 808 {
833 object *tmp = get_object (); 809 object *tmp = op->clone ();
834 810
835 copy_object (op, tmp);
836 tmp->x = x; 811 tmp->x = x;
837 tmp->y = y; 812 tmp->y = y;
838 813
839 tmp->duration = op->duration + 1; 814 tmp->duration = op->duration + 1;
840 815
… …
858int 833int
859cast_cone (object *op, object *caster, int dir, object *spell) 834cast_cone (object *op, object *caster, int dir, object *spell)
860{ 835{
861 object *tmp; 836 object *tmp;
862 int i, success = 0, range_min = -1, range_max = 1; 837 int i, success = 0, range_min = -1, range_max = 1;
863 mapstruct *m; 838 maptile *m;
864 sint16 sx, sy; 839 sint16 sx, sy;
865 MoveType movetype; 840 MoveType movetype;
866 841
867 if (!spell->other_arch) 842 if (!spell->other_arch)
868 return 0; 843 return 0;
… …
924 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype) 899 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype)
925 continue; 900 continue;
926 901
927 success = 1; 902 success = 1;
928 tmp = arch_to_object (spell->other_arch); 903 tmp = arch_to_object (spell->other_arch);
929 set_owner (tmp, op); 904 tmp->set_owner (op);
930 set_spell_skill (op, caster, spell, tmp); 905 set_spell_skill (op, caster, spell, tmp);
931 tmp->level = caster_level (caster, spell); 906 tmp->level = caster_level (caster, spell);
932 tmp->x = sx; 907 tmp->x = sx;
933 tmp->y = sy; 908 tmp->y = sy;
934 tmp->attacktype = spell->attacktype; 909 tmp->attacktype = spell->attacktype;
… …
1023 return; 998 return;
1024 999
1025 if (env->type == PLAYER) 1000 if (env->type == PLAYER)
1026 esrv_del_item (env->contr, op->count); 1001 esrv_del_item (env->contr, op->count);
1027 1002
1028 remove_ob (op); 1003 op->remove ();
1029 op->x = env->x; 1004 op->x = env->x;
1030 op->y = env->y; 1005 op->y = env->y;
1031 if ((op = insert_ob_in_map (op, env->map, op, 0)) == NULL) 1006 if ((op = insert_ob_in_map (op, env->map, op, 0)) == NULL)
1032 return; 1007 return;
1033 } 1008 }
… …
1035 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding 1010 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding
1036 // on a safe map. I don't like this special casing, but it seems to be neccessary 1011 // on a safe map. I don't like this special casing, but it seems to be neccessary
1037 // as bombs can be carried. 1012 // as bombs can be carried.
1038 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 1013 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
1039 { 1014 {
1040 remove_ob (op); 1015 op->destroy ();
1041 free_object (op);
1042 return; 1016 return;
1043 } 1017 }
1044 1018
1045 /* This copies a lot of the code from the fire bullet, 1019 /* This copies a lot of the code from the fire bullet,
1046 * but using the cast_bullet isn't really feasible, 1020 * but using the cast_bullet isn't really feasible,
1047 * so just set up the appropriate values. 1021 * so just set up the appropriate values.
1048 */ 1022 */
1049 at = find_archetype (SPLINT); 1023 at = archetype::find (SPLINT);
1050 if (at) 1024 if (at)
1051 { 1025 {
1052 for (i = 1; i < 9; i++) 1026 for (i = 1; i < 9; i++)
1053 { 1027 {
1054 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i])) 1028 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i]))
… …
1057 tmp->direction = i; 1031 tmp->direction = i;
1058 tmp->range = op->range; 1032 tmp->range = op->range;
1059 tmp->stats.dam = op->stats.dam; 1033 tmp->stats.dam = op->stats.dam;
1060 tmp->duration = op->duration; 1034 tmp->duration = op->duration;
1061 tmp->attacktype = op->attacktype; 1035 tmp->attacktype = op->attacktype;
1062 copy_owner (tmp, op); 1036 tmp->set_owner (op);
1063 if (op->skill && op->skill != tmp->skill) 1037 if (op->skill && op->skill != tmp->skill)
1064 { 1038 {
1065 tmp->skill = op->skill; 1039 tmp->skill = op->skill;
1066 } 1040 }
1067 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 1041 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
… …
1081{ 1055{
1082 1056
1083 object *tmp; 1057 object *tmp;
1084 int mflags; 1058 int mflags;
1085 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir]; 1059 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir];
1086 mapstruct *m; 1060 maptile *m;
1087 1061
1088 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy); 1062 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy);
1089 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK)) 1063 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
1090 { 1064 {
1091 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1065 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
… …
1097 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 1071 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
1098 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1072 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1099 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 1073 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
1100 tmp->attacktype = spell->attacktype; 1074 tmp->attacktype = spell->attacktype;
1101 1075
1102 set_owner (tmp, op); 1076 tmp->set_owner (op);
1103 set_spell_skill (op, caster, spell, tmp); 1077 set_spell_skill (op, caster, spell, tmp);
1104 tmp->x = dx; 1078 tmp->x = dx;
1105 tmp->y = dy; 1079 tmp->y = dy;
1106 insert_ob_in_map (tmp, m, op, 0); 1080 insert_ob_in_map (tmp, m, op, 0);
1107 return 1; 1081 return 1;
… …
1127get_pointed_target (object *op, int dir, int range, int type) 1101get_pointed_target (object *op, int dir, int range, int type)
1128{ 1102{
1129 object *target; 1103 object *target;
1130 sint16 x, y; 1104 sint16 x, y;
1131 int dist, mflags; 1105 int dist, mflags;
1132 mapstruct *mp; 1106 maptile *mp;
1133 1107
1134 if (dir == 0) 1108 if (dir == 0)
1135 return NULL; 1109 return NULL;
1136 1110
1137 for (dist = 1; dist < range; dist++) 1111 for (dist = 1; dist < range; dist++)
… …
1150 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW) 1124 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
1151 return NULL; 1125 return NULL;
1152 1126
1153 if (mflags & P_IS_ALIVE) 1127 if (mflags & P_IS_ALIVE)
1154 { 1128 {
1155 for (target = get_map_ob (mp, x, y); target; target = target->above) 1129 for (target = GET_MAP_OB (mp, x, y); target; target = target->above)
1156 { 1130 {
1157 if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER)) 1131 if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER))
1158 { 1132 {
1159 return target; 1133 return target;
1160 } 1134 }
… …
1227 if (effect->attacktype & AT_DEATH) 1201 if (effect->attacktype & AT_DEATH)
1228 { 1202 {
1229 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1203 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1230 1204
1231 /* casting death spells at undead isn't a good thing */ 1205 /* casting death spells at undead isn't a good thing */
1232 if QUERY_FLAG
1233 (target, FLAG_UNDEAD) 1206 if (QUERY_FLAG (target, FLAG_UNDEAD))
1234 { 1207 {
1235 if (random_roll (0, 2, op, PREFER_LOW)) 1208 if (random_roll (0, 2, op, PREFER_LOW))
1236 { 1209 {
1237 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!"); 1210 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");
1238 effect->x = op->x; 1211 effect->x = op->x;
… …
1240 } 1213 }
1241 else 1214 else
1242 { 1215 {
1243 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target)); 1216 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target));
1244 target->stats.hp = target->stats.maxhp * 2; 1217 target->stats.hp = target->stats.maxhp * 2;
1245 free_object (effect); 1218 effect->destroy ();
1246 return 0; 1219 return 0;
1247 } 1220 }
1248 } 1221 }
1249 } 1222 }
1250 else 1223 else
1251 { 1224 {
1252 /* how much woe to inflict :) */ 1225 /* how much woe to inflict :) */
1253 effect->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1226 effect->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1254 } 1227 }
1255 1228
1256 set_owner (effect, op); 1229 effect->set_owner (op);
1257 set_spell_skill (op, caster, spell, effect); 1230 set_spell_skill (op, caster, spell, effect);
1258 1231
1259 /* ok, tell it where to be, and insert! */ 1232 /* ok, tell it where to be, and insert! */
1260 effect->x = target->x; 1233 effect->x = target->x;
1261 effect->y = target->y; 1234 effect->y = target->y;
… …
1277move_missile (object *op) 1250move_missile (object *op)
1278{ 1251{
1279 int i, mflags; 1252 int i, mflags;
1280 object *owner; 1253 object *owner;
1281 sint16 new_x, new_y; 1254 sint16 new_x, new_y;
1282 mapstruct *m; 1255 maptile *m;
1283 1256
1284 if (op->range-- <= 0) 1257 if (op->range-- <= 0)
1285 { 1258 {
1286 remove_ob (op); 1259 op->destroy ();
1287 free_object (op);
1288 return; 1260 return;
1289 } 1261 }
1290 1262
1291 owner = get_owner (op); 1263 owner = op->owner;
1292#if 0 1264#if 0
1293 /* It'd make things nastier if this wasn't here - spells cast by 1265 /* It'd make things nastier if this wasn't here - spells cast by
1294 * monster that are then killed would continue to survive 1266 * monster that are then killed would continue to survive
1295 */ 1267 */
1296 if (owner == NULL) 1268 if (owner == NULL)
1297 { 1269 {
1298 remove_ob (op); 1270 op->destroy ();
1299 free_object (op);
1300 return; 1271 return;
1301 } 1272 }
1302#endif 1273#endif
1303 1274
1304 new_x = op->x + DIRX (op); 1275 new_x = op->x + DIRX (op);
… …
1306 1277
1307 mflags = get_map_flags (op->map, &m, new_x, new_y, &new_x, &new_y); 1278 mflags = get_map_flags (op->map, &m, new_x, new_y, &new_x, &new_y);
1308 1279
1309 if (!(mflags & P_OUT_OF_MAP) && ((mflags & P_IS_ALIVE) || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y)))) 1280 if (!(mflags & P_OUT_OF_MAP) && ((mflags & P_IS_ALIVE) || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))))
1310 { 1281 {
1311 tag_t tag = op->count;
1312
1313 hit_map (op, op->direction, AT_MAGIC, 1); 1282 hit_map (op, op->direction, AT_MAGIC, 1);
1314 /* Basically, missile only hits one thing then goes away. 1283 /* Basically, missile only hits one thing then goes away.
1315 * we need to remove it if someone hasn't already done so. 1284 * we need to remove it if someone hasn't already done so.
1316 */ 1285 */
1317 if (!was_destroyed (op, tag)) 1286 if (!op->destroyed ())
1318 { 1287 op->destroy ();
1319 remove_ob (op); 1288
1320 free_object (op);
1321 }
1322 return; 1289 return;
1323 } 1290 }
1324 1291
1325 remove_ob (op); 1292 op->remove ();
1293
1326 if (!op->direction || (mflags & P_OUT_OF_MAP)) 1294 if (!op->direction || (mflags & P_OUT_OF_MAP))
1327 { 1295 {
1328 free_object (op); 1296 op->destroy ();
1329 return; 1297 return;
1330 } 1298 }
1299
1331 op->x = new_x; 1300 op->x = new_x;
1332 op->y = new_y; 1301 op->y = new_y;
1333 op->map = m; 1302 op->map = m;
1334 i = spell_find_dir (op->map, op->x, op->y, get_owner (op)); 1303 i = spell_find_dir (op->map, op->x, op->y, op->owner);
1335 if (i > 0 && i != op->direction) 1304 if (i > 0 && i != op->direction)
1336 { 1305 {
1337 op->direction = i; 1306 op->direction = i;
1338 SET_ANIMATION (op, op->direction); 1307 SET_ANIMATION (op, op->direction);
1339 } 1308 }
1309
1340 insert_ob_in_map (op, op->map, op, 0); 1310 insert_ob_in_map (op, op->map, op, 0);
1341} 1311}
1342 1312
1343/**************************************************************************** 1313/****************************************************************************
1344 * Destruction 1314 * Destruction
… …
1390int 1360int
1391cast_destruction (object *op, object *caster, object *spell_ob) 1361cast_destruction (object *op, object *caster, object *spell_ob)
1392{ 1362{
1393 int i, j, range, mflags, friendly = 0, dam, dur; 1363 int i, j, range, mflags, friendly = 0, dam, dur;
1394 sint16 sx, sy; 1364 sint16 sx, sy;
1395 mapstruct *m; 1365 maptile *m;
1396 object *tmp; 1366 object *tmp;
1397 const char *skill; 1367 const char *skill;
1398 1368
1399 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob); 1369 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
1400 dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 1370 dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
… …
1428 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy); 1398 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
1429 if (mflags & P_OUT_OF_MAP) 1399 if (mflags & P_OUT_OF_MAP)
1430 continue; 1400 continue;
1431 if (mflags & P_IS_ALIVE) 1401 if (mflags & P_IS_ALIVE)
1432 { 1402 {
1433 for (tmp = get_map_ob (m, sx, sy); tmp; tmp = tmp->above) 1403 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)
1434 { 1404 {
1435 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER) 1405 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER)
1436 break; 1406 break;
1437 } 1407 }
1438 if (tmp) 1408 if (tmp)
… …
1561 force->stats.ac = spell_ob->stats.ac; 1531 force->stats.ac = spell_ob->stats.ac;
1562 force->stats.wc = spell_ob->stats.wc; 1532 force->stats.wc = spell_ob->stats.wc;
1563 1533
1564 change_abil (tmp, force); /* Mostly to display any messages */ 1534 change_abil (tmp, force); /* Mostly to display any messages */
1565 insert_ob_in_ob (force, tmp); 1535 insert_ob_in_ob (force, tmp);
1566 fix_player (tmp); 1536 tmp->update_stats ();
1567 return 1; 1537 return 1;
1568 1538
1569} 1539}
1570 1540
1571 1541
… …
1582mood_change (object *op, object *caster, object *spell) 1552mood_change (object *op, object *caster, object *spell)
1583{ 1553{
1584 object *tmp, *god, *head; 1554 object *tmp, *god, *head;
1585 int done_one, range, mflags, level, at, best_at; 1555 int done_one, range, mflags, level, at, best_at;
1586 sint16 x, y, nx, ny; 1556 sint16 x, y, nx, ny;
1587 mapstruct *m; 1557 maptile *m;
1588 const char *race; 1558 const char *race;
1589 1559
1590 /* We precompute some values here so that we don't have to keep 1560 /* We precompute some values here so that we don't have to keep
1591 * doing it over and over again. 1561 * doing it over and over again.
1592 */ 1562 */
… …
1622 1592
1623 /* If there is nothing living on this space, no need to go further */ 1593 /* If there is nothing living on this space, no need to go further */
1624 if (!(mflags & P_IS_ALIVE)) 1594 if (!(mflags & P_IS_ALIVE))
1625 continue; 1595 continue;
1626 1596
1627 for (tmp = get_map_ob (m, nx, ny); tmp; tmp = tmp->above) 1597 for (tmp = GET_MAP_OB (m, nx, ny); tmp; tmp = tmp->above)
1628 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 1598 if (QUERY_FLAG (tmp, FLAG_MONSTER))
1629 break; 1599 break;
1630 1600
1631 /* There can be living objects that are not monsters */ 1601 /* There can be living objects that are not monsters */
1632 if (!tmp || tmp->type == PLAYER) 1602 if (!tmp || tmp->type == PLAYER)
… …
1720 SET_FLAG (head, FLAG_FRIENDLY); 1690 SET_FLAG (head, FLAG_FRIENDLY);
1721 /* Prevent uncontolled outbreaks of self replicating monsters. 1691 /* Prevent uncontolled outbreaks of self replicating monsters.
1722 Typical use case is charm, go somwhere, use aggravation to make hostile. 1692 Typical use case is charm, go somwhere, use aggravation to make hostile.
1723 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */ 1693 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1724 CLEAR_FLAG (head, FLAG_GENERATOR); 1694 CLEAR_FLAG (head, FLAG_GENERATOR);
1725 set_owner (head, op); 1695 head->set_owner (op);
1726 set_spell_skill (op, caster, spell, head); 1696 set_spell_skill (op, caster, spell, head);
1727 add_friendly_object (head); 1697 add_friendly_object (head);
1728 head->attack_movement = PETMOVE; 1698 head->attack_movement = PETMOVE;
1729 done_one = 1; 1699 done_one = 1;
1730 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL); 1700 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL);
… …
1756move_ball_spell (object *op) 1726move_ball_spell (object *op)
1757{ 1727{
1758 int i, j, dam_save, dir, mflags; 1728 int i, j, dam_save, dir, mflags;
1759 sint16 nx, ny, hx, hy; 1729 sint16 nx, ny, hx, hy;
1760 object *owner; 1730 object *owner;
1761 mapstruct *m; 1731 maptile *m;
1762 1732
1763 owner = get_owner (op); 1733 owner = op->owner;
1764 1734
1765 /* the following logic makes sure that the ball doesn't move into a wall, 1735 /* the following logic makes sure that the ball doesn't move into a wall,
1766 * and makes sure that it will move along a wall to try and get at it's 1736 * and makes sure that it will move along a wall to try and get at it's
1767 * victim. The block immediately below more or less chooses a random 1737 * victim. The block immediately below more or less chooses a random
1768 * offset to move the ball, eg, keep it mostly on course, with some 1738 * offset to move the ball, eg, keep it mostly on course, with some
… …
1797 nx = op->x; 1767 nx = op->x;
1798 ny = op->y; 1768 ny = op->y;
1799 m = op->map; 1769 m = op->map;
1800 } 1770 }
1801 1771
1802 remove_ob (op); 1772 op->remove ();
1803 op->y = ny; 1773 op->y = ny;
1804 op->x = nx; 1774 op->x = nx;
1805 insert_ob_in_map (op, m, op, 0); 1775 insert_ob_in_map (op, m, op, 0);
1806 1776
1807 dam_save = op->stats.dam; /* save the original dam: we do halfdam on 1777 dam_save = op->stats.dam; /* save the original dam: we do halfdam on
… …
1847 } 1817 }
1848 1818
1849 /* restore to the center location and damage */ 1819 /* restore to the center location and damage */
1850 op->stats.dam = dam_save; 1820 op->stats.dam = dam_save;
1851 1821
1852 i = spell_find_dir (op->map, op->x, op->y, get_owner (op)); 1822 i = spell_find_dir (op->map, op->x, op->y, op->owner);
1853 1823
1854 if (i >= 0) 1824 if (i >= 0)
1855 { /* we have a preferred direction! */ 1825 { /* we have a preferred direction! */
1856 /* pick another direction if the preferred dir is blocked. */ 1826 /* pick another direction if the preferred dir is blocked. */
1857 if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP || 1827 if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP ||
… …
1878#if 0 1848#if 0
1879 static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 }; 1849 static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 };
1880 static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 }; 1850 static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 };
1881 sint16 target_x, target_y, origin_x, origin_y; 1851 sint16 target_x, target_y, origin_x, origin_y;
1882 int adjustdir; 1852 int adjustdir;
1883 mapstruct *m; 1853 maptile *m;
1884#endif 1854#endif
1885 int basedir; 1855 int basedir;
1886 object *owner; 1856 object *owner;
1887 1857
1888 owner = get_owner (op); 1858 owner = op->owner;
1889 if (op->duration == 0 || owner == NULL) 1859 if (op->duration == 0 || owner == NULL)
1890 { 1860 {
1891 remove_ob (op); 1861 op->destroy ();
1892 free_object (op);
1893 return; 1862 return;
1894 } 1863 }
1864
1895 op->duration--; 1865 op->duration--;
1896 1866
1897 basedir = op->direction; 1867 basedir = op->direction;
1898 if (basedir == 0) 1868 if (basedir == 0)
1899 { 1869 {
… …
1998 return 0; 1968 return 0;
1999 1969
2000 tmp = get_archetype (SWARM_SPELL); 1970 tmp = get_archetype (SWARM_SPELL);
2001 tmp->x = op->x; 1971 tmp->x = op->x;
2002 tmp->y = op->y; 1972 tmp->y = op->y;
2003 set_owner (tmp, op); /* needed so that if swarm elements kill, caster gets xp. */ 1973 tmp->set_owner (op); /* needed so that if swarm elements kill, caster gets xp. */
2004 set_spell_skill (op, caster, spell, tmp); 1974 set_spell_skill (op, caster, spell, tmp);
2005 1975
2006 tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */ 1976 tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */
2007 tmp->spell = arch_to_object (spell->other_arch); 1977 tmp->spell = arch_to_object (spell->other_arch);
2008 1978
… …
2031cast_light (object *op, object *caster, object *spell, int dir) 2001cast_light (object *op, object *caster, object *spell, int dir)
2032{ 2002{
2033 object *target = NULL, *tmp = NULL; 2003 object *target = NULL, *tmp = NULL;
2034 sint16 x, y; 2004 sint16 x, y;
2035 int dam, mflags; 2005 int dam, mflags;
2036 mapstruct *m; 2006 maptile *m;
2037 2007
2038 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 2008 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
2039 2009
2040 if (!dir) 2010 if (!dir)
2041 { 2011 {
… …
2055 return 0; 2025 return 0;
2056 } 2026 }
2057 2027
2058 if (mflags & P_IS_ALIVE && spell->attacktype) 2028 if (mflags & P_IS_ALIVE && spell->attacktype)
2059 { 2029 {
2060 for (target = get_map_ob (m, x, y); target; target = target->above) 2030 for (target = GET_MAP_OB (m, x, y); target; target = target->above)
2061 if (QUERY_FLAG (target, FLAG_MONSTER)) 2031 if (QUERY_FLAG (target, FLAG_MONSTER))
2062 { 2032 {
2063 /* oky doky. got a target monster. Lets make a blinding attack */ 2033 /* oky doky. got a target monster. Lets make a blinding attack */
2064 if (target->head) 2034 if (target->head)
2065 target = target->head; 2035 target = target->head;
… …
2109cast_cause_disease (object *op, object *caster, object *spell, int dir) 2079cast_cause_disease (object *op, object *caster, object *spell, int dir)
2110{ 2080{
2111 sint16 x, y; 2081 sint16 x, y;
2112 int i, mflags, range, dam_mod, dur_mod; 2082 int i, mflags, range, dam_mod, dur_mod;
2113 object *walk; 2083 object *walk;
2114 mapstruct *m; 2084 maptile *m;
2115 2085
2116 x = op->x; 2086 x = op->x;
2117 y = op->y; 2087 y = op->y;
2118 2088
2119 /* If casting from a scroll, no direction will be available, so refer to the 2089 /* If casting from a scroll, no direction will be available, so refer to the
… …
2147 2117
2148 /* Only bother looking on this space if there is something living here */ 2118 /* Only bother looking on this space if there is something living here */
2149 if (mflags & P_IS_ALIVE) 2119 if (mflags & P_IS_ALIVE)
2150 { 2120 {
2151 /* search this square for a victim */ 2121 /* search this square for a victim */
2152 for (walk = get_map_ob (m, x, y); walk; walk = walk->above) 2122 for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above)
2153 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER)) 2123 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER))
2154 { /* found a victim */ 2124 { /* found a victim */
2155 object *disease = arch_to_object (spell->other_arch); 2125 object *disease = arch_to_object (spell->other_arch);
2156 2126
2157 set_owner (disease, op); 2127 disease->set_owner (op);
2158 set_spell_skill (op, caster, spell, disease); 2128 set_spell_skill (op, caster, spell, disease);
2159 disease->stats.exp = 0; 2129 disease->stats.exp = 0;
2160 disease->level = caster_level (caster, spell); 2130 disease->level = caster_level (caster, spell);
2161 2131
2162 /* do level adjustments */ 2132 /* do level adjustments */
… …
2211 { 2181 {
2212 object *flash; /* visual effect for inflicting disease */ 2182 object *flash; /* visual effect for inflicting disease */
2213 2183
2214 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name); 2184 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
2215 2185
2216 free_object (disease); /* don't need this one anymore */ 2186 disease->destroy (); /* don't need this one anymore */
2217 flash = get_archetype (ARCH_DETECT_MAGIC); 2187 flash = get_archetype (ARCH_DETECT_MAGIC);
2218 flash->x = x; 2188 flash->x = x;
2219 flash->y = y; 2189 flash->y = y;
2220 flash->map = walk->map; 2190 flash->map = walk->map;
2221 insert_ob_in_map (flash, walk->map, op, 0); 2191 insert_ob_in_map (flash, walk->map, op, 0);
2222 return 1; 2192 return 1;
2223 } 2193 }
2224 free_object (disease); 2194
2195 disease->destroy ();
2225 } 2196 }
2226 } /* if living creature */ 2197 } /* if living creature */
2227 } /* for range of spaces */ 2198 } /* for range of spaces */
2228 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!"); 2199 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!");
2229 return 1; 2200 return 1;

Diff Legend

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