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.11 by root, Mon Sep 11 20:26:41 2006 UTC vs.
Revision 1.28 by pippijn, Mon Jan 15 21:06:20 2007 UTC

1
2/* 1/*
3 * static char *rcsid_spell_attack_c = 2 * CrossFire, A Multiplayer game for X-windows
4 * "$Id: spell_attack.C,v 1.11 2006/09/11 20:26:41 root Exp $"; 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 * Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen
7 *
8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version.
12 *
13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details.
17 *
18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
5 */ 23 */
6
7
8/*
9 CrossFire, A Multiplayer game for X-windows
10
11 Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team
12 Copyright (C) 1992 Frank Tore Johansen
13
14 This program is free software; you can redistribute it and/or modify
15 it under the terms of the GNU General Public License as published by
16 the Free Software Foundation; either version 2 of the License, or
17 (at your option) any later version.
18
19 This program is distributed in the hope that it will be useful,
20 but WITHOUT ANY WARRANTY; without even the implied warranty of
21 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22 GNU General Public License for more details.
23
24 You should have received a copy of the GNU General Public License
25 along with this program; if not, write to the Free Software
26 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
27
28 The authors can be reached via e-mail at crossfire-devel@real-time.com
29*/
30 24
31/* This file contains all the spell attack code. Grouping this code 25/* This file contains all the spell attack code. Grouping this code
32 * together should hopefully make it easier to find the relevent bits 26 * together should hopefully make it easier to find the relevent bits
33 * of code 27 * of code
34 */ 28 */
35 29
36#include <global.h> 30#include <global.h>
37#include <object.h> 31#include <object.h>
38#include <living.h> 32#include <living.h>
39#ifndef __CEXTRACT__
40# include <sproto.h> 33#include <sproto.h>
41#endif
42#include <spells.h> 34#include <spells.h>
43#include <sounds.h> 35#include <sounds.h>
44 36
45/* 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
46 * 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)
… …
64 { 56 {
65 weight_move = op->weight + (op->weight * op->level) / 3; 57 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); */ 58 /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */
67 } 59 }
68 60
69 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)
70 { 62 {
71 int num_sections = 1; 63 int num_sections = 1;
72 64
73 /* don't move DM */ 65 /* don't move DM */
74 if (QUERY_FLAG (tmp, FLAG_WIZ)) 66 if (QUERY_FLAG (tmp, FLAG_WIZ))
… …
124void 116void
125forklightning (object *op, object *tmp) 117forklightning (object *op, object *tmp)
126{ 118{
127 int new_dir = 1; /* direction or -1 for left, +1 for right 0 if no new bolt */ 119 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 */ 120 int t_dir; /* stores temporary dir calculation */
129 mapstruct *m; 121 maptile *m;
130 sint16 sx, sy; 122 sint16 sx, sy;
131 object *new_bolt; 123 object *new_bolt;
132 124
133 /* pick a fork direction. tmp->stats.Con is the left bias 125 /* pick a fork direction. tmp->stats.Con is the left bias
134 * i.e., the chance in 100 of forking LEFT 126 * i.e., the chance in 100 of forking LEFT
… …
147 139
148 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)))
149 return; 141 return;
150 142
151 /* OK, we made a fork */ 143 /* OK, we made a fork */
152 new_bolt = get_object (); 144 new_bolt = tmp->clone ();
153 copy_object (tmp, new_bolt);
154 145
155 /* reduce chances of subsequent forking */ 146 /* reduce chances of subsequent forking */
156 new_bolt->stats.Dex -= 10; 147 new_bolt->stats.Dex -= 10;
157 tmp->stats.Dex -= 10; /* less forks from main bolt too */ 148 tmp->stats.Dex -= 10; /* less forks from main bolt too */
158 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */ 149 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */
159 new_bolt->speed_left = -0.1; 150 new_bolt->speed_left = -0.1;
160 new_bolt->direction = t_dir; 151 new_bolt->direction = t_dir;
161 new_bolt->duration++; 152 new_bolt->duration++;
162 new_bolt->x = sx;
163 new_bolt->y = sy;
164 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */ 153 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */
165 new_bolt->stats.dam++; 154 new_bolt->stats.dam++;
166 tmp->stats.dam /= 2; /* reduce father bolt damage */ 155 tmp->stats.dam /= 2; /* reduce father bolt damage */
167 tmp->stats.dam++; 156 tmp->stats.dam++;
168 new_bolt = insert_ob_in_map (new_bolt, m, op, 0); 157 if ((new_bolt = m->insert (new_bolt, sx, sy, op)))
169 update_turn_face (new_bolt); 158 update_turn_face (new_bolt);
170} 159}
171 160
172/* move_bolt: moves bolt 'op'. Basically, it just advances a space, 161/* move_bolt: moves bolt 'op'. Basically, it just advances a space,
173 * and checks for various things that may stop it. 162 * and checks for various things that may stop it.
174 */ 163 */
… …
177move_bolt (object *op) 166move_bolt (object *op)
178{ 167{
179 object *tmp; 168 object *tmp;
180 int mflags; 169 int mflags;
181 sint16 x, y; 170 sint16 x, y;
182 mapstruct *m; 171 maptile *m;
183 172
184 if (--(op->duration) < 0) 173 if (--op->duration < 0)
185 { 174 {
186 remove_ob (op); 175 op->destroy ();
187 free_object (op);
188 return; 176 return;
189 } 177 }
190 178
191 hit_map (op, 0, op->attacktype, 1); 179 hit_map (op, 0, op->attacktype, 1);
192 180
193 if (!op->direction) 181 if (!op->direction)
194 return; 182 return;
195 183
196 if (--op->range < 0) 184 if (--op->range < 0)
197 {
198 op->range = 0; 185 op->range = 0;
199 }
200 else 186 else
201 { 187 {
202 x = op->x + DIRX (op); 188 x = op->x + DIRX (op);
203 y = op->y + DIRY (op); 189 y = op->y + DIRY (op);
204 m = op->map; 190 m = op->map;
… …
212 * 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
213 * will be useful. 199 * will be useful.
214 */ 200 */
215 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)))
216 { 202 {
217
218 if (!QUERY_FLAG (op, FLAG_REFLECTING)) 203 if (!QUERY_FLAG (op, FLAG_REFLECTING))
219 return; 204 return;
220 205
221 /* Since walls don't run diagonal, if the bolt is in 206 /* Since walls don't run diagonal, if the bolt is in
222 * one of 4 main directions, it just reflects back in the 207 * one of 4 main directions, it just reflects back in the
… …
252 else if (left) 237 else if (left)
253 op->direction = absdir (op->direction + 2); 238 op->direction = absdir (op->direction + 2);
254 else if (right) 239 else if (right)
255 op->direction = absdir (op->direction - 2); 240 op->direction = absdir (op->direction - 2);
256 } 241 }
242
257 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */ 243 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */
258 return; 244 return;
259 } 245 }
260 else 246 else
261 { /* Create a copy of this object and put it ahead */ 247 { /* Create a copy of this object and put it ahead */
262 tmp = get_object (); 248 object *tmp = op->clone ();
263 copy_object (op, tmp); 249
250 m->insert (tmp, x, y, op);
264 tmp->speed_left = -0.1; 251 tmp->speed_left = -0.1;
265 tmp->x += DIRX (tmp), tmp->y += DIRY (tmp);
266 tmp = insert_ob_in_map (tmp, op->map, op, 0);
267 /* 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 */
268 tmp->duration++; 253 tmp->duration++;
269 254
270 /* New forking code. Possibly create forks of this object 255 /* New forking code. Possibly create forks of this object
271 * going off in other directions. 256 * going off in other directions.
272 */ 257 */
273
274 if (rndm (0, 99) < tmp->stats.Dex) 258 if (rndm (0, 99) < tmp->stats.Dex)
275 { /* stats.Dex % of forking */ 259 { /* stats.Dex % of forking */
276 forklightning (op, tmp); 260 forklightning (op, tmp);
277 } 261 }
262
278 /* 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
279 * doesn't create any bolts that continue to move onward. 264 * doesn't create any bolts that continue to move onward.
280 */ 265 */
281 op->range = 0; 266 op->range = 0;
282 } /* copy object and move it along */ 267 } /* copy object and move it along */
… …
289 * we remove the magic flag - that can be derived from 274 * we remove the magic flag - that can be derived from
290 * spob->attacktype. 275 * spob->attacktype.
291 * This function sets up the appropriate owner and skill 276 * This function sets up the appropriate owner and skill
292 * pointers. 277 * pointers.
293 */ 278 */
294
295int 279int
296fire_bolt (object *op, object *caster, int dir, object *spob, object *skill) 280fire_bolt (object *op, object *caster, int dir, object *spob, object *skill)
297{ 281{
298 object *tmp = NULL; 282 object *tmp = NULL;
299 int mflags; 283 int mflags;
… …
317 301
318 tmp->direction = dir; 302 tmp->direction = dir;
319 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 303 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
320 SET_ANIMATION (tmp, dir); 304 SET_ANIMATION (tmp, dir);
321 305
322 set_owner (tmp, op); 306 tmp->set_owner (op);
323 set_spell_skill (op, caster, spob, tmp); 307 set_spell_skill (op, caster, spob, tmp);
324 308
325 tmp->x = op->x + DIRX (tmp); 309 tmp->x = op->x + DIRX (tmp);
326 tmp->y = op->y + DIRY (tmp); 310 tmp->y = op->y + DIRY (tmp);
327 tmp->map = op->map; 311 tmp->map = op->map;
328 312
313 maptile *newmap;
329 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);
330 if (mflags & P_OUT_OF_MAP) 315 if (mflags & P_OUT_OF_MAP)
331 { 316 {
332 free_object (tmp); 317 tmp->destroy ();
333 return 0; 318 return 0;
334 } 319 }
320
321 tmp->map = newmap;
322
335 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)))
336 { 324 {
337 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 325 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
338 { 326 {
339 free_object (tmp); 327 tmp->destroy ();
340 return 0; 328 return 0;
341 } 329 }
330
342 tmp->x = op->x; 331 tmp->x = op->x;
343 tmp->y = op->y; 332 tmp->y = op->y;
344 tmp->direction = absdir (tmp->direction + 4); 333 tmp->direction = absdir (tmp->direction + 4);
345 tmp->map = op->map; 334 tmp->map = op->map;
346 } 335 }
347 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL) 336
337 if ((tmp = tmp->insert_at (tmp, op)))
348 move_bolt (tmp); 338 move_bolt (tmp);
339
349 return 1; 340 return 1;
350} 341}
351 342
352 343
353 344
… …
362 * At least that is what I think this does. 353 * At least that is what I think this does.
363 */ 354 */
364void 355void
365explosion (object *op) 356explosion (object *op)
366{ 357{
367 object *tmp;
368 mapstruct *m = op->map; 358 maptile *m = op->map;
369 int i; 359 int i;
370 360
371 if (--(op->duration) < 0) 361 if (--op->duration < 0)
372 { 362 {
373 remove_ob (op); 363 op->destroy ();
374 free_object (op);
375 return; 364 return;
376 } 365 }
366
377 hit_map (op, 0, op->attacktype, 0); 367 hit_map (op, 0, op->attacktype, 0);
378 368
379 if (op->range > 0) 369 if (op->range > 0)
380 { 370 {
381 for (i = 1; i < 9; i++) 371 for (i = 1; i < 9; i++)
382 { 372 {
383 sint16 dx, dy; 373 sint16 dx, dy;
384 374
385 dx = op->x + freearr_x[i]; 375 dx = op->x + freearr_x[i];
386 dy = op->y + freearr_y[i]; 376 dy = op->y + freearr_y[i];
377
387 /* ok_to_put_more already does things like checks for walls, 378 /* ok_to_put_more already does things like checks for walls,
388 * out of map, etc. 379 * out of map, etc.
389 */ 380 */
390 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))
391 { 382 {
392 tmp = get_object (); 383 object *tmp = op->clone ();
393 copy_object (op, tmp); 384
394 tmp->state = 0; 385 tmp->state = 0;
395 tmp->speed_left = -0.21; 386 tmp->speed_left = -0.21;
396 tmp->range--; 387 tmp->range--;
397 tmp->value = 0; 388 tmp->value = 0;
398 tmp->x = dx; 389
399 tmp->y = dy; 390 m->insert (tmp, dx, dy, op);
400 insert_ob_in_map (tmp, m, op, 0);
401 } 391 }
402 } 392 }
403 } 393 }
404} 394}
405 395
… …
409 * explode. 399 * explode.
410 */ 400 */
411void 401void
412explode_bullet (object *op) 402explode_bullet (object *op)
413{ 403{
414 tag_t op_tag = op->count;
415 object *tmp, *owner; 404 object *tmp, *owner;
416 405
417 if (op->other_arch == NULL) 406 if (op->other_arch == NULL)
418 { 407 {
419 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n"); 408 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");
420 remove_ob (op); 409 op->destroy ();
421 free_object (op);
422 return; 410 return;
423 } 411 }
424 412
425 if (op->env) 413 if (op->env)
426 { 414 {
427 object *env;
428
429 env = object_get_env_recursive (op); 415 object *env = object_get_env_recursive (op);
430 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))
431 { 417 {
432 LOG (llevError, "BUG: explode_bullet(): env out of map\n"); 418 LOG (llevError, "BUG: explode_bullet(): env out of map\n");
433 remove_ob (op); 419 op->destroy ();
434 free_object (op);
435 return; 420 return;
436 } 421 }
437 remove_ob (op); 422
438 op->x = env->x; 423 op->insert_at (env, op, INS_NO_MERGE | INS_NO_WALK_ON);
439 op->y = env->y;
440 insert_ob_in_map (op, env->map, op, INS_NO_MERGE | INS_NO_WALK_ON);
441 } 424 }
442 else if (out_of_map (op->map, op->x, op->y)) 425 else if (out_of_map (op->map, op->x, op->y))
443 { 426 {
444 LOG (llevError, "BUG: explode_bullet(): op out of map\n"); 427 LOG (llevError, "BUG: explode_bullet(): op out of map\n");
445 remove_ob (op); 428 op->destroy ();
446 free_object (op);
447 return; 429 return;
448 } 430 }
449 431
450 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps 432 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps
451 // NOTE: If this breaks something important: remove this. I can't think of anything 433 // NOTE: If this breaks something important: remove this. I can't think of anything
452 // bad at the moment that might happen from this. 434 // bad at the moment that might happen from this.
453 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 435 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
454 { 436 {
455 remove_ob (op); 437 op->destroy ();
456 free_object (op);
457 return; 438 return;
458 } 439 }
459 440
460 if (op->attacktype) 441 if (op->attacktype)
461 { 442 {
462 hit_map (op, 0, op->attacktype, 1); 443 hit_map (op, 0, op->attacktype, 1);
463 if (was_destroyed (op, op_tag)) 444 if (op->destroyed ())
464 return; 445 return;
465 } 446 }
466 447
467 /* other_arch contains what this explodes into */ 448 /* other_arch contains what this explodes into */
468 tmp = arch_to_object (op->other_arch); 449 tmp = arch_to_object (op->other_arch);
469 450
470 copy_owner (tmp, op); 451 tmp->set_owner (op);
471 tmp->skill = op->skill; 452 tmp->skill = op->skill;
472 453
473 owner = get_owner (op); 454 owner = op->owner;
474 455
475 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))
476 { 457 {
477 remove_ob (op); 458 op->destroy ();
478 free_object (op);
479 return; 459 return;
480 } 460 }
481
482 tmp->x = op->x;
483 tmp->y = op->y;
484 461
485 /* special for bombs - it actually has sane values for these */ 462 /* special for bombs - it actually has sane values for these */
486 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB) 463 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB)
487 { 464 {
488 tmp->attacktype = op->attacktype; 465 tmp->attacktype = op->attacktype;
… …
492 } 469 }
493 else 470 else
494 { 471 {
495 if (op->attacktype & AT_MAGIC) 472 if (op->attacktype & AT_MAGIC)
496 tmp->attacktype |= AT_MAGIC; 473 tmp->attacktype |= AT_MAGIC;
474
497 /* Spell doc describes what is going on here */ 475 /* Spell doc describes what is going on here */
498 tmp->stats.dam = op->dam_modifier; 476 tmp->stats.dam = op->dam_modifier;
499 tmp->range = op->stats.maxhp; 477 tmp->range = op->stats.maxhp;
500 tmp->duration = op->stats.hp; 478 tmp->duration = op->stats.hp;
501 /* 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 -
… …
509 tmp->stats.sp = op->direction; 487 tmp->stats.sp = op->direction;
510 488
511 /* Prevent recursion */ 489 /* Prevent recursion */
512 op->move_on = 0; 490 op->move_on = 0;
513 491
514 insert_ob_in_map (tmp, op->map, op, 0); 492 tmp->insert_at (op, op);
515 /* remove the firebullet */ 493 /* remove the firebullet */
516 if (!was_destroyed (op, op_tag)) 494 op->destroy ();
517 {
518 remove_ob (op);
519 free_object (op);
520 }
521} 495}
522
523
524 496
525/* 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
526 * (eg, explode, damage player, etc) 498 * (eg, explode, damage player, etc)
527 */ 499 */
528
529void 500void
530check_bullet (object *op) 501check_bullet (object *op)
531{ 502{
532 tag_t op_tag = op->count, tmp_tag;
533 object *tmp; 503 object *tmp;
534 int dam, mflags; 504 int dam, mflags;
535 mapstruct *m; 505 maptile *m;
536 sint16 sx, sy; 506 sint16 sx, sy;
537 507
538 mflags = get_map_flags (op->map, &m, op->x, op->y, &sx, &sy); 508 mflags = get_map_flags (op->map, &m, op->x, op->y, &sx, &sy);
539 509
540 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy))) 510 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy)))
… …
549 519
550 /* 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 */
551 if (!(mflags & P_IS_ALIVE)) 521 if (!(mflags & P_IS_ALIVE))
552 return; 522 return;
553 523
554 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)
555 { 525 {
556 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 526 if (QUERY_FLAG (tmp, FLAG_ALIVE))
557 { 527 {
558 tmp_tag = tmp->count;
559 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 528 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
560 if (was_destroyed (op, op_tag) || !was_destroyed (tmp, tmp_tag) || (op->stats.dam -= dam) < 0) 529 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
561 { 530 {
562 if (!QUERY_FLAG (op, FLAG_REMOVED)) 531 if (!QUERY_FLAG (op, FLAG_REMOVED))
563 { 532 {
564 remove_ob (op); 533 op->destroy ();
565 free_object (op);
566 return; 534 return;
567 } 535 }
568 } 536 }
569 } 537 }
570 } 538 }
571} 539}
572
573 540
574/* Basically, we move 'op' one square, and if it hits something, 541/* Basically, we move 'op' one square, and if it hits something,
575 * call check_bullet. 542 * call check_bullet.
576 * This function is only applicable to bullets, but not to all 543 * This function is only applicable to bullets, but not to all
577 * fired arches (eg, bolts). 544 * fired arches (eg, bolts).
578 */ 545 */
579
580void 546void
581move_bullet (object *op) 547move_bullet (object *op)
582{ 548{
583 sint16 new_x, new_y; 549 sint16 new_x, new_y;
584 int mflags; 550 int mflags;
585 mapstruct *m; 551 maptile *m;
586 552
587#if 0 553#if 0
588 /* We need a better general purpose way to do this */ 554 /* We need a better general purpose way to do this */
589 555
590 /* peterm: added to make comet leave a trail of burnouts 556 /* peterm: added to make comet leave a trail of burnouts
591 it's an unadulterated hack, but the effect is cool. */ 557 it's an unadulterated hack, but the effect is cool. */
592 if (op->stats.sp == SP_METEOR) 558 if (op->stats.sp == SP_METEOR)
593 { 559 {
594 replace_insert_ob_in_map ("fire_trail", op); 560 replace_insert_ob_in_map ("fire_trail", op);
595 if (was_destroyed (op, op_tag)) 561 if (op->destroyed ())
596 return; 562 return;
597 } /* end addition. */ 563 } /* end addition. */
598#endif 564#endif
599 565
600 /* Reached the end of its life - remove it */ 566 /* Reached the end of its life - remove it */
601 if (--op->range <= 0) 567 if (--op->range <= 0)
602 { 568 {
603 if (op->other_arch) 569 if (op->other_arch)
604 {
605 explode_bullet (op); 570 explode_bullet (op);
606 }
607 else 571 else
608 { 572 op->destroy ();
609 remove_ob (op); 573
610 free_object (op);
611 }
612 return; 574 return;
613 } 575 }
614 576
615 new_x = op->x + DIRX (op); 577 new_x = op->x + DIRX (op);
616 new_y = op->y + DIRY (op); 578 new_y = op->y + DIRY (op);
617 m = op->map; 579 m = op->map;
618 mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y); 580 mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y);
619 581
620 if (mflags & P_OUT_OF_MAP) 582 if (mflags & P_OUT_OF_MAP)
621 { 583 {
622 remove_ob (op); 584 op->destroy ();
623 free_object (op);
624 return; 585 return;
625 } 586 }
626 587
627 if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))) 588 if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y)))
628 { 589 {
629 if (op->other_arch) 590 if (op->other_arch)
630 {
631 explode_bullet (op); 591 explode_bullet (op);
632 }
633 else 592 else
634 { 593 op->destroy ();
635 remove_ob (op); 594
636 free_object (op);
637 }
638 return; 595 return;
639 } 596 }
640 597
641 remove_ob (op); 598 if (!(op = m->insert (op, new_x, new_y, op)))
642 op->x = new_x;
643 op->y = new_y;
644 if ((op = insert_ob_in_map (op, m, op, 0)) == NULL)
645 return; 599 return;
646 600
647 if (reflwall (op->map, op->x, op->y, op)) 601 if (reflwall (op->map, op->x, op->y, op))
648 { 602 {
649 op->direction = absdir (op->direction + 4); 603 op->direction = absdir (op->direction + 4);
650 update_turn_face (op); 604 update_turn_face (op);
651 } 605 }
652 else 606 else
653 {
654 check_bullet (op); 607 check_bullet (op);
655 }
656} 608}
657 609
658 610
659 611
660 612
… …
695 647
696 tmp->direction = dir; 648 tmp->direction = dir;
697 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 649 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
698 SET_ANIMATION (tmp, dir); 650 SET_ANIMATION (tmp, dir);
699 651
700 set_owner (tmp, op); 652 tmp->set_owner (op);
701 set_spell_skill (op, caster, spob, tmp); 653 set_spell_skill (op, caster, spob, tmp);
702 654
703 tmp->x = op->x + freearr_x[dir]; 655 tmp->x = op->x + freearr_x[dir];
704 tmp->y = op->y + freearr_y[dir]; 656 tmp->y = op->y + freearr_y[dir];
705 tmp->map = op->map; 657 tmp->map = op->map;
706 658
659 maptile *newmap;
707 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);
708 if (mflags & P_OUT_OF_MAP) 661 if (mflags & P_OUT_OF_MAP)
709 { 662 {
710 free_object (tmp); 663 tmp->destroy ();
711 return 0; 664 return 0;
712 } 665 }
666
667 tmp->map = newmap;
668
713 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)))
714 { 670 {
715 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 671 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
716 { 672 {
717 free_object (tmp); 673 tmp->destroy ();
718 return 0; 674 return 0;
719 } 675 }
676
720 tmp->x = op->x; 677 tmp->x = op->x;
721 tmp->y = op->y; 678 tmp->y = op->y;
722 tmp->direction = absdir (tmp->direction + 4); 679 tmp->direction = absdir (tmp->direction + 4);
723 tmp->map = op->map; 680 tmp->map = op->map;
724 } 681 }
725 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL) 682
726 { 683 if ((tmp = tmp->insert_at (tmp, op)))
727 check_bullet (tmp); 684 check_bullet (tmp);
728 } 685
729 return 1; 686 return 1;
730} 687}
731 688
732 689
733 690
… …
743void 700void
744cone_drop (object *op) 701cone_drop (object *op)
745{ 702{
746 object *new_ob = arch_to_object (op->other_arch); 703 object *new_ob = arch_to_object (op->other_arch);
747 704
748 new_ob->x = op->x;
749 new_ob->y = op->y;
750 new_ob->level = op->level; 705 new_ob->level = op->level;
751 set_owner (new_ob, op->owner); 706 new_ob->set_owner (op->owner);
752 707
753 /* preserve skill ownership */ 708 /* preserve skill ownership */
754 if (op->skill && op->skill != new_ob->skill) 709 if (op->skill && op->skill != new_ob->skill)
755 {
756 new_ob->skill = op->skill; 710 new_ob->skill = op->skill;
757 }
758 insert_ob_in_map (new_ob, op->map, op, 0);
759 711
712 new_ob->insert_at (op, op);
760} 713}
761 714
762/* 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 */
763 716
764void 717void
765move_cone (object *op) 718move_cone (object *op)
766{ 719{
767 int i; 720 int i;
768 tag_t tag;
769 721
770 /* 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 */
771 if (!op->map) 723 if (!op->map)
772 { 724 {
773 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");
774 op->speed = 0; 726 op->set_speed (0);
775 update_ob_speed (op);
776 return; 727 return;
777 } 728 }
778 729
779 /* lava saves it's life, but not yours :) */ 730 /* lava saves it's life, but not yours :) */
780 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 731 if (QUERY_FLAG (op, FLAG_LIFESAVE))
… …
786#if 0 737#if 0
787 /* Disable this - enabling it makes monsters easier, as 738 /* Disable this - enabling it makes monsters easier, as
788 * when their cone dies when they die. 739 * when their cone dies when they die.
789 */ 740 */
790 /* If no owner left, the spell dies out. */ 741 /* If no owner left, the spell dies out. */
791 if (get_owner (op) == NULL) 742 if (op->owner == NULL)
792 { 743 {
793 remove_ob (op); 744 op->destroy ();
794 free_object (op);
795 return; 745 return;
796 } 746 }
797#endif 747#endif
798 748
799 tag = op->count;
800 hit_map (op, 0, op->attacktype, 0); 749 hit_map (op, 0, op->attacktype, 0);
801 750
802 /* Check to see if we should push anything. 751 /* Check to see if we should push anything.
803 * Spell objects with weight push whatever they encounter to some 752 * Spell objects with weight push whatever they encounter to some
804 * degree. 753 * degree.
805 */ 754 */
806 if (op->weight) 755 if (op->weight)
807 check_spell_knockback (op); 756 check_spell_knockback (op);
808 757
809 if (was_destroyed (op, tag)) 758 if (op->destroyed ())
810 return; 759 return;
811 760
812 if ((op->duration--) < 0) 761 if ((op->duration--) < 0)
813 { 762 {
814 remove_ob (op); 763 op->destroy ();
815 free_object (op);
816 return; 764 return;
817 } 765 }
818 /* Object has hit maximum range, so don't have it move 766 /* Object has hit maximum range, so don't have it move
819 * any further. When the duration above expires, 767 * any further. When the duration above expires,
820 * then the object will get removed. 768 * then the object will get removed.
… …
829 { 777 {
830 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)];
831 779
832 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))
833 { 781 {
834 object *tmp = get_object (); 782 object *tmp = op->clone ();
835
836 copy_object (op, tmp);
837 tmp->x = x;
838 tmp->y = y;
839 783
840 tmp->duration = op->duration + 1; 784 tmp->duration = op->duration + 1;
841 785
842 /* Use for spell tracking - see ok_to_put_more() */ 786 /* Use for spell tracking - see ok_to_put_more() */
843 tmp->stats.maxhp = op->stats.maxhp; 787 tmp->stats.maxhp = op->stats.maxhp;
844 insert_ob_in_map (tmp, op->map, op, 0); 788
789 op->map->insert (tmp, x, y, op);
790
845 if (tmp->other_arch) 791 if (tmp->other_arch)
846 cone_drop (tmp); 792 cone_drop (tmp);
847 } 793 }
848 } 794 }
849} 795}
… …
859int 805int
860cast_cone (object *op, object *caster, int dir, object *spell) 806cast_cone (object *op, object *caster, int dir, object *spell)
861{ 807{
862 object *tmp; 808 object *tmp;
863 int i, success = 0, range_min = -1, range_max = 1; 809 int i, success = 0, range_min = -1, range_max = 1;
864 mapstruct *m; 810 maptile *m;
865 sint16 sx, sy; 811 sint16 sx, sy;
866 MoveType movetype; 812 MoveType movetype;
867 813
868 if (!spell->other_arch) 814 if (!spell->other_arch)
869 return 0; 815 return 0;
… …
925 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype) 871 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype)
926 continue; 872 continue;
927 873
928 success = 1; 874 success = 1;
929 tmp = arch_to_object (spell->other_arch); 875 tmp = arch_to_object (spell->other_arch);
930 set_owner (tmp, op); 876 tmp->set_owner (op);
931 set_spell_skill (op, caster, spell, tmp); 877 set_spell_skill (op, caster, spell, tmp);
932 tmp->level = caster_level (caster, spell); 878 tmp->level = caster_level (caster, spell);
933 tmp->x = sx;
934 tmp->y = sy;
935 tmp->attacktype = spell->attacktype; 879 tmp->attacktype = spell->attacktype;
936 880
937 /* holy word stuff */ 881 /* holy word stuff */
938 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) 882 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER))
939 if (!tailor_god_spell (tmp, op)) 883 if (!tailor_god_spell (tmp, op))
… …
976 920
977 if (!(tmp->move_type & MOVE_FLY_LOW)) 921 if (!(tmp->move_type & MOVE_FLY_LOW))
978 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);
979 923
980 if (!tmp->move_on && tmp->stats.dam) 924 if (!tmp->move_on && tmp->stats.dam)
981 {
982 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);
983 }
984 926
985 insert_ob_in_map (tmp, m, op, 0); 927 m->insert (tmp, sx, sy, op);
986 928
987 /* 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
988 * a single space too many times. 930 * a single space too many times.
989 */ 931 */
990 tmp->stats.maxhp = tmp->count; 932 tmp->stats.maxhp = tmp->count;
… …
1009void 951void
1010animate_bomb (object *op) 952animate_bomb (object *op)
1011{ 953{
1012 int i; 954 int i;
1013 object *env, *tmp; 955 object *env, *tmp;
1014 archetype *at;
1015 956
1016 if (op->state != NUM_ANIMATIONS (op) - 1) 957 if (op->state != NUM_ANIMATIONS (op) - 1)
1017 return; 958 return;
1018 959
1019 env = object_get_env_recursive (op); 960 env = object_get_env_recursive (op);
… …
1024 return; 965 return;
1025 966
1026 if (env->type == PLAYER) 967 if (env->type == PLAYER)
1027 esrv_del_item (env->contr, op->count); 968 esrv_del_item (env->contr, op->count);
1028 969
1029 remove_ob (op); 970 if (!(op = op->insert_at (env, op)))
1030 op->x = env->x;
1031 op->y = env->y;
1032 if ((op = insert_ob_in_map (op, env->map, op, 0)) == NULL)
1033 return; 971 return;
1034 } 972 }
1035 973
1036 // 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
1037 // 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
1038 // as bombs can be carried. 976 // as bombs can be carried.
1039 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 977 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
1040 { 978 {
1041 remove_ob (op); 979 op->destroy ();
1042 free_object (op);
1043 return; 980 return;
1044 } 981 }
1045 982
1046 /* This copies a lot of the code from the fire bullet, 983 /* This copies a lot of the code from the fire bullet,
1047 * but using the cast_bullet isn't really feasible, 984 * but using the cast_bullet isn't really feasible,
1048 * so just set up the appropriate values. 985 * so just set up the appropriate values.
1049 */ 986 */
1050 at = find_archetype (SPLINT); 987 if (archetype *at = archetype::find (SPLINT))
1051 if (at)
1052 { 988 {
1053 for (i = 1; i < 9; i++) 989 for (i = 1; i < 9; i++)
1054 { 990 {
1055 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]))
1056 continue; 992 continue;
993
1057 tmp = arch_to_object (at); 994 tmp = arch_to_object (at);
1058 tmp->direction = i; 995 tmp->direction = i;
1059 tmp->range = op->range; 996 tmp->range = op->range;
1060 tmp->stats.dam = op->stats.dam; 997 tmp->stats.dam = op->stats.dam;
1061 tmp->duration = op->duration; 998 tmp->duration = op->duration;
1062 tmp->attacktype = op->attacktype; 999 tmp->attacktype = op->attacktype;
1063 copy_owner (tmp, op); 1000 tmp->set_owner (op);
1064 if (op->skill && op->skill != tmp->skill) 1001 if (op->skill && op->skill != tmp->skill)
1065 {
1066 tmp->skill = op->skill; 1002 tmp->skill = op->skill;
1067 } 1003
1068 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 1004 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
1069 SET_ANIMATION (tmp, i); 1005 SET_ANIMATION (tmp, i);
1070 tmp->x = op->x + freearr_x[i]; 1006
1071 tmp->y = op->y + freearr_x[i]; 1007 op->map->insert (tmp, op->x + freearr_x[i], op->y + freearr_x[i], op);
1072 insert_ob_in_map (tmp, op->map, op, 0);
1073 move_bullet (tmp); 1008 move_bullet (tmp);
1074 } 1009 }
1075 } 1010 }
1076 1011
1077 explode_bullet (op); 1012 explode_bullet (op);
… …
1082{ 1017{
1083 1018
1084 object *tmp; 1019 object *tmp;
1085 int mflags; 1020 int mflags;
1086 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir]; 1021 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir];
1087 mapstruct *m; 1022 maptile *m;
1088 1023
1089 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy); 1024 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy);
1090 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK)) 1025 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
1091 { 1026 {
1092 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1027 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
… …
1098 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 1033 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
1099 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);
1100 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 1035 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
1101 tmp->attacktype = spell->attacktype; 1036 tmp->attacktype = spell->attacktype;
1102 1037
1103 set_owner (tmp, op); 1038 tmp->set_owner (op);
1104 set_spell_skill (op, caster, spell, tmp); 1039 set_spell_skill (op, caster, spell, tmp);
1105 tmp->x = dx; 1040
1106 tmp->y = dy; 1041 m->insert (tmp, dx, dy, op);
1107 insert_ob_in_map (tmp, m, op, 0);
1108 return 1; 1042 return 1;
1109} 1043}
1110 1044
1111/**************************************************************************** 1045/****************************************************************************
1112 * 1046 *
… …
1128get_pointed_target (object *op, int dir, int range, int type) 1062get_pointed_target (object *op, int dir, int range, int type)
1129{ 1063{
1130 object *target; 1064 object *target;
1131 sint16 x, y; 1065 sint16 x, y;
1132 int dist, mflags; 1066 int dist, mflags;
1133 mapstruct *mp; 1067 maptile *mp;
1134 1068
1135 if (dir == 0) 1069 if (dir == 0)
1136 return NULL; 1070 return NULL;
1137 1071
1138 for (dist = 1; dist < range; dist++) 1072 for (dist = 1; dist < range; dist++)
… …
1151 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW) 1085 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
1152 return NULL; 1086 return NULL;
1153 1087
1154 if (mflags & P_IS_ALIVE) 1088 if (mflags & P_IS_ALIVE)
1155 { 1089 {
1156 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)
1157 { 1091 {
1158 if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER)) 1092 if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER))
1159 { 1093 {
1160 return target; 1094 return target;
1161 } 1095 }
… …
1228 if (effect->attacktype & AT_DEATH) 1162 if (effect->attacktype & AT_DEATH)
1229 { 1163 {
1230 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1164 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1231 1165
1232 /* casting death spells at undead isn't a good thing */ 1166 /* casting death spells at undead isn't a good thing */
1233 if QUERY_FLAG
1234 (target, FLAG_UNDEAD) 1167 if (QUERY_FLAG (target, FLAG_UNDEAD))
1235 { 1168 {
1236 if (random_roll (0, 2, op, PREFER_LOW)) 1169 if (random_roll (0, 2, op, PREFER_LOW))
1237 { 1170 {
1238 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!"); 1171 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");
1239 effect->x = op->x; 1172 effect->x = op->x;
… …
1241 } 1174 }
1242 else 1175 else
1243 { 1176 {
1244 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target)); 1177 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target));
1245 target->stats.hp = target->stats.maxhp * 2; 1178 target->stats.hp = target->stats.maxhp * 2;
1246 free_object (effect); 1179 effect->destroy ();
1247 return 0; 1180 return 0;
1248 } 1181 }
1249 } 1182 }
1250 } 1183 }
1251 else 1184 else
1252 { 1185 {
1253 /* how much woe to inflict :) */ 1186 /* how much woe to inflict :) */
1254 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);
1255 } 1188 }
1256 1189
1257 set_owner (effect, op); 1190 effect->set_owner (op);
1258 set_spell_skill (op, caster, spell, effect); 1191 set_spell_skill (op, caster, spell, effect);
1259 1192
1260 /* ok, tell it where to be, and insert! */ 1193 /* ok, tell it where to be, and insert! */
1261 effect->x = target->x; 1194 effect->insert_at (target, op);
1262 effect->y = target->y;
1263 insert_ob_in_map (effect, target->map, op, 0);
1264 1195
1265 return 1; 1196 return 1;
1266} 1197}
1267 1198
1268 1199
… …
1278move_missile (object *op) 1209move_missile (object *op)
1279{ 1210{
1280 int i, mflags; 1211 int i, mflags;
1281 object *owner; 1212 object *owner;
1282 sint16 new_x, new_y; 1213 sint16 new_x, new_y;
1283 mapstruct *m; 1214 maptile *m;
1284 1215
1285 if (op->range-- <= 0) 1216 if (op->range-- <= 0)
1286 { 1217 {
1287 remove_ob (op); 1218 op->destroy ();
1288 free_object (op);
1289 return; 1219 return;
1290 } 1220 }
1291 1221
1292 owner = get_owner (op); 1222 owner = op->owner;
1293#if 0 1223#if 0
1294 /* 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
1295 * monster that are then killed would continue to survive 1225 * monster that are then killed would continue to survive
1296 */ 1226 */
1297 if (owner == NULL) 1227 if (owner == NULL)
1298 { 1228 {
1299 remove_ob (op); 1229 op->destroy ();
1300 free_object (op);
1301 return; 1230 return;
1302 } 1231 }
1303#endif 1232#endif
1304 1233
1305 new_x = op->x + DIRX (op); 1234 new_x = op->x + DIRX (op);
… …
1307 1236
1308 mflags = get_map_flags (op->map, &m, new_x, new_y, &new_x, &new_y); 1237 mflags = get_map_flags (op->map, &m, new_x, new_y, &new_x, &new_y);
1309 1238
1310 if (!(mflags & P_OUT_OF_MAP) && ((mflags & P_IS_ALIVE) || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y)))) 1239 if (!(mflags & P_OUT_OF_MAP) && ((mflags & P_IS_ALIVE) || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))))
1311 { 1240 {
1312 tag_t tag = op->count;
1313
1314 hit_map (op, op->direction, AT_MAGIC, 1); 1241 hit_map (op, op->direction, AT_MAGIC, 1);
1315 /* Basically, missile only hits one thing then goes away. 1242 /* Basically, missile only hits one thing then goes away.
1316 * we need to remove it if someone hasn't already done so. 1243 * we need to remove it if someone hasn't already done so.
1317 */ 1244 */
1318 if (!was_destroyed (op, tag)) 1245 if (!op->destroyed ())
1319 { 1246 op->destroy ();
1320 remove_ob (op); 1247
1321 free_object (op);
1322 }
1323 return; 1248 return;
1324 } 1249 }
1325 1250
1326 remove_ob (op); 1251 op->remove ();
1252
1327 if (!op->direction || (mflags & P_OUT_OF_MAP)) 1253 if (!op->direction || (mflags & P_OUT_OF_MAP))
1328 { 1254 {
1329 free_object (op); 1255 op->destroy ();
1330 return; 1256 return;
1331 } 1257 }
1332 op->x = new_x; 1258
1333 op->y = new_y; 1259 i = spell_find_dir (m, new_x, new_y, op->owner);
1334 op->map = m;
1335 i = spell_find_dir (op->map, op->x, op->y, get_owner (op));
1336 if (i > 0 && i != op->direction) 1260 if (i > 0 && i != op->direction)
1337 { 1261 {
1338 op->direction = i; 1262 op->direction = i;
1339 SET_ANIMATION (op, op->direction); 1263 SET_ANIMATION (op, op->direction);
1340 } 1264 }
1341 insert_ob_in_map (op, op->map, op, 0); 1265
1266 m->insert (op, new_x, new_y, op);
1342} 1267}
1343 1268
1344/**************************************************************************** 1269/****************************************************************************
1345 * Destruction 1270 * Destruction
1346 ****************************************************************************/ 1271 ****************************************************************************/
… …
1391int 1316int
1392cast_destruction (object *op, object *caster, object *spell_ob) 1317cast_destruction (object *op, object *caster, object *spell_ob)
1393{ 1318{
1394 int i, j, range, mflags, friendly = 0, dam, dur; 1319 int i, j, range, mflags, friendly = 0, dam, dur;
1395 sint16 sx, sy; 1320 sint16 sx, sy;
1396 mapstruct *m; 1321 maptile *m;
1397 object *tmp; 1322 object *tmp;
1398 const char *skill; 1323 const char *skill;
1399 1324
1400 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob); 1325 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
1401 dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 1326 dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
… …
1424 for (j = -range; j < range; j++) 1349 for (j = -range; j < range; j++)
1425 { 1350 {
1426 m = op->map; 1351 m = op->map;
1427 sx = op->x + i; 1352 sx = op->x + i;
1428 sy = op->y + j; 1353 sy = op->y + j;
1354
1429 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy); 1355 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
1430 if (mflags & P_OUT_OF_MAP) 1356 if (mflags & P_OUT_OF_MAP)
1431 continue; 1357 continue;
1358
1432 if (mflags & P_IS_ALIVE) 1359 if (mflags & P_IS_ALIVE)
1433 { 1360 {
1434 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)
1435 {
1436 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER) 1362 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER)
1437 break; 1363 break;
1438 } 1364
1439 if (tmp) 1365 if (tmp)
1440 { 1366 {
1441 if (tmp->head) 1367 if (tmp->head)
1442 tmp = tmp->head; 1368 tmp = tmp->head;
1443 1369
… …
1446 { 1372 {
1447 if (spell_ob->subtype == SP_DESTRUCTION) 1373 if (spell_ob->subtype == SP_DESTRUCTION)
1448 { 1374 {
1449 hit_player (tmp, dam, op, spell_ob->attacktype, 0); 1375 hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1450 if (spell_ob->other_arch) 1376 if (spell_ob->other_arch)
1451 {
1452 tmp = arch_to_object (spell_ob->other_arch); 1377 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op);
1453 tmp->x = sx;
1454 tmp->y = sy;
1455 insert_ob_in_map (tmp, m, op, 0);
1456 }
1457 } 1378 }
1458 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)
1459 { 1380 {
1460 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch) 1381 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1461 {
1462 object *effect = arch_to_object (spell_ob->other_arch); 1382 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op);
1463
1464 effect->x = sx;
1465 effect->y = sy;
1466 insert_ob_in_map (effect, m, op, 0);
1467 }
1468 } 1383 }
1469 } 1384 }
1470 } 1385 }
1471 } 1386 }
1472 } 1387 }
1473 } 1388 }
1389
1474 op->skill = skill; 1390 op->skill = skill;
1475 return 1; 1391 return 1;
1476} 1392}
1477 1393
1478/*************************************************************************** 1394/***************************************************************************
… …
1562 force->stats.ac = spell_ob->stats.ac; 1478 force->stats.ac = spell_ob->stats.ac;
1563 force->stats.wc = spell_ob->stats.wc; 1479 force->stats.wc = spell_ob->stats.wc;
1564 1480
1565 change_abil (tmp, force); /* Mostly to display any messages */ 1481 change_abil (tmp, force); /* Mostly to display any messages */
1566 insert_ob_in_ob (force, tmp); 1482 insert_ob_in_ob (force, tmp);
1567 fix_player (tmp); 1483 tmp->update_stats ();
1568 return 1; 1484 return 1;
1569 1485
1570} 1486}
1571 1487
1572 1488
… …
1583mood_change (object *op, object *caster, object *spell) 1499mood_change (object *op, object *caster, object *spell)
1584{ 1500{
1585 object *tmp, *god, *head; 1501 object *tmp, *god, *head;
1586 int done_one, range, mflags, level, at, best_at; 1502 int done_one, range, mflags, level, at, best_at;
1587 sint16 x, y, nx, ny; 1503 sint16 x, y, nx, ny;
1588 mapstruct *m; 1504 maptile *m;
1589 const char *race; 1505 const char *race;
1590 1506
1591 /* We precompute some values here so that we don't have to keep 1507 /* We precompute some values here so that we don't have to keep
1592 * doing it over and over again. 1508 * doing it over and over again.
1593 */ 1509 */
… …
1623 1539
1624 /* If there is nothing living on this space, no need to go further */ 1540 /* If there is nothing living on this space, no need to go further */
1625 if (!(mflags & P_IS_ALIVE)) 1541 if (!(mflags & P_IS_ALIVE))
1626 continue; 1542 continue;
1627 1543
1628 for (tmp = get_map_ob (m, nx, ny); tmp; tmp = tmp->above) 1544 for (tmp = GET_MAP_OB (m, nx, ny); tmp; tmp = tmp->above)
1629 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 1545 if (QUERY_FLAG (tmp, FLAG_MONSTER))
1630 break; 1546 break;
1631 1547
1632 /* There can be living objects that are not monsters */ 1548 /* There can be living objects that are not monsters */
1633 if (!tmp || tmp->type == PLAYER) 1549 if (!tmp || tmp->type == PLAYER)
… …
1713 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK)) 1629 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK))
1714 { 1630 {
1715 SET_FLAG (head, FLAG_BERSERK); 1631 SET_FLAG (head, FLAG_BERSERK);
1716 done_one = 1; 1632 done_one = 1;
1717 } 1633 }
1634
1718 /* charm */ 1635 /* charm */
1719 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY)) 1636 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY))
1720 { 1637 {
1721 SET_FLAG (head, FLAG_FRIENDLY);
1722 /* Prevent uncontolled outbreaks of self replicating monsters. 1638 /* Prevent uncontolled outbreaks of self replicating monsters.
1723 Typical use case is charm, go somwhere, use aggravation to make hostile. 1639 Typical use case is charm, go somwhere, use aggravation to make hostile.
1724 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */ 1640 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1725 CLEAR_FLAG (head, FLAG_GENERATOR); 1641 CLEAR_FLAG (head, FLAG_GENERATOR);
1726 set_owner (head, op); 1642 head->set_owner (op);
1727 set_spell_skill (op, caster, spell, head); 1643 set_spell_skill (op, caster, spell, head);
1728 add_friendly_object (head); 1644 add_friendly_object (head);
1729 head->attack_movement = PETMOVE; 1645 head->attack_movement = PETMOVE;
1730 done_one = 1; 1646 done_one = 1;
1731 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL); 1647 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL);
1732 head->stats.exp = 0; 1648 head->stats.exp = 0;
1733 } 1649 }
1734 1650
1735 /* If a monster was effected, put an effect in */ 1651 /* If a monster was effected, put an effect in */
1736 if (done_one && spell->other_arch) 1652 if (done_one && spell->other_arch)
1737 {
1738 tmp = arch_to_object (spell->other_arch); 1653 m->insert (arch_to_object (spell->other_arch), nx, ny, op);
1739 tmp->x = nx;
1740 tmp->y = ny;
1741 insert_ob_in_map (tmp, m, op, 0);
1742 }
1743 } /* for y */ 1654 } /* for y */
1744 1655
1745 return 1; 1656 return 1;
1746} 1657}
1747 1658
… …
1757move_ball_spell (object *op) 1668move_ball_spell (object *op)
1758{ 1669{
1759 int i, j, dam_save, dir, mflags; 1670 int i, j, dam_save, dir, mflags;
1760 sint16 nx, ny, hx, hy; 1671 sint16 nx, ny, hx, hy;
1761 object *owner; 1672 object *owner;
1762 mapstruct *m; 1673 maptile *m;
1763 1674
1764 owner = get_owner (op); 1675 owner = op->owner;
1765 1676
1766 /* the following logic makes sure that the ball doesn't move into a wall, 1677 /* the following logic makes sure that the ball doesn't move into a wall,
1767 * and makes sure that it will move along a wall to try and get at it's 1678 * and makes sure that it will move along a wall to try and get at it's
1768 * victim. The block immediately below more or less chooses a random 1679 * victim. The block immediately below more or less chooses a random
1769 * offset to move the ball, eg, keep it mostly on course, with some 1680 * offset to move the ball, eg, keep it mostly on course, with some
… …
1798 nx = op->x; 1709 nx = op->x;
1799 ny = op->y; 1710 ny = op->y;
1800 m = op->map; 1711 m = op->map;
1801 } 1712 }
1802 1713
1803 remove_ob (op); 1714 m->insert (op, nx, ny, op);
1804 op->y = ny;
1805 op->x = nx;
1806 insert_ob_in_map (op, m, op, 0);
1807 1715
1808 dam_save = op->stats.dam; /* save the original dam: we do halfdam on 1716 dam_save = op->stats.dam; /* save the original dam: we do halfdam on
1809 surrounding squares */ 1717 surrounding squares */
1810 1718
1811 /* loop over current square and neighbors to hit. 1719 /* loop over current square and neighbors to hit.
… …
1837 1745
1838 } 1746 }
1839 1747
1840 /* insert the other arch */ 1748 /* insert the other arch */
1841 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))) 1749 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))))
1842 { 1750 m->insert (arch_to_object (op->other_arch), hx, hy, op);
1843 new_ob = arch_to_object (op->other_arch);
1844 new_ob->x = hx;
1845 new_ob->y = hy;
1846 insert_ob_in_map (new_ob, m, op, 0);
1847 }
1848 } 1751 }
1849 1752
1850 /* restore to the center location and damage */ 1753 /* restore to the center location and damage */
1851 op->stats.dam = dam_save; 1754 op->stats.dam = dam_save;
1852 1755
1853 i = spell_find_dir (op->map, op->x, op->y, get_owner (op)); 1756 i = spell_find_dir (op->map, op->x, op->y, op->owner);
1854 1757
1855 if (i >= 0) 1758 if (i >= 0)
1856 { /* we have a preferred direction! */ 1759 { /* we have a preferred direction! */
1857 /* pick another direction if the preferred dir is blocked. */ 1760 /* pick another direction if the preferred dir is blocked. */
1858 if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP || 1761 if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP ||
1859 OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))) 1762 OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))
1860 {
1861 i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */ 1763 i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */
1862 } 1764
1863 op->direction = i; 1765 op->direction = i;
1864 } 1766 }
1865} 1767}
1866 1768
1867 1769
… …
1879#if 0 1781#if 0
1880 static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 }; 1782 static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 };
1881 static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 }; 1783 static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 };
1882 sint16 target_x, target_y, origin_x, origin_y; 1784 sint16 target_x, target_y, origin_x, origin_y;
1883 int adjustdir; 1785 int adjustdir;
1884 mapstruct *m; 1786 maptile *m;
1885#endif 1787#endif
1886 int basedir; 1788 int basedir;
1887 object *owner; 1789 object *owner;
1888 1790
1889 owner = get_owner (op); 1791 owner = op->owner;
1890 if (op->duration == 0 || owner == NULL) 1792 if (op->duration == 0 || owner == NULL)
1891 { 1793 {
1892 remove_ob (op); 1794 op->destroy ();
1893 free_object (op);
1894 return; 1795 return;
1895 } 1796 }
1797
1896 op->duration--; 1798 op->duration--;
1897 1799
1898 basedir = op->direction; 1800 basedir = op->direction;
1899 if (basedir == 0) 1801 if (basedir == 0)
1900 { 1802 {
… …
1997 1899
1998 if (!spell->other_arch) 1900 if (!spell->other_arch)
1999 return 0; 1901 return 0;
2000 1902
2001 tmp = get_archetype (SWARM_SPELL); 1903 tmp = get_archetype (SWARM_SPELL);
2002 tmp->x = op->x;
2003 tmp->y = op->y;
2004 set_owner (tmp, op); /* needed so that if swarm elements kill, caster gets xp. */ 1904 tmp->set_owner (op); /* needed so that if swarm elements kill, caster gets xp. */
2005 set_spell_skill (op, caster, spell, tmp); 1905 set_spell_skill (op, caster, spell, tmp);
2006 1906
2007 tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */ 1907 tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */
2008 tmp->spell = arch_to_object (spell->other_arch); 1908 tmp->spell = arch_to_object (spell->other_arch);
2009 1909
2010 tmp->attacktype = tmp->spell->attacktype; 1910 tmp->attacktype = tmp->spell->attacktype;
2011 1911
2012 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 1912 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
2013 {
2014 if (!tailor_god_spell (tmp, op)) 1913 if (!tailor_god_spell (tmp, op))
2015 return 1; 1914 return 1;
2016 } 1915
2017 tmp->duration = SP_level_duration_adjust (caster, spell); 1916 tmp->duration = SP_level_duration_adjust (caster, spell);
2018 for (i = 0; i < spell->duration; i++) 1917 for (i = 0; i < spell->duration; i++)
2019 tmp->duration += die_roll (1, 3, op, PREFER_HIGH); 1918 tmp->duration += die_roll (1, 3, op, PREFER_HIGH);
2020 1919
2021 tmp->direction = dir; 1920 tmp->direction = dir;
2022 tmp->invisible = 1; 1921 tmp->invisible = 1;
2023 insert_ob_in_map (tmp, op->map, op, 0); 1922
1923 tmp->insert_at (op, op);
2024 return 1; 1924 return 1;
2025} 1925}
2026 1926
2027 1927
2028/* See the spells documentation file for why this is its own 1928/* See the spells documentation file for why this is its own
… …
2032cast_light (object *op, object *caster, object *spell, int dir) 1932cast_light (object *op, object *caster, object *spell, int dir)
2033{ 1933{
2034 object *target = NULL, *tmp = NULL; 1934 object *target = NULL, *tmp = NULL;
2035 sint16 x, y; 1935 sint16 x, y;
2036 int dam, mflags; 1936 int dam, mflags;
2037 mapstruct *m; 1937 maptile *m;
2038 1938
2039 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1939 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
2040 1940
2041 if (!dir) 1941 if (!dir)
2042 { 1942 {
… …
2056 return 0; 1956 return 0;
2057 } 1957 }
2058 1958
2059 if (mflags & P_IS_ALIVE && spell->attacktype) 1959 if (mflags & P_IS_ALIVE && spell->attacktype)
2060 { 1960 {
2061 for (target = get_map_ob (m, x, y); target; target = target->above) 1961 for (target = GET_MAP_OB (m, x, y); target; target = target->above)
2062 if (QUERY_FLAG (target, FLAG_MONSTER)) 1962 if (QUERY_FLAG (target, FLAG_MONSTER))
2063 { 1963 {
2064 /* oky doky. got a target monster. Lets make a blinding attack */ 1964 /* oky doky. got a target monster. Lets make a blinding attack */
2065 if (target->head) 1965 if (target->head)
2066 target = target->head; 1966 target = target->head;
… …
2088 { 1988 {
2089 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell); 1989 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell);
2090 if (tmp->glow_radius > MAX_LIGHT_RADII) 1990 if (tmp->glow_radius > MAX_LIGHT_RADII)
2091 tmp->glow_radius = MAX_LIGHT_RADII; 1991 tmp->glow_radius = MAX_LIGHT_RADII;
2092 } 1992 }
2093 tmp->x = x; 1993
2094 tmp->y = y; 1994 m->insert (tmp, x, y, op);
2095 insert_ob_in_map (tmp, m, op, 0);
2096 return 1; 1995 return 1;
2097} 1996}
2098 1997
2099 1998
2100 1999
… …
2110cast_cause_disease (object *op, object *caster, object *spell, int dir) 2009cast_cause_disease (object *op, object *caster, object *spell, int dir)
2111{ 2010{
2112 sint16 x, y; 2011 sint16 x, y;
2113 int i, mflags, range, dam_mod, dur_mod; 2012 int i, mflags, range, dam_mod, dur_mod;
2114 object *walk; 2013 object *walk;
2115 mapstruct *m; 2014 maptile *m;
2116 2015
2117 x = op->x; 2016 x = op->x;
2118 y = op->y; 2017 y = op->y;
2119 2018
2120 /* If casting from a scroll, no direction will be available, so refer to the 2019 /* If casting from a scroll, no direction will be available, so refer to the
… …
2148 2047
2149 /* Only bother looking on this space if there is something living here */ 2048 /* Only bother looking on this space if there is something living here */
2150 if (mflags & P_IS_ALIVE) 2049 if (mflags & P_IS_ALIVE)
2151 { 2050 {
2152 /* search this square for a victim */ 2051 /* search this square for a victim */
2153 for (walk = get_map_ob (m, x, y); walk; walk = walk->above) 2052 for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above)
2154 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER)) 2053 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER))
2155 { /* found a victim */ 2054 { /* found a victim */
2156 object *disease = arch_to_object (spell->other_arch); 2055 object *disease = arch_to_object (spell->other_arch);
2157 2056
2158 set_owner (disease, op); 2057 disease->set_owner (op);
2159 set_spell_skill (op, caster, spell, disease); 2058 set_spell_skill (op, caster, spell, disease);
2160 disease->stats.exp = 0; 2059 disease->stats.exp = 0;
2161 disease->level = caster_level (caster, spell); 2060 disease->level = caster_level (caster, spell);
2162 2061
2163 /* do level adjustments */ 2062 /* do level adjustments */
… …
2212 { 2111 {
2213 object *flash; /* visual effect for inflicting disease */ 2112 object *flash; /* visual effect for inflicting disease */
2214 2113
2215 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name); 2114 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
2216 2115
2217 free_object (disease); /* don't need this one anymore */ 2116 disease->destroy (); /* don't need this one anymore */
2218 flash = get_archetype (ARCH_DETECT_MAGIC); 2117 walk->map->insert (get_archetype (ARCH_DETECT_MAGIC), x, y, op);
2219 flash->x = x;
2220 flash->y = y;
2221 flash->map = walk->map;
2222 insert_ob_in_map (flash, walk->map, op, 0);
2223 return 1; 2118 return 1;
2224 } 2119 }
2225 free_object (disease); 2120
2121 disease->destroy ();
2226 } 2122 }
2227 } /* if living creature */ 2123 } /* if living creature */
2228 } /* for range of spaces */ 2124 } /* for range of spaces */
2125
2229 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!"); 2126 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!");
2230 return 1; 2127 return 1;
2231} 2128}

Diff Legend

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