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.14 by root, Thu Sep 14 23:13:49 2006 UTC vs.
Revision 1.34 by root, Thu May 17 00:33:29 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24/* This file contains all the spell attack code. Grouping this code 25/* This file contains all the spell attack code. Grouping this code
25 * together should hopefully make it easier to find the relevent bits 26 * together should hopefully make it easier to find the relevent bits
26 * of code 27 * of code
27 */ 28 */
28 29
29#include <global.h> 30#include <global.h>
30#include <object.h> 31#include <object.h>
31#include <living.h> 32#include <living.h>
32#ifndef __CEXTRACT__
33# include <sproto.h> 33#include <sproto.h>
34#endif
35#include <spells.h> 34#include <spells.h>
36#include <sounds.h> 35#include <sounds.h>
37 36
38/* this function checks to see if a spell pushes objects as well 37/* this function checks to see if a spell pushes objects as well
39 * as flies over and damages them (only used for cones for now) 38 * as flies over and damages them (only used for cones for now)
… …
57 { 56 {
58 weight_move = op->weight + (op->weight * op->level) / 3; 57 weight_move = op->weight + (op->weight * op->level) / 3;
59 /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */ 58 /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */
60 } 59 }
61 60
62 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 61 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
63 { 62 {
64 int num_sections = 1; 63 int num_sections = 1;
65 64
66 /* don't move DM */ 65 /* don't move DM */
67 if (QUERY_FLAG (tmp, FLAG_WIZ)) 66 if (QUERY_FLAG (tmp, FLAG_WIZ))
… …
117void 116void
118forklightning (object *op, object *tmp) 117forklightning (object *op, object *tmp)
119{ 118{
120 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 */
121 int t_dir; /* stores temporary dir calculation */ 120 int t_dir; /* stores temporary dir calculation */
122 mapstruct *m; 121 maptile *m;
123 sint16 sx, sy; 122 sint16 sx, sy;
124 object *new_bolt; 123 object *new_bolt;
125 124
126 /* pick a fork direction. tmp->stats.Con is the left bias 125 /* pick a fork direction. tmp->stats.Con is the left bias
127 * i.e., the chance in 100 of forking LEFT 126 * i.e., the chance in 100 of forking LEFT
… …
140 139
141 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, sx, sy))) 140 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, sx, sy)))
142 return; 141 return;
143 142
144 /* OK, we made a fork */ 143 /* OK, we made a fork */
145 new_bolt = get_object (); 144 new_bolt = tmp->clone ();
146 copy_object (tmp, new_bolt);
147 145
148 /* reduce chances of subsequent forking */ 146 /* reduce chances of subsequent forking */
149 new_bolt->stats.Dex -= 10; 147 new_bolt->stats.Dex -= 10;
150 tmp->stats.Dex -= 10; /* less forks from main bolt too */ 148 tmp->stats.Dex -= 10; /* less forks from main bolt too */
151 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */ 149 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */
152 new_bolt->speed_left = -0.1; 150 new_bolt->speed_left = -0.1f;
153 new_bolt->direction = t_dir; 151 new_bolt->direction = t_dir;
154 new_bolt->duration++; 152 new_bolt->duration++;
155 new_bolt->x = sx;
156 new_bolt->y = sy;
157 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */ 153 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */
158 new_bolt->stats.dam++; 154 new_bolt->stats.dam++;
159 tmp->stats.dam /= 2; /* reduce father bolt damage */ 155 tmp->stats.dam /= 2; /* reduce father bolt damage */
160 tmp->stats.dam++; 156 tmp->stats.dam++;
161 new_bolt = insert_ob_in_map (new_bolt, m, op, 0); 157 if ((new_bolt = m->insert (new_bolt, sx, sy, op)))
162 update_turn_face (new_bolt); 158 update_turn_face (new_bolt);
163} 159}
164 160
165/* move_bolt: moves bolt 'op'. Basically, it just advances a space, 161/* move_bolt: moves bolt 'op'. Basically, it just advances a space,
166 * and checks for various things that may stop it. 162 * and checks for various things that may stop it.
167 */ 163 */
168 164
169void 165void
170move_bolt (object *op) 166move_bolt (object *op)
171{ 167{
172 object *tmp;
173 int mflags; 168 int mflags;
174 sint16 x, y; 169 sint16 x, y;
175 mapstruct *m; 170 maptile *m;
176 171
177 if (--(op->duration) < 0) 172 if (--op->duration < 0)
178 { 173 {
179 remove_ob (op); 174 op->destroy ();
180 free_object (op);
181 return; 175 return;
182 } 176 }
183 177
184 hit_map (op, 0, op->attacktype, 1); 178 hit_map (op, 0, op->attacktype, 1);
185 179
186 if (!op->direction) 180 if (!op->direction)
187 return; 181 return;
188 182
189 if (--op->range < 0) 183 if (--op->range < 0)
190 {
191 op->range = 0; 184 op->range = 0;
192 }
193 else 185 else
194 { 186 {
195 x = op->x + DIRX (op); 187 x = op->x + DIRX (op);
196 y = op->y + DIRY (op); 188 y = op->y + DIRY (op);
197 m = op->map; 189 m = op->map;
… …
205 * 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
206 * will be useful. 198 * will be useful.
207 */ 199 */
208 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)))
209 { 201 {
210
211 if (!QUERY_FLAG (op, FLAG_REFLECTING)) 202 if (!QUERY_FLAG (op, FLAG_REFLECTING))
212 return; 203 return;
213 204
214 /* Since walls don't run diagonal, if the bolt is in 205 /* Since walls don't run diagonal, if the bolt is in
215 * one of 4 main directions, it just reflects back in the 206 * one of 4 main directions, it just reflects back in the
… …
245 else if (left) 236 else if (left)
246 op->direction = absdir (op->direction + 2); 237 op->direction = absdir (op->direction + 2);
247 else if (right) 238 else if (right)
248 op->direction = absdir (op->direction - 2); 239 op->direction = absdir (op->direction - 2);
249 } 240 }
241
250 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */ 242 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */
251 return; 243 return;
252 } 244 }
253 else 245 else
254 { /* Create a copy of this object and put it ahead */ 246 { /* Create a copy of this object and put it ahead */
255 tmp = get_object (); 247 object *tmp = op->clone ();
256 copy_object (op, tmp); 248
249 m->insert (tmp, x, y, op);
257 tmp->speed_left = -0.1; 250 tmp->speed_left = -0.1f;
258 tmp->x += DIRX (tmp), tmp->y += DIRY (tmp);
259 tmp = insert_ob_in_map (tmp, op->map, op, 0);
260 /* 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 */
261 tmp->duration++; 252 tmp->duration++;
262 253
263 /* New forking code. Possibly create forks of this object 254 /* New forking code. Possibly create forks of this object
264 * going off in other directions. 255 * going off in other directions.
265 */ 256 */
266
267 if (rndm (0, 99) < tmp->stats.Dex) 257 if (rndm (0, 99) < tmp->stats.Dex)
268 { /* stats.Dex % of forking */ 258 { /* stats.Dex % of forking */
269 forklightning (op, tmp); 259 forklightning (op, tmp);
270 } 260 }
261
271 /* 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
272 * doesn't create any bolts that continue to move onward. 263 * doesn't create any bolts that continue to move onward.
273 */ 264 */
274 op->range = 0; 265 op->range = 0;
275 } /* copy object and move it along */ 266 } /* copy object and move it along */
… …
282 * we remove the magic flag - that can be derived from 273 * we remove the magic flag - that can be derived from
283 * spob->attacktype. 274 * spob->attacktype.
284 * This function sets up the appropriate owner and skill 275 * This function sets up the appropriate owner and skill
285 * pointers. 276 * pointers.
286 */ 277 */
287
288int 278int
289fire_bolt (object *op, object *caster, int dir, object *spob, object *skill) 279fire_bolt (object *op, object *caster, int dir, object *spob, object *skill)
290{ 280{
291 object *tmp = NULL; 281 object *tmp = NULL;
292 int mflags; 282 int mflags;
… …
310 300
311 tmp->direction = dir; 301 tmp->direction = dir;
312 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 302 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
313 SET_ANIMATION (tmp, dir); 303 SET_ANIMATION (tmp, dir);
314 304
315 set_owner (tmp, op); 305 tmp->set_owner (op);
316 set_spell_skill (op, caster, spob, tmp); 306 set_spell_skill (op, caster, spob, tmp);
317 307
318 tmp->x = op->x + DIRX (tmp); 308 tmp->x = op->x + DIRX (tmp);
319 tmp->y = op->y + DIRY (tmp); 309 tmp->y = op->y + DIRY (tmp);
320 tmp->map = op->map; 310 tmp->map = op->map;
321 311
312 maptile *newmap;
322 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);
323 if (mflags & P_OUT_OF_MAP) 314 if (mflags & P_OUT_OF_MAP)
324 { 315 {
325 free_object (tmp); 316 tmp->destroy ();
326 return 0; 317 return 0;
327 } 318 }
319
320 tmp->map = newmap;
321
328 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)))
329 { 323 {
330 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 324 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
331 { 325 {
332 free_object (tmp); 326 tmp->destroy ();
333 return 0; 327 return 0;
334 } 328 }
329
335 tmp->x = op->x; 330 tmp->x = op->x;
336 tmp->y = op->y; 331 tmp->y = op->y;
337 tmp->direction = absdir (tmp->direction + 4); 332 tmp->direction = absdir (tmp->direction + 4);
338 tmp->map = op->map; 333 tmp->map = op->map;
339 } 334 }
340 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL) 335
336 if ((tmp = tmp->insert_at (tmp, op)))
341 move_bolt (tmp); 337 move_bolt (tmp);
338
342 return 1; 339 return 1;
343} 340}
344 341
345 342
346 343
… …
355 * At least that is what I think this does. 352 * At least that is what I think this does.
356 */ 353 */
357void 354void
358explosion (object *op) 355explosion (object *op)
359{ 356{
360 object *tmp;
361 mapstruct *m = op->map; 357 maptile *m = op->map;
362 int i; 358 int i;
363 359
364 if (--(op->duration) < 0) 360 if (--op->duration < 0)
365 { 361 {
366 remove_ob (op); 362 op->destroy ();
367 free_object (op);
368 return; 363 return;
369 } 364 }
365
370 hit_map (op, 0, op->attacktype, 0); 366 hit_map (op, 0, op->attacktype, 0);
371 367
372 if (op->range > 0) 368 if (op->range > 0)
373 { 369 {
374 for (i = 1; i < 9; i++) 370 for (i = 1; i < 9; i++)
375 { 371 {
376 sint16 dx, dy; 372 sint16 dx, dy;
377 373
378 dx = op->x + freearr_x[i]; 374 dx = op->x + freearr_x[i];
379 dy = op->y + freearr_y[i]; 375 dy = op->y + freearr_y[i];
376
380 /* ok_to_put_more already does things like checks for walls, 377 /* ok_to_put_more already does things like checks for walls,
381 * out of map, etc. 378 * out of map, etc.
382 */ 379 */
383 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))
384 { 381 {
385 tmp = get_object (); 382 object *tmp = op->clone ();
386 copy_object (op, tmp); 383
387 tmp->state = 0; 384 tmp->state = 0;
388 tmp->speed_left = -0.21; 385 tmp->speed_left = -0.21f;
389 tmp->range--; 386 tmp->range--;
390 tmp->value = 0; 387 tmp->value = 0;
391 tmp->x = dx; 388
392 tmp->y = dy; 389 m->insert (tmp, dx, dy, op);
393 insert_ob_in_map (tmp, m, op, 0);
394 } 390 }
395 } 391 }
396 } 392 }
397} 393}
398 394
… …
407 object *tmp, *owner; 403 object *tmp, *owner;
408 404
409 if (op->other_arch == NULL) 405 if (op->other_arch == NULL)
410 { 406 {
411 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n"); 407 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");
412 remove_ob (op); 408 op->destroy ();
413 free_object (op);
414 return; 409 return;
415 } 410 }
416 411
417 if (op->env) 412 if (op->env)
418 { 413 {
419 object *env;
420
421 env = object_get_env_recursive (op); 414 object *env = object_get_env_recursive (op);
422 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))
423 { 416 {
424 LOG (llevError, "BUG: explode_bullet(): env out of map\n"); 417 LOG (llevError, "BUG: explode_bullet(): env out of map\n");
425 remove_ob (op); 418 op->destroy ();
426 free_object (op);
427 return; 419 return;
428 } 420 }
429 remove_ob (op); 421
430 op->x = env->x; 422 op->insert_at (env, op, INS_NO_MERGE | INS_NO_WALK_ON);
431 op->y = env->y;
432 insert_ob_in_map (op, env->map, op, INS_NO_MERGE | INS_NO_WALK_ON);
433 } 423 }
434 else if (out_of_map (op->map, op->x, op->y)) 424 else if (out_of_map (op->map, op->x, op->y))
435 { 425 {
436 LOG (llevError, "BUG: explode_bullet(): op out of map\n"); 426 LOG (llevError, "BUG: explode_bullet(): op out of map\n");
437 remove_ob (op); 427 op->destroy ();
438 free_object (op);
439 return; 428 return;
440 } 429 }
441 430
442 // 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
443 // 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
444 // bad at the moment that might happen from this. 433 // bad at the moment that might happen from this.
445 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)
446 { 435 {
447 remove_ob (op); 436 op->destroy ();
448 free_object (op);
449 return; 437 return;
450 } 438 }
451 439
452 if (op->attacktype) 440 if (op->attacktype)
453 { 441 {
… …
457 } 445 }
458 446
459 /* other_arch contains what this explodes into */ 447 /* other_arch contains what this explodes into */
460 tmp = arch_to_object (op->other_arch); 448 tmp = arch_to_object (op->other_arch);
461 449
462 copy_owner (tmp, op); 450 tmp->set_owner (op);
463 tmp->skill = op->skill; 451 tmp->skill = op->skill;
464 452
465 owner = get_owner (op); 453 owner = op->owner;
466 454
467 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))
468 { 456 {
469 remove_ob (op); 457 op->destroy ();
470 free_object (op);
471 return; 458 return;
472 } 459 }
473
474 tmp->x = op->x;
475 tmp->y = op->y;
476 460
477 /* special for bombs - it actually has sane values for these */ 461 /* special for bombs - it actually has sane values for these */
478 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB) 462 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB)
479 { 463 {
480 tmp->attacktype = op->attacktype; 464 tmp->attacktype = op->attacktype;
… …
484 } 468 }
485 else 469 else
486 { 470 {
487 if (op->attacktype & AT_MAGIC) 471 if (op->attacktype & AT_MAGIC)
488 tmp->attacktype |= AT_MAGIC; 472 tmp->attacktype |= AT_MAGIC;
473
489 /* Spell doc describes what is going on here */ 474 /* Spell doc describes what is going on here */
490 tmp->stats.dam = op->dam_modifier; 475 tmp->stats.dam = op->dam_modifier;
491 tmp->range = op->stats.maxhp; 476 tmp->range = op->stats.maxhp;
492 tmp->duration = op->stats.hp; 477 tmp->duration = op->stats.hp;
493 /* 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 -
… …
501 tmp->stats.sp = op->direction; 486 tmp->stats.sp = op->direction;
502 487
503 /* Prevent recursion */ 488 /* Prevent recursion */
504 op->move_on = 0; 489 op->move_on = 0;
505 490
506 insert_ob_in_map (tmp, op->map, op, 0); 491 tmp->insert_at (op, op);
507 /* remove the firebullet */ 492 /* remove the firebullet */
508 if (!op->destroyed ()) 493 op->destroy ();
509 {
510 remove_ob (op);
511 free_object (op);
512 }
513} 494}
514
515
516 495
517/* 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
518 * (eg, explode, damage player, etc) 497 * (eg, explode, damage player, etc)
519 */ 498 */
520
521void 499void
522check_bullet (object *op) 500check_bullet (object *op)
523{ 501{
524 object *tmp; 502 object *tmp;
525 int dam, mflags; 503 int dam, mflags;
526 mapstruct *m; 504 maptile *m;
527 sint16 sx, sy; 505 sint16 sx, sy;
528 506
529 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);
530 508
531 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)))
… …
540 518
541 /* 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 */
542 if (!(mflags & P_IS_ALIVE)) 520 if (!(mflags & P_IS_ALIVE))
543 return; 521 return;
544 522
545 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 523 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
546 { 524 {
547 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 525 if (QUERY_FLAG (tmp, FLAG_ALIVE))
548 { 526 {
549 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 527 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
550 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0) 528 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
551 { 529 {
552 if (!QUERY_FLAG (op, FLAG_REMOVED)) 530 if (!QUERY_FLAG (op, FLAG_REMOVED))
553 { 531 {
554 remove_ob (op); 532 op->destroy ();
555 free_object (op);
556 return; 533 return;
557 } 534 }
558 } 535 }
559 } 536 }
560 } 537 }
561} 538}
562
563 539
564/* Basically, we move 'op' one square, and if it hits something, 540/* Basically, we move 'op' one square, and if it hits something,
565 * call check_bullet. 541 * call check_bullet.
566 * This function is only applicable to bullets, but not to all 542 * This function is only applicable to bullets, but not to all
567 * fired arches (eg, bolts). 543 * fired arches (eg, bolts).
568 */ 544 */
569
570void 545void
571move_bullet (object *op) 546move_bullet (object *op)
572{ 547{
573 sint16 new_x, new_y; 548 sint16 new_x, new_y;
574 int mflags; 549 int mflags;
575 mapstruct *m; 550 maptile *m;
576 551
577#if 0 552#if 0
578 /* We need a better general purpose way to do this */ 553 /* We need a better general purpose way to do this */
579 554
580 /* peterm: added to make comet leave a trail of burnouts 555 /* peterm: added to make comet leave a trail of burnouts
… …
589 564
590 /* Reached the end of its life - remove it */ 565 /* Reached the end of its life - remove it */
591 if (--op->range <= 0) 566 if (--op->range <= 0)
592 { 567 {
593 if (op->other_arch) 568 if (op->other_arch)
594 {
595 explode_bullet (op); 569 explode_bullet (op);
596 }
597 else 570 else
598 { 571 op->destroy ();
599 remove_ob (op); 572
600 free_object (op);
601 }
602 return; 573 return;
603 } 574 }
604 575
605 new_x = op->x + DIRX (op); 576 new_x = op->x + DIRX (op);
606 new_y = op->y + DIRY (op); 577 new_y = op->y + DIRY (op);
607 m = op->map; 578 m = op->map;
608 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);
609 580
610 if (mflags & P_OUT_OF_MAP) 581 if (mflags & P_OUT_OF_MAP)
611 { 582 {
612 remove_ob (op); 583 op->destroy ();
613 free_object (op);
614 return; 584 return;
615 } 585 }
616 586
617 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)))
618 { 588 {
619 if (op->other_arch) 589 if (op->other_arch)
620 {
621 explode_bullet (op); 590 explode_bullet (op);
622 }
623 else 591 else
624 { 592 op->destroy ();
625 remove_ob (op); 593
626 free_object (op);
627 }
628 return; 594 return;
629 } 595 }
630 596
631 remove_ob (op); 597 if (!(op = m->insert (op, new_x, new_y, op)))
632 op->x = new_x;
633 op->y = new_y;
634 if ((op = insert_ob_in_map (op, m, op, 0)) == NULL)
635 return; 598 return;
636 599
637 if (reflwall (op->map, op->x, op->y, op)) 600 if (reflwall (op->map, op->x, op->y, op))
638 { 601 {
639 op->direction = absdir (op->direction + 4); 602 op->direction = absdir (op->direction + 4);
640 update_turn_face (op); 603 update_turn_face (op);
641 } 604 }
642 else 605 else
643 {
644 check_bullet (op); 606 check_bullet (op);
645 }
646} 607}
647
648
649
650 608
651/* fire_bullet 609/* fire_bullet
652 * object op (cast from caster) files a bolt in dir. 610 * object op (cast from caster) files a bolt in dir.
653 * spob is the spell object for the bolt. 611 * spob is the spell object for the bolt.
654 * we remove the magic flag - that can be derived from 612 * we remove the magic flag - that can be derived from
… …
685 643
686 tmp->direction = dir; 644 tmp->direction = dir;
687 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 645 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
688 SET_ANIMATION (tmp, dir); 646 SET_ANIMATION (tmp, dir);
689 647
690 set_owner (tmp, op); 648 tmp->set_owner (op);
691 set_spell_skill (op, caster, spob, tmp); 649 set_spell_skill (op, caster, spob, tmp);
692 650
693 tmp->x = op->x + freearr_x[dir]; 651 tmp->x = op->x + freearr_x[dir];
694 tmp->y = op->y + freearr_y[dir]; 652 tmp->y = op->y + freearr_y[dir];
695 tmp->map = op->map; 653 tmp->map = op->map;
696 654
655 maptile *newmap;
697 mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y); 656 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
698 if (mflags & P_OUT_OF_MAP) 657 if (mflags & P_OUT_OF_MAP)
699 { 658 {
700 free_object (tmp); 659 tmp->destroy ();
701 return 0; 660 return 0;
702 } 661 }
662
663 tmp->map = newmap;
664
703 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 665 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
704 { 666 {
705 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 667 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
706 { 668 {
707 free_object (tmp); 669 tmp->destroy ();
708 return 0; 670 return 0;
709 } 671 }
672
710 tmp->x = op->x; 673 tmp->x = op->x;
711 tmp->y = op->y; 674 tmp->y = op->y;
712 tmp->direction = absdir (tmp->direction + 4); 675 tmp->direction = absdir (tmp->direction + 4);
713 tmp->map = op->map; 676 tmp->map = op->map;
714 } 677 }
715 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL) 678
716 { 679 if ((tmp = tmp->insert_at (tmp, op)))
717 check_bullet (tmp); 680 check_bullet (tmp);
718 } 681
719 return 1; 682 return 1;
720} 683}
721
722
723
724 684
725/***************************************************************************** 685/*****************************************************************************
726 * 686 *
727 * CONE RELATED FUNCTIONS 687 * CONE RELATED FUNCTIONS
728 * 688 *
729 *****************************************************************************/ 689 *****************************************************************************/
730 690
731
732/* drops an object based on what is in the cone's "other_arch" */ 691/* drops an object based on what is in the cone's "other_arch" */
733void 692void
734cone_drop (object *op) 693cone_drop (object *op)
735{ 694{
736 object *new_ob = arch_to_object (op->other_arch); 695 object *new_ob = arch_to_object (op->other_arch);
737 696
738 new_ob->x = op->x;
739 new_ob->y = op->y;
740 new_ob->level = op->level; 697 new_ob->level = op->level;
741 set_owner (new_ob, op->owner); 698 new_ob->set_owner (op->owner);
742 699
743 /* preserve skill ownership */ 700 /* preserve skill ownership */
744 if (op->skill && op->skill != new_ob->skill) 701 if (op->skill && op->skill != new_ob->skill)
745 {
746 new_ob->skill = op->skill; 702 new_ob->skill = op->skill;
747 }
748 insert_ob_in_map (new_ob, op->map, op, 0);
749 703
704 new_ob->insert_at (op, op);
750} 705}
751 706
752/* move_cone: causes cone object 'op' to move a space/hit creatures */ 707/* move_cone: causes cone object 'op' to move a space/hit creatures */
753 708
754void 709void
… …
758 713
759 /* if no map then hit_map will crash so just ignore object */ 714 /* if no map then hit_map will crash so just ignore object */
760 if (!op->map) 715 if (!op->map)
761 { 716 {
762 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown"); 717 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown");
763 op->speed = 0; 718 op->set_speed (0);
764 update_ob_speed (op);
765 return; 719 return;
766 } 720 }
767 721
768 /* lava saves it's life, but not yours :) */ 722 /* lava saves it's life, but not yours :) */
769 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 723 if (QUERY_FLAG (op, FLAG_LIFESAVE))
… …
775#if 0 729#if 0
776 /* Disable this - enabling it makes monsters easier, as 730 /* Disable this - enabling it makes monsters easier, as
777 * when their cone dies when they die. 731 * when their cone dies when they die.
778 */ 732 */
779 /* If no owner left, the spell dies out. */ 733 /* If no owner left, the spell dies out. */
780 if (get_owner (op) == NULL) 734 if (op->owner == NULL)
781 { 735 {
782 remove_ob (op); 736 op->destroy ();
783 free_object (op);
784 return; 737 return;
785 } 738 }
786#endif 739#endif
787 740
788 hit_map (op, 0, op->attacktype, 0); 741 hit_map (op, 0, op->attacktype, 0);
… …
797 if (op->destroyed ()) 750 if (op->destroyed ())
798 return; 751 return;
799 752
800 if ((op->duration--) < 0) 753 if ((op->duration--) < 0)
801 { 754 {
802 remove_ob (op); 755 op->destroy ();
803 free_object (op);
804 return; 756 return;
805 } 757 }
806 /* Object has hit maximum range, so don't have it move 758 /* Object has hit maximum range, so don't have it move
807 * any further. When the duration above expires, 759 * any further. When the duration above expires,
808 * then the object will get removed. 760 * then the object will get removed.
… …
817 { 769 {
818 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)]; 770 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)];
819 771
820 if (ok_to_put_more (op->map, x, y, op, op->attacktype)) 772 if (ok_to_put_more (op->map, x, y, op, op->attacktype))
821 { 773 {
822 object *tmp = get_object (); 774 object *tmp = op->clone ();
823
824 copy_object (op, tmp);
825 tmp->x = x;
826 tmp->y = y;
827 775
828 tmp->duration = op->duration + 1; 776 tmp->duration = op->duration + 1;
829 777
830 /* Use for spell tracking - see ok_to_put_more() */ 778 /* Use for spell tracking - see ok_to_put_more() */
831 tmp->stats.maxhp = op->stats.maxhp; 779 tmp->stats.maxhp = op->stats.maxhp;
832 insert_ob_in_map (tmp, op->map, op, 0); 780
781 op->map->insert (tmp, x, y, op);
782
833 if (tmp->other_arch) 783 if (tmp->other_arch)
834 cone_drop (tmp); 784 cone_drop (tmp);
835 } 785 }
836 } 786 }
837} 787}
… …
847int 797int
848cast_cone (object *op, object *caster, int dir, object *spell) 798cast_cone (object *op, object *caster, int dir, object *spell)
849{ 799{
850 object *tmp; 800 object *tmp;
851 int i, success = 0, range_min = -1, range_max = 1; 801 int i, success = 0, range_min = -1, range_max = 1;
852 mapstruct *m; 802 maptile *m;
853 sint16 sx, sy; 803 sint16 sx, sy;
854 MoveType movetype; 804 MoveType movetype;
855 805
856 if (!spell->other_arch) 806 if (!spell->other_arch)
857 return 0; 807 return 0;
… …
913 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype) 863 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype)
914 continue; 864 continue;
915 865
916 success = 1; 866 success = 1;
917 tmp = arch_to_object (spell->other_arch); 867 tmp = arch_to_object (spell->other_arch);
918 set_owner (tmp, op); 868 tmp->set_owner (op);
919 set_spell_skill (op, caster, spell, tmp); 869 set_spell_skill (op, caster, spell, tmp);
920 tmp->level = caster_level (caster, spell); 870 tmp->level = caster_level (caster, spell);
921 tmp->x = sx;
922 tmp->y = sy;
923 tmp->attacktype = spell->attacktype; 871 tmp->attacktype = spell->attacktype;
924 872
925 /* holy word stuff */ 873 /* holy word stuff */
926 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) 874 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER))
927 if (!tailor_god_spell (tmp, op)) 875 if (!tailor_god_spell (tmp, op))
… …
964 912
965 if (!(tmp->move_type & MOVE_FLY_LOW)) 913 if (!(tmp->move_type & MOVE_FLY_LOW))
966 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->name); 914 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->name);
967 915
968 if (!tmp->move_on && tmp->stats.dam) 916 if (!tmp->move_on && tmp->stats.dam)
969 {
970 LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->name); 917 LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->name);
971 }
972 918
973 insert_ob_in_map (tmp, m, op, 0); 919 m->insert (tmp, sx, sy, op);
974 920
975 /* This is used for tracking spells so that one effect doesn't hit 921 /* This is used for tracking spells so that one effect doesn't hit
976 * a single space too many times. 922 * a single space too many times.
977 */ 923 */
978 tmp->stats.maxhp = tmp->count; 924 tmp->stats.maxhp = tmp->count;
… …
997void 943void
998animate_bomb (object *op) 944animate_bomb (object *op)
999{ 945{
1000 int i; 946 int i;
1001 object *env, *tmp; 947 object *env, *tmp;
1002 archetype *at;
1003 948
1004 if (op->state != NUM_ANIMATIONS (op) - 1) 949 if (op->state != NUM_ANIMATIONS (op) - 1)
1005 return; 950 return;
1006 951
1007 env = object_get_env_recursive (op); 952 env = object_get_env_recursive (op);
… …
1012 return; 957 return;
1013 958
1014 if (env->type == PLAYER) 959 if (env->type == PLAYER)
1015 esrv_del_item (env->contr, op->count); 960 esrv_del_item (env->contr, op->count);
1016 961
1017 remove_ob (op); 962 if (!(op = op->insert_at (env, op)))
1018 op->x = env->x;
1019 op->y = env->y;
1020 if ((op = insert_ob_in_map (op, env->map, op, 0)) == NULL)
1021 return; 963 return;
1022 } 964 }
1023 965
1024 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding 966 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding
1025 // on a safe map. I don't like this special casing, but it seems to be neccessary 967 // on a safe map. I don't like this special casing, but it seems to be neccessary
1026 // as bombs can be carried. 968 // as bombs can be carried.
1027 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 969 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
1028 { 970 {
1029 remove_ob (op); 971 op->destroy ();
1030 free_object (op);
1031 return; 972 return;
1032 } 973 }
1033 974
1034 /* This copies a lot of the code from the fire bullet, 975 /* This copies a lot of the code from the fire bullet,
1035 * but using the cast_bullet isn't really feasible, 976 * but using the cast_bullet isn't really feasible,
1036 * so just set up the appropriate values. 977 * so just set up the appropriate values.
1037 */ 978 */
1038 at = archetype::find (SPLINT); 979 if (archetype *at = archetype::find (SPLINT))
1039 if (at)
1040 { 980 {
1041 for (i = 1; i < 9; i++) 981 for (i = 1; i < 9; i++)
1042 { 982 {
1043 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i])) 983 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i]))
1044 continue; 984 continue;
985
1045 tmp = arch_to_object (at); 986 tmp = arch_to_object (at);
1046 tmp->direction = i; 987 tmp->direction = i;
1047 tmp->range = op->range; 988 tmp->range = op->range;
1048 tmp->stats.dam = op->stats.dam; 989 tmp->stats.dam = op->stats.dam;
1049 tmp->duration = op->duration; 990 tmp->duration = op->duration;
1050 tmp->attacktype = op->attacktype; 991 tmp->attacktype = op->attacktype;
1051 copy_owner (tmp, op); 992 tmp->set_owner (op);
1052 if (op->skill && op->skill != tmp->skill) 993 if (op->skill && op->skill != tmp->skill)
1053 {
1054 tmp->skill = op->skill; 994 tmp->skill = op->skill;
1055 } 995
1056 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 996 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
1057 SET_ANIMATION (tmp, i); 997 SET_ANIMATION (tmp, i);
1058 tmp->x = op->x + freearr_x[i]; 998
1059 tmp->y = op->y + freearr_x[i]; 999 op->map->insert (tmp, op->x + freearr_x[i], op->y + freearr_x[i], op);
1060 insert_ob_in_map (tmp, op->map, op, 0);
1061 move_bullet (tmp); 1000 move_bullet (tmp);
1062 } 1001 }
1063 } 1002 }
1064 1003
1065 explode_bullet (op); 1004 explode_bullet (op);
… …
1070{ 1009{
1071 1010
1072 object *tmp; 1011 object *tmp;
1073 int mflags; 1012 int mflags;
1074 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir]; 1013 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir];
1075 mapstruct *m; 1014 maptile *m;
1076 1015
1077 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy); 1016 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy);
1078 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK)) 1017 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
1079 { 1018 {
1080 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1019 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
… …
1086 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 1025 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
1087 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1026 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1088 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 1027 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
1089 tmp->attacktype = spell->attacktype; 1028 tmp->attacktype = spell->attacktype;
1090 1029
1091 set_owner (tmp, op); 1030 tmp->set_owner (op);
1092 set_spell_skill (op, caster, spell, tmp); 1031 set_spell_skill (op, caster, spell, tmp);
1093 tmp->x = dx; 1032
1094 tmp->y = dy; 1033 m->insert (tmp, dx, dy, op);
1095 insert_ob_in_map (tmp, m, op, 0);
1096 return 1; 1034 return 1;
1097} 1035}
1098 1036
1099/**************************************************************************** 1037/****************************************************************************
1100 * 1038 *
… …
1116get_pointed_target (object *op, int dir, int range, int type) 1054get_pointed_target (object *op, int dir, int range, int type)
1117{ 1055{
1118 object *target; 1056 object *target;
1119 sint16 x, y; 1057 sint16 x, y;
1120 int dist, mflags; 1058 int dist, mflags;
1121 mapstruct *mp; 1059 maptile *mp;
1122 1060
1123 if (dir == 0) 1061 if (dir == 0)
1124 return NULL; 1062 return NULL;
1125 1063
1126 for (dist = 1; dist < range; dist++) 1064 for (dist = 1; dist < range; dist++)
… …
1139 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW) 1077 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
1140 return NULL; 1078 return NULL;
1141 1079
1142 if (mflags & P_IS_ALIVE) 1080 if (mflags & P_IS_ALIVE)
1143 { 1081 {
1144 for (target = get_map_ob (mp, x, y); target; target = target->above) 1082 for (target = GET_MAP_OB (mp, x, y); target; target = target->above)
1145 { 1083 {
1146 if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER)) 1084 if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER))
1147 { 1085 {
1148 return target; 1086 return target;
1149 } 1087 }
… …
1216 if (effect->attacktype & AT_DEATH) 1154 if (effect->attacktype & AT_DEATH)
1217 { 1155 {
1218 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1156 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1219 1157
1220 /* casting death spells at undead isn't a good thing */ 1158 /* casting death spells at undead isn't a good thing */
1221 if QUERY_FLAG
1222 (target, FLAG_UNDEAD) 1159 if (QUERY_FLAG (target, FLAG_UNDEAD))
1223 { 1160 {
1224 if (random_roll (0, 2, op, PREFER_LOW)) 1161 if (random_roll (0, 2, op, PREFER_LOW))
1225 { 1162 {
1226 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!"); 1163 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");
1227 effect->x = op->x; 1164 effect->x = op->x;
… …
1229 } 1166 }
1230 else 1167 else
1231 { 1168 {
1232 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target)); 1169 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target));
1233 target->stats.hp = target->stats.maxhp * 2; 1170 target->stats.hp = target->stats.maxhp * 2;
1234 free_object (effect); 1171 effect->destroy ();
1235 return 0; 1172 return 0;
1236 } 1173 }
1237 } 1174 }
1238 } 1175 }
1239 else 1176 else
1240 { 1177 {
1241 /* how much woe to inflict :) */ 1178 /* how much woe to inflict :) */
1242 effect->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1179 effect->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1243 } 1180 }
1244 1181
1245 set_owner (effect, op); 1182 effect->set_owner (op);
1246 set_spell_skill (op, caster, spell, effect); 1183 set_spell_skill (op, caster, spell, effect);
1247 1184
1248 /* ok, tell it where to be, and insert! */ 1185 /* ok, tell it where to be, and insert! */
1249 effect->x = target->x; 1186 effect->insert_at (target, op);
1250 effect->y = target->y;
1251 insert_ob_in_map (effect, target->map, op, 0);
1252 1187
1253 return 1; 1188 return 1;
1254} 1189}
1255 1190
1256 1191
… …
1266move_missile (object *op) 1201move_missile (object *op)
1267{ 1202{
1268 int i, mflags; 1203 int i, mflags;
1269 object *owner; 1204 object *owner;
1270 sint16 new_x, new_y; 1205 sint16 new_x, new_y;
1271 mapstruct *m; 1206 maptile *m;
1272 1207
1273 if (op->range-- <= 0) 1208 if (op->range-- <= 0)
1274 { 1209 {
1275 remove_ob (op); 1210 op->destroy ();
1276 free_object (op);
1277 return; 1211 return;
1278 } 1212 }
1279 1213
1280 owner = get_owner (op); 1214 owner = op->owner;
1281#if 0 1215#if 0
1282 /* It'd make things nastier if this wasn't here - spells cast by 1216 /* It'd make things nastier if this wasn't here - spells cast by
1283 * monster that are then killed would continue to survive 1217 * monster that are then killed would continue to survive
1284 */ 1218 */
1285 if (owner == NULL) 1219 if (owner == NULL)
1286 { 1220 {
1287 remove_ob (op); 1221 op->destroy ();
1288 free_object (op);
1289 return; 1222 return;
1290 } 1223 }
1291#endif 1224#endif
1292 1225
1293 new_x = op->x + DIRX (op); 1226 new_x = op->x + DIRX (op);
… …
1300 hit_map (op, op->direction, AT_MAGIC, 1); 1233 hit_map (op, op->direction, AT_MAGIC, 1);
1301 /* Basically, missile only hits one thing then goes away. 1234 /* Basically, missile only hits one thing then goes away.
1302 * we need to remove it if someone hasn't already done so. 1235 * we need to remove it if someone hasn't already done so.
1303 */ 1236 */
1304 if (!op->destroyed ()) 1237 if (!op->destroyed ())
1305 free_object (op); 1238 op->destroy ();
1306 1239
1307 return; 1240 return;
1308 } 1241 }
1309 1242
1310 remove_ob (op); 1243 op->remove ();
1311 1244
1312 if (!op->direction || (mflags & P_OUT_OF_MAP)) 1245 if (!op->direction || (mflags & P_OUT_OF_MAP))
1313 { 1246 {
1314 free_object (op); 1247 op->destroy ();
1315 return; 1248 return;
1316 } 1249 }
1317 1250
1318 op->x = new_x; 1251 i = spell_find_dir (m, new_x, new_y, op->owner);
1319 op->y = new_y;
1320 op->map = m;
1321 i = spell_find_dir (op->map, op->x, op->y, get_owner (op));
1322 if (i > 0 && i != op->direction) 1252 if (i > 0 && i != op->direction)
1323 { 1253 {
1324 op->direction = i; 1254 op->direction = i;
1325 SET_ANIMATION (op, op->direction); 1255 SET_ANIMATION (op, op->direction);
1326 } 1256 }
1327 1257
1328 insert_ob_in_map (op, op->map, op, 0); 1258 m->insert (op, new_x, new_y, op);
1329} 1259}
1330 1260
1331/**************************************************************************** 1261/****************************************************************************
1332 * Destruction 1262 * Destruction
1333 ****************************************************************************/ 1263 ****************************************************************************/
… …
1370 return 0; 1300 return 0;
1371 } 1301 }
1372 return 1; 1302 return 1;
1373} 1303}
1374 1304
1375
1376
1377
1378int 1305int
1379cast_destruction (object *op, object *caster, object *spell_ob) 1306cast_destruction (object *op, object *caster, object *spell_ob)
1380{ 1307{
1381 int i, j, range, mflags, friendly = 0, dam, dur; 1308 int i, j, range, mflags, friendly = 0, dam, dur;
1382 sint16 sx, sy; 1309 sint16 sx, sy;
1383 mapstruct *m; 1310 maptile *m;
1384 object *tmp; 1311 object *tmp;
1385 const char *skill; 1312 const char *skill;
1386 1313
1387 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob); 1314 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
1388 dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 1315 dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
… …
1411 for (j = -range; j < range; j++) 1338 for (j = -range; j < range; j++)
1412 { 1339 {
1413 m = op->map; 1340 m = op->map;
1414 sx = op->x + i; 1341 sx = op->x + i;
1415 sy = op->y + j; 1342 sy = op->y + j;
1343
1416 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy); 1344 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
1417 if (mflags & P_OUT_OF_MAP) 1345 if (mflags & P_OUT_OF_MAP)
1418 continue; 1346 continue;
1347
1419 if (mflags & P_IS_ALIVE) 1348 if (mflags & P_IS_ALIVE)
1420 { 1349 {
1421 for (tmp = get_map_ob (m, sx, sy); tmp; tmp = tmp->above) 1350 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)
1422 {
1423 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER) 1351 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER)
1424 break; 1352 break;
1425 } 1353
1426 if (tmp) 1354 if (tmp)
1427 { 1355 {
1428 if (tmp->head) 1356 if (tmp->head)
1429 tmp = tmp->head; 1357 tmp = tmp->head;
1430 1358
… …
1433 { 1361 {
1434 if (spell_ob->subtype == SP_DESTRUCTION) 1362 if (spell_ob->subtype == SP_DESTRUCTION)
1435 { 1363 {
1436 hit_player (tmp, dam, op, spell_ob->attacktype, 0); 1364 hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1437 if (spell_ob->other_arch) 1365 if (spell_ob->other_arch)
1438 {
1439 tmp = arch_to_object (spell_ob->other_arch); 1366 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op);
1440 tmp->x = sx;
1441 tmp->y = sy;
1442 insert_ob_in_map (tmp, m, op, 0);
1443 }
1444 } 1367 }
1445 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100) 1368 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100)
1446 { 1369 {
1447 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch) 1370 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1448 {
1449 object *effect = arch_to_object (spell_ob->other_arch); 1371 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op);
1450
1451 effect->x = sx;
1452 effect->y = sy;
1453 insert_ob_in_map (effect, m, op, 0);
1454 }
1455 } 1372 }
1456 } 1373 }
1457 } 1374 }
1458 } 1375 }
1459 } 1376 }
1460 } 1377 }
1378
1461 op->skill = skill; 1379 op->skill = skill;
1462 return 1; 1380 return 1;
1463} 1381}
1464 1382
1465/*************************************************************************** 1383/***************************************************************************
… …
1525 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect."); 1443 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1526 } 1444 }
1527 return 1; 1445 return 1;
1528 } 1446 }
1529 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; 1447 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1530 force->speed = 1.0; 1448 force->speed = 1.f;
1531 force->speed_left = -1.0; 1449 force->speed_left = -1.f;
1532 SET_FLAG (force, FLAG_APPLIED); 1450 SET_FLAG (force, FLAG_APPLIED);
1533 1451
1534 if (god) 1452 if (god)
1535 { 1453 {
1536 if (spell_ob->last_grace) 1454 if (spell_ob->last_grace)
… …
1549 force->stats.ac = spell_ob->stats.ac; 1467 force->stats.ac = spell_ob->stats.ac;
1550 force->stats.wc = spell_ob->stats.wc; 1468 force->stats.wc = spell_ob->stats.wc;
1551 1469
1552 change_abil (tmp, force); /* Mostly to display any messages */ 1470 change_abil (tmp, force); /* Mostly to display any messages */
1553 insert_ob_in_ob (force, tmp); 1471 insert_ob_in_ob (force, tmp);
1554 fix_player (tmp); 1472 tmp->update_stats ();
1555 return 1; 1473 return 1;
1556 1474
1557} 1475}
1558
1559 1476
1560/********************************************************************** 1477/**********************************************************************
1561 * mood change 1478 * mood change
1562 * Arguably, this may or may not be an attack spell. But since it 1479 * Arguably, this may or may not be an attack spell. But since it
1563 * effects monsters, it seems best to put it into this file 1480 * effects monsters, it seems best to put it into this file
… …
1570mood_change (object *op, object *caster, object *spell) 1487mood_change (object *op, object *caster, object *spell)
1571{ 1488{
1572 object *tmp, *god, *head; 1489 object *tmp, *god, *head;
1573 int done_one, range, mflags, level, at, best_at; 1490 int done_one, range, mflags, level, at, best_at;
1574 sint16 x, y, nx, ny; 1491 sint16 x, y, nx, ny;
1575 mapstruct *m; 1492 maptile *m;
1576 const char *race; 1493 const char *race;
1577 1494
1578 /* We precompute some values here so that we don't have to keep 1495 /* We precompute some values here so that we don't have to keep
1579 * doing it over and over again. 1496 * doing it over and over again.
1580 */ 1497 */
… …
1593 else if (god && !strcmp (spell->race, "GOD_FRIEND")) 1510 else if (god && !strcmp (spell->race, "GOD_FRIEND"))
1594 race = god->race; 1511 race = god->race;
1595 else 1512 else
1596 race = spell->race; 1513 race = spell->race;
1597 1514
1598
1599 for (x = op->x - range; x <= op->x + range; x++) 1515 for (x = op->x - range; x <= op->x + range; x++)
1600 for (y = op->y - range; y <= op->y + range; y++) 1516 for (y = op->y - range; y <= op->y + range; y++)
1601 { 1517 {
1602
1603 done_one = 0; 1518 done_one = 0;
1604 m = op->map; 1519 m = op->map;
1605 nx = x; 1520 nx = x;
1606 ny = y; 1521 ny = y;
1607 mflags = get_map_flags (m, &m, x, y, &nx, &ny); 1522 mflags = get_map_flags (m, &m, x, y, &nx, &ny);
… …
1610 1525
1611 /* If there is nothing living on this space, no need to go further */ 1526 /* If there is nothing living on this space, no need to go further */
1612 if (!(mflags & P_IS_ALIVE)) 1527 if (!(mflags & P_IS_ALIVE))
1613 continue; 1528 continue;
1614 1529
1530 // players can only affect spaces that they can actually see
1531 if (caster && caster->contr
1532 && caster->contr->visibility_at (m, nx, ny) < 70)
1533 continue;
1534
1615 for (tmp = get_map_ob (m, nx, ny); tmp; tmp = tmp->above) 1535 for (tmp = GET_MAP_TOP (m, nx, ny); tmp; tmp = tmp->below)
1616 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 1536 if (QUERY_FLAG (tmp, FLAG_MONSTER))
1617 break; 1537 break;
1618 1538
1619 /* There can be living objects that are not monsters */ 1539 /* There can be living objects that are not monsters */
1620 if (!tmp || tmp->type == PLAYER) 1540 if (!tmp || tmp->type == PLAYER)
… …
1627 head = tmp; 1547 head = tmp;
1628 1548
1629 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */ 1549 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */
1630 if (race && head->race && !strstr (race, head->race)) 1550 if (race && head->race && !strstr (race, head->race))
1631 continue; 1551 continue;
1552
1632 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD)) 1553 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD))
1633 continue; 1554 continue;
1634 1555
1635 /* Now do a bunch of stuff related to saving throws */ 1556 /* Now do a bunch of stuff related to saving throws */
1636 best_at = -1; 1557 best_at = -1;
… …
1673 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level)))) 1594 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level))))
1674 /* Failed, no effect */ 1595 /* Failed, no effect */
1675 continue; 1596 continue;
1676 } 1597 }
1677 1598
1678 /* Done with saving throw. Now start effecting the monster */ 1599 /* Done with saving throw. Now start affecting the monster */
1679 1600
1680 /* aggravation */ 1601 /* aggravation */
1681 if (QUERY_FLAG (spell, FLAG_MONSTER)) 1602 if (QUERY_FLAG (spell, FLAG_MONSTER))
1682 { 1603 {
1683 CLEAR_FLAG (head, FLAG_SLEEP); 1604 CLEAR_FLAG (head, FLAG_SLEEP);
1684 if (QUERY_FLAG (head, FLAG_FRIENDLY))
1685 remove_friendly_object (head); 1605 remove_friendly_object (head);
1686
1687 done_one = 1; 1606 done_one = 1;
1688 head->enemy = op; 1607 head->enemy = op;
1689 } 1608 }
1690 1609
1691 /* calm monsters */ 1610 /* calm monsters */
… …
1700 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK)) 1619 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK))
1701 { 1620 {
1702 SET_FLAG (head, FLAG_BERSERK); 1621 SET_FLAG (head, FLAG_BERSERK);
1703 done_one = 1; 1622 done_one = 1;
1704 } 1623 }
1624
1705 /* charm */ 1625 /* charm */
1706 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY)) 1626 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY))
1707 { 1627 {
1708 SET_FLAG (head, FLAG_FRIENDLY);
1709 /* Prevent uncontolled outbreaks of self replicating monsters. 1628 /* Prevent uncontolled outbreaks of self replicating monsters.
1710 Typical use case is charm, go somwhere, use aggravation to make hostile. 1629 Typical use case is charm, go somwhere, use aggravation to make hostile.
1711 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */ 1630 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1712 CLEAR_FLAG (head, FLAG_GENERATOR); 1631 CLEAR_FLAG (head, FLAG_GENERATOR);
1713 set_owner (head, op); 1632 head->set_owner (op);
1714 set_spell_skill (op, caster, spell, head); 1633 set_spell_skill (op, caster, spell, head);
1715 add_friendly_object (head); 1634 add_friendly_object (head);
1716 head->attack_movement = PETMOVE; 1635 head->attack_movement = PETMOVE;
1717 done_one = 1; 1636 done_one = 1;
1718 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL); 1637 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL);
1719 head->stats.exp = 0; 1638 head->stats.exp = 0;
1720 } 1639 }
1721 1640
1722 /* If a monster was effected, put an effect in */ 1641 /* If a monster was effected, put an effect in */
1723 if (done_one && spell->other_arch) 1642 if (done_one && spell->other_arch)
1724 {
1725 tmp = arch_to_object (spell->other_arch); 1643 m->insert (arch_to_object (spell->other_arch), nx, ny, op);
1726 tmp->x = nx;
1727 tmp->y = ny;
1728 insert_ob_in_map (tmp, m, op, 0);
1729 }
1730 } /* for y */ 1644 } /* for y */
1731 1645
1732 return 1; 1646 return 1;
1733} 1647}
1734 1648
… …
1744move_ball_spell (object *op) 1658move_ball_spell (object *op)
1745{ 1659{
1746 int i, j, dam_save, dir, mflags; 1660 int i, j, dam_save, dir, mflags;
1747 sint16 nx, ny, hx, hy; 1661 sint16 nx, ny, hx, hy;
1748 object *owner; 1662 object *owner;
1749 mapstruct *m; 1663 maptile *m;
1750 1664
1751 owner = get_owner (op); 1665 owner = op->owner;
1752 1666
1753 /* the following logic makes sure that the ball doesn't move into a wall, 1667 /* the following logic makes sure that the ball doesn't move into a wall,
1754 * and makes sure that it will move along a wall to try and get at it's 1668 * and makes sure that it will move along a wall to try and get at it's
1755 * victim. The block immediately below more or less chooses a random 1669 * victim. The block immediately below more or less chooses a random
1756 * offset to move the ball, eg, keep it mostly on course, with some 1670 * offset to move the ball, eg, keep it mostly on course, with some
… …
1785 nx = op->x; 1699 nx = op->x;
1786 ny = op->y; 1700 ny = op->y;
1787 m = op->map; 1701 m = op->map;
1788 } 1702 }
1789 1703
1790 remove_ob (op); 1704 m->insert (op, nx, ny, op);
1791 op->y = ny;
1792 op->x = nx;
1793 insert_ob_in_map (op, m, op, 0);
1794 1705
1795 dam_save = op->stats.dam; /* save the original dam: we do halfdam on 1706 dam_save = op->stats.dam; /* save the original dam: we do halfdam on
1796 surrounding squares */ 1707 surrounding squares */
1797 1708
1798 /* loop over current square and neighbors to hit. 1709 /* loop over current square and neighbors to hit.
1799 * if this has an other_arch field, we insert that in 1710 * if this has an other_arch field, we insert that in
1800 * the surround spaces. 1711 * the surround spaces.
1801 */ 1712 */
1802 for (j = 0; j < 9; j++) 1713 for (j = 0; j < 9; j++)
1803 { 1714 {
1804 object *new_ob;
1805
1806 hx = nx + freearr_x[j]; 1715 hx = nx + freearr_x[j];
1807 hy = ny + freearr_y[j]; 1716 hy = ny + freearr_y[j];
1808 1717
1809 m = op->map; 1718 m = op->map;
1810 mflags = get_map_flags (m, &m, hx, hy, &hx, &hy); 1719 mflags = get_map_flags (m, &m, hx, hy, &hx, &hy);
… …
1824 1733
1825 } 1734 }
1826 1735
1827 /* insert the other arch */ 1736 /* insert the other arch */
1828 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))) 1737 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))))
1829 { 1738 m->insert (arch_to_object (op->other_arch), hx, hy, op);
1830 new_ob = arch_to_object (op->other_arch);
1831 new_ob->x = hx;
1832 new_ob->y = hy;
1833 insert_ob_in_map (new_ob, m, op, 0);
1834 }
1835 } 1739 }
1836 1740
1837 /* restore to the center location and damage */ 1741 /* restore to the center location and damage */
1838 op->stats.dam = dam_save; 1742 op->stats.dam = dam_save;
1839 1743
1840 i = spell_find_dir (op->map, op->x, op->y, get_owner (op)); 1744 i = spell_find_dir (op->map, op->x, op->y, op->owner);
1841 1745
1842 if (i >= 0) 1746 if (i >= 0)
1843 { /* we have a preferred direction! */ 1747 { /* we have a preferred direction! */
1844 /* pick another direction if the preferred dir is blocked. */ 1748 /* pick another direction if the preferred dir is blocked. */
1845 if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP || 1749 if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP ||
1846 OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))) 1750 OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))
1847 {
1848 i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */ 1751 i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */
1849 } 1752
1850 op->direction = i; 1753 op->direction = i;
1851 } 1754 }
1852} 1755}
1853 1756
1854 1757
… …
1866#if 0 1769#if 0
1867 static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 }; 1770 static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 };
1868 static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 }; 1771 static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 };
1869 sint16 target_x, target_y, origin_x, origin_y; 1772 sint16 target_x, target_y, origin_x, origin_y;
1870 int adjustdir; 1773 int adjustdir;
1871 mapstruct *m; 1774 maptile *m;
1872#endif 1775#endif
1873 int basedir; 1776 int basedir;
1874 object *owner; 1777 object *owner;
1875 1778
1876 owner = get_owner (op); 1779 owner = op->owner;
1877 if (op->duration == 0 || owner == NULL) 1780 if (op->duration == 0 || owner == NULL)
1878 { 1781 {
1879 remove_ob (op); 1782 op->destroy ();
1880 free_object (op);
1881 return; 1783 return;
1882 } 1784 }
1785
1883 op->duration--; 1786 op->duration--;
1884 1787
1885 basedir = op->direction; 1788 basedir = op->direction;
1886 if (basedir == 0) 1789 if (basedir == 0)
1887 { 1790 {
… …
1892#if 0 1795#if 0
1893 // this is bogus: it causes wrong places to be checked below 1796 // this is bogus: it causes wrong places to be checked below
1894 // (a wall 2 cells away will block the effect...) and 1797 // (a wall 2 cells away will block the effect...) and
1895 // doesn't work for SP_BULLET anyhow, so again tests the wrong 1798 // doesn't work for SP_BULLET anyhow, so again tests the wrong
1896 // space. 1799 // space.
1897 // should be fixed later, but correctness before featurs... 1800 // should be fixed later, but correctness before features...
1898 // (schmorp) 1801 // (schmorp)
1899 1802
1900 /* new offset calculation to make swarm element distribution 1803 /* new offset calculation to make swarm element distribution
1901 * more uniform 1804 * more uniform
1902 */ 1805 */
… …
1984 1887
1985 if (!spell->other_arch) 1888 if (!spell->other_arch)
1986 return 0; 1889 return 0;
1987 1890
1988 tmp = get_archetype (SWARM_SPELL); 1891 tmp = get_archetype (SWARM_SPELL);
1989 tmp->x = op->x;
1990 tmp->y = op->y;
1991 set_owner (tmp, op); /* needed so that if swarm elements kill, caster gets xp. */ 1892 tmp->set_owner (op); /* needed so that if swarm elements kill, caster gets xp. */
1992 set_spell_skill (op, caster, spell, tmp); 1893 set_spell_skill (op, caster, spell, tmp);
1993 1894
1994 tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */ 1895 tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */
1995 tmp->spell = arch_to_object (spell->other_arch); 1896 tmp->spell = arch_to_object (spell->other_arch);
1996 1897
1997 tmp->attacktype = tmp->spell->attacktype; 1898 tmp->attacktype = tmp->spell->attacktype;
1998 1899
1999 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 1900 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
2000 {
2001 if (!tailor_god_spell (tmp, op)) 1901 if (!tailor_god_spell (tmp, op))
2002 return 1; 1902 return 1;
2003 } 1903
2004 tmp->duration = SP_level_duration_adjust (caster, spell); 1904 tmp->duration = SP_level_duration_adjust (caster, spell);
2005 for (i = 0; i < spell->duration; i++) 1905 for (i = 0; i < spell->duration; i++)
2006 tmp->duration += die_roll (1, 3, op, PREFER_HIGH); 1906 tmp->duration += die_roll (1, 3, op, PREFER_HIGH);
2007 1907
2008 tmp->direction = dir; 1908 tmp->direction = dir;
2009 tmp->invisible = 1; 1909 tmp->invisible = 1;
2010 insert_ob_in_map (tmp, op->map, op, 0); 1910
1911 tmp->insert_at (op, op);
2011 return 1; 1912 return 1;
2012} 1913}
2013 1914
2014 1915
2015/* See the spells documentation file for why this is its own 1916/* See the spells documentation file for why this is its own
… …
2019cast_light (object *op, object *caster, object *spell, int dir) 1920cast_light (object *op, object *caster, object *spell, int dir)
2020{ 1921{
2021 object *target = NULL, *tmp = NULL; 1922 object *target = NULL, *tmp = NULL;
2022 sint16 x, y; 1923 sint16 x, y;
2023 int dam, mflags; 1924 int dam, mflags;
2024 mapstruct *m; 1925 maptile *m;
2025 1926
2026 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1927 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
2027 1928
2028 if (!dir) 1929 if (!dir)
2029 { 1930 {
… …
2043 return 0; 1944 return 0;
2044 } 1945 }
2045 1946
2046 if (mflags & P_IS_ALIVE && spell->attacktype) 1947 if (mflags & P_IS_ALIVE && spell->attacktype)
2047 { 1948 {
2048 for (target = get_map_ob (m, x, y); target; target = target->above) 1949 for (target = GET_MAP_OB (m, x, y); target; target = target->above)
2049 if (QUERY_FLAG (target, FLAG_MONSTER)) 1950 if (QUERY_FLAG (target, FLAG_MONSTER))
2050 { 1951 {
2051 /* oky doky. got a target monster. Lets make a blinding attack */ 1952 /* oky doky. got a target monster. Lets make a blinding attack */
2052 if (target->head) 1953 if (target->head)
2053 target = target->head; 1954 target = target->head;
… …
2075 { 1976 {
2076 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell); 1977 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell);
2077 if (tmp->glow_radius > MAX_LIGHT_RADII) 1978 if (tmp->glow_radius > MAX_LIGHT_RADII)
2078 tmp->glow_radius = MAX_LIGHT_RADII; 1979 tmp->glow_radius = MAX_LIGHT_RADII;
2079 } 1980 }
2080 tmp->x = x; 1981
2081 tmp->y = y; 1982 m->insert (tmp, x, y, op);
2082 insert_ob_in_map (tmp, m, op, 0);
2083 return 1; 1983 return 1;
2084} 1984}
2085 1985
2086 1986
2087 1987
… …
2097cast_cause_disease (object *op, object *caster, object *spell, int dir) 1997cast_cause_disease (object *op, object *caster, object *spell, int dir)
2098{ 1998{
2099 sint16 x, y; 1999 sint16 x, y;
2100 int i, mflags, range, dam_mod, dur_mod; 2000 int i, mflags, range, dam_mod, dur_mod;
2101 object *walk; 2001 object *walk;
2102 mapstruct *m; 2002 maptile *m;
2103 2003
2104 x = op->x; 2004 x = op->x;
2105 y = op->y; 2005 y = op->y;
2106 2006
2107 /* If casting from a scroll, no direction will be available, so refer to the 2007 /* If casting from a scroll, no direction will be available, so refer to the
… …
2135 2035
2136 /* Only bother looking on this space if there is something living here */ 2036 /* Only bother looking on this space if there is something living here */
2137 if (mflags & P_IS_ALIVE) 2037 if (mflags & P_IS_ALIVE)
2138 { 2038 {
2139 /* search this square for a victim */ 2039 /* search this square for a victim */
2140 for (walk = get_map_ob (m, x, y); walk; walk = walk->above) 2040 for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above)
2141 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER)) 2041 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER))
2142 { /* found a victim */ 2042 { /* found a victim */
2143 object *disease = arch_to_object (spell->other_arch); 2043 object *disease = arch_to_object (spell->other_arch);
2144 2044
2145 set_owner (disease, op); 2045 disease->set_owner (op);
2146 set_spell_skill (op, caster, spell, disease); 2046 set_spell_skill (op, caster, spell, disease);
2147 disease->stats.exp = 0; 2047 disease->stats.exp = 0;
2148 disease->level = caster_level (caster, spell); 2048 disease->level = caster_level (caster, spell);
2149 2049
2150 /* do level adjustments */ 2050 /* do level adjustments */
… …
2195 if (disease->stats.sp) 2095 if (disease->stats.sp)
2196 disease->stats.sp -= dam_mod; 2096 disease->stats.sp -= dam_mod;
2197 2097
2198 if (infect_object (walk, disease, 1)) 2098 if (infect_object (walk, disease, 1))
2199 { 2099 {
2200 object *flash; /* visual effect for inflicting disease */
2201
2202 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name); 2100 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
2203 2101
2204 free_object (disease); /* don't need this one anymore */ 2102 disease->destroy (); /* don't need this one anymore */
2205 flash = get_archetype (ARCH_DETECT_MAGIC); 2103 walk->map->insert (get_archetype (ARCH_DETECT_MAGIC), x, y, op);
2206 flash->x = x;
2207 flash->y = y;
2208 flash->map = walk->map;
2209 insert_ob_in_map (flash, walk->map, op, 0);
2210 return 1; 2104 return 1;
2211 } 2105 }
2212 free_object (disease); 2106
2107 disease->destroy ();
2213 } 2108 }
2214 } /* if living creature */ 2109 } /* if living creature */
2215 } /* for range of spaces */ 2110 } /* for range of spaces */
2111
2216 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!"); 2112 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!");
2217 return 1; 2113 return 1;
2218} 2114}

Diff Legend

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