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.9 by root, Sun Sep 10 15:59:57 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.9 2006/09/10 15:59:57 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 }
177
190 hit_map (op, 0, op->attacktype, 1); 178 hit_map (op, 0, op->attacktype, 1);
191 179
192 if (!op->direction) 180 if (!op->direction)
193 return; 181 return;
194 182
195 if (--op->range < 0) 183 if (--op->range < 0)
196 {
197 op->range = 0; 184 op->range = 0;
198 }
199 else 185 else
200 { 186 {
201 x = op->x + DIRX (op); 187 x = op->x + DIRX (op);
202 y = op->y + DIRY (op); 188 y = op->y + DIRY (op);
203 m = op->map; 189 m = op->map;
… …
211 * 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
212 * will be useful. 198 * will be useful.
213 */ 199 */
214 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)))
215 { 201 {
216
217 if (!QUERY_FLAG (op, FLAG_REFLECTING)) 202 if (!QUERY_FLAG (op, FLAG_REFLECTING))
218 return; 203 return;
219 204
220 /* Since walls don't run diagonal, if the bolt is in 205 /* Since walls don't run diagonal, if the bolt is in
221 * one of 4 main directions, it just reflects back in the 206 * one of 4 main directions, it just reflects back in the
… …
251 else if (left) 236 else if (left)
252 op->direction = absdir (op->direction + 2); 237 op->direction = absdir (op->direction + 2);
253 else if (right) 238 else if (right)
254 op->direction = absdir (op->direction - 2); 239 op->direction = absdir (op->direction - 2);
255 } 240 }
241
256 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */ 242 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */
257 return; 243 return;
258 } 244 }
259 else 245 else
260 { /* Create a copy of this object and put it ahead */ 246 { /* Create a copy of this object and put it ahead */
261 tmp = get_object (); 247 object *tmp = op->clone ();
262 copy_object (op, tmp); 248
249 m->insert (tmp, x, y, op);
263 tmp->speed_left = -0.1; 250 tmp->speed_left = -0.1;
264 tmp->x += DIRX (tmp), tmp->y += DIRY (tmp);
265 tmp = insert_ob_in_map (tmp, op->map, op, 0);
266 /* 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 */
267 tmp->duration++; 252 tmp->duration++;
268 253
269 /* New forking code. Possibly create forks of this object 254 /* New forking code. Possibly create forks of this object
270 * going off in other directions. 255 * going off in other directions.
271 */ 256 */
272
273 if (rndm (0, 99) < tmp->stats.Dex) 257 if (rndm (0, 99) < tmp->stats.Dex)
274 { /* stats.Dex % of forking */ 258 { /* stats.Dex % of forking */
275 forklightning (op, tmp); 259 forklightning (op, tmp);
276 } 260 }
261
277 /* 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
278 * doesn't create any bolts that continue to move onward. 263 * doesn't create any bolts that continue to move onward.
279 */ 264 */
280 op->range = 0; 265 op->range = 0;
281 } /* copy object and move it along */ 266 } /* copy object and move it along */
… …
288 * we remove the magic flag - that can be derived from 273 * we remove the magic flag - that can be derived from
289 * spob->attacktype. 274 * spob->attacktype.
290 * This function sets up the appropriate owner and skill 275 * This function sets up the appropriate owner and skill
291 * pointers. 276 * pointers.
292 */ 277 */
293
294int 278int
295fire_bolt (object *op, object *caster, int dir, object *spob, object *skill) 279fire_bolt (object *op, object *caster, int dir, object *spob, object *skill)
296{ 280{
297 object *tmp = NULL; 281 object *tmp = NULL;
298 int mflags; 282 int mflags;
… …
316 300
317 tmp->direction = dir; 301 tmp->direction = dir;
318 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 302 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
319 SET_ANIMATION (tmp, dir); 303 SET_ANIMATION (tmp, dir);
320 304
321 set_owner (tmp, op); 305 tmp->set_owner (op);
322 set_spell_skill (op, caster, spob, tmp); 306 set_spell_skill (op, caster, spob, tmp);
323 307
324 tmp->x = op->x + DIRX (tmp); 308 tmp->x = op->x + DIRX (tmp);
325 tmp->y = op->y + DIRY (tmp); 309 tmp->y = op->y + DIRY (tmp);
326 tmp->map = op->map; 310 tmp->map = op->map;
327 311
312 maptile *newmap;
328 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);
329 if (mflags & P_OUT_OF_MAP) 314 if (mflags & P_OUT_OF_MAP)
330 { 315 {
331 free_object (tmp); 316 tmp->destroy ();
332 return 0; 317 return 0;
333 } 318 }
319
320 tmp->map = newmap;
321
334 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)))
335 { 323 {
336 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 324 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
337 { 325 {
338 free_object (tmp); 326 tmp->destroy ();
339 return 0; 327 return 0;
340 } 328 }
329
341 tmp->x = op->x; 330 tmp->x = op->x;
342 tmp->y = op->y; 331 tmp->y = op->y;
343 tmp->direction = absdir (tmp->direction + 4); 332 tmp->direction = absdir (tmp->direction + 4);
344 tmp->map = op->map; 333 tmp->map = op->map;
345 } 334 }
346 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL) 335
336 if ((tmp = tmp->insert_at (tmp, op)))
347 move_bolt (tmp); 337 move_bolt (tmp);
338
348 return 1; 339 return 1;
349} 340}
350 341
351 342
352 343
… …
361 * At least that is what I think this does. 352 * At least that is what I think this does.
362 */ 353 */
363void 354void
364explosion (object *op) 355explosion (object *op)
365{ 356{
366 object *tmp;
367 mapstruct *m = op->map; 357 maptile *m = op->map;
368 int i; 358 int i;
369 359
370 if (--(op->duration) < 0) 360 if (--op->duration < 0)
371 { 361 {
372 remove_ob (op); 362 op->destroy ();
373 free_object (op);
374 return; 363 return;
375 } 364 }
365
376 hit_map (op, 0, op->attacktype, 0); 366 hit_map (op, 0, op->attacktype, 0);
377 367
378 if (op->range > 0) 368 if (op->range > 0)
379 { 369 {
380 for (i = 1; i < 9; i++) 370 for (i = 1; i < 9; i++)
381 { 371 {
382 sint16 dx, dy; 372 sint16 dx, dy;
383 373
384 dx = op->x + freearr_x[i]; 374 dx = op->x + freearr_x[i];
385 dy = op->y + freearr_y[i]; 375 dy = op->y + freearr_y[i];
376
386 /* ok_to_put_more already does things like checks for walls, 377 /* ok_to_put_more already does things like checks for walls,
387 * out of map, etc. 378 * out of map, etc.
388 */ 379 */
389 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))
390 { 381 {
391 tmp = get_object (); 382 object *tmp = op->clone ();
392 copy_object (op, tmp); 383
393 tmp->state = 0; 384 tmp->state = 0;
394 tmp->speed_left = -0.21; 385 tmp->speed_left = -0.21;
395 tmp->range--; 386 tmp->range--;
396 tmp->value = 0; 387 tmp->value = 0;
397 tmp->x = dx; 388
398 tmp->y = dy; 389 m->insert (tmp, dx, dy, op);
399 insert_ob_in_map (tmp, m, op, 0);
400 } 390 }
401 } 391 }
402 } 392 }
403} 393}
404 394
… …
408 * explode. 398 * explode.
409 */ 399 */
410void 400void
411explode_bullet (object *op) 401explode_bullet (object *op)
412{ 402{
413 tag_t op_tag = op->count;
414 object *tmp, *owner; 403 object *tmp, *owner;
415 404
416 if (op->other_arch == NULL) 405 if (op->other_arch == NULL)
417 { 406 {
418 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n"); 407 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");
419 remove_ob (op); 408 op->destroy ();
420 free_object (op);
421 return; 409 return;
422 } 410 }
423 411
424 if (op->env) 412 if (op->env)
425 { 413 {
426 object *env;
427
428 env = object_get_env_recursive (op); 414 object *env = object_get_env_recursive (op);
429 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))
430 { 416 {
431 LOG (llevError, "BUG: explode_bullet(): env out of map\n"); 417 LOG (llevError, "BUG: explode_bullet(): env out of map\n");
432 remove_ob (op); 418 op->destroy ();
433 free_object (op);
434 return; 419 return;
435 } 420 }
436 remove_ob (op); 421
437 op->x = env->x; 422 op->insert_at (env, op, INS_NO_MERGE | INS_NO_WALK_ON);
438 op->y = env->y;
439 insert_ob_in_map (op, env->map, op, INS_NO_MERGE | INS_NO_WALK_ON);
440 } 423 }
441 else if (out_of_map (op->map, op->x, op->y)) 424 else if (out_of_map (op->map, op->x, op->y))
442 { 425 {
443 LOG (llevError, "BUG: explode_bullet(): op out of map\n"); 426 LOG (llevError, "BUG: explode_bullet(): op out of map\n");
444 remove_ob (op); 427 op->destroy ();
445 free_object (op);
446 return; 428 return;
447 } 429 }
448 430
449 // 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
450 // 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
451 // bad at the moment that might happen from this. 433 // bad at the moment that might happen from this.
452 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 434 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
453 { 435 {
454 remove_ob (op); 436 op->destroy ();
455 free_object (op);
456 return; 437 return;
457 } 438 }
458 439
459 if (op->attacktype) 440 if (op->attacktype)
460 { 441 {
461 hit_map (op, 0, op->attacktype, 1); 442 hit_map (op, 0, op->attacktype, 1);
462 if (was_destroyed (op, op_tag)) 443 if (op->destroyed ())
463 return; 444 return;
464 } 445 }
465 446
466 /* other_arch contains what this explodes into */ 447 /* other_arch contains what this explodes into */
467 tmp = arch_to_object (op->other_arch); 448 tmp = arch_to_object (op->other_arch);
468 449
469 copy_owner (tmp, op); 450 tmp->set_owner (op);
470 tmp->skill = op->skill; 451 tmp->skill = op->skill;
471 452
472 owner = get_owner (op); 453 owner = op->owner;
454
473 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))
474 { 456 {
475 remove_ob (op); 457 op->destroy ();
476 free_object (op);
477 return; 458 return;
478 } 459 }
479 tmp->x = op->x;
480 tmp->y = op->y;
481 460
482 /* special for bombs - it actually has sane values for these */ 461 /* special for bombs - it actually has sane values for these */
483 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB) 462 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB)
484 { 463 {
485 tmp->attacktype = op->attacktype; 464 tmp->attacktype = op->attacktype;
… …
489 } 468 }
490 else 469 else
491 { 470 {
492 if (op->attacktype & AT_MAGIC) 471 if (op->attacktype & AT_MAGIC)
493 tmp->attacktype |= AT_MAGIC; 472 tmp->attacktype |= AT_MAGIC;
473
494 /* Spell doc describes what is going on here */ 474 /* Spell doc describes what is going on here */
495 tmp->stats.dam = op->dam_modifier; 475 tmp->stats.dam = op->dam_modifier;
496 tmp->range = op->stats.maxhp; 476 tmp->range = op->stats.maxhp;
497 tmp->duration = op->stats.hp; 477 tmp->duration = op->stats.hp;
498 /* 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 -
… …
506 tmp->stats.sp = op->direction; 486 tmp->stats.sp = op->direction;
507 487
508 /* Prevent recursion */ 488 /* Prevent recursion */
509 op->move_on = 0; 489 op->move_on = 0;
510 490
511 insert_ob_in_map (tmp, op->map, op, 0); 491 tmp->insert_at (op, op);
512 /* remove the firebullet */ 492 /* remove the firebullet */
513 if (!was_destroyed (op, op_tag)) 493 op->destroy ();
514 {
515 remove_ob (op);
516 free_object (op);
517 }
518} 494}
519
520
521 495
522/* 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
523 * (eg, explode, damage player, etc) 497 * (eg, explode, damage player, etc)
524 */ 498 */
525
526void 499void
527check_bullet (object *op) 500check_bullet (object *op)
528{ 501{
529 tag_t op_tag = op->count, tmp_tag;
530 object *tmp; 502 object *tmp;
531 int dam, mflags; 503 int dam, mflags;
532 mapstruct *m; 504 maptile *m;
533 sint16 sx, sy; 505 sint16 sx, sy;
534 506
535 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);
536 508
537 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)))
… …
546 518
547 /* 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 */
548 if (!(mflags & P_IS_ALIVE)) 520 if (!(mflags & P_IS_ALIVE))
549 return; 521 return;
550 522
551 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)
552 { 524 {
553 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 525 if (QUERY_FLAG (tmp, FLAG_ALIVE))
554 { 526 {
555 tmp_tag = tmp->count;
556 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 527 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
557 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)
558 { 529 {
559 if (!QUERY_FLAG (op, FLAG_REMOVED)) 530 if (!QUERY_FLAG (op, FLAG_REMOVED))
560 { 531 {
561 remove_ob (op); 532 op->destroy ();
562 free_object (op);
563 return; 533 return;
564 } 534 }
565 } 535 }
566 } 536 }
567 } 537 }
568} 538}
569
570 539
571/* Basically, we move 'op' one square, and if it hits something, 540/* Basically, we move 'op' one square, and if it hits something,
572 * call check_bullet. 541 * call check_bullet.
573 * This function is only applicable to bullets, but not to all 542 * This function is only applicable to bullets, but not to all
574 * fired arches (eg, bolts). 543 * fired arches (eg, bolts).
575 */ 544 */
576
577void 545void
578move_bullet (object *op) 546move_bullet (object *op)
579{ 547{
580 sint16 new_x, new_y; 548 sint16 new_x, new_y;
581 int mflags; 549 int mflags;
582 mapstruct *m; 550 maptile *m;
583 551
584#if 0 552#if 0
585 /* We need a better general purpose way to do this */ 553 /* We need a better general purpose way to do this */
586 554
587 /* peterm: added to make comet leave a trail of burnouts 555 /* peterm: added to make comet leave a trail of burnouts
588 it's an unadulterated hack, but the effect is cool. */ 556 it's an unadulterated hack, but the effect is cool. */
589 if (op->stats.sp == SP_METEOR) 557 if (op->stats.sp == SP_METEOR)
590 { 558 {
591 replace_insert_ob_in_map ("fire_trail", op); 559 replace_insert_ob_in_map ("fire_trail", op);
592 if (was_destroyed (op, op_tag)) 560 if (op->destroyed ())
593 return; 561 return;
594 } /* end addition. */ 562 } /* end addition. */
595#endif 563#endif
596 564
597 /* Reached the end of its life - remove it */ 565 /* Reached the end of its life - remove it */
598 if (--op->range <= 0) 566 if (--op->range <= 0)
599 { 567 {
600 if (op->other_arch) 568 if (op->other_arch)
601 {
602 explode_bullet (op); 569 explode_bullet (op);
603 }
604 else 570 else
605 { 571 op->destroy ();
606 remove_ob (op); 572
607 free_object (op);
608 }
609 return; 573 return;
610 } 574 }
611 575
612 new_x = op->x + DIRX (op); 576 new_x = op->x + DIRX (op);
613 new_y = op->y + DIRY (op); 577 new_y = op->y + DIRY (op);
614 m = op->map; 578 m = op->map;
615 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);
616 580
617 if (mflags & P_OUT_OF_MAP) 581 if (mflags & P_OUT_OF_MAP)
618 { 582 {
619 remove_ob (op); 583 op->destroy ();
620 free_object (op);
621 return; 584 return;
622 } 585 }
623 586
624 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)))
625 { 588 {
626 if (op->other_arch) 589 if (op->other_arch)
627 {
628 explode_bullet (op); 590 explode_bullet (op);
629 }
630 else 591 else
631 { 592 op->destroy ();
632 remove_ob (op); 593
633 free_object (op);
634 }
635 return; 594 return;
636 } 595 }
637 596
638 remove_ob (op); 597 if (!(op = m->insert (op, new_x, new_y, op)))
639 op->x = new_x;
640 op->y = new_y;
641 if ((op = insert_ob_in_map (op, m, op, 0)) == NULL)
642 return; 598 return;
643 599
644 if (reflwall (op->map, op->x, op->y, op)) 600 if (reflwall (op->map, op->x, op->y, op))
645 { 601 {
646 op->direction = absdir (op->direction + 4); 602 op->direction = absdir (op->direction + 4);
647 update_turn_face (op); 603 update_turn_face (op);
648 } 604 }
649 else 605 else
650 {
651 check_bullet (op); 606 check_bullet (op);
652 }
653} 607}
654 608
655 609
656 610
657 611
… …
692 646
693 tmp->direction = dir; 647 tmp->direction = dir;
694 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 648 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
695 SET_ANIMATION (tmp, dir); 649 SET_ANIMATION (tmp, dir);
696 650
697 set_owner (tmp, op); 651 tmp->set_owner (op);
698 set_spell_skill (op, caster, spob, tmp); 652 set_spell_skill (op, caster, spob, tmp);
699 653
700 tmp->x = op->x + freearr_x[dir]; 654 tmp->x = op->x + freearr_x[dir];
701 tmp->y = op->y + freearr_y[dir]; 655 tmp->y = op->y + freearr_y[dir];
702 tmp->map = op->map; 656 tmp->map = op->map;
703 657
658 maptile *newmap;
704 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);
705 if (mflags & P_OUT_OF_MAP) 660 if (mflags & P_OUT_OF_MAP)
706 { 661 {
707 free_object (tmp); 662 tmp->destroy ();
708 return 0; 663 return 0;
709 } 664 }
665
666 tmp->map = newmap;
667
710 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)))
711 { 669 {
712 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 670 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
713 { 671 {
714 free_object (tmp); 672 tmp->destroy ();
715 return 0; 673 return 0;
716 } 674 }
675
717 tmp->x = op->x; 676 tmp->x = op->x;
718 tmp->y = op->y; 677 tmp->y = op->y;
719 tmp->direction = absdir (tmp->direction + 4); 678 tmp->direction = absdir (tmp->direction + 4);
720 tmp->map = op->map; 679 tmp->map = op->map;
721 } 680 }
722 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL) 681
723 { 682 if ((tmp = tmp->insert_at (tmp, op)))
724 check_bullet (tmp); 683 check_bullet (tmp);
725 } 684
726 return 1; 685 return 1;
727} 686}
728 687
729 688
730 689
… …
740void 699void
741cone_drop (object *op) 700cone_drop (object *op)
742{ 701{
743 object *new_ob = arch_to_object (op->other_arch); 702 object *new_ob = arch_to_object (op->other_arch);
744 703
745 new_ob->x = op->x;
746 new_ob->y = op->y;
747 new_ob->level = op->level; 704 new_ob->level = op->level;
748 set_owner (new_ob, op->owner); 705 new_ob->set_owner (op->owner);
749 706
750 /* preserve skill ownership */ 707 /* preserve skill ownership */
751 if (op->skill && op->skill != new_ob->skill) 708 if (op->skill && op->skill != new_ob->skill)
752 {
753 new_ob->skill = op->skill; 709 new_ob->skill = op->skill;
754 }
755 insert_ob_in_map (new_ob, op->map, op, 0);
756 710
711 new_ob->insert_at (op, op);
757} 712}
758 713
759/* 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 */
760 715
761void 716void
762move_cone (object *op) 717move_cone (object *op)
763{ 718{
764 int i; 719 int i;
765 tag_t tag;
766 720
767 /* 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 */
768 if (!op->map) 722 if (!op->map)
769 { 723 {
770 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");
771 op->speed = 0; 725 op->set_speed (0);
772 update_ob_speed (op);
773 return; 726 return;
774 } 727 }
775 728
776 /* lava saves it's life, but not yours :) */ 729 /* lava saves it's life, but not yours :) */
777 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 730 if (QUERY_FLAG (op, FLAG_LIFESAVE))
… …
783#if 0 736#if 0
784 /* Disable this - enabling it makes monsters easier, as 737 /* Disable this - enabling it makes monsters easier, as
785 * when their cone dies when they die. 738 * when their cone dies when they die.
786 */ 739 */
787 /* If no owner left, the spell dies out. */ 740 /* If no owner left, the spell dies out. */
788 if (get_owner (op) == NULL) 741 if (op->owner == NULL)
789 { 742 {
790 remove_ob (op); 743 op->destroy ();
791 free_object (op);
792 return; 744 return;
793 } 745 }
794#endif 746#endif
795 747
796 tag = op->count;
797 hit_map (op, 0, op->attacktype, 0); 748 hit_map (op, 0, op->attacktype, 0);
798 749
799 /* Check to see if we should push anything. 750 /* Check to see if we should push anything.
800 * Spell objects with weight push whatever they encounter to some 751 * Spell objects with weight push whatever they encounter to some
801 * degree. 752 * degree.
802 */ 753 */
803 if (op->weight) 754 if (op->weight)
804 check_spell_knockback (op); 755 check_spell_knockback (op);
805 756
806 if (was_destroyed (op, tag)) 757 if (op->destroyed ())
807 return; 758 return;
808 759
809 if ((op->duration--) < 0) 760 if ((op->duration--) < 0)
810 { 761 {
811 remove_ob (op); 762 op->destroy ();
812 free_object (op);
813 return; 763 return;
814 } 764 }
815 /* Object has hit maximum range, so don't have it move 765 /* Object has hit maximum range, so don't have it move
816 * any further. When the duration above expires, 766 * any further. When the duration above expires,
817 * then the object will get removed. 767 * then the object will get removed.
… …
826 { 776 {
827 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)];
828 778
829 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))
830 { 780 {
831 object *tmp = get_object (); 781 object *tmp = op->clone ();
832
833 copy_object (op, tmp);
834 tmp->x = x;
835 tmp->y = y;
836 782
837 tmp->duration = op->duration + 1; 783 tmp->duration = op->duration + 1;
838 784
839 /* Use for spell tracking - see ok_to_put_more() */ 785 /* Use for spell tracking - see ok_to_put_more() */
840 tmp->stats.maxhp = op->stats.maxhp; 786 tmp->stats.maxhp = op->stats.maxhp;
841 insert_ob_in_map (tmp, op->map, op, 0); 787
788 op->map->insert (tmp, x, y, op);
789
842 if (tmp->other_arch) 790 if (tmp->other_arch)
843 cone_drop (tmp); 791 cone_drop (tmp);
844 } 792 }
845 } 793 }
846} 794}
… …
856int 804int
857cast_cone (object *op, object *caster, int dir, object *spell) 805cast_cone (object *op, object *caster, int dir, object *spell)
858{ 806{
859 object *tmp; 807 object *tmp;
860 int i, success = 0, range_min = -1, range_max = 1; 808 int i, success = 0, range_min = -1, range_max = 1;
861 mapstruct *m; 809 maptile *m;
862 sint16 sx, sy; 810 sint16 sx, sy;
863 MoveType movetype; 811 MoveType movetype;
864 812
865 if (!spell->other_arch) 813 if (!spell->other_arch)
866 return 0; 814 return 0;
… …
922 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype) 870 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype)
923 continue; 871 continue;
924 872
925 success = 1; 873 success = 1;
926 tmp = arch_to_object (spell->other_arch); 874 tmp = arch_to_object (spell->other_arch);
927 set_owner (tmp, op); 875 tmp->set_owner (op);
928 set_spell_skill (op, caster, spell, tmp); 876 set_spell_skill (op, caster, spell, tmp);
929 tmp->level = caster_level (caster, spell); 877 tmp->level = caster_level (caster, spell);
930 tmp->x = sx;
931 tmp->y = sy;
932 tmp->attacktype = spell->attacktype; 878 tmp->attacktype = spell->attacktype;
933 879
934 /* holy word stuff */ 880 /* holy word stuff */
935 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) 881 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER))
936 {
937 if (!tailor_god_spell (tmp, op)) 882 if (!tailor_god_spell (tmp, op))
938 return 0; 883 return 0;
939 }
940 884
941 if (dir) 885 if (dir)
942 tmp->stats.sp = dir; 886 tmp->stats.sp = dir;
943 else 887 else
944 tmp->stats.sp = i; 888 tmp->stats.sp = i;
… …
950 { 894 {
951 tmp->range /= 4; 895 tmp->range /= 4;
952 if (tmp->range < 2 && spell->range >= 2) 896 if (tmp->range < 2 && spell->range >= 2)
953 tmp->range = 2; 897 tmp->range = 2;
954 } 898 }
899
955 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 900 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
956 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 901 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
957 902
958 /* Special bonus for fear attacks */ 903 /* Special bonus for fear attacks */
959 if (tmp->attacktype & AT_FEAR) 904 if (tmp->attacktype & AT_FEAR)
… …
961 if (caster->type == PLAYER) 906 if (caster->type == PLAYER)
962 tmp->duration += fear_bonus[caster->stats.Cha]; 907 tmp->duration += fear_bonus[caster->stats.Cha];
963 else 908 else
964 tmp->duration += caster->level / 3; 909 tmp->duration += caster->level / 3;
965 } 910 }
911
966 if (tmp->attacktype & (AT_HOLYWORD | AT_TURN_UNDEAD)) 912 if (tmp->attacktype & (AT_HOLYWORD | AT_TURN_UNDEAD))
967 { 913 {
968 if (caster->type == PLAYER) 914 if (caster->type == PLAYER)
969 tmp->duration += turn_bonus[caster->stats.Wis] / 5; 915 tmp->duration += turn_bonus[caster->stats.Wis] / 5;
970 else 916 else
971 tmp->duration += caster->level / 3; 917 tmp->duration += caster->level / 3;
972 } 918 }
973 919
974
975 if (!(tmp->move_type & MOVE_FLY_LOW)) 920 if (!(tmp->move_type & MOVE_FLY_LOW))
976 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);
977 922
978 if (!tmp->move_on && tmp->stats.dam) 923 if (!tmp->move_on && tmp->stats.dam)
979 {
980 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);
981 } 925
982 insert_ob_in_map (tmp, m, op, 0); 926 m->insert (tmp, sx, sy, op);
983 927
984 /* 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
985 * a single space too many times. 929 * a single space too many times.
986 */ 930 */
987 tmp->stats.maxhp = tmp->count; 931 tmp->stats.maxhp = tmp->count;
988 932
989 if (tmp->other_arch) 933 if (tmp->other_arch)
990 cone_drop (tmp); 934 cone_drop (tmp);
991 } 935 }
936
992 return success; 937 return success;
993} 938}
994 939
995/**************************************************************************** 940/****************************************************************************
996 * 941 *
… …
1005void 950void
1006animate_bomb (object *op) 951animate_bomb (object *op)
1007{ 952{
1008 int i; 953 int i;
1009 object *env, *tmp; 954 object *env, *tmp;
1010 archetype *at;
1011 955
1012 if (op->state != NUM_ANIMATIONS (op) - 1) 956 if (op->state != NUM_ANIMATIONS (op) - 1)
1013 return; 957 return;
1014 958
1015
1016 env = object_get_env_recursive (op); 959 env = object_get_env_recursive (op);
1017 960
1018 if (op->env) 961 if (op->env)
1019 { 962 {
1020 if (env->map == NULL) 963 if (env->map == NULL)
1021 return; 964 return;
1022 965
1023 if (env->type == PLAYER) 966 if (env->type == PLAYER)
1024 esrv_del_item (env->contr, op->count); 967 esrv_del_item (env->contr, op->count);
1025 968
1026 remove_ob (op); 969 if (!(op = op->insert_at (env, op)))
1027 op->x = env->x;
1028 op->y = env->y;
1029 if ((op = insert_ob_in_map (op, env->map, op, 0)) == NULL)
1030 return; 970 return;
1031 } 971 }
1032 972
1033 // 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
1034 // 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
1035 // as bombs can be carried. 975 // as bombs can be carried.
1036 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)
1037 { 977 {
1038 remove_ob (op); 978 op->destroy ();
1039 free_object (op);
1040 return; 979 return;
1041 } 980 }
1042 981
1043 /* This copies a lot of the code from the fire bullet, 982 /* This copies a lot of the code from the fire bullet,
1044 * but using the cast_bullet isn't really feasible, 983 * but using the cast_bullet isn't really feasible,
1045 * so just set up the appropriate values. 984 * so just set up the appropriate values.
1046 */ 985 */
1047 at = find_archetype (SPLINT); 986 if (archetype *at = archetype::find (SPLINT))
1048 if (at)
1049 { 987 {
1050 for (i = 1; i < 9; i++) 988 for (i = 1; i < 9; i++)
1051 { 989 {
1052 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]))
1053 continue; 991 continue;
992
1054 tmp = arch_to_object (at); 993 tmp = arch_to_object (at);
1055 tmp->direction = i; 994 tmp->direction = i;
1056 tmp->range = op->range; 995 tmp->range = op->range;
1057 tmp->stats.dam = op->stats.dam; 996 tmp->stats.dam = op->stats.dam;
1058 tmp->duration = op->duration; 997 tmp->duration = op->duration;
1059 tmp->attacktype = op->attacktype; 998 tmp->attacktype = op->attacktype;
1060 copy_owner (tmp, op); 999 tmp->set_owner (op);
1061 if (op->skill && op->skill != tmp->skill) 1000 if (op->skill && op->skill != tmp->skill)
1062 {
1063 tmp->skill = op->skill; 1001 tmp->skill = op->skill;
1064 } 1002
1065 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 1003 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
1066 SET_ANIMATION (tmp, i); 1004 SET_ANIMATION (tmp, i);
1067 tmp->x = op->x + freearr_x[i]; 1005
1068 tmp->y = op->y + freearr_x[i]; 1006 op->map->insert (tmp, op->x + freearr_x[i], op->y + freearr_x[i], op);
1069 insert_ob_in_map (tmp, op->map, op, 0);
1070 move_bullet (tmp); 1007 move_bullet (tmp);
1071 } 1008 }
1072 } 1009 }
1073 1010
1074 explode_bullet (op); 1011 explode_bullet (op);
… …
1079{ 1016{
1080 1017
1081 object *tmp; 1018 object *tmp;
1082 int mflags; 1019 int mflags;
1083 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];
1084 mapstruct *m; 1021 maptile *m;
1085 1022
1086 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy); 1023 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy);
1087 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))
1088 { 1025 {
1089 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.");
… …
1095 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 1032 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
1096 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);
1097 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 1034 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
1098 tmp->attacktype = spell->attacktype; 1035 tmp->attacktype = spell->attacktype;
1099 1036
1100 set_owner (tmp, op); 1037 tmp->set_owner (op);
1101 set_spell_skill (op, caster, spell, tmp); 1038 set_spell_skill (op, caster, spell, tmp);
1102 tmp->x = dx; 1039
1103 tmp->y = dy; 1040 m->insert (tmp, dx, dy, op);
1104 insert_ob_in_map (tmp, m, op, 0);
1105 return 1; 1041 return 1;
1106} 1042}
1107 1043
1108/**************************************************************************** 1044/****************************************************************************
1109 * 1045 *
… …
1125get_pointed_target (object *op, int dir, int range, int type) 1061get_pointed_target (object *op, int dir, int range, int type)
1126{ 1062{
1127 object *target; 1063 object *target;
1128 sint16 x, y; 1064 sint16 x, y;
1129 int dist, mflags; 1065 int dist, mflags;
1130 mapstruct *mp; 1066 maptile *mp;
1131 1067
1132 if (dir == 0) 1068 if (dir == 0)
1133 return NULL; 1069 return NULL;
1134 1070
1135 for (dist = 1; dist < range; dist++) 1071 for (dist = 1; dist < range; dist++)
… …
1148 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW) 1084 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
1149 return NULL; 1085 return NULL;
1150 1086
1151 if (mflags & P_IS_ALIVE) 1087 if (mflags & P_IS_ALIVE)
1152 { 1088 {
1153 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)
1154 { 1090 {
1155 if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER)) 1091 if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER))
1156 { 1092 {
1157 return target; 1093 return target;
1158 } 1094 }
… …
1225 if (effect->attacktype & AT_DEATH) 1161 if (effect->attacktype & AT_DEATH)
1226 { 1162 {
1227 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1163 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1228 1164
1229 /* casting death spells at undead isn't a good thing */ 1165 /* casting death spells at undead isn't a good thing */
1230 if QUERY_FLAG
1231 (target, FLAG_UNDEAD) 1166 if (QUERY_FLAG (target, FLAG_UNDEAD))
1232 { 1167 {
1233 if (random_roll (0, 2, op, PREFER_LOW)) 1168 if (random_roll (0, 2, op, PREFER_LOW))
1234 { 1169 {
1235 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!"); 1170 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");
1236 effect->x = op->x; 1171 effect->x = op->x;
… …
1238 } 1173 }
1239 else 1174 else
1240 { 1175 {
1241 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));
1242 target->stats.hp = target->stats.maxhp * 2; 1177 target->stats.hp = target->stats.maxhp * 2;
1243 free_object (effect); 1178 effect->destroy ();
1244 return 0; 1179 return 0;
1245 } 1180 }
1246 } 1181 }
1247 } 1182 }
1248 else 1183 else
1249 { 1184 {
1250 /* how much woe to inflict :) */ 1185 /* how much woe to inflict :) */
1251 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);
1252 } 1187 }
1253 1188
1254 set_owner (effect, op); 1189 effect->set_owner (op);
1255 set_spell_skill (op, caster, spell, effect); 1190 set_spell_skill (op, caster, spell, effect);
1256 1191
1257 /* ok, tell it where to be, and insert! */ 1192 /* ok, tell it where to be, and insert! */
1258 effect->x = target->x; 1193 effect->insert_at (target, op);
1259 effect->y = target->y;
1260 insert_ob_in_map (effect, target->map, op, 0);
1261 1194
1262 return 1; 1195 return 1;
1263} 1196}
1264 1197
1265 1198
… …
1275move_missile (object *op) 1208move_missile (object *op)
1276{ 1209{
1277 int i, mflags; 1210 int i, mflags;
1278 object *owner; 1211 object *owner;
1279 sint16 new_x, new_y; 1212 sint16 new_x, new_y;
1280 mapstruct *m; 1213 maptile *m;
1281 1214
1282 if (op->range-- <= 0) 1215 if (op->range-- <= 0)
1283 { 1216 {
1284 remove_ob (op); 1217 op->destroy ();
1285 free_object (op);
1286 return; 1218 return;
1287 } 1219 }
1288 1220
1289 owner = get_owner (op); 1221 owner = op->owner;
1290#if 0 1222#if 0
1291 /* 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
1292 * monster that are then killed would continue to survive 1224 * monster that are then killed would continue to survive
1293 */ 1225 */
1294 if (owner == NULL) 1226 if (owner == NULL)
1295 { 1227 {
1296 remove_ob (op); 1228 op->destroy ();
1297 free_object (op);
1298 return; 1229 return;
1299 } 1230 }
1300#endif 1231#endif
1301 1232
1302 new_x = op->x + DIRX (op); 1233 new_x = op->x + DIRX (op);
… …
1304 1235
1305 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);
1306 1237
1307 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))))
1308 { 1239 {
1309 tag_t tag = op->count;
1310
1311 hit_map (op, op->direction, AT_MAGIC, 1); 1240 hit_map (op, op->direction, AT_MAGIC, 1);
1312 /* Basically, missile only hits one thing then goes away. 1241 /* Basically, missile only hits one thing then goes away.
1313 * 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.
1314 */ 1243 */
1315 if (!was_destroyed (op, tag)) 1244 if (!op->destroyed ())
1316 { 1245 op->destroy ();
1317 remove_ob (op); 1246
1318 free_object (op);
1319 }
1320 return; 1247 return;
1321 } 1248 }
1322 1249
1323 remove_ob (op); 1250 op->remove ();
1251
1324 if (!op->direction || (mflags & P_OUT_OF_MAP)) 1252 if (!op->direction || (mflags & P_OUT_OF_MAP))
1325 { 1253 {
1326 free_object (op); 1254 op->destroy ();
1327 return; 1255 return;
1328 } 1256 }
1329 op->x = new_x; 1257
1330 op->y = new_y; 1258 i = spell_find_dir (m, new_x, new_y, op->owner);
1331 op->map = m;
1332 i = spell_find_dir (op->map, op->x, op->y, get_owner (op));
1333 if (i > 0 && i != op->direction) 1259 if (i > 0 && i != op->direction)
1334 { 1260 {
1335 op->direction = i; 1261 op->direction = i;
1336 SET_ANIMATION (op, op->direction); 1262 SET_ANIMATION (op, op->direction);
1337 } 1263 }
1338 insert_ob_in_map (op, op->map, op, 0); 1264
1265 m->insert (op, new_x, new_y, op);
1339} 1266}
1340 1267
1341/**************************************************************************** 1268/****************************************************************************
1342 * Destruction 1269 * Destruction
1343 ****************************************************************************/ 1270 ****************************************************************************/
… …
1388int 1315int
1389cast_destruction (object *op, object *caster, object *spell_ob) 1316cast_destruction (object *op, object *caster, object *spell_ob)
1390{ 1317{
1391 int i, j, range, mflags, friendly = 0, dam, dur; 1318 int i, j, range, mflags, friendly = 0, dam, dur;
1392 sint16 sx, sy; 1319 sint16 sx, sy;
1393 mapstruct *m; 1320 maptile *m;
1394 object *tmp; 1321 object *tmp;
1395 const char *skill; 1322 const char *skill;
1396 1323
1397 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob); 1324 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
1398 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);
… …
1421 for (j = -range; j < range; j++) 1348 for (j = -range; j < range; j++)
1422 { 1349 {
1423 m = op->map; 1350 m = op->map;
1424 sx = op->x + i; 1351 sx = op->x + i;
1425 sy = op->y + j; 1352 sy = op->y + j;
1353
1426 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy); 1354 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
1427 if (mflags & P_OUT_OF_MAP) 1355 if (mflags & P_OUT_OF_MAP)
1428 continue; 1356 continue;
1357
1429 if (mflags & P_IS_ALIVE) 1358 if (mflags & P_IS_ALIVE)
1430 { 1359 {
1431 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)
1432 {
1433 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER) 1361 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER)
1434 break; 1362 break;
1435 } 1363
1436 if (tmp) 1364 if (tmp)
1437 { 1365 {
1438 if (tmp->head) 1366 if (tmp->head)
1439 tmp = tmp->head; 1367 tmp = tmp->head;
1440 1368
… …
1443 { 1371 {
1444 if (spell_ob->subtype == SP_DESTRUCTION) 1372 if (spell_ob->subtype == SP_DESTRUCTION)
1445 { 1373 {
1446 hit_player (tmp, dam, op, spell_ob->attacktype, 0); 1374 hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1447 if (spell_ob->other_arch) 1375 if (spell_ob->other_arch)
1448 {
1449 tmp = arch_to_object (spell_ob->other_arch); 1376 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op);
1450 tmp->x = sx;
1451 tmp->y = sy;
1452 insert_ob_in_map (tmp, m, op, 0);
1453 }
1454 } 1377 }
1455 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)
1456 { 1379 {
1457 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch) 1380 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1458 {
1459 object *effect = arch_to_object (spell_ob->other_arch); 1381 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op);
1460
1461 effect->x = sx;
1462 effect->y = sy;
1463 insert_ob_in_map (effect, m, op, 0);
1464 }
1465 } 1382 }
1466 } 1383 }
1467 } 1384 }
1468 } 1385 }
1469 } 1386 }
1470 } 1387 }
1388
1471 op->skill = skill; 1389 op->skill = skill;
1472 return 1; 1390 return 1;
1473} 1391}
1474 1392
1475/*************************************************************************** 1393/***************************************************************************
… …
1559 force->stats.ac = spell_ob->stats.ac; 1477 force->stats.ac = spell_ob->stats.ac;
1560 force->stats.wc = spell_ob->stats.wc; 1478 force->stats.wc = spell_ob->stats.wc;
1561 1479
1562 change_abil (tmp, force); /* Mostly to display any messages */ 1480 change_abil (tmp, force); /* Mostly to display any messages */
1563 insert_ob_in_ob (force, tmp); 1481 insert_ob_in_ob (force, tmp);
1564 fix_player (tmp); 1482 tmp->update_stats ();
1565 return 1; 1483 return 1;
1566 1484
1567} 1485}
1568
1569 1486
1570/********************************************************************** 1487/**********************************************************************
1571 * mood change 1488 * mood change
1572 * 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
1573 * effects monsters, it seems best to put it into this file 1490 * effects monsters, it seems best to put it into this file
… …
1580mood_change (object *op, object *caster, object *spell) 1497mood_change (object *op, object *caster, object *spell)
1581{ 1498{
1582 object *tmp, *god, *head; 1499 object *tmp, *god, *head;
1583 int done_one, range, mflags, level, at, best_at; 1500 int done_one, range, mflags, level, at, best_at;
1584 sint16 x, y, nx, ny; 1501 sint16 x, y, nx, ny;
1585 mapstruct *m; 1502 maptile *m;
1586 const char *race; 1503 const char *race;
1587 1504
1588 /* 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
1589 * doing it over and over again. 1506 * doing it over and over again.
1590 */ 1507 */
… …
1603 else if (god && !strcmp (spell->race, "GOD_FRIEND")) 1520 else if (god && !strcmp (spell->race, "GOD_FRIEND"))
1604 race = god->race; 1521 race = god->race;
1605 else 1522 else
1606 race = spell->race; 1523 race = spell->race;
1607 1524
1608
1609 for (x = op->x - range; x <= op->x + range; x++) 1525 for (x = op->x - range; x <= op->x + range; x++)
1610 for (y = op->y - range; y <= op->y + range; y++) 1526 for (y = op->y - range; y <= op->y + range; y++)
1611 { 1527 {
1612
1613 done_one = 0; 1528 done_one = 0;
1614 m = op->map; 1529 m = op->map;
1615 nx = x; 1530 nx = x;
1616 ny = y; 1531 ny = y;
1617 mflags = get_map_flags (m, &m, x, y, &nx, &ny); 1532 mflags = get_map_flags (m, &m, x, y, &nx, &ny);
… …
1620 1535
1621 /* 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 */
1622 if (!(mflags & P_IS_ALIVE)) 1537 if (!(mflags & P_IS_ALIVE))
1623 continue; 1538 continue;
1624 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
1625 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)
1626 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 1546 if (QUERY_FLAG (tmp, FLAG_MONSTER))
1627 break; 1547 break;
1628 1548
1629 /* There can be living objects that are not monsters */ 1549 /* There can be living objects that are not monsters */
1630 if (!tmp || tmp->type == PLAYER) 1550 if (!tmp || tmp->type == PLAYER)
… …
1637 head = tmp; 1557 head = tmp;
1638 1558
1639 /* 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 */
1640 if (race && head->race && !strstr (race, head->race)) 1560 if (race && head->race && !strstr (race, head->race))
1641 continue; 1561 continue;
1562
1642 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD)) 1563 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD))
1643 continue; 1564 continue;
1644 1565
1645 /* Now do a bunch of stuff related to saving throws */ 1566 /* Now do a bunch of stuff related to saving throws */
1646 best_at = -1; 1567 best_at = -1;
… …
1683 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))))
1684 /* Failed, no effect */ 1605 /* Failed, no effect */
1685 continue; 1606 continue;
1686 } 1607 }
1687 1608
1688 /* Done with saving throw. Now start effecting the monster */ 1609 /* Done with saving throw. Now start affecting the monster */
1689 1610
1690 /* aggravation */ 1611 /* aggravation */
1691 if (QUERY_FLAG (spell, FLAG_MONSTER)) 1612 if (QUERY_FLAG (spell, FLAG_MONSTER))
1692 { 1613 {
1693 CLEAR_FLAG (head, FLAG_SLEEP); 1614 CLEAR_FLAG (head, FLAG_SLEEP);
… …
1710 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK)) 1631 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK))
1711 { 1632 {
1712 SET_FLAG (head, FLAG_BERSERK); 1633 SET_FLAG (head, FLAG_BERSERK);
1713 done_one = 1; 1634 done_one = 1;
1714 } 1635 }
1636
1715 /* charm */ 1637 /* charm */
1716 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))
1717 { 1639 {
1718 SET_FLAG (head, FLAG_FRIENDLY);
1719 /* Prevent uncontolled outbreaks of self replicating monsters. 1640 /* Prevent uncontolled outbreaks of self replicating monsters.
1720 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.
1721 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. */
1722 CLEAR_FLAG (head, FLAG_GENERATOR); 1643 CLEAR_FLAG (head, FLAG_GENERATOR);
1723 set_owner (head, op); 1644 head->set_owner (op);
1724 set_spell_skill (op, caster, spell, head); 1645 set_spell_skill (op, caster, spell, head);
1725 add_friendly_object (head); 1646 add_friendly_object (head);
1726 head->attack_movement = PETMOVE; 1647 head->attack_movement = PETMOVE;
1727 done_one = 1; 1648 done_one = 1;
1728 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);
1729 head->stats.exp = 0; 1650 head->stats.exp = 0;
1730 } 1651 }
1731 1652
1732 /* If a monster was effected, put an effect in */ 1653 /* If a monster was effected, put an effect in */
1733 if (done_one && spell->other_arch) 1654 if (done_one && spell->other_arch)
1734 {
1735 tmp = arch_to_object (spell->other_arch); 1655 m->insert (arch_to_object (spell->other_arch), nx, ny, op);
1736 tmp->x = nx;
1737 tmp->y = ny;
1738 insert_ob_in_map (tmp, m, op, 0);
1739 }
1740 } /* for y */ 1656 } /* for y */
1741 1657
1742 return 1; 1658 return 1;
1743} 1659}
1744 1660
… …
1754move_ball_spell (object *op) 1670move_ball_spell (object *op)
1755{ 1671{
1756 int i, j, dam_save, dir, mflags; 1672 int i, j, dam_save, dir, mflags;
1757 sint16 nx, ny, hx, hy; 1673 sint16 nx, ny, hx, hy;
1758 object *owner; 1674 object *owner;
1759 mapstruct *m; 1675 maptile *m;
1760 1676
1761 owner = get_owner (op); 1677 owner = op->owner;
1762 1678
1763 /* 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,
1764 * 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
1765 * victim. The block immediately below more or less chooses a random 1681 * victim. The block immediately below more or less chooses a random
1766 * 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
… …
1795 nx = op->x; 1711 nx = op->x;
1796 ny = op->y; 1712 ny = op->y;
1797 m = op->map; 1713 m = op->map;
1798 } 1714 }
1799 1715
1800 remove_ob (op); 1716 m->insert (op, nx, ny, op);
1801 op->y = ny;
1802 op->x = nx;
1803 insert_ob_in_map (op, m, op, 0);
1804 1717
1805 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
1806 surrounding squares */ 1719 surrounding squares */
1807 1720
1808 /* loop over current square and neighbors to hit. 1721 /* loop over current square and neighbors to hit.
1809 * if this has an other_arch field, we insert that in 1722 * if this has an other_arch field, we insert that in
1810 * the surround spaces. 1723 * the surround spaces.
1811 */ 1724 */
1812 for (j = 0; j < 9; j++) 1725 for (j = 0; j < 9; j++)
1813 { 1726 {
1814 object *new_ob;
1815
1816 hx = nx + freearr_x[j]; 1727 hx = nx + freearr_x[j];
1817 hy = ny + freearr_y[j]; 1728 hy = ny + freearr_y[j];
1818 1729
1819 m = op->map; 1730 m = op->map;
1820 mflags = get_map_flags (m, &m, hx, hy, &hx, &hy); 1731 mflags = get_map_flags (m, &m, hx, hy, &hx, &hy);
… …
1834 1745
1835 } 1746 }
1836 1747
1837 /* insert the other arch */ 1748 /* insert the other arch */
1838 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))))
1839 { 1750 m->insert (arch_to_object (op->other_arch), hx, hy, op);
1840 new_ob = arch_to_object (op->other_arch);
1841 new_ob->x = hx;
1842 new_ob->y = hy;
1843 insert_ob_in_map (new_ob, m, op, 0);
1844 }
1845 } 1751 }
1846 1752
1847 /* restore to the center location and damage */ 1753 /* restore to the center location and damage */
1848 op->stats.dam = dam_save; 1754 op->stats.dam = dam_save;
1849 1755
1850 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);
1851 1757
1852 if (i >= 0) 1758 if (i >= 0)
1853 { /* we have a preferred direction! */ 1759 { /* we have a preferred direction! */
1854 /* pick another direction if the preferred dir is blocked. */ 1760 /* pick another direction if the preferred dir is blocked. */
1855 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 ||
1856 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)))
1857 {
1858 i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */ 1763 i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */
1859 } 1764
1860 op->direction = i; 1765 op->direction = i;
1861 } 1766 }
1862} 1767}
1863 1768
1864 1769
… …
1876#if 0 1781#if 0
1877 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 };
1878 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 };
1879 sint16 target_x, target_y, origin_x, origin_y; 1784 sint16 target_x, target_y, origin_x, origin_y;
1880 int adjustdir; 1785 int adjustdir;
1881 mapstruct *m; 1786 maptile *m;
1882#endif 1787#endif
1883 int basedir; 1788 int basedir;
1884 object *owner; 1789 object *owner;
1885 1790
1886 owner = get_owner (op); 1791 owner = op->owner;
1887 if (op->duration == 0 || owner == NULL) 1792 if (op->duration == 0 || owner == NULL)
1888 { 1793 {
1889 remove_ob (op); 1794 op->destroy ();
1890 free_object (op);
1891 return; 1795 return;
1892 } 1796 }
1797
1893 op->duration--; 1798 op->duration--;
1894 1799
1895 basedir = op->direction; 1800 basedir = op->direction;
1896 if (basedir == 0) 1801 if (basedir == 0)
1897 { 1802 {
… …
1994 1899
1995 if (!spell->other_arch) 1900 if (!spell->other_arch)
1996 return 0; 1901 return 0;
1997 1902
1998 tmp = get_archetype (SWARM_SPELL); 1903 tmp = get_archetype (SWARM_SPELL);
1999 tmp->x = op->x;
2000 tmp->y = op->y;
2001 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. */
2002 set_spell_skill (op, caster, spell, tmp); 1905 set_spell_skill (op, caster, spell, tmp);
2003 1906
2004 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. */
2005 tmp->spell = arch_to_object (spell->other_arch); 1908 tmp->spell = arch_to_object (spell->other_arch);
2006 1909
2007 tmp->attacktype = tmp->spell->attacktype; 1910 tmp->attacktype = tmp->spell->attacktype;
2008 1911
2009 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 1912 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
2010 {
2011 if (!tailor_god_spell (tmp, op)) 1913 if (!tailor_god_spell (tmp, op))
2012 return 1; 1914 return 1;
2013 } 1915
2014 tmp->duration = SP_level_duration_adjust (caster, spell); 1916 tmp->duration = SP_level_duration_adjust (caster, spell);
2015 for (i = 0; i < spell->duration; i++) 1917 for (i = 0; i < spell->duration; i++)
2016 tmp->duration += die_roll (1, 3, op, PREFER_HIGH); 1918 tmp->duration += die_roll (1, 3, op, PREFER_HIGH);
2017 1919
2018 tmp->direction = dir; 1920 tmp->direction = dir;
2019 tmp->invisible = 1; 1921 tmp->invisible = 1;
2020 insert_ob_in_map (tmp, op->map, op, 0); 1922
1923 tmp->insert_at (op, op);
2021 return 1; 1924 return 1;
2022} 1925}
2023 1926
2024 1927
2025/* See the spells documentation file for why this is its own 1928/* See the spells documentation file for why this is its own
… …
2029cast_light (object *op, object *caster, object *spell, int dir) 1932cast_light (object *op, object *caster, object *spell, int dir)
2030{ 1933{
2031 object *target = NULL, *tmp = NULL; 1934 object *target = NULL, *tmp = NULL;
2032 sint16 x, y; 1935 sint16 x, y;
2033 int dam, mflags; 1936 int dam, mflags;
2034 mapstruct *m; 1937 maptile *m;
2035 1938
2036 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1939 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
2037 1940
2038 if (!dir) 1941 if (!dir)
2039 { 1942 {
… …
2053 return 0; 1956 return 0;
2054 } 1957 }
2055 1958
2056 if (mflags & P_IS_ALIVE && spell->attacktype) 1959 if (mflags & P_IS_ALIVE && spell->attacktype)
2057 { 1960 {
2058 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)
2059 if (QUERY_FLAG (target, FLAG_MONSTER)) 1962 if (QUERY_FLAG (target, FLAG_MONSTER))
2060 { 1963 {
2061 /* oky doky. got a target monster. Lets make a blinding attack */ 1964 /* oky doky. got a target monster. Lets make a blinding attack */
2062 if (target->head) 1965 if (target->head)
2063 target = target->head; 1966 target = target->head;
… …
2085 { 1988 {
2086 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell); 1989 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell);
2087 if (tmp->glow_radius > MAX_LIGHT_RADII) 1990 if (tmp->glow_radius > MAX_LIGHT_RADII)
2088 tmp->glow_radius = MAX_LIGHT_RADII; 1991 tmp->glow_radius = MAX_LIGHT_RADII;
2089 } 1992 }
2090 tmp->x = x; 1993
2091 tmp->y = y; 1994 m->insert (tmp, x, y, op);
2092 insert_ob_in_map (tmp, m, op, 0);
2093 return 1; 1995 return 1;
2094} 1996}
2095 1997
2096 1998
2097 1999
… …
2107cast_cause_disease (object *op, object *caster, object *spell, int dir) 2009cast_cause_disease (object *op, object *caster, object *spell, int dir)
2108{ 2010{
2109 sint16 x, y; 2011 sint16 x, y;
2110 int i, mflags, range, dam_mod, dur_mod; 2012 int i, mflags, range, dam_mod, dur_mod;
2111 object *walk; 2013 object *walk;
2112 mapstruct *m; 2014 maptile *m;
2113 2015
2114 x = op->x; 2016 x = op->x;
2115 y = op->y; 2017 y = op->y;
2116 2018
2117 /* 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
… …
2145 2047
2146 /* 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 */
2147 if (mflags & P_IS_ALIVE) 2049 if (mflags & P_IS_ALIVE)
2148 { 2050 {
2149 /* search this square for a victim */ 2051 /* search this square for a victim */
2150 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)
2151 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER)) 2053 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER))
2152 { /* found a victim */ 2054 { /* found a victim */
2153 object *disease = arch_to_object (spell->other_arch); 2055 object *disease = arch_to_object (spell->other_arch);
2154 2056
2155 set_owner (disease, op); 2057 disease->set_owner (op);
2156 set_spell_skill (op, caster, spell, disease); 2058 set_spell_skill (op, caster, spell, disease);
2157 disease->stats.exp = 0; 2059 disease->stats.exp = 0;
2158 disease->level = caster_level (caster, spell); 2060 disease->level = caster_level (caster, spell);
2159 2061
2160 /* do level adjustments */ 2062 /* do level adjustments */
… …
2205 if (disease->stats.sp) 2107 if (disease->stats.sp)
2206 disease->stats.sp -= dam_mod; 2108 disease->stats.sp -= dam_mod;
2207 2109
2208 if (infect_object (walk, disease, 1)) 2110 if (infect_object (walk, disease, 1))
2209 { 2111 {
2210 object *flash; /* visual effect for inflicting disease */
2211
2212 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);
2213 2113
2214 free_object (disease); /* don't need this one anymore */ 2114 disease->destroy (); /* don't need this one anymore */
2215 flash = get_archetype (ARCH_DETECT_MAGIC); 2115 walk->map->insert (get_archetype (ARCH_DETECT_MAGIC), x, y, op);
2216 flash->x = x;
2217 flash->y = y;
2218 flash->map = walk->map;
2219 insert_ob_in_map (flash, walk->map, op, 0);
2220 return 1; 2116 return 1;
2221 } 2117 }
2222 free_object (disease); 2118
2119 disease->destroy ();
2223 } 2120 }
2224 } /* if living creature */ 2121 } /* if living creature */
2225 } /* for range of spaces */ 2122 } /* for range of spaces */
2123
2226 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!"); 2124 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!");
2227 return 1; 2125 return 1;
2228} 2126}

Diff Legend

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