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.17 by root, Tue Dec 12 21:39:57 2006 UTC vs.
Revision 1.29 by root, Mon Jan 29 16:11:48 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24/* This file contains all the spell attack code. Grouping this code 25/* This file contains all the spell attack code. Grouping this code
25 * together should hopefully make it easier to find the relevent bits 26 * together should hopefully make it easier to find the relevent bits
26 * of code 27 * of code
27 */ 28 */
28 29
29#include <global.h> 30#include <global.h>
30#include <object.h> 31#include <object.h>
31#include <living.h> 32#include <living.h>
32#ifndef __CEXTRACT__
33# include <sproto.h> 33#include <sproto.h>
34#endif
35#include <spells.h> 34#include <spells.h>
36#include <sounds.h> 35#include <sounds.h>
37 36
38/* this function checks to see if a spell pushes objects as well 37/* this function checks to see if a spell pushes objects as well
39 * as flies over and damages them (only used for cones for now) 38 * as flies over and damages them (only used for cones for now)
… …
57 { 56 {
58 weight_move = op->weight + (op->weight * op->level) / 3; 57 weight_move = op->weight + (op->weight * op->level) / 3;
59 /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */ 58 /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */
60 } 59 }
61 60
62 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 61 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
63 { 62 {
64 int num_sections = 1; 63 int num_sections = 1;
65 64
66 /* don't move DM */ 65 /* don't move DM */
67 if (QUERY_FLAG (tmp, FLAG_WIZ)) 66 if (QUERY_FLAG (tmp, FLAG_WIZ))
… …
140 139
141 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, sx, sy))) 140 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, sx, sy)))
142 return; 141 return;
143 142
144 /* OK, we made a fork */ 143 /* OK, we made a fork */
145 new_bolt = object::create (); 144 new_bolt = tmp->clone ();
146 tmp->copy_to (new_bolt);
147 145
148 /* reduce chances of subsequent forking */ 146 /* reduce chances of subsequent forking */
149 new_bolt->stats.Dex -= 10; 147 new_bolt->stats.Dex -= 10;
150 tmp->stats.Dex -= 10; /* less forks from main bolt too */ 148 tmp->stats.Dex -= 10; /* less forks from main bolt too */
151 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */ 149 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */
152 new_bolt->speed_left = -0.1; 150 new_bolt->speed_left = -0.1;
153 new_bolt->direction = t_dir; 151 new_bolt->direction = t_dir;
154 new_bolt->duration++; 152 new_bolt->duration++;
155 new_bolt->x = sx;
156 new_bolt->y = sy;
157 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */ 153 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */
158 new_bolt->stats.dam++; 154 new_bolt->stats.dam++;
159 tmp->stats.dam /= 2; /* reduce father bolt damage */ 155 tmp->stats.dam /= 2; /* reduce father bolt damage */
160 tmp->stats.dam++; 156 tmp->stats.dam++;
161 new_bolt = insert_ob_in_map (new_bolt, m, op, 0); 157 if ((new_bolt = m->insert (new_bolt, sx, sy, op)))
162 update_turn_face (new_bolt); 158 update_turn_face (new_bolt);
163} 159}
164 160
165/* move_bolt: moves bolt 'op'. Basically, it just advances a space, 161/* move_bolt: moves bolt 'op'. Basically, it just advances a space,
166 * and checks for various things that may stop it. 162 * and checks for various things that may stop it.
167 */ 163 */
… …
172 object *tmp; 168 object *tmp;
173 int mflags; 169 int mflags;
174 sint16 x, y; 170 sint16 x, y;
175 maptile *m; 171 maptile *m;
176 172
177 if (--(op->duration) < 0) 173 if (--op->duration < 0)
178 { 174 {
179 op->destroy (); 175 op->destroy ();
180 return; 176 return;
181 } 177 }
182 178
… …
184 180
185 if (!op->direction) 181 if (!op->direction)
186 return; 182 return;
187 183
188 if (--op->range < 0) 184 if (--op->range < 0)
189 {
190 op->range = 0; 185 op->range = 0;
191 }
192 else 186 else
193 { 187 {
194 x = op->x + DIRX (op); 188 x = op->x + DIRX (op);
195 y = op->y + DIRY (op); 189 y = op->y + DIRY (op);
196 m = op->map; 190 m = op->map;
… …
204 * on the space. So only call reflwall if we think the data it returns 198 * on the space. So only call reflwall if we think the data it returns
205 * will be useful. 199 * will be useful.
206 */ 200 */
207 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op))) 201 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op)))
208 { 202 {
209
210 if (!QUERY_FLAG (op, FLAG_REFLECTING)) 203 if (!QUERY_FLAG (op, FLAG_REFLECTING))
211 return; 204 return;
212 205
213 /* Since walls don't run diagonal, if the bolt is in 206 /* Since walls don't run diagonal, if the bolt is in
214 * one of 4 main directions, it just reflects back in the 207 * one of 4 main directions, it just reflects back in the
… …
244 else if (left) 237 else if (left)
245 op->direction = absdir (op->direction + 2); 238 op->direction = absdir (op->direction + 2);
246 else if (right) 239 else if (right)
247 op->direction = absdir (op->direction - 2); 240 op->direction = absdir (op->direction - 2);
248 } 241 }
242
249 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */ 243 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */
250 return; 244 return;
251 } 245 }
252 else 246 else
253 { /* Create a copy of this object and put it ahead */ 247 { /* Create a copy of this object and put it ahead */
254 tmp = object::create (); 248 object *tmp = op->clone ();
255 op->copy_to (tmp); 249
250 m->insert (tmp, x, y, op);
256 tmp->speed_left = -0.1; 251 tmp->speed_left = -0.1;
257 tmp->x += DIRX (tmp), tmp->y += DIRY (tmp);
258 tmp = insert_ob_in_map (tmp, op->map, op, 0);
259 /* To make up for the decrease at the top of the function */ 252 /* To make up for the decrease at the top of the function */
260 tmp->duration++; 253 tmp->duration++;
261 254
262 /* New forking code. Possibly create forks of this object 255 /* New forking code. Possibly create forks of this object
263 * going off in other directions. 256 * going off in other directions.
264 */ 257 */
265
266 if (rndm (0, 99) < tmp->stats.Dex) 258 if (rndm (0, 99) < tmp->stats.Dex)
267 { /* stats.Dex % of forking */ 259 { /* stats.Dex % of forking */
268 forklightning (op, tmp); 260 forklightning (op, tmp);
269 } 261 }
262
270 /* In this way, the object left behind sticks on the space, but 263 /* In this way, the object left behind sticks on the space, but
271 * doesn't create any bolts that continue to move onward. 264 * doesn't create any bolts that continue to move onward.
272 */ 265 */
273 op->range = 0; 266 op->range = 0;
274 } /* copy object and move it along */ 267 } /* copy object and move it along */
… …
281 * we remove the magic flag - that can be derived from 274 * we remove the magic flag - that can be derived from
282 * spob->attacktype. 275 * spob->attacktype.
283 * This function sets up the appropriate owner and skill 276 * This function sets up the appropriate owner and skill
284 * pointers. 277 * pointers.
285 */ 278 */
286
287int 279int
288fire_bolt (object *op, object *caster, int dir, object *spob, object *skill) 280fire_bolt (object *op, object *caster, int dir, object *spob, object *skill)
289{ 281{
290 object *tmp = NULL; 282 object *tmp = NULL;
291 int mflags; 283 int mflags;
… …
309 301
310 tmp->direction = dir; 302 tmp->direction = dir;
311 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 303 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
312 SET_ANIMATION (tmp, dir); 304 SET_ANIMATION (tmp, dir);
313 305
314 set_owner (tmp, op); 306 tmp->set_owner (op);
315 set_spell_skill (op, caster, spob, tmp); 307 set_spell_skill (op, caster, spob, tmp);
316 308
317 tmp->x = op->x + DIRX (tmp); 309 tmp->x = op->x + DIRX (tmp);
318 tmp->y = op->y + DIRY (tmp); 310 tmp->y = op->y + DIRY (tmp);
319 tmp->map = op->map; 311 tmp->map = op->map;
320 312
313 maptile *newmap;
321 mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y); 314 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
322 if (mflags & P_OUT_OF_MAP) 315 if (mflags & P_OUT_OF_MAP)
323 { 316 {
324 tmp->destroy (); 317 tmp->destroy ();
325 return 0; 318 return 0;
326 } 319 }
320
321 tmp->map = newmap;
327 322
328 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 323 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
329 { 324 {
330 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 325 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
331 { 326 {
… …
337 tmp->y = op->y; 332 tmp->y = op->y;
338 tmp->direction = absdir (tmp->direction + 4); 333 tmp->direction = absdir (tmp->direction + 4);
339 tmp->map = op->map; 334 tmp->map = op->map;
340 } 335 }
341 336
342 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL) 337 if ((tmp = tmp->insert_at (tmp, op)))
343 move_bolt (tmp); 338 move_bolt (tmp);
344 339
345 return 1; 340 return 1;
346} 341}
347 342
… …
358 * At least that is what I think this does. 353 * At least that is what I think this does.
359 */ 354 */
360void 355void
361explosion (object *op) 356explosion (object *op)
362{ 357{
363 object *tmp;
364 maptile *m = op->map; 358 maptile *m = op->map;
365 int i; 359 int i;
366 360
367 if (--(op->duration) < 0) 361 if (--op->duration < 0)
368 { 362 {
369 op->destroy (); 363 op->destroy ();
370 return; 364 return;
371 } 365 }
372 366
… …
378 { 372 {
379 sint16 dx, dy; 373 sint16 dx, dy;
380 374
381 dx = op->x + freearr_x[i]; 375 dx = op->x + freearr_x[i];
382 dy = op->y + freearr_y[i]; 376 dy = op->y + freearr_y[i];
377
383 /* ok_to_put_more already does things like checks for walls, 378 /* ok_to_put_more already does things like checks for walls,
384 * out of map, etc. 379 * out of map, etc.
385 */ 380 */
386 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype)) 381 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype))
387 { 382 {
388 tmp = object::create (); 383 object *tmp = op->clone ();
389 op->copy_to (tmp); 384
390 tmp->state = 0; 385 tmp->state = 0;
391 tmp->speed_left = -0.21; 386 tmp->speed_left = -0.21;
392 tmp->range--; 387 tmp->range--;
393 tmp->value = 0; 388 tmp->value = 0;
394 tmp->x = dx; 389
395 tmp->y = dy; 390 m->insert (tmp, dx, dy, op);
396 insert_ob_in_map (tmp, m, op, 0);
397 } 391 }
398 } 392 }
399 } 393 }
400} 394}
401 395
… …
416 return; 410 return;
417 } 411 }
418 412
419 if (op->env) 413 if (op->env)
420 { 414 {
421 object *env;
422
423 env = object_get_env_recursive (op); 415 object *env = object_get_env_recursive (op);
424 if (env->map == NULL || out_of_map (env->map, env->x, env->y)) 416 if (env->map == NULL || out_of_map (env->map, env->x, env->y))
425 { 417 {
426 LOG (llevError, "BUG: explode_bullet(): env out of map\n"); 418 LOG (llevError, "BUG: explode_bullet(): env out of map\n");
427 op->destroy (); 419 op->destroy ();
428 return; 420 return;
429 } 421 }
430 422
431 op->remove (); 423 op->insert_at (env, op, INS_NO_MERGE | INS_NO_WALK_ON);
432 op->x = env->x;
433 op->y = env->y;
434 insert_ob_in_map (op, env->map, op, INS_NO_MERGE | INS_NO_WALK_ON);
435 } 424 }
436 else if (out_of_map (op->map, op->x, op->y)) 425 else if (out_of_map (op->map, op->x, op->y))
437 { 426 {
438 LOG (llevError, "BUG: explode_bullet(): op out of map\n"); 427 LOG (llevError, "BUG: explode_bullet(): op out of map\n");
439 op->destroy (); 428 op->destroy ();
… …
457 } 446 }
458 447
459 /* other_arch contains what this explodes into */ 448 /* other_arch contains what this explodes into */
460 tmp = arch_to_object (op->other_arch); 449 tmp = arch_to_object (op->other_arch);
461 450
462 copy_owner (tmp, op); 451 tmp->set_owner (op);
463 tmp->skill = op->skill; 452 tmp->skill = op->skill;
464 453
465 owner = get_owner (op); 454 owner = op->owner;
466 455
467 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner)) 456 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner))
468 { 457 {
469 op->destroy (); 458 op->destroy ();
470 return; 459 return;
471 } 460 }
472
473 tmp->x = op->x;
474 tmp->y = op->y;
475 461
476 /* special for bombs - it actually has sane values for these */ 462 /* special for bombs - it actually has sane values for these */
477 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB) 463 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB)
478 { 464 {
479 tmp->attacktype = op->attacktype; 465 tmp->attacktype = op->attacktype;
… …
483 } 469 }
484 else 470 else
485 { 471 {
486 if (op->attacktype & AT_MAGIC) 472 if (op->attacktype & AT_MAGIC)
487 tmp->attacktype |= AT_MAGIC; 473 tmp->attacktype |= AT_MAGIC;
474
488 /* Spell doc describes what is going on here */ 475 /* Spell doc describes what is going on here */
489 tmp->stats.dam = op->dam_modifier; 476 tmp->stats.dam = op->dam_modifier;
490 tmp->range = op->stats.maxhp; 477 tmp->range = op->stats.maxhp;
491 tmp->duration = op->stats.hp; 478 tmp->duration = op->stats.hp;
492 /* Used for spell tracking - just need a unique val for this spell - 479 /* Used for spell tracking - just need a unique val for this spell -
… …
500 tmp->stats.sp = op->direction; 487 tmp->stats.sp = op->direction;
501 488
502 /* Prevent recursion */ 489 /* Prevent recursion */
503 op->move_on = 0; 490 op->move_on = 0;
504 491
505 insert_ob_in_map (tmp, op->map, op, 0); 492 tmp->insert_at (op, op);
506 /* remove the firebullet */ 493 /* remove the firebullet */
507 if (!op->destroyed ())
508 {
509 op->destroy (); 494 op->destroy ();
510 }
511} 495}
512
513
514 496
515/* checks to see what op should do, given the space it is on 497/* checks to see what op should do, given the space it is on
516 * (eg, explode, damage player, etc) 498 * (eg, explode, damage player, etc)
517 */ 499 */
518
519void 500void
520check_bullet (object *op) 501check_bullet (object *op)
521{ 502{
522 object *tmp; 503 object *tmp;
523 int dam, mflags; 504 int dam, mflags;
… …
538 519
539 /* If nothing alive on this space, no reason to do anything further */ 520 /* If nothing alive on this space, no reason to do anything further */
540 if (!(mflags & P_IS_ALIVE)) 521 if (!(mflags & P_IS_ALIVE))
541 return; 522 return;
542 523
543 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 524 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
544 { 525 {
545 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 526 if (QUERY_FLAG (tmp, FLAG_ALIVE))
546 { 527 {
547 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 528 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
548 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0) 529 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
… …
555 } 536 }
556 } 537 }
557 } 538 }
558} 539}
559 540
560
561/* Basically, we move 'op' one square, and if it hits something, 541/* Basically, we move 'op' one square, and if it hits something,
562 * call check_bullet. 542 * call check_bullet.
563 * This function is only applicable to bullets, but not to all 543 * This function is only applicable to bullets, but not to all
564 * fired arches (eg, bolts). 544 * fired arches (eg, bolts).
565 */ 545 */
566
567void 546void
568move_bullet (object *op) 547move_bullet (object *op)
569{ 548{
570 sint16 new_x, new_y; 549 sint16 new_x, new_y;
571 int mflags; 550 int mflags;
… …
614 op->destroy (); 593 op->destroy ();
615 594
616 return; 595 return;
617 } 596 }
618 597
619 op->remove (); 598 if (!(op = m->insert (op, new_x, new_y, op)))
620 op->x = new_x;
621 op->y = new_y;
622 if ((op = insert_ob_in_map (op, m, op, 0)) == NULL)
623 return; 599 return;
624 600
625 if (reflwall (op->map, op->x, op->y, op)) 601 if (reflwall (op->map, op->x, op->y, op))
626 { 602 {
627 op->direction = absdir (op->direction + 4); 603 op->direction = absdir (op->direction + 4);
628 update_turn_face (op); 604 update_turn_face (op);
629 } 605 }
630 else 606 else
631 {
632 check_bullet (op); 607 check_bullet (op);
633 }
634} 608}
635 609
636 610
637 611
638 612
… …
673 647
674 tmp->direction = dir; 648 tmp->direction = dir;
675 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 649 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
676 SET_ANIMATION (tmp, dir); 650 SET_ANIMATION (tmp, dir);
677 651
678 set_owner (tmp, op); 652 tmp->set_owner (op);
679 set_spell_skill (op, caster, spob, tmp); 653 set_spell_skill (op, caster, spob, tmp);
680 654
681 tmp->x = op->x + freearr_x[dir]; 655 tmp->x = op->x + freearr_x[dir];
682 tmp->y = op->y + freearr_y[dir]; 656 tmp->y = op->y + freearr_y[dir];
683 tmp->map = op->map; 657 tmp->map = op->map;
684 658
659 maptile *newmap;
685 mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y); 660 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
686 if (mflags & P_OUT_OF_MAP) 661 if (mflags & P_OUT_OF_MAP)
687 { 662 {
688 tmp->destroy (); 663 tmp->destroy ();
689 return 0; 664 return 0;
690 } 665 }
666
667 tmp->map = newmap;
691 668
692 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 669 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
693 { 670 {
694 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 671 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
695 { 672 {
… …
701 tmp->y = op->y; 678 tmp->y = op->y;
702 tmp->direction = absdir (tmp->direction + 4); 679 tmp->direction = absdir (tmp->direction + 4);
703 tmp->map = op->map; 680 tmp->map = op->map;
704 } 681 }
705 682
706 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL) 683 if ((tmp = tmp->insert_at (tmp, op)))
707 check_bullet (tmp); 684 check_bullet (tmp);
708 685
709 return 1; 686 return 1;
710} 687}
711 688
… …
723void 700void
724cone_drop (object *op) 701cone_drop (object *op)
725{ 702{
726 object *new_ob = arch_to_object (op->other_arch); 703 object *new_ob = arch_to_object (op->other_arch);
727 704
728 new_ob->x = op->x;
729 new_ob->y = op->y;
730 new_ob->level = op->level; 705 new_ob->level = op->level;
731 set_owner (new_ob, op->owner); 706 new_ob->set_owner (op->owner);
732 707
733 /* preserve skill ownership */ 708 /* preserve skill ownership */
734 if (op->skill && op->skill != new_ob->skill) 709 if (op->skill && op->skill != new_ob->skill)
735 {
736 new_ob->skill = op->skill; 710 new_ob->skill = op->skill;
737 }
738 insert_ob_in_map (new_ob, op->map, op, 0);
739 711
712 new_ob->insert_at (op, op);
740} 713}
741 714
742/* move_cone: causes cone object 'op' to move a space/hit creatures */ 715/* move_cone: causes cone object 'op' to move a space/hit creatures */
743 716
744void 717void
… …
748 721
749 /* if no map then hit_map will crash so just ignore object */ 722 /* if no map then hit_map will crash so just ignore object */
750 if (!op->map) 723 if (!op->map)
751 { 724 {
752 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown"); 725 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown");
753 op->speed = 0; 726 op->set_speed (0);
754 update_ob_speed (op);
755 return; 727 return;
756 } 728 }
757 729
758 /* lava saves it's life, but not yours :) */ 730 /* lava saves it's life, but not yours :) */
759 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 731 if (QUERY_FLAG (op, FLAG_LIFESAVE))
… …
765#if 0 737#if 0
766 /* Disable this - enabling it makes monsters easier, as 738 /* Disable this - enabling it makes monsters easier, as
767 * when their cone dies when they die. 739 * when their cone dies when they die.
768 */ 740 */
769 /* If no owner left, the spell dies out. */ 741 /* If no owner left, the spell dies out. */
770 if (get_owner (op) == NULL) 742 if (op->owner == NULL)
771 { 743 {
772 op->destroy (); 744 op->destroy ();
773 return; 745 return;
774 } 746 }
775#endif 747#endif
… …
805 { 777 {
806 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)]; 778 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)];
807 779
808 if (ok_to_put_more (op->map, x, y, op, op->attacktype)) 780 if (ok_to_put_more (op->map, x, y, op, op->attacktype))
809 { 781 {
810 object *tmp = object::create (); 782 object *tmp = op->clone ();
811
812 op->copy_to (tmp);
813 tmp->x = x;
814 tmp->y = y;
815 783
816 tmp->duration = op->duration + 1; 784 tmp->duration = op->duration + 1;
817 785
818 /* Use for spell tracking - see ok_to_put_more() */ 786 /* Use for spell tracking - see ok_to_put_more() */
819 tmp->stats.maxhp = op->stats.maxhp; 787 tmp->stats.maxhp = op->stats.maxhp;
820 insert_ob_in_map (tmp, op->map, op, 0); 788
789 op->map->insert (tmp, x, y, op);
790
821 if (tmp->other_arch) 791 if (tmp->other_arch)
822 cone_drop (tmp); 792 cone_drop (tmp);
823 } 793 }
824 } 794 }
825} 795}
… …
901 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype) 871 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype)
902 continue; 872 continue;
903 873
904 success = 1; 874 success = 1;
905 tmp = arch_to_object (spell->other_arch); 875 tmp = arch_to_object (spell->other_arch);
906 set_owner (tmp, op); 876 tmp->set_owner (op);
907 set_spell_skill (op, caster, spell, tmp); 877 set_spell_skill (op, caster, spell, tmp);
908 tmp->level = caster_level (caster, spell); 878 tmp->level = caster_level (caster, spell);
909 tmp->x = sx;
910 tmp->y = sy;
911 tmp->attacktype = spell->attacktype; 879 tmp->attacktype = spell->attacktype;
912 880
913 /* holy word stuff */ 881 /* holy word stuff */
914 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) 882 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER))
915 if (!tailor_god_spell (tmp, op)) 883 if (!tailor_god_spell (tmp, op))
… …
952 920
953 if (!(tmp->move_type & MOVE_FLY_LOW)) 921 if (!(tmp->move_type & MOVE_FLY_LOW))
954 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->name); 922 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->name);
955 923
956 if (!tmp->move_on && tmp->stats.dam) 924 if (!tmp->move_on && tmp->stats.dam)
957 {
958 LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->name); 925 LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->name);
959 }
960 926
961 insert_ob_in_map (tmp, m, op, 0); 927 m->insert (tmp, sx, sy, op);
962 928
963 /* This is used for tracking spells so that one effect doesn't hit 929 /* This is used for tracking spells so that one effect doesn't hit
964 * a single space too many times. 930 * a single space too many times.
965 */ 931 */
966 tmp->stats.maxhp = tmp->count; 932 tmp->stats.maxhp = tmp->count;
… …
985void 951void
986animate_bomb (object *op) 952animate_bomb (object *op)
987{ 953{
988 int i; 954 int i;
989 object *env, *tmp; 955 object *env, *tmp;
990 archetype *at;
991 956
992 if (op->state != NUM_ANIMATIONS (op) - 1) 957 if (op->state != NUM_ANIMATIONS (op) - 1)
993 return; 958 return;
994 959
995 env = object_get_env_recursive (op); 960 env = object_get_env_recursive (op);
… …
1000 return; 965 return;
1001 966
1002 if (env->type == PLAYER) 967 if (env->type == PLAYER)
1003 esrv_del_item (env->contr, op->count); 968 esrv_del_item (env->contr, op->count);
1004 969
1005 op->remove (); 970 if (!(op = op->insert_at (env, op)))
1006 op->x = env->x;
1007 op->y = env->y;
1008 if ((op = insert_ob_in_map (op, env->map, op, 0)) == NULL)
1009 return; 971 return;
1010 } 972 }
1011 973
1012 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding 974 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding
1013 // on a safe map. I don't like this special casing, but it seems to be neccessary 975 // on a safe map. I don't like this special casing, but it seems to be neccessary
… …
1020 982
1021 /* This copies a lot of the code from the fire bullet, 983 /* This copies a lot of the code from the fire bullet,
1022 * but using the cast_bullet isn't really feasible, 984 * but using the cast_bullet isn't really feasible,
1023 * so just set up the appropriate values. 985 * so just set up the appropriate values.
1024 */ 986 */
1025 at = archetype::find (SPLINT); 987 if (archetype *at = archetype::find (SPLINT))
1026 if (at)
1027 { 988 {
1028 for (i = 1; i < 9; i++) 989 for (i = 1; i < 9; i++)
1029 { 990 {
1030 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i])) 991 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i]))
1031 continue; 992 continue;
993
1032 tmp = arch_to_object (at); 994 tmp = arch_to_object (at);
1033 tmp->direction = i; 995 tmp->direction = i;
1034 tmp->range = op->range; 996 tmp->range = op->range;
1035 tmp->stats.dam = op->stats.dam; 997 tmp->stats.dam = op->stats.dam;
1036 tmp->duration = op->duration; 998 tmp->duration = op->duration;
1037 tmp->attacktype = op->attacktype; 999 tmp->attacktype = op->attacktype;
1038 copy_owner (tmp, op); 1000 tmp->set_owner (op);
1039 if (op->skill && op->skill != tmp->skill) 1001 if (op->skill && op->skill != tmp->skill)
1040 {
1041 tmp->skill = op->skill; 1002 tmp->skill = op->skill;
1042 } 1003
1043 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 1004 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
1044 SET_ANIMATION (tmp, i); 1005 SET_ANIMATION (tmp, i);
1045 tmp->x = op->x + freearr_x[i]; 1006
1046 tmp->y = op->y + freearr_x[i]; 1007 op->map->insert (tmp, op->x + freearr_x[i], op->y + freearr_x[i], op);
1047 insert_ob_in_map (tmp, op->map, op, 0);
1048 move_bullet (tmp); 1008 move_bullet (tmp);
1049 } 1009 }
1050 } 1010 }
1051 1011
1052 explode_bullet (op); 1012 explode_bullet (op);
… …
1073 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 1033 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
1074 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1034 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1075 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 1035 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
1076 tmp->attacktype = spell->attacktype; 1036 tmp->attacktype = spell->attacktype;
1077 1037
1078 set_owner (tmp, op); 1038 tmp->set_owner (op);
1079 set_spell_skill (op, caster, spell, tmp); 1039 set_spell_skill (op, caster, spell, tmp);
1080 tmp->x = dx; 1040
1081 tmp->y = dy; 1041 m->insert (tmp, dx, dy, op);
1082 insert_ob_in_map (tmp, m, op, 0);
1083 return 1; 1042 return 1;
1084} 1043}
1085 1044
1086/**************************************************************************** 1045/****************************************************************************
1087 * 1046 *
… …
1126 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW) 1085 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
1127 return NULL; 1086 return NULL;
1128 1087
1129 if (mflags & P_IS_ALIVE) 1088 if (mflags & P_IS_ALIVE)
1130 { 1089 {
1131 for (target = get_map_ob (mp, x, y); target; target = target->above) 1090 for (target = GET_MAP_OB (mp, x, y); target; target = target->above)
1132 { 1091 {
1133 if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER)) 1092 if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER))
1134 { 1093 {
1135 return target; 1094 return target;
1136 } 1095 }
… …
1203 if (effect->attacktype & AT_DEATH) 1162 if (effect->attacktype & AT_DEATH)
1204 { 1163 {
1205 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1164 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1206 1165
1207 /* casting death spells at undead isn't a good thing */ 1166 /* casting death spells at undead isn't a good thing */
1208 if QUERY_FLAG
1209 (target, FLAG_UNDEAD) 1167 if (QUERY_FLAG (target, FLAG_UNDEAD))
1210 { 1168 {
1211 if (random_roll (0, 2, op, PREFER_LOW)) 1169 if (random_roll (0, 2, op, PREFER_LOW))
1212 { 1170 {
1213 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!"); 1171 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");
1214 effect->x = op->x; 1172 effect->x = op->x;
… …
1227 { 1185 {
1228 /* how much woe to inflict :) */ 1186 /* how much woe to inflict :) */
1229 effect->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1187 effect->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1230 } 1188 }
1231 1189
1232 set_owner (effect, op); 1190 effect->set_owner (op);
1233 set_spell_skill (op, caster, spell, effect); 1191 set_spell_skill (op, caster, spell, effect);
1234 1192
1235 /* ok, tell it where to be, and insert! */ 1193 /* ok, tell it where to be, and insert! */
1236 effect->x = target->x; 1194 effect->insert_at (target, op);
1237 effect->y = target->y;
1238 insert_ob_in_map (effect, target->map, op, 0);
1239 1195
1240 return 1; 1196 return 1;
1241} 1197}
1242 1198
1243 1199
… …
1261 { 1217 {
1262 op->destroy (); 1218 op->destroy ();
1263 return; 1219 return;
1264 } 1220 }
1265 1221
1266 owner = get_owner (op); 1222 owner = op->owner;
1267#if 0 1223#if 0
1268 /* It'd make things nastier if this wasn't here - spells cast by 1224 /* It'd make things nastier if this wasn't here - spells cast by
1269 * monster that are then killed would continue to survive 1225 * monster that are then killed would continue to survive
1270 */ 1226 */
1271 if (owner == NULL) 1227 if (owner == NULL)
… …
1298 { 1254 {
1299 op->destroy (); 1255 op->destroy ();
1300 return; 1256 return;
1301 } 1257 }
1302 1258
1303 op->x = new_x; 1259 i = spell_find_dir (m, new_x, new_y, op->owner);
1304 op->y = new_y;
1305 op->map = m;
1306 i = spell_find_dir (op->map, op->x, op->y, get_owner (op));
1307 if (i > 0 && i != op->direction) 1260 if (i > 0 && i != op->direction)
1308 { 1261 {
1309 op->direction = i; 1262 op->direction = i;
1310 SET_ANIMATION (op, op->direction); 1263 SET_ANIMATION (op, op->direction);
1311 } 1264 }
1312 1265
1313 insert_ob_in_map (op, op->map, op, 0); 1266 m->insert (op, new_x, new_y, op);
1314} 1267}
1315 1268
1316/**************************************************************************** 1269/****************************************************************************
1317 * Destruction 1270 * Destruction
1318 ****************************************************************************/ 1271 ****************************************************************************/
… …
1396 for (j = -range; j < range; j++) 1349 for (j = -range; j < range; j++)
1397 { 1350 {
1398 m = op->map; 1351 m = op->map;
1399 sx = op->x + i; 1352 sx = op->x + i;
1400 sy = op->y + j; 1353 sy = op->y + j;
1354
1401 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy); 1355 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
1402 if (mflags & P_OUT_OF_MAP) 1356 if (mflags & P_OUT_OF_MAP)
1403 continue; 1357 continue;
1358
1404 if (mflags & P_IS_ALIVE) 1359 if (mflags & P_IS_ALIVE)
1405 { 1360 {
1406 for (tmp = get_map_ob (m, sx, sy); tmp; tmp = tmp->above) 1361 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)
1407 {
1408 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER) 1362 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER)
1409 break; 1363 break;
1410 } 1364
1411 if (tmp) 1365 if (tmp)
1412 { 1366 {
1413 if (tmp->head) 1367 if (tmp->head)
1414 tmp = tmp->head; 1368 tmp = tmp->head;
1415 1369
… …
1418 { 1372 {
1419 if (spell_ob->subtype == SP_DESTRUCTION) 1373 if (spell_ob->subtype == SP_DESTRUCTION)
1420 { 1374 {
1421 hit_player (tmp, dam, op, spell_ob->attacktype, 0); 1375 hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1422 if (spell_ob->other_arch) 1376 if (spell_ob->other_arch)
1423 {
1424 tmp = arch_to_object (spell_ob->other_arch); 1377 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op);
1425 tmp->x = sx;
1426 tmp->y = sy;
1427 insert_ob_in_map (tmp, m, op, 0);
1428 }
1429 } 1378 }
1430 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100) 1379 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100)
1431 { 1380 {
1432 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch) 1381 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1433 {
1434 object *effect = arch_to_object (spell_ob->other_arch); 1382 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op);
1435
1436 effect->x = sx;
1437 effect->y = sy;
1438 insert_ob_in_map (effect, m, op, 0);
1439 }
1440 } 1383 }
1441 } 1384 }
1442 } 1385 }
1443 } 1386 }
1444 } 1387 }
1445 } 1388 }
1389
1446 op->skill = skill; 1390 op->skill = skill;
1447 return 1; 1391 return 1;
1448} 1392}
1449 1393
1450/*************************************************************************** 1394/***************************************************************************
… …
1534 force->stats.ac = spell_ob->stats.ac; 1478 force->stats.ac = spell_ob->stats.ac;
1535 force->stats.wc = spell_ob->stats.wc; 1479 force->stats.wc = spell_ob->stats.wc;
1536 1480
1537 change_abil (tmp, force); /* Mostly to display any messages */ 1481 change_abil (tmp, force); /* Mostly to display any messages */
1538 insert_ob_in_ob (force, tmp); 1482 insert_ob_in_ob (force, tmp);
1539 fix_player (tmp); 1483 tmp->update_stats ();
1540 return 1; 1484 return 1;
1541 1485
1542} 1486}
1543
1544 1487
1545/********************************************************************** 1488/**********************************************************************
1546 * mood change 1489 * mood change
1547 * Arguably, this may or may not be an attack spell. But since it 1490 * Arguably, this may or may not be an attack spell. But since it
1548 * effects monsters, it seems best to put it into this file 1491 * effects monsters, it seems best to put it into this file
… …
1578 else if (god && !strcmp (spell->race, "GOD_FRIEND")) 1521 else if (god && !strcmp (spell->race, "GOD_FRIEND"))
1579 race = god->race; 1522 race = god->race;
1580 else 1523 else
1581 race = spell->race; 1524 race = spell->race;
1582 1525
1583
1584 for (x = op->x - range; x <= op->x + range; x++) 1526 for (x = op->x - range; x <= op->x + range; x++)
1585 for (y = op->y - range; y <= op->y + range; y++) 1527 for (y = op->y - range; y <= op->y + range; y++)
1586 { 1528 {
1587
1588 done_one = 0; 1529 done_one = 0;
1589 m = op->map; 1530 m = op->map;
1590 nx = x; 1531 nx = x;
1591 ny = y; 1532 ny = y;
1592 mflags = get_map_flags (m, &m, x, y, &nx, &ny); 1533 mflags = get_map_flags (m, &m, x, y, &nx, &ny);
… …
1595 1536
1596 /* If there is nothing living on this space, no need to go further */ 1537 /* If there is nothing living on this space, no need to go further */
1597 if (!(mflags & P_IS_ALIVE)) 1538 if (!(mflags & P_IS_ALIVE))
1598 continue; 1539 continue;
1599 1540
1541 // players can only affect spaces that they can actually see
1542 if (caster && caster->contr
1543 && caster->contr->visibility_at (m, nx, ny) < 70)
1544 continue;
1545
1600 for (tmp = get_map_ob (m, nx, ny); tmp; tmp = tmp->above) 1546 for (tmp = GET_MAP_TOP (m, nx, ny); tmp; tmp = tmp->below)
1601 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 1547 if (QUERY_FLAG (tmp, FLAG_MONSTER))
1602 break; 1548 break;
1603 1549
1604 /* There can be living objects that are not monsters */ 1550 /* There can be living objects that are not monsters */
1605 if (!tmp || tmp->type == PLAYER) 1551 if (!tmp || tmp->type == PLAYER)
… …
1612 head = tmp; 1558 head = tmp;
1613 1559
1614 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */ 1560 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */
1615 if (race && head->race && !strstr (race, head->race)) 1561 if (race && head->race && !strstr (race, head->race))
1616 continue; 1562 continue;
1563
1617 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD)) 1564 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD))
1618 continue; 1565 continue;
1619 1566
1620 /* Now do a bunch of stuff related to saving throws */ 1567 /* Now do a bunch of stuff related to saving throws */
1621 best_at = -1; 1568 best_at = -1;
… …
1658 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level)))) 1605 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level))))
1659 /* Failed, no effect */ 1606 /* Failed, no effect */
1660 continue; 1607 continue;
1661 } 1608 }
1662 1609
1663 /* Done with saving throw. Now start effecting the monster */ 1610 /* Done with saving throw. Now start affecting the monster */
1664 1611
1665 /* aggravation */ 1612 /* aggravation */
1666 if (QUERY_FLAG (spell, FLAG_MONSTER)) 1613 if (QUERY_FLAG (spell, FLAG_MONSTER))
1667 { 1614 {
1668 CLEAR_FLAG (head, FLAG_SLEEP); 1615 CLEAR_FLAG (head, FLAG_SLEEP);
… …
1685 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK)) 1632 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK))
1686 { 1633 {
1687 SET_FLAG (head, FLAG_BERSERK); 1634 SET_FLAG (head, FLAG_BERSERK);
1688 done_one = 1; 1635 done_one = 1;
1689 } 1636 }
1637
1690 /* charm */ 1638 /* charm */
1691 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY)) 1639 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY))
1692 { 1640 {
1693 SET_FLAG (head, FLAG_FRIENDLY);
1694 /* Prevent uncontolled outbreaks of self replicating monsters. 1641 /* Prevent uncontolled outbreaks of self replicating monsters.
1695 Typical use case is charm, go somwhere, use aggravation to make hostile. 1642 Typical use case is charm, go somwhere, use aggravation to make hostile.
1696 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */ 1643 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1697 CLEAR_FLAG (head, FLAG_GENERATOR); 1644 CLEAR_FLAG (head, FLAG_GENERATOR);
1698 set_owner (head, op); 1645 head->set_owner (op);
1699 set_spell_skill (op, caster, spell, head); 1646 set_spell_skill (op, caster, spell, head);
1700 add_friendly_object (head); 1647 add_friendly_object (head);
1701 head->attack_movement = PETMOVE; 1648 head->attack_movement = PETMOVE;
1702 done_one = 1; 1649 done_one = 1;
1703 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL); 1650 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL);
1704 head->stats.exp = 0; 1651 head->stats.exp = 0;
1705 } 1652 }
1706 1653
1707 /* If a monster was effected, put an effect in */ 1654 /* If a monster was effected, put an effect in */
1708 if (done_one && spell->other_arch) 1655 if (done_one && spell->other_arch)
1709 {
1710 tmp = arch_to_object (spell->other_arch); 1656 m->insert (arch_to_object (spell->other_arch), nx, ny, op);
1711 tmp->x = nx;
1712 tmp->y = ny;
1713 insert_ob_in_map (tmp, m, op, 0);
1714 }
1715 } /* for y */ 1657 } /* for y */
1716 1658
1717 return 1; 1659 return 1;
1718} 1660}
1719 1661
… …
1731 int i, j, dam_save, dir, mflags; 1673 int i, j, dam_save, dir, mflags;
1732 sint16 nx, ny, hx, hy; 1674 sint16 nx, ny, hx, hy;
1733 object *owner; 1675 object *owner;
1734 maptile *m; 1676 maptile *m;
1735 1677
1736 owner = get_owner (op); 1678 owner = op->owner;
1737 1679
1738 /* the following logic makes sure that the ball doesn't move into a wall, 1680 /* the following logic makes sure that the ball doesn't move into a wall,
1739 * and makes sure that it will move along a wall to try and get at it's 1681 * and makes sure that it will move along a wall to try and get at it's
1740 * victim. The block immediately below more or less chooses a random 1682 * victim. The block immediately below more or less chooses a random
1741 * offset to move the ball, eg, keep it mostly on course, with some 1683 * offset to move the ball, eg, keep it mostly on course, with some
… …
1770 nx = op->x; 1712 nx = op->x;
1771 ny = op->y; 1713 ny = op->y;
1772 m = op->map; 1714 m = op->map;
1773 } 1715 }
1774 1716
1775 op->remove (); 1717 m->insert (op, nx, ny, op);
1776 op->y = ny;
1777 op->x = nx;
1778 insert_ob_in_map (op, m, op, 0);
1779 1718
1780 dam_save = op->stats.dam; /* save the original dam: we do halfdam on 1719 dam_save = op->stats.dam; /* save the original dam: we do halfdam on
1781 surrounding squares */ 1720 surrounding squares */
1782 1721
1783 /* loop over current square and neighbors to hit. 1722 /* loop over current square and neighbors to hit.
… …
1809 1748
1810 } 1749 }
1811 1750
1812 /* insert the other arch */ 1751 /* insert the other arch */
1813 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))) 1752 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))))
1814 { 1753 m->insert (arch_to_object (op->other_arch), hx, hy, op);
1815 new_ob = arch_to_object (op->other_arch);
1816 new_ob->x = hx;
1817 new_ob->y = hy;
1818 insert_ob_in_map (new_ob, m, op, 0);
1819 }
1820 } 1754 }
1821 1755
1822 /* restore to the center location and damage */ 1756 /* restore to the center location and damage */
1823 op->stats.dam = dam_save; 1757 op->stats.dam = dam_save;
1824 1758
1825 i = spell_find_dir (op->map, op->x, op->y, get_owner (op)); 1759 i = spell_find_dir (op->map, op->x, op->y, op->owner);
1826 1760
1827 if (i >= 0) 1761 if (i >= 0)
1828 { /* we have a preferred direction! */ 1762 { /* we have a preferred direction! */
1829 /* pick another direction if the preferred dir is blocked. */ 1763 /* pick another direction if the preferred dir is blocked. */
1830 if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP || 1764 if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP ||
1831 OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))) 1765 OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))
1832 {
1833 i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */ 1766 i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */
1834 } 1767
1835 op->direction = i; 1768 op->direction = i;
1836 } 1769 }
1837} 1770}
1838 1771
1839 1772
… …
1856 maptile *m; 1789 maptile *m;
1857#endif 1790#endif
1858 int basedir; 1791 int basedir;
1859 object *owner; 1792 object *owner;
1860 1793
1861 owner = get_owner (op); 1794 owner = op->owner;
1862 if (op->duration == 0 || owner == NULL) 1795 if (op->duration == 0 || owner == NULL)
1863 { 1796 {
1864 op->destroy (); 1797 op->destroy ();
1865 return; 1798 return;
1866 } 1799 }
… …
1969 1902
1970 if (!spell->other_arch) 1903 if (!spell->other_arch)
1971 return 0; 1904 return 0;
1972 1905
1973 tmp = get_archetype (SWARM_SPELL); 1906 tmp = get_archetype (SWARM_SPELL);
1974 tmp->x = op->x;
1975 tmp->y = op->y;
1976 set_owner (tmp, op); /* needed so that if swarm elements kill, caster gets xp. */ 1907 tmp->set_owner (op); /* needed so that if swarm elements kill, caster gets xp. */
1977 set_spell_skill (op, caster, spell, tmp); 1908 set_spell_skill (op, caster, spell, tmp);
1978 1909
1979 tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */ 1910 tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */
1980 tmp->spell = arch_to_object (spell->other_arch); 1911 tmp->spell = arch_to_object (spell->other_arch);
1981 1912
1982 tmp->attacktype = tmp->spell->attacktype; 1913 tmp->attacktype = tmp->spell->attacktype;
1983 1914
1984 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 1915 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
1985 {
1986 if (!tailor_god_spell (tmp, op)) 1916 if (!tailor_god_spell (tmp, op))
1987 return 1; 1917 return 1;
1988 } 1918
1989 tmp->duration = SP_level_duration_adjust (caster, spell); 1919 tmp->duration = SP_level_duration_adjust (caster, spell);
1990 for (i = 0; i < spell->duration; i++) 1920 for (i = 0; i < spell->duration; i++)
1991 tmp->duration += die_roll (1, 3, op, PREFER_HIGH); 1921 tmp->duration += die_roll (1, 3, op, PREFER_HIGH);
1992 1922
1993 tmp->direction = dir; 1923 tmp->direction = dir;
1994 tmp->invisible = 1; 1924 tmp->invisible = 1;
1995 insert_ob_in_map (tmp, op->map, op, 0); 1925
1926 tmp->insert_at (op, op);
1996 return 1; 1927 return 1;
1997} 1928}
1998 1929
1999 1930
2000/* See the spells documentation file for why this is its own 1931/* See the spells documentation file for why this is its own
… …
2028 return 0; 1959 return 0;
2029 } 1960 }
2030 1961
2031 if (mflags & P_IS_ALIVE && spell->attacktype) 1962 if (mflags & P_IS_ALIVE && spell->attacktype)
2032 { 1963 {
2033 for (target = get_map_ob (m, x, y); target; target = target->above) 1964 for (target = GET_MAP_OB (m, x, y); target; target = target->above)
2034 if (QUERY_FLAG (target, FLAG_MONSTER)) 1965 if (QUERY_FLAG (target, FLAG_MONSTER))
2035 { 1966 {
2036 /* oky doky. got a target monster. Lets make a blinding attack */ 1967 /* oky doky. got a target monster. Lets make a blinding attack */
2037 if (target->head) 1968 if (target->head)
2038 target = target->head; 1969 target = target->head;
… …
2060 { 1991 {
2061 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell); 1992 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell);
2062 if (tmp->glow_radius > MAX_LIGHT_RADII) 1993 if (tmp->glow_radius > MAX_LIGHT_RADII)
2063 tmp->glow_radius = MAX_LIGHT_RADII; 1994 tmp->glow_radius = MAX_LIGHT_RADII;
2064 } 1995 }
2065 tmp->x = x; 1996
2066 tmp->y = y; 1997 m->insert (tmp, x, y, op);
2067 insert_ob_in_map (tmp, m, op, 0);
2068 return 1; 1998 return 1;
2069} 1999}
2070 2000
2071 2001
2072 2002
… …
2120 2050
2121 /* Only bother looking on this space if there is something living here */ 2051 /* Only bother looking on this space if there is something living here */
2122 if (mflags & P_IS_ALIVE) 2052 if (mflags & P_IS_ALIVE)
2123 { 2053 {
2124 /* search this square for a victim */ 2054 /* search this square for a victim */
2125 for (walk = get_map_ob (m, x, y); walk; walk = walk->above) 2055 for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above)
2126 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER)) 2056 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER))
2127 { /* found a victim */ 2057 { /* found a victim */
2128 object *disease = arch_to_object (spell->other_arch); 2058 object *disease = arch_to_object (spell->other_arch);
2129 2059
2130 set_owner (disease, op); 2060 disease->set_owner (op);
2131 set_spell_skill (op, caster, spell, disease); 2061 set_spell_skill (op, caster, spell, disease);
2132 disease->stats.exp = 0; 2062 disease->stats.exp = 0;
2133 disease->level = caster_level (caster, spell); 2063 disease->level = caster_level (caster, spell);
2134 2064
2135 /* do level adjustments */ 2065 /* do level adjustments */
… …
2185 object *flash; /* visual effect for inflicting disease */ 2115 object *flash; /* visual effect for inflicting disease */
2186 2116
2187 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name); 2117 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
2188 2118
2189 disease->destroy (); /* don't need this one anymore */ 2119 disease->destroy (); /* don't need this one anymore */
2190 flash = get_archetype (ARCH_DETECT_MAGIC); 2120 walk->map->insert (get_archetype (ARCH_DETECT_MAGIC), x, y, op);
2191 flash->x = x;
2192 flash->y = y;
2193 flash->map = walk->map;
2194 insert_ob_in_map (flash, walk->map, op, 0);
2195 return 1; 2121 return 1;
2196 } 2122 }
2197 2123
2198 disease->destroy (); 2124 disease->destroy ();
2199 } 2125 }
2200 } /* if living creature */ 2126 } /* if living creature */
2201 } /* for range of spaces */ 2127 } /* for range of spaces */
2128
2202 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!"); 2129 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!");
2203 return 1; 2130 return 1;
2204} 2131}

Diff Legend

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