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.30 by pippijn, Thu Mar 1 12:28:16 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 */
175 164
176void 165void
177move_bolt (object *op) 166move_bolt (object *op)
178{ 167{
179 object *tmp;
180 int mflags; 168 int mflags;
181 sint16 x, y; 169 sint16 x, y;
182 mapstruct *m; 170 maptile *m;
183 171
184 if (--(op->duration) < 0) 172 if (--op->duration < 0)
185 { 173 {
186 remove_ob (op); 174 op->destroy ();
187 free_object (op);
188 return; 175 return;
189 } 176 }
190 177
191 hit_map (op, 0, op->attacktype, 1); 178 hit_map (op, 0, op->attacktype, 1);
192 179
193 if (!op->direction) 180 if (!op->direction)
194 return; 181 return;
195 182
196 if (--op->range < 0) 183 if (--op->range < 0)
197 {
198 op->range = 0; 184 op->range = 0;
199 }
200 else 185 else
201 { 186 {
202 x = op->x + DIRX (op); 187 x = op->x + DIRX (op);
203 y = op->y + DIRY (op); 188 y = op->y + DIRY (op);
204 m = op->map; 189 m = op->map;
… …
212 * on the space. So only call reflwall if we think the data it returns 197 * on the space. So only call reflwall if we think the data it returns
213 * will be useful. 198 * will be useful.
214 */ 199 */
215 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op))) 200 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op)))
216 { 201 {
217
218 if (!QUERY_FLAG (op, FLAG_REFLECTING)) 202 if (!QUERY_FLAG (op, FLAG_REFLECTING))
219 return; 203 return;
220 204
221 /* Since walls don't run diagonal, if the bolt is in 205 /* Since walls don't run diagonal, if the bolt is in
222 * one of 4 main directions, it just reflects back in the 206 * one of 4 main directions, it just reflects back in the
… …
252 else if (left) 236 else if (left)
253 op->direction = absdir (op->direction + 2); 237 op->direction = absdir (op->direction + 2);
254 else if (right) 238 else if (right)
255 op->direction = absdir (op->direction - 2); 239 op->direction = absdir (op->direction - 2);
256 } 240 }
241
257 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */ 242 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */
258 return; 243 return;
259 } 244 }
260 else 245 else
261 { /* Create a copy of this object and put it ahead */ 246 { /* Create a copy of this object and put it ahead */
262 tmp = get_object (); 247 object *tmp = op->clone ();
263 copy_object (op, tmp); 248
249 m->insert (tmp, x, y, op);
264 tmp->speed_left = -0.1; 250 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 */ 251 /* To make up for the decrease at the top of the function */
268 tmp->duration++; 252 tmp->duration++;
269 253
270 /* New forking code. Possibly create forks of this object 254 /* New forking code. Possibly create forks of this object
271 * going off in other directions. 255 * going off in other directions.
272 */ 256 */
273
274 if (rndm (0, 99) < tmp->stats.Dex) 257 if (rndm (0, 99) < tmp->stats.Dex)
275 { /* stats.Dex % of forking */ 258 { /* stats.Dex % of forking */
276 forklightning (op, tmp); 259 forklightning (op, tmp);
277 } 260 }
261
278 /* In this way, the object left behind sticks on the space, but 262 /* In this way, the object left behind sticks on the space, but
279 * doesn't create any bolts that continue to move onward. 263 * doesn't create any bolts that continue to move onward.
280 */ 264 */
281 op->range = 0; 265 op->range = 0;
282 } /* copy object and move it along */ 266 } /* copy object and move it along */
… …
289 * we remove the magic flag - that can be derived from 273 * we remove the magic flag - that can be derived from
290 * spob->attacktype. 274 * spob->attacktype.
291 * This function sets up the appropriate owner and skill 275 * This function sets up the appropriate owner and skill
292 * pointers. 276 * pointers.
293 */ 277 */
294
295int 278int
296fire_bolt (object *op, object *caster, int dir, object *spob, object *skill) 279fire_bolt (object *op, object *caster, int dir, object *spob, object *skill)
297{ 280{
298 object *tmp = NULL; 281 object *tmp = NULL;
299 int mflags; 282 int mflags;
… …
317 300
318 tmp->direction = dir; 301 tmp->direction = dir;
319 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 302 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
320 SET_ANIMATION (tmp, dir); 303 SET_ANIMATION (tmp, dir);
321 304
322 set_owner (tmp, op); 305 tmp->set_owner (op);
323 set_spell_skill (op, caster, spob, tmp); 306 set_spell_skill (op, caster, spob, tmp);
324 307
325 tmp->x = op->x + DIRX (tmp); 308 tmp->x = op->x + DIRX (tmp);
326 tmp->y = op->y + DIRY (tmp); 309 tmp->y = op->y + DIRY (tmp);
327 tmp->map = op->map; 310 tmp->map = op->map;
328 311
312 maptile *newmap;
329 mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y); 313 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
330 if (mflags & P_OUT_OF_MAP) 314 if (mflags & P_OUT_OF_MAP)
331 { 315 {
332 free_object (tmp); 316 tmp->destroy ();
333 return 0; 317 return 0;
334 } 318 }
319
320 tmp->map = newmap;
321
335 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 322 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
336 { 323 {
337 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 324 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
338 { 325 {
339 free_object (tmp); 326 tmp->destroy ();
340 return 0; 327 return 0;
341 } 328 }
329
342 tmp->x = op->x; 330 tmp->x = op->x;
343 tmp->y = op->y; 331 tmp->y = op->y;
344 tmp->direction = absdir (tmp->direction + 4); 332 tmp->direction = absdir (tmp->direction + 4);
345 tmp->map = op->map; 333 tmp->map = op->map;
346 } 334 }
347 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL) 335
336 if ((tmp = tmp->insert_at (tmp, op)))
348 move_bolt (tmp); 337 move_bolt (tmp);
338
349 return 1; 339 return 1;
350} 340}
351 341
352 342
353 343
… …
362 * At least that is what I think this does. 352 * At least that is what I think this does.
363 */ 353 */
364void 354void
365explosion (object *op) 355explosion (object *op)
366{ 356{
367 object *tmp;
368 mapstruct *m = op->map; 357 maptile *m = op->map;
369 int i; 358 int i;
370 359
371 if (--(op->duration) < 0) 360 if (--op->duration < 0)
372 { 361 {
373 remove_ob (op); 362 op->destroy ();
374 free_object (op);
375 return; 363 return;
376 } 364 }
365
377 hit_map (op, 0, op->attacktype, 0); 366 hit_map (op, 0, op->attacktype, 0);
378 367
379 if (op->range > 0) 368 if (op->range > 0)
380 { 369 {
381 for (i = 1; i < 9; i++) 370 for (i = 1; i < 9; i++)
382 { 371 {
383 sint16 dx, dy; 372 sint16 dx, dy;
384 373
385 dx = op->x + freearr_x[i]; 374 dx = op->x + freearr_x[i];
386 dy = op->y + freearr_y[i]; 375 dy = op->y + freearr_y[i];
376
387 /* ok_to_put_more already does things like checks for walls, 377 /* ok_to_put_more already does things like checks for walls,
388 * out of map, etc. 378 * out of map, etc.
389 */ 379 */
390 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype)) 380 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype))
391 { 381 {
392 tmp = get_object (); 382 object *tmp = op->clone ();
393 copy_object (op, tmp); 383
394 tmp->state = 0; 384 tmp->state = 0;
395 tmp->speed_left = -0.21; 385 tmp->speed_left = -0.21;
396 tmp->range--; 386 tmp->range--;
397 tmp->value = 0; 387 tmp->value = 0;
398 tmp->x = dx; 388
399 tmp->y = dy; 389 m->insert (tmp, dx, dy, op);
400 insert_ob_in_map (tmp, m, op, 0);
401 } 390 }
402 } 391 }
403 } 392 }
404} 393}
405 394
… …
409 * explode. 398 * explode.
410 */ 399 */
411void 400void
412explode_bullet (object *op) 401explode_bullet (object *op)
413{ 402{
414 tag_t op_tag = op->count;
415 object *tmp, *owner; 403 object *tmp, *owner;
416 404
417 if (op->other_arch == NULL) 405 if (op->other_arch == NULL)
418 { 406 {
419 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n"); 407 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");
420 remove_ob (op); 408 op->destroy ();
421 free_object (op);
422 return; 409 return;
423 } 410 }
424 411
425 if (op->env) 412 if (op->env)
426 { 413 {
427 object *env;
428
429 env = object_get_env_recursive (op); 414 object *env = object_get_env_recursive (op);
430 if (env->map == NULL || out_of_map (env->map, env->x, env->y)) 415 if (env->map == NULL || out_of_map (env->map, env->x, env->y))
431 { 416 {
432 LOG (llevError, "BUG: explode_bullet(): env out of map\n"); 417 LOG (llevError, "BUG: explode_bullet(): env out of map\n");
433 remove_ob (op); 418 op->destroy ();
434 free_object (op);
435 return; 419 return;
436 } 420 }
437 remove_ob (op); 421
438 op->x = env->x; 422 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 } 423 }
442 else if (out_of_map (op->map, op->x, op->y)) 424 else if (out_of_map (op->map, op->x, op->y))
443 { 425 {
444 LOG (llevError, "BUG: explode_bullet(): op out of map\n"); 426 LOG (llevError, "BUG: explode_bullet(): op out of map\n");
445 remove_ob (op); 427 op->destroy ();
446 free_object (op);
447 return; 428 return;
448 } 429 }
449 430
450 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps 431 // 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 432 // NOTE: If this breaks something important: remove this. I can't think of anything
452 // bad at the moment that might happen from this. 433 // 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) 434 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
454 { 435 {
455 remove_ob (op); 436 op->destroy ();
456 free_object (op);
457 return; 437 return;
458 } 438 }
459 439
460 if (op->attacktype) 440 if (op->attacktype)
461 { 441 {
462 hit_map (op, 0, op->attacktype, 1); 442 hit_map (op, 0, op->attacktype, 1);
463 if (was_destroyed (op, op_tag)) 443 if (op->destroyed ())
464 return; 444 return;
465 } 445 }
466 446
467 /* other_arch contains what this explodes into */ 447 /* other_arch contains what this explodes into */
468 tmp = arch_to_object (op->other_arch); 448 tmp = arch_to_object (op->other_arch);
469 449
470 copy_owner (tmp, op); 450 tmp->set_owner (op);
471 tmp->skill = op->skill; 451 tmp->skill = op->skill;
472 452
473 owner = get_owner (op); 453 owner = op->owner;
474 454
475 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner)) 455 if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner))
476 { 456 {
477 remove_ob (op); 457 op->destroy ();
478 free_object (op);
479 return; 458 return;
480 } 459 }
481
482 tmp->x = op->x;
483 tmp->y = op->y;
484 460
485 /* special for bombs - it actually has sane values for these */ 461 /* special for bombs - it actually has sane values for these */
486 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB) 462 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB)
487 { 463 {
488 tmp->attacktype = op->attacktype; 464 tmp->attacktype = op->attacktype;
… …
492 } 468 }
493 else 469 else
494 { 470 {
495 if (op->attacktype & AT_MAGIC) 471 if (op->attacktype & AT_MAGIC)
496 tmp->attacktype |= AT_MAGIC; 472 tmp->attacktype |= AT_MAGIC;
473
497 /* Spell doc describes what is going on here */ 474 /* Spell doc describes what is going on here */
498 tmp->stats.dam = op->dam_modifier; 475 tmp->stats.dam = op->dam_modifier;
499 tmp->range = op->stats.maxhp; 476 tmp->range = op->stats.maxhp;
500 tmp->duration = op->stats.hp; 477 tmp->duration = op->stats.hp;
501 /* Used for spell tracking - just need a unique val for this spell - 478 /* Used for spell tracking - just need a unique val for this spell -
… …
509 tmp->stats.sp = op->direction; 486 tmp->stats.sp = op->direction;
510 487
511 /* Prevent recursion */ 488 /* Prevent recursion */
512 op->move_on = 0; 489 op->move_on = 0;
513 490
514 insert_ob_in_map (tmp, op->map, op, 0); 491 tmp->insert_at (op, op);
515 /* remove the firebullet */ 492 /* remove the firebullet */
516 if (!was_destroyed (op, op_tag)) 493 op->destroy ();
517 {
518 remove_ob (op);
519 free_object (op);
520 }
521} 494}
522
523
524 495
525/* checks to see what op should do, given the space it is on 496/* checks to see what op should do, given the space it is on
526 * (eg, explode, damage player, etc) 497 * (eg, explode, damage player, etc)
527 */ 498 */
528
529void 499void
530check_bullet (object *op) 500check_bullet (object *op)
531{ 501{
532 tag_t op_tag = op->count, tmp_tag;
533 object *tmp; 502 object *tmp;
534 int dam, mflags; 503 int dam, mflags;
535 mapstruct *m; 504 maptile *m;
536 sint16 sx, sy; 505 sint16 sx, sy;
537 506
538 mflags = get_map_flags (op->map, &m, op->x, op->y, &sx, &sy); 507 mflags = get_map_flags (op->map, &m, op->x, op->y, &sx, &sy);
539 508
540 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy))) 509 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy)))
… …
549 518
550 /* If nothing alive on this space, no reason to do anything further */ 519 /* If nothing alive on this space, no reason to do anything further */
551 if (!(mflags & P_IS_ALIVE)) 520 if (!(mflags & P_IS_ALIVE))
552 return; 521 return;
553 522
554 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 523 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
555 { 524 {
556 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 525 if (QUERY_FLAG (tmp, FLAG_ALIVE))
557 { 526 {
558 tmp_tag = tmp->count;
559 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 527 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) 528 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
561 { 529 {
562 if (!QUERY_FLAG (op, FLAG_REMOVED)) 530 if (!QUERY_FLAG (op, FLAG_REMOVED))
563 { 531 {
564 remove_ob (op); 532 op->destroy ();
565 free_object (op);
566 return; 533 return;
567 } 534 }
568 } 535 }
569 } 536 }
570 } 537 }
571} 538}
572
573 539
574/* Basically, we move 'op' one square, and if it hits something, 540/* Basically, we move 'op' one square, and if it hits something,
575 * call check_bullet. 541 * call check_bullet.
576 * This function is only applicable to bullets, but not to all 542 * This function is only applicable to bullets, but not to all
577 * fired arches (eg, bolts). 543 * fired arches (eg, bolts).
578 */ 544 */
579
580void 545void
581move_bullet (object *op) 546move_bullet (object *op)
582{ 547{
583 sint16 new_x, new_y; 548 sint16 new_x, new_y;
584 int mflags; 549 int mflags;
585 mapstruct *m; 550 maptile *m;
586 551
587#if 0 552#if 0
588 /* We need a better general purpose way to do this */ 553 /* We need a better general purpose way to do this */
589 554
590 /* peterm: added to make comet leave a trail of burnouts 555 /* peterm: added to make comet leave a trail of burnouts
591 it's an unadulterated hack, but the effect is cool. */ 556 it's an unadulterated hack, but the effect is cool. */
592 if (op->stats.sp == SP_METEOR) 557 if (op->stats.sp == SP_METEOR)
593 { 558 {
594 replace_insert_ob_in_map ("fire_trail", op); 559 replace_insert_ob_in_map ("fire_trail", op);
595 if (was_destroyed (op, op_tag)) 560 if (op->destroyed ())
596 return; 561 return;
597 } /* end addition. */ 562 } /* end addition. */
598#endif 563#endif
599 564
600 /* Reached the end of its life - remove it */ 565 /* Reached the end of its life - remove it */
601 if (--op->range <= 0) 566 if (--op->range <= 0)
602 { 567 {
603 if (op->other_arch) 568 if (op->other_arch)
604 {
605 explode_bullet (op); 569 explode_bullet (op);
606 }
607 else 570 else
608 { 571 op->destroy ();
609 remove_ob (op); 572
610 free_object (op);
611 }
612 return; 573 return;
613 } 574 }
614 575
615 new_x = op->x + DIRX (op); 576 new_x = op->x + DIRX (op);
616 new_y = op->y + DIRY (op); 577 new_y = op->y + DIRY (op);
617 m = op->map; 578 m = op->map;
618 mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y); 579 mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y);
619 580
620 if (mflags & P_OUT_OF_MAP) 581 if (mflags & P_OUT_OF_MAP)
621 { 582 {
622 remove_ob (op); 583 op->destroy ();
623 free_object (op);
624 return; 584 return;
625 } 585 }
626 586
627 if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))) 587 if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y)))
628 { 588 {
629 if (op->other_arch) 589 if (op->other_arch)
630 {
631 explode_bullet (op); 590 explode_bullet (op);
632 }
633 else 591 else
634 { 592 op->destroy ();
635 remove_ob (op); 593
636 free_object (op);
637 }
638 return; 594 return;
639 } 595 }
640 596
641 remove_ob (op); 597 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; 598 return;
646 599
647 if (reflwall (op->map, op->x, op->y, op)) 600 if (reflwall (op->map, op->x, op->y, op))
648 { 601 {
649 op->direction = absdir (op->direction + 4); 602 op->direction = absdir (op->direction + 4);
650 update_turn_face (op); 603 update_turn_face (op);
651 } 604 }
652 else 605 else
653 {
654 check_bullet (op); 606 check_bullet (op);
655 }
656} 607}
657 608
658 609
659 610
660 611
… …
695 646
696 tmp->direction = dir; 647 tmp->direction = dir;
697 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 648 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
698 SET_ANIMATION (tmp, dir); 649 SET_ANIMATION (tmp, dir);
699 650
700 set_owner (tmp, op); 651 tmp->set_owner (op);
701 set_spell_skill (op, caster, spob, tmp); 652 set_spell_skill (op, caster, spob, tmp);
702 653
703 tmp->x = op->x + freearr_x[dir]; 654 tmp->x = op->x + freearr_x[dir];
704 tmp->y = op->y + freearr_y[dir]; 655 tmp->y = op->y + freearr_y[dir];
705 tmp->map = op->map; 656 tmp->map = op->map;
706 657
658 maptile *newmap;
707 mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y); 659 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
708 if (mflags & P_OUT_OF_MAP) 660 if (mflags & P_OUT_OF_MAP)
709 { 661 {
710 free_object (tmp); 662 tmp->destroy ();
711 return 0; 663 return 0;
712 } 664 }
665
666 tmp->map = newmap;
667
713 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 668 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
714 { 669 {
715 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 670 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
716 { 671 {
717 free_object (tmp); 672 tmp->destroy ();
718 return 0; 673 return 0;
719 } 674 }
675
720 tmp->x = op->x; 676 tmp->x = op->x;
721 tmp->y = op->y; 677 tmp->y = op->y;
722 tmp->direction = absdir (tmp->direction + 4); 678 tmp->direction = absdir (tmp->direction + 4);
723 tmp->map = op->map; 679 tmp->map = op->map;
724 } 680 }
725 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL) 681
726 { 682 if ((tmp = tmp->insert_at (tmp, op)))
727 check_bullet (tmp); 683 check_bullet (tmp);
728 } 684
729 return 1; 685 return 1;
730} 686}
731 687
732 688
733 689
… …
743void 699void
744cone_drop (object *op) 700cone_drop (object *op)
745{ 701{
746 object *new_ob = arch_to_object (op->other_arch); 702 object *new_ob = arch_to_object (op->other_arch);
747 703
748 new_ob->x = op->x;
749 new_ob->y = op->y;
750 new_ob->level = op->level; 704 new_ob->level = op->level;
751 set_owner (new_ob, op->owner); 705 new_ob->set_owner (op->owner);
752 706
753 /* preserve skill ownership */ 707 /* preserve skill ownership */
754 if (op->skill && op->skill != new_ob->skill) 708 if (op->skill && op->skill != new_ob->skill)
755 {
756 new_ob->skill = op->skill; 709 new_ob->skill = op->skill;
757 }
758 insert_ob_in_map (new_ob, op->map, op, 0);
759 710
711 new_ob->insert_at (op, op);
760} 712}
761 713
762/* move_cone: causes cone object 'op' to move a space/hit creatures */ 714/* move_cone: causes cone object 'op' to move a space/hit creatures */
763 715
764void 716void
765move_cone (object *op) 717move_cone (object *op)
766{ 718{
767 int i; 719 int i;
768 tag_t tag;
769 720
770 /* if no map then hit_map will crash so just ignore object */ 721 /* if no map then hit_map will crash so just ignore object */
771 if (!op->map) 722 if (!op->map)
772 { 723 {
773 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown"); 724 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown");
774 op->speed = 0; 725 op->set_speed (0);
775 update_ob_speed (op);
776 return; 726 return;
777 } 727 }
778 728
779 /* lava saves it's life, but not yours :) */ 729 /* lava saves it's life, but not yours :) */
780 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 730 if (QUERY_FLAG (op, FLAG_LIFESAVE))
… …
786#if 0 736#if 0
787 /* Disable this - enabling it makes monsters easier, as 737 /* Disable this - enabling it makes monsters easier, as
788 * when their cone dies when they die. 738 * when their cone dies when they die.
789 */ 739 */
790 /* If no owner left, the spell dies out. */ 740 /* If no owner left, the spell dies out. */
791 if (get_owner (op) == NULL) 741 if (op->owner == NULL)
792 { 742 {
793 remove_ob (op); 743 op->destroy ();
794 free_object (op);
795 return; 744 return;
796 } 745 }
797#endif 746#endif
798 747
799 tag = op->count;
800 hit_map (op, 0, op->attacktype, 0); 748 hit_map (op, 0, op->attacktype, 0);
801 749
802 /* Check to see if we should push anything. 750 /* Check to see if we should push anything.
803 * Spell objects with weight push whatever they encounter to some 751 * Spell objects with weight push whatever they encounter to some
804 * degree. 752 * degree.
805 */ 753 */
806 if (op->weight) 754 if (op->weight)
807 check_spell_knockback (op); 755 check_spell_knockback (op);
808 756
809 if (was_destroyed (op, tag)) 757 if (op->destroyed ())
810 return; 758 return;
811 759
812 if ((op->duration--) < 0) 760 if ((op->duration--) < 0)
813 { 761 {
814 remove_ob (op); 762 op->destroy ();
815 free_object (op);
816 return; 763 return;
817 } 764 }
818 /* Object has hit maximum range, so don't have it move 765 /* Object has hit maximum range, so don't have it move
819 * any further. When the duration above expires, 766 * any further. When the duration above expires,
820 * then the object will get removed. 767 * then the object will get removed.
… …
829 { 776 {
830 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)]; 777 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)];
831 778
832 if (ok_to_put_more (op->map, x, y, op, op->attacktype)) 779 if (ok_to_put_more (op->map, x, y, op, op->attacktype))
833 { 780 {
834 object *tmp = get_object (); 781 object *tmp = op->clone ();
835
836 copy_object (op, tmp);
837 tmp->x = x;
838 tmp->y = y;
839 782
840 tmp->duration = op->duration + 1; 783 tmp->duration = op->duration + 1;
841 784
842 /* Use for spell tracking - see ok_to_put_more() */ 785 /* Use for spell tracking - see ok_to_put_more() */
843 tmp->stats.maxhp = op->stats.maxhp; 786 tmp->stats.maxhp = op->stats.maxhp;
844 insert_ob_in_map (tmp, op->map, op, 0); 787
788 op->map->insert (tmp, x, y, op);
789
845 if (tmp->other_arch) 790 if (tmp->other_arch)
846 cone_drop (tmp); 791 cone_drop (tmp);
847 } 792 }
848 } 793 }
849} 794}
… …
859int 804int
860cast_cone (object *op, object *caster, int dir, object *spell) 805cast_cone (object *op, object *caster, int dir, object *spell)
861{ 806{
862 object *tmp; 807 object *tmp;
863 int i, success = 0, range_min = -1, range_max = 1; 808 int i, success = 0, range_min = -1, range_max = 1;
864 mapstruct *m; 809 maptile *m;
865 sint16 sx, sy; 810 sint16 sx, sy;
866 MoveType movetype; 811 MoveType movetype;
867 812
868 if (!spell->other_arch) 813 if (!spell->other_arch)
869 return 0; 814 return 0;
… …
925 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype) 870 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype)
926 continue; 871 continue;
927 872
928 success = 1; 873 success = 1;
929 tmp = arch_to_object (spell->other_arch); 874 tmp = arch_to_object (spell->other_arch);
930 set_owner (tmp, op); 875 tmp->set_owner (op);
931 set_spell_skill (op, caster, spell, tmp); 876 set_spell_skill (op, caster, spell, tmp);
932 tmp->level = caster_level (caster, spell); 877 tmp->level = caster_level (caster, spell);
933 tmp->x = sx;
934 tmp->y = sy;
935 tmp->attacktype = spell->attacktype; 878 tmp->attacktype = spell->attacktype;
936 879
937 /* holy word stuff */ 880 /* holy word stuff */
938 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) 881 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER))
939 if (!tailor_god_spell (tmp, op)) 882 if (!tailor_god_spell (tmp, op))
… …
976 919
977 if (!(tmp->move_type & MOVE_FLY_LOW)) 920 if (!(tmp->move_type & MOVE_FLY_LOW))
978 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->name); 921 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->name);
979 922
980 if (!tmp->move_on && tmp->stats.dam) 923 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); 924 LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->name);
983 }
984 925
985 insert_ob_in_map (tmp, m, op, 0); 926 m->insert (tmp, sx, sy, op);
986 927
987 /* This is used for tracking spells so that one effect doesn't hit 928 /* This is used for tracking spells so that one effect doesn't hit
988 * a single space too many times. 929 * a single space too many times.
989 */ 930 */
990 tmp->stats.maxhp = tmp->count; 931 tmp->stats.maxhp = tmp->count;
… …
1009void 950void
1010animate_bomb (object *op) 951animate_bomb (object *op)
1011{ 952{
1012 int i; 953 int i;
1013 object *env, *tmp; 954 object *env, *tmp;
1014 archetype *at;
1015 955
1016 if (op->state != NUM_ANIMATIONS (op) - 1) 956 if (op->state != NUM_ANIMATIONS (op) - 1)
1017 return; 957 return;
1018 958
1019 env = object_get_env_recursive (op); 959 env = object_get_env_recursive (op);
… …
1024 return; 964 return;
1025 965
1026 if (env->type == PLAYER) 966 if (env->type == PLAYER)
1027 esrv_del_item (env->contr, op->count); 967 esrv_del_item (env->contr, op->count);
1028 968
1029 remove_ob (op); 969 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; 970 return;
1034 } 971 }
1035 972
1036 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding 973 // 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 974 // on a safe map. I don't like this special casing, but it seems to be neccessary
1038 // as bombs can be carried. 975 // as bombs can be carried.
1039 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 976 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
1040 { 977 {
1041 remove_ob (op); 978 op->destroy ();
1042 free_object (op);
1043 return; 979 return;
1044 } 980 }
1045 981
1046 /* This copies a lot of the code from the fire bullet, 982 /* This copies a lot of the code from the fire bullet,
1047 * but using the cast_bullet isn't really feasible, 983 * but using the cast_bullet isn't really feasible,
1048 * so just set up the appropriate values. 984 * so just set up the appropriate values.
1049 */ 985 */
1050 at = find_archetype (SPLINT); 986 if (archetype *at = archetype::find (SPLINT))
1051 if (at)
1052 { 987 {
1053 for (i = 1; i < 9; i++) 988 for (i = 1; i < 9; i++)
1054 { 989 {
1055 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i])) 990 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i]))
1056 continue; 991 continue;
992
1057 tmp = arch_to_object (at); 993 tmp = arch_to_object (at);
1058 tmp->direction = i; 994 tmp->direction = i;
1059 tmp->range = op->range; 995 tmp->range = op->range;
1060 tmp->stats.dam = op->stats.dam; 996 tmp->stats.dam = op->stats.dam;
1061 tmp->duration = op->duration; 997 tmp->duration = op->duration;
1062 tmp->attacktype = op->attacktype; 998 tmp->attacktype = op->attacktype;
1063 copy_owner (tmp, op); 999 tmp->set_owner (op);
1064 if (op->skill && op->skill != tmp->skill) 1000 if (op->skill && op->skill != tmp->skill)
1065 {
1066 tmp->skill = op->skill; 1001 tmp->skill = op->skill;
1067 } 1002
1068 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 1003 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
1069 SET_ANIMATION (tmp, i); 1004 SET_ANIMATION (tmp, i);
1070 tmp->x = op->x + freearr_x[i]; 1005
1071 tmp->y = op->y + freearr_x[i]; 1006 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); 1007 move_bullet (tmp);
1074 } 1008 }
1075 } 1009 }
1076 1010
1077 explode_bullet (op); 1011 explode_bullet (op);
… …
1082{ 1016{
1083 1017
1084 object *tmp; 1018 object *tmp;
1085 int mflags; 1019 int mflags;
1086 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir]; 1020 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir];
1087 mapstruct *m; 1021 maptile *m;
1088 1022
1089 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy); 1023 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)) 1024 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
1091 { 1025 {
1092 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1026 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
… …
1098 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 1032 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
1099 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1033 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1100 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 1034 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
1101 tmp->attacktype = spell->attacktype; 1035 tmp->attacktype = spell->attacktype;
1102 1036
1103 set_owner (tmp, op); 1037 tmp->set_owner (op);
1104 set_spell_skill (op, caster, spell, tmp); 1038 set_spell_skill (op, caster, spell, tmp);
1105 tmp->x = dx; 1039
1106 tmp->y = dy; 1040 m->insert (tmp, dx, dy, op);
1107 insert_ob_in_map (tmp, m, op, 0);
1108 return 1; 1041 return 1;
1109} 1042}
1110 1043
1111/**************************************************************************** 1044/****************************************************************************
1112 * 1045 *
… …
1128get_pointed_target (object *op, int dir, int range, int type) 1061get_pointed_target (object *op, int dir, int range, int type)
1129{ 1062{
1130 object *target; 1063 object *target;
1131 sint16 x, y; 1064 sint16 x, y;
1132 int dist, mflags; 1065 int dist, mflags;
1133 mapstruct *mp; 1066 maptile *mp;
1134 1067
1135 if (dir == 0) 1068 if (dir == 0)
1136 return NULL; 1069 return NULL;
1137 1070
1138 for (dist = 1; dist < range; dist++) 1071 for (dist = 1; dist < range; dist++)
… …
1151 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW) 1084 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
1152 return NULL; 1085 return NULL;
1153 1086
1154 if (mflags & P_IS_ALIVE) 1087 if (mflags & P_IS_ALIVE)
1155 { 1088 {
1156 for (target = get_map_ob (mp, x, y); target; target = target->above) 1089 for (target = GET_MAP_OB (mp, x, y); target; target = target->above)
1157 { 1090 {
1158 if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER)) 1091 if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER))
1159 { 1092 {
1160 return target; 1093 return target;
1161 } 1094 }
… …
1228 if (effect->attacktype & AT_DEATH) 1161 if (effect->attacktype & AT_DEATH)
1229 { 1162 {
1230 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1163 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1231 1164
1232 /* casting death spells at undead isn't a good thing */ 1165 /* casting death spells at undead isn't a good thing */
1233 if QUERY_FLAG
1234 (target, FLAG_UNDEAD) 1166 if (QUERY_FLAG (target, FLAG_UNDEAD))
1235 { 1167 {
1236 if (random_roll (0, 2, op, PREFER_LOW)) 1168 if (random_roll (0, 2, op, PREFER_LOW))
1237 { 1169 {
1238 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!"); 1170 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");
1239 effect->x = op->x; 1171 effect->x = op->x;
… …
1241 } 1173 }
1242 else 1174 else
1243 { 1175 {
1244 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target)); 1176 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target));
1245 target->stats.hp = target->stats.maxhp * 2; 1177 target->stats.hp = target->stats.maxhp * 2;
1246 free_object (effect); 1178 effect->destroy ();
1247 return 0; 1179 return 0;
1248 } 1180 }
1249 } 1181 }
1250 } 1182 }
1251 else 1183 else
1252 { 1184 {
1253 /* how much woe to inflict :) */ 1185 /* how much woe to inflict :) */
1254 effect->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1186 effect->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1255 } 1187 }
1256 1188
1257 set_owner (effect, op); 1189 effect->set_owner (op);
1258 set_spell_skill (op, caster, spell, effect); 1190 set_spell_skill (op, caster, spell, effect);
1259 1191
1260 /* ok, tell it where to be, and insert! */ 1192 /* ok, tell it where to be, and insert! */
1261 effect->x = target->x; 1193 effect->insert_at (target, op);
1262 effect->y = target->y;
1263 insert_ob_in_map (effect, target->map, op, 0);
1264 1194
1265 return 1; 1195 return 1;
1266} 1196}
1267 1197
1268 1198
… …
1278move_missile (object *op) 1208move_missile (object *op)
1279{ 1209{
1280 int i, mflags; 1210 int i, mflags;
1281 object *owner; 1211 object *owner;
1282 sint16 new_x, new_y; 1212 sint16 new_x, new_y;
1283 mapstruct *m; 1213 maptile *m;
1284 1214
1285 if (op->range-- <= 0) 1215 if (op->range-- <= 0)
1286 { 1216 {
1287 remove_ob (op); 1217 op->destroy ();
1288 free_object (op);
1289 return; 1218 return;
1290 } 1219 }
1291 1220
1292 owner = get_owner (op); 1221 owner = op->owner;
1293#if 0 1222#if 0
1294 /* It'd make things nastier if this wasn't here - spells cast by 1223 /* It'd make things nastier if this wasn't here - spells cast by
1295 * monster that are then killed would continue to survive 1224 * monster that are then killed would continue to survive
1296 */ 1225 */
1297 if (owner == NULL) 1226 if (owner == NULL)
1298 { 1227 {
1299 remove_ob (op); 1228 op->destroy ();
1300 free_object (op);
1301 return; 1229 return;
1302 } 1230 }
1303#endif 1231#endif
1304 1232
1305 new_x = op->x + DIRX (op); 1233 new_x = op->x + DIRX (op);
… …
1307 1235
1308 mflags = get_map_flags (op->map, &m, new_x, new_y, &new_x, &new_y); 1236 mflags = get_map_flags (op->map, &m, new_x, new_y, &new_x, &new_y);
1309 1237
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)))) 1238 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 { 1239 {
1312 tag_t tag = op->count;
1313
1314 hit_map (op, op->direction, AT_MAGIC, 1); 1240 hit_map (op, op->direction, AT_MAGIC, 1);
1315 /* Basically, missile only hits one thing then goes away. 1241 /* Basically, missile only hits one thing then goes away.
1316 * we need to remove it if someone hasn't already done so. 1242 * we need to remove it if someone hasn't already done so.
1317 */ 1243 */
1318 if (!was_destroyed (op, tag)) 1244 if (!op->destroyed ())
1319 { 1245 op->destroy ();
1320 remove_ob (op); 1246
1321 free_object (op);
1322 }
1323 return; 1247 return;
1324 } 1248 }
1325 1249
1326 remove_ob (op); 1250 op->remove ();
1251
1327 if (!op->direction || (mflags & P_OUT_OF_MAP)) 1252 if (!op->direction || (mflags & P_OUT_OF_MAP))
1328 { 1253 {
1329 free_object (op); 1254 op->destroy ();
1330 return; 1255 return;
1331 } 1256 }
1332 op->x = new_x; 1257
1333 op->y = new_y; 1258 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) 1259 if (i > 0 && i != op->direction)
1337 { 1260 {
1338 op->direction = i; 1261 op->direction = i;
1339 SET_ANIMATION (op, op->direction); 1262 SET_ANIMATION (op, op->direction);
1340 } 1263 }
1341 insert_ob_in_map (op, op->map, op, 0); 1264
1265 m->insert (op, new_x, new_y, op);
1342} 1266}
1343 1267
1344/**************************************************************************** 1268/****************************************************************************
1345 * Destruction 1269 * Destruction
1346 ****************************************************************************/ 1270 ****************************************************************************/
… …
1391int 1315int
1392cast_destruction (object *op, object *caster, object *spell_ob) 1316cast_destruction (object *op, object *caster, object *spell_ob)
1393{ 1317{
1394 int i, j, range, mflags, friendly = 0, dam, dur; 1318 int i, j, range, mflags, friendly = 0, dam, dur;
1395 sint16 sx, sy; 1319 sint16 sx, sy;
1396 mapstruct *m; 1320 maptile *m;
1397 object *tmp; 1321 object *tmp;
1398 const char *skill; 1322 const char *skill;
1399 1323
1400 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob); 1324 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
1401 dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 1325 dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
… …
1424 for (j = -range; j < range; j++) 1348 for (j = -range; j < range; j++)
1425 { 1349 {
1426 m = op->map; 1350 m = op->map;
1427 sx = op->x + i; 1351 sx = op->x + i;
1428 sy = op->y + j; 1352 sy = op->y + j;
1353
1429 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy); 1354 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
1430 if (mflags & P_OUT_OF_MAP) 1355 if (mflags & P_OUT_OF_MAP)
1431 continue; 1356 continue;
1357
1432 if (mflags & P_IS_ALIVE) 1358 if (mflags & P_IS_ALIVE)
1433 { 1359 {
1434 for (tmp = get_map_ob (m, sx, sy); tmp; tmp = tmp->above) 1360 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)
1435 {
1436 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER) 1361 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER)
1437 break; 1362 break;
1438 } 1363
1439 if (tmp) 1364 if (tmp)
1440 { 1365 {
1441 if (tmp->head) 1366 if (tmp->head)
1442 tmp = tmp->head; 1367 tmp = tmp->head;
1443 1368
… …
1446 { 1371 {
1447 if (spell_ob->subtype == SP_DESTRUCTION) 1372 if (spell_ob->subtype == SP_DESTRUCTION)
1448 { 1373 {
1449 hit_player (tmp, dam, op, spell_ob->attacktype, 0); 1374 hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1450 if (spell_ob->other_arch) 1375 if (spell_ob->other_arch)
1451 {
1452 tmp = arch_to_object (spell_ob->other_arch); 1376 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 } 1377 }
1458 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100) 1378 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100)
1459 { 1379 {
1460 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch) 1380 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1461 {
1462 object *effect = arch_to_object (spell_ob->other_arch); 1381 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 } 1382 }
1469 } 1383 }
1470 } 1384 }
1471 } 1385 }
1472 } 1386 }
1473 } 1387 }
1388
1474 op->skill = skill; 1389 op->skill = skill;
1475 return 1; 1390 return 1;
1476} 1391}
1477 1392
1478/*************************************************************************** 1393/***************************************************************************
… …
1562 force->stats.ac = spell_ob->stats.ac; 1477 force->stats.ac = spell_ob->stats.ac;
1563 force->stats.wc = spell_ob->stats.wc; 1478 force->stats.wc = spell_ob->stats.wc;
1564 1479
1565 change_abil (tmp, force); /* Mostly to display any messages */ 1480 change_abil (tmp, force); /* Mostly to display any messages */
1566 insert_ob_in_ob (force, tmp); 1481 insert_ob_in_ob (force, tmp);
1567 fix_player (tmp); 1482 tmp->update_stats ();
1568 return 1; 1483 return 1;
1569 1484
1570} 1485}
1571
1572 1486
1573/********************************************************************** 1487/**********************************************************************
1574 * mood change 1488 * mood change
1575 * Arguably, this may or may not be an attack spell. But since it 1489 * Arguably, this may or may not be an attack spell. But since it
1576 * effects monsters, it seems best to put it into this file 1490 * effects monsters, it seems best to put it into this file
… …
1583mood_change (object *op, object *caster, object *spell) 1497mood_change (object *op, object *caster, object *spell)
1584{ 1498{
1585 object *tmp, *god, *head; 1499 object *tmp, *god, *head;
1586 int done_one, range, mflags, level, at, best_at; 1500 int done_one, range, mflags, level, at, best_at;
1587 sint16 x, y, nx, ny; 1501 sint16 x, y, nx, ny;
1588 mapstruct *m; 1502 maptile *m;
1589 const char *race; 1503 const char *race;
1590 1504
1591 /* We precompute some values here so that we don't have to keep 1505 /* We precompute some values here so that we don't have to keep
1592 * doing it over and over again. 1506 * doing it over and over again.
1593 */ 1507 */
… …
1606 else if (god && !strcmp (spell->race, "GOD_FRIEND")) 1520 else if (god && !strcmp (spell->race, "GOD_FRIEND"))
1607 race = god->race; 1521 race = god->race;
1608 else 1522 else
1609 race = spell->race; 1523 race = spell->race;
1610 1524
1611
1612 for (x = op->x - range; x <= op->x + range; x++) 1525 for (x = op->x - range; x <= op->x + range; x++)
1613 for (y = op->y - range; y <= op->y + range; y++) 1526 for (y = op->y - range; y <= op->y + range; y++)
1614 { 1527 {
1615
1616 done_one = 0; 1528 done_one = 0;
1617 m = op->map; 1529 m = op->map;
1618 nx = x; 1530 nx = x;
1619 ny = y; 1531 ny = y;
1620 mflags = get_map_flags (m, &m, x, y, &nx, &ny); 1532 mflags = get_map_flags (m, &m, x, y, &nx, &ny);
… …
1623 1535
1624 /* If there is nothing living on this space, no need to go further */ 1536 /* If there is nothing living on this space, no need to go further */
1625 if (!(mflags & P_IS_ALIVE)) 1537 if (!(mflags & P_IS_ALIVE))
1626 continue; 1538 continue;
1627 1539
1540 // players can only affect spaces that they can actually see
1541 if (caster && caster->contr
1542 && caster->contr->visibility_at (m, nx, ny) < 70)
1543 continue;
1544
1628 for (tmp = get_map_ob (m, nx, ny); tmp; tmp = tmp->above) 1545 for (tmp = GET_MAP_TOP (m, nx, ny); tmp; tmp = tmp->below)
1629 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 1546 if (QUERY_FLAG (tmp, FLAG_MONSTER))
1630 break; 1547 break;
1631 1548
1632 /* There can be living objects that are not monsters */ 1549 /* There can be living objects that are not monsters */
1633 if (!tmp || tmp->type == PLAYER) 1550 if (!tmp || tmp->type == PLAYER)
… …
1640 head = tmp; 1557 head = tmp;
1641 1558
1642 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */ 1559 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */
1643 if (race && head->race && !strstr (race, head->race)) 1560 if (race && head->race && !strstr (race, head->race))
1644 continue; 1561 continue;
1562
1645 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD)) 1563 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD))
1646 continue; 1564 continue;
1647 1565
1648 /* Now do a bunch of stuff related to saving throws */ 1566 /* Now do a bunch of stuff related to saving throws */
1649 best_at = -1; 1567 best_at = -1;
… …
1686 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level)))) 1604 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level))))
1687 /* Failed, no effect */ 1605 /* Failed, no effect */
1688 continue; 1606 continue;
1689 } 1607 }
1690 1608
1691 /* Done with saving throw. Now start effecting the monster */ 1609 /* Done with saving throw. Now start affecting the monster */
1692 1610
1693 /* aggravation */ 1611 /* aggravation */
1694 if (QUERY_FLAG (spell, FLAG_MONSTER)) 1612 if (QUERY_FLAG (spell, FLAG_MONSTER))
1695 { 1613 {
1696 CLEAR_FLAG (head, FLAG_SLEEP); 1614 CLEAR_FLAG (head, FLAG_SLEEP);
… …
1713 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK)) 1631 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK))
1714 { 1632 {
1715 SET_FLAG (head, FLAG_BERSERK); 1633 SET_FLAG (head, FLAG_BERSERK);
1716 done_one = 1; 1634 done_one = 1;
1717 } 1635 }
1636
1718 /* charm */ 1637 /* charm */
1719 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY)) 1638 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY))
1720 { 1639 {
1721 SET_FLAG (head, FLAG_FRIENDLY);
1722 /* Prevent uncontolled outbreaks of self replicating monsters. 1640 /* Prevent uncontolled outbreaks of self replicating monsters.
1723 Typical use case is charm, go somwhere, use aggravation to make hostile. 1641 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. */ 1642 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1725 CLEAR_FLAG (head, FLAG_GENERATOR); 1643 CLEAR_FLAG (head, FLAG_GENERATOR);
1726 set_owner (head, op); 1644 head->set_owner (op);
1727 set_spell_skill (op, caster, spell, head); 1645 set_spell_skill (op, caster, spell, head);
1728 add_friendly_object (head); 1646 add_friendly_object (head);
1729 head->attack_movement = PETMOVE; 1647 head->attack_movement = PETMOVE;
1730 done_one = 1; 1648 done_one = 1;
1731 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL); 1649 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL);
1732 head->stats.exp = 0; 1650 head->stats.exp = 0;
1733 } 1651 }
1734 1652
1735 /* If a monster was effected, put an effect in */ 1653 /* If a monster was effected, put an effect in */
1736 if (done_one && spell->other_arch) 1654 if (done_one && spell->other_arch)
1737 {
1738 tmp = arch_to_object (spell->other_arch); 1655 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 */ 1656 } /* for y */
1744 1657
1745 return 1; 1658 return 1;
1746} 1659}
1747 1660
… …
1757move_ball_spell (object *op) 1670move_ball_spell (object *op)
1758{ 1671{
1759 int i, j, dam_save, dir, mflags; 1672 int i, j, dam_save, dir, mflags;
1760 sint16 nx, ny, hx, hy; 1673 sint16 nx, ny, hx, hy;
1761 object *owner; 1674 object *owner;
1762 mapstruct *m; 1675 maptile *m;
1763 1676
1764 owner = get_owner (op); 1677 owner = op->owner;
1765 1678
1766 /* the following logic makes sure that the ball doesn't move into a wall, 1679 /* 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 1680 * 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 1681 * 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 1682 * offset to move the ball, eg, keep it mostly on course, with some
… …
1798 nx = op->x; 1711 nx = op->x;
1799 ny = op->y; 1712 ny = op->y;
1800 m = op->map; 1713 m = op->map;
1801 } 1714 }
1802 1715
1803 remove_ob (op); 1716 m->insert (op, nx, ny, op);
1804 op->y = ny;
1805 op->x = nx;
1806 insert_ob_in_map (op, m, op, 0);
1807 1717
1808 dam_save = op->stats.dam; /* save the original dam: we do halfdam on 1718 dam_save = op->stats.dam; /* save the original dam: we do halfdam on
1809 surrounding squares */ 1719 surrounding squares */
1810 1720
1811 /* loop over current square and neighbors to hit. 1721 /* loop over current square and neighbors to hit.
1812 * if this has an other_arch field, we insert that in 1722 * if this has an other_arch field, we insert that in
1813 * the surround spaces. 1723 * the surround spaces.
1814 */ 1724 */
1815 for (j = 0; j < 9; j++) 1725 for (j = 0; j < 9; j++)
1816 { 1726 {
1817 object *new_ob;
1818
1819 hx = nx + freearr_x[j]; 1727 hx = nx + freearr_x[j];
1820 hy = ny + freearr_y[j]; 1728 hy = ny + freearr_y[j];
1821 1729
1822 m = op->map; 1730 m = op->map;
1823 mflags = get_map_flags (m, &m, hx, hy, &hx, &hy); 1731 mflags = get_map_flags (m, &m, hx, hy, &hx, &hy);
… …
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 */
… …
2208 if (disease->stats.sp) 2107 if (disease->stats.sp)
2209 disease->stats.sp -= dam_mod; 2108 disease->stats.sp -= dam_mod;
2210 2109
2211 if (infect_object (walk, disease, 1)) 2110 if (infect_object (walk, disease, 1))
2212 { 2111 {
2213 object *flash; /* visual effect for inflicting disease */
2214
2215 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name); 2112 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
2216 2113
2217 free_object (disease); /* don't need this one anymore */ 2114 disease->destroy (); /* don't need this one anymore */
2218 flash = get_archetype (ARCH_DETECT_MAGIC); 2115 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; 2116 return 1;
2224 } 2117 }
2225 free_object (disease); 2118
2119 disease->destroy ();
2226 } 2120 }
2227 } /* if living creature */ 2121 } /* if living creature */
2228 } /* for range of spaces */ 2122 } /* for range of spaces */
2123
2229 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!"); 2124 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!");
2230 return 1; 2125 return 1;
2231} 2126}

Diff Legend

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