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.13 by root, Thu Sep 14 22:34:05 2006 UTC vs.
Revision 1.33 by root, Sat May 12 22:04:20 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24/* This file contains all the spell attack code. Grouping this code 25/* This file contains all the spell attack code. Grouping this code
25 * together should hopefully make it easier to find the relevent bits 26 * together should hopefully make it easier to find the relevent bits
26 * of code 27 * of code
27 */ 28 */
28 29
29#include <global.h> 30#include <global.h>
30#include <object.h> 31#include <object.h>
31#include <living.h> 32#include <living.h>
32#ifndef __CEXTRACT__
33# include <sproto.h> 33#include <sproto.h>
34#endif
35#include <spells.h> 34#include <spells.h>
36#include <sounds.h> 35#include <sounds.h>
37 36
38/* this function checks to see if a spell pushes objects as well 37/* this function checks to see if a spell pushes objects as well
39 * as flies over and damages them (only used for cones for now) 38 * as flies over and damages them (only used for cones for now)
… …
57 { 56 {
58 weight_move = op->weight + (op->weight * op->level) / 3; 57 weight_move = op->weight + (op->weight * op->level) / 3;
59 /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */ 58 /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */
60 } 59 }
61 60
62 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 61 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
63 { 62 {
64 int num_sections = 1; 63 int num_sections = 1;
65 64
66 /* don't move DM */ 65 /* don't move DM */
67 if (QUERY_FLAG (tmp, FLAG_WIZ)) 66 if (QUERY_FLAG (tmp, FLAG_WIZ))
… …
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
… …
402 * explode. 398 * explode.
403 */ 399 */
404void 400void
405explode_bullet (object *op) 401explode_bullet (object *op)
406{ 402{
407 tag_t op_tag = op->count;
408 object *tmp, *owner; 403 object *tmp, *owner;
409 404
410 if (op->other_arch == NULL) 405 if (op->other_arch == NULL)
411 { 406 {
412 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n"); 407 LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");
413 remove_ob (op); 408 op->destroy ();
414 free_object (op);
415 return; 409 return;
416 } 410 }
417 411
418 if (op->env) 412 if (op->env)
419 { 413 {
420 object *env;
421
422 env = object_get_env_recursive (op); 414 object *env = object_get_env_recursive (op);
423 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))
424 { 416 {
425 LOG (llevError, "BUG: explode_bullet(): env out of map\n"); 417 LOG (llevError, "BUG: explode_bullet(): env out of map\n");
426 remove_ob (op); 418 op->destroy ();
427 free_object (op);
428 return; 419 return;
429 } 420 }
430 remove_ob (op); 421
431 op->x = env->x; 422 op->insert_at (env, op, INS_NO_MERGE | INS_NO_WALK_ON);
432 op->y = env->y;
433 insert_ob_in_map (op, env->map, op, INS_NO_MERGE | INS_NO_WALK_ON);
434 } 423 }
435 else if (out_of_map (op->map, op->x, op->y)) 424 else if (out_of_map (op->map, op->x, op->y))
436 { 425 {
437 LOG (llevError, "BUG: explode_bullet(): op out of map\n"); 426 LOG (llevError, "BUG: explode_bullet(): op out of map\n");
438 remove_ob (op); 427 op->destroy ();
439 free_object (op);
440 return; 428 return;
441 } 429 }
442 430
443 // 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
444 // 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
445 // bad at the moment that might happen from this. 433 // bad at the moment that might happen from this.
446 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)
447 { 435 {
448 remove_ob (op); 436 op->destroy ();
449 free_object (op);
450 return; 437 return;
451 } 438 }
452 439
453 if (op->attacktype) 440 if (op->attacktype)
454 { 441 {
455 hit_map (op, 0, op->attacktype, 1); 442 hit_map (op, 0, op->attacktype, 1);
456 if (was_destroyed (op, op_tag)) 443 if (op->destroyed ())
457 return; 444 return;
458 } 445 }
459 446
460 /* other_arch contains what this explodes into */ 447 /* other_arch contains what this explodes into */
461 tmp = arch_to_object (op->other_arch); 448 tmp = arch_to_object (op->other_arch);
462 449
463 copy_owner (tmp, op); 450 tmp->set_owner (op);
464 tmp->skill = op->skill; 451 tmp->skill = op->skill;
465 452
466 owner = get_owner (op); 453 owner = op->owner;
467 454
468 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))
469 { 456 {
470 remove_ob (op); 457 op->destroy ();
471 free_object (op);
472 return; 458 return;
473 } 459 }
474
475 tmp->x = op->x;
476 tmp->y = op->y;
477 460
478 /* special for bombs - it actually has sane values for these */ 461 /* special for bombs - it actually has sane values for these */
479 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB) 462 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB)
480 { 463 {
481 tmp->attacktype = op->attacktype; 464 tmp->attacktype = op->attacktype;
… …
485 } 468 }
486 else 469 else
487 { 470 {
488 if (op->attacktype & AT_MAGIC) 471 if (op->attacktype & AT_MAGIC)
489 tmp->attacktype |= AT_MAGIC; 472 tmp->attacktype |= AT_MAGIC;
473
490 /* Spell doc describes what is going on here */ 474 /* Spell doc describes what is going on here */
491 tmp->stats.dam = op->dam_modifier; 475 tmp->stats.dam = op->dam_modifier;
492 tmp->range = op->stats.maxhp; 476 tmp->range = op->stats.maxhp;
493 tmp->duration = op->stats.hp; 477 tmp->duration = op->stats.hp;
494 /* 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 -
… …
502 tmp->stats.sp = op->direction; 486 tmp->stats.sp = op->direction;
503 487
504 /* Prevent recursion */ 488 /* Prevent recursion */
505 op->move_on = 0; 489 op->move_on = 0;
506 490
507 insert_ob_in_map (tmp, op->map, op, 0); 491 tmp->insert_at (op, op);
508 /* remove the firebullet */ 492 /* remove the firebullet */
509 if (!was_destroyed (op, op_tag)) 493 op->destroy ();
510 {
511 remove_ob (op);
512 free_object (op);
513 }
514} 494}
515
516
517 495
518/* 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
519 * (eg, explode, damage player, etc) 497 * (eg, explode, damage player, etc)
520 */ 498 */
521
522void 499void
523check_bullet (object *op) 500check_bullet (object *op)
524{ 501{
525 tag_t op_tag = op->count, tmp_tag;
526 object *tmp; 502 object *tmp;
527 int dam, mflags; 503 int dam, mflags;
528 mapstruct *m; 504 maptile *m;
529 sint16 sx, sy; 505 sint16 sx, sy;
530 506
531 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);
532 508
533 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)))
… …
542 518
543 /* 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 */
544 if (!(mflags & P_IS_ALIVE)) 520 if (!(mflags & P_IS_ALIVE))
545 return; 521 return;
546 522
547 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)
548 { 524 {
549 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 525 if (QUERY_FLAG (tmp, FLAG_ALIVE))
550 { 526 {
551 tmp_tag = tmp->count;
552 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 527 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
553 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)
554 { 529 {
555 if (!QUERY_FLAG (op, FLAG_REMOVED)) 530 if (!QUERY_FLAG (op, FLAG_REMOVED))
556 { 531 {
557 remove_ob (op); 532 op->destroy ();
558 free_object (op);
559 return; 533 return;
560 } 534 }
561 } 535 }
562 } 536 }
563 } 537 }
564} 538}
565
566 539
567/* Basically, we move 'op' one square, and if it hits something, 540/* Basically, we move 'op' one square, and if it hits something,
568 * call check_bullet. 541 * call check_bullet.
569 * This function is only applicable to bullets, but not to all 542 * This function is only applicable to bullets, but not to all
570 * fired arches (eg, bolts). 543 * fired arches (eg, bolts).
571 */ 544 */
572
573void 545void
574move_bullet (object *op) 546move_bullet (object *op)
575{ 547{
576 sint16 new_x, new_y; 548 sint16 new_x, new_y;
577 int mflags; 549 int mflags;
578 mapstruct *m; 550 maptile *m;
579 551
580#if 0 552#if 0
581 /* We need a better general purpose way to do this */ 553 /* We need a better general purpose way to do this */
582 554
583 /* peterm: added to make comet leave a trail of burnouts 555 /* peterm: added to make comet leave a trail of burnouts
584 it's an unadulterated hack, but the effect is cool. */ 556 it's an unadulterated hack, but the effect is cool. */
585 if (op->stats.sp == SP_METEOR) 557 if (op->stats.sp == SP_METEOR)
586 { 558 {
587 replace_insert_ob_in_map ("fire_trail", op); 559 replace_insert_ob_in_map ("fire_trail", op);
588 if (was_destroyed (op, op_tag)) 560 if (op->destroyed ())
589 return; 561 return;
590 } /* end addition. */ 562 } /* end addition. */
591#endif 563#endif
592 564
593 /* Reached the end of its life - remove it */ 565 /* Reached the end of its life - remove it */
594 if (--op->range <= 0) 566 if (--op->range <= 0)
595 { 567 {
596 if (op->other_arch) 568 if (op->other_arch)
597 {
598 explode_bullet (op); 569 explode_bullet (op);
599 }
600 else 570 else
601 { 571 op->destroy ();
602 remove_ob (op); 572
603 free_object (op);
604 }
605 return; 573 return;
606 } 574 }
607 575
608 new_x = op->x + DIRX (op); 576 new_x = op->x + DIRX (op);
609 new_y = op->y + DIRY (op); 577 new_y = op->y + DIRY (op);
610 m = op->map; 578 m = op->map;
611 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);
612 580
613 if (mflags & P_OUT_OF_MAP) 581 if (mflags & P_OUT_OF_MAP)
614 { 582 {
615 remove_ob (op); 583 op->destroy ();
616 free_object (op);
617 return; 584 return;
618 } 585 }
619 586
620 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)))
621 { 588 {
622 if (op->other_arch) 589 if (op->other_arch)
623 {
624 explode_bullet (op); 590 explode_bullet (op);
625 }
626 else 591 else
627 { 592 op->destroy ();
628 remove_ob (op); 593
629 free_object (op);
630 }
631 return; 594 return;
632 } 595 }
633 596
634 remove_ob (op); 597 if (!(op = m->insert (op, new_x, new_y, op)))
635 op->x = new_x;
636 op->y = new_y;
637 if ((op = insert_ob_in_map (op, m, op, 0)) == NULL)
638 return; 598 return;
639 599
640 if (reflwall (op->map, op->x, op->y, op)) 600 if (reflwall (op->map, op->x, op->y, op))
641 { 601 {
642 op->direction = absdir (op->direction + 4); 602 op->direction = absdir (op->direction + 4);
643 update_turn_face (op); 603 update_turn_face (op);
644 } 604 }
645 else 605 else
646 {
647 check_bullet (op); 606 check_bullet (op);
648 }
649} 607}
650
651
652
653 608
654/* fire_bullet 609/* fire_bullet
655 * object op (cast from caster) files a bolt in dir. 610 * object op (cast from caster) files a bolt in dir.
656 * spob is the spell object for the bolt. 611 * spob is the spell object for the bolt.
657 * we remove the magic flag - that can be derived from 612 * we remove the magic flag - that can be derived from
… …
688 643
689 tmp->direction = dir; 644 tmp->direction = dir;
690 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 645 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
691 SET_ANIMATION (tmp, dir); 646 SET_ANIMATION (tmp, dir);
692 647
693 set_owner (tmp, op); 648 tmp->set_owner (op);
694 set_spell_skill (op, caster, spob, tmp); 649 set_spell_skill (op, caster, spob, tmp);
695 650
696 tmp->x = op->x + freearr_x[dir]; 651 tmp->x = op->x + freearr_x[dir];
697 tmp->y = op->y + freearr_y[dir]; 652 tmp->y = op->y + freearr_y[dir];
698 tmp->map = op->map; 653 tmp->map = op->map;
699 654
655 maptile *newmap;
700 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);
701 if (mflags & P_OUT_OF_MAP) 657 if (mflags & P_OUT_OF_MAP)
702 { 658 {
703 free_object (tmp); 659 tmp->destroy ();
704 return 0; 660 return 0;
705 } 661 }
662
663 tmp->map = newmap;
664
706 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)))
707 { 666 {
708 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 667 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
709 { 668 {
710 free_object (tmp); 669 tmp->destroy ();
711 return 0; 670 return 0;
712 } 671 }
672
713 tmp->x = op->x; 673 tmp->x = op->x;
714 tmp->y = op->y; 674 tmp->y = op->y;
715 tmp->direction = absdir (tmp->direction + 4); 675 tmp->direction = absdir (tmp->direction + 4);
716 tmp->map = op->map; 676 tmp->map = op->map;
717 } 677 }
718 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL) 678
719 { 679 if ((tmp = tmp->insert_at (tmp, op)))
720 check_bullet (tmp); 680 check_bullet (tmp);
721 } 681
722 return 1; 682 return 1;
723} 683}
724
725
726
727 684
728/***************************************************************************** 685/*****************************************************************************
729 * 686 *
730 * CONE RELATED FUNCTIONS 687 * CONE RELATED FUNCTIONS
731 * 688 *
732 *****************************************************************************/ 689 *****************************************************************************/
733 690
734
735/* 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" */
736void 692void
737cone_drop (object *op) 693cone_drop (object *op)
738{ 694{
739 object *new_ob = arch_to_object (op->other_arch); 695 object *new_ob = arch_to_object (op->other_arch);
740 696
741 new_ob->x = op->x;
742 new_ob->y = op->y;
743 new_ob->level = op->level; 697 new_ob->level = op->level;
744 set_owner (new_ob, op->owner); 698 new_ob->set_owner (op->owner);
745 699
746 /* preserve skill ownership */ 700 /* preserve skill ownership */
747 if (op->skill && op->skill != new_ob->skill) 701 if (op->skill && op->skill != new_ob->skill)
748 {
749 new_ob->skill = op->skill; 702 new_ob->skill = op->skill;
750 }
751 insert_ob_in_map (new_ob, op->map, op, 0);
752 703
704 new_ob->insert_at (op, op);
753} 705}
754 706
755/* 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 */
756 708
757void 709void
758move_cone (object *op) 710move_cone (object *op)
759{ 711{
760 int i; 712 int i;
761 tag_t tag;
762 713
763 /* 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 */
764 if (!op->map) 715 if (!op->map)
765 { 716 {
766 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");
767 op->speed = 0; 718 op->set_speed (0);
768 update_ob_speed (op);
769 return; 719 return;
770 } 720 }
771 721
772 /* lava saves it's life, but not yours :) */ 722 /* lava saves it's life, but not yours :) */
773 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 723 if (QUERY_FLAG (op, FLAG_LIFESAVE))
… …
779#if 0 729#if 0
780 /* Disable this - enabling it makes monsters easier, as 730 /* Disable this - enabling it makes monsters easier, as
781 * when their cone dies when they die. 731 * when their cone dies when they die.
782 */ 732 */
783 /* If no owner left, the spell dies out. */ 733 /* If no owner left, the spell dies out. */
784 if (get_owner (op) == NULL) 734 if (op->owner == NULL)
785 { 735 {
786 remove_ob (op); 736 op->destroy ();
787 free_object (op);
788 return; 737 return;
789 } 738 }
790#endif 739#endif
791 740
792 tag = op->count;
793 hit_map (op, 0, op->attacktype, 0); 741 hit_map (op, 0, op->attacktype, 0);
794 742
795 /* Check to see if we should push anything. 743 /* Check to see if we should push anything.
796 * Spell objects with weight push whatever they encounter to some 744 * Spell objects with weight push whatever they encounter to some
797 * degree. 745 * degree.
798 */ 746 */
799 if (op->weight) 747 if (op->weight)
800 check_spell_knockback (op); 748 check_spell_knockback (op);
801 749
802 if (was_destroyed (op, tag)) 750 if (op->destroyed ())
803 return; 751 return;
804 752
805 if ((op->duration--) < 0) 753 if ((op->duration--) < 0)
806 { 754 {
807 remove_ob (op); 755 op->destroy ();
808 free_object (op);
809 return; 756 return;
810 } 757 }
811 /* Object has hit maximum range, so don't have it move 758 /* Object has hit maximum range, so don't have it move
812 * any further. When the duration above expires, 759 * any further. When the duration above expires,
813 * then the object will get removed. 760 * then the object will get removed.
… …
822 { 769 {
823 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)];
824 771
825 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))
826 { 773 {
827 object *tmp = get_object (); 774 object *tmp = op->clone ();
828
829 copy_object (op, tmp);
830 tmp->x = x;
831 tmp->y = y;
832 775
833 tmp->duration = op->duration + 1; 776 tmp->duration = op->duration + 1;
834 777
835 /* Use for spell tracking - see ok_to_put_more() */ 778 /* Use for spell tracking - see ok_to_put_more() */
836 tmp->stats.maxhp = op->stats.maxhp; 779 tmp->stats.maxhp = op->stats.maxhp;
837 insert_ob_in_map (tmp, op->map, op, 0); 780
781 op->map->insert (tmp, x, y, op);
782
838 if (tmp->other_arch) 783 if (tmp->other_arch)
839 cone_drop (tmp); 784 cone_drop (tmp);
840 } 785 }
841 } 786 }
842} 787}
… …
852int 797int
853cast_cone (object *op, object *caster, int dir, object *spell) 798cast_cone (object *op, object *caster, int dir, object *spell)
854{ 799{
855 object *tmp; 800 object *tmp;
856 int i, success = 0, range_min = -1, range_max = 1; 801 int i, success = 0, range_min = -1, range_max = 1;
857 mapstruct *m; 802 maptile *m;
858 sint16 sx, sy; 803 sint16 sx, sy;
859 MoveType movetype; 804 MoveType movetype;
860 805
861 if (!spell->other_arch) 806 if (!spell->other_arch)
862 return 0; 807 return 0;
… …
918 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype) 863 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype)
919 continue; 864 continue;
920 865
921 success = 1; 866 success = 1;
922 tmp = arch_to_object (spell->other_arch); 867 tmp = arch_to_object (spell->other_arch);
923 set_owner (tmp, op); 868 tmp->set_owner (op);
924 set_spell_skill (op, caster, spell, tmp); 869 set_spell_skill (op, caster, spell, tmp);
925 tmp->level = caster_level (caster, spell); 870 tmp->level = caster_level (caster, spell);
926 tmp->x = sx;
927 tmp->y = sy;
928 tmp->attacktype = spell->attacktype; 871 tmp->attacktype = spell->attacktype;
929 872
930 /* holy word stuff */ 873 /* holy word stuff */
931 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) 874 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER))
932 if (!tailor_god_spell (tmp, op)) 875 if (!tailor_god_spell (tmp, op))
… …
969 912
970 if (!(tmp->move_type & MOVE_FLY_LOW)) 913 if (!(tmp->move_type & MOVE_FLY_LOW))
971 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);
972 915
973 if (!tmp->move_on && tmp->stats.dam) 916 if (!tmp->move_on && tmp->stats.dam)
974 {
975 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);
976 }
977 918
978 insert_ob_in_map (tmp, m, op, 0); 919 m->insert (tmp, sx, sy, op);
979 920
980 /* 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
981 * a single space too many times. 922 * a single space too many times.
982 */ 923 */
983 tmp->stats.maxhp = tmp->count; 924 tmp->stats.maxhp = tmp->count;
… …
1002void 943void
1003animate_bomb (object *op) 944animate_bomb (object *op)
1004{ 945{
1005 int i; 946 int i;
1006 object *env, *tmp; 947 object *env, *tmp;
1007 archetype *at;
1008 948
1009 if (op->state != NUM_ANIMATIONS (op) - 1) 949 if (op->state != NUM_ANIMATIONS (op) - 1)
1010 return; 950 return;
1011 951
1012 env = object_get_env_recursive (op); 952 env = object_get_env_recursive (op);
… …
1017 return; 957 return;
1018 958
1019 if (env->type == PLAYER) 959 if (env->type == PLAYER)
1020 esrv_del_item (env->contr, op->count); 960 esrv_del_item (env->contr, op->count);
1021 961
1022 remove_ob (op); 962 if (!(op = op->insert_at (env, op)))
1023 op->x = env->x;
1024 op->y = env->y;
1025 if ((op = insert_ob_in_map (op, env->map, op, 0)) == NULL)
1026 return; 963 return;
1027 } 964 }
1028 965
1029 // 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
1030 // 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
1031 // as bombs can be carried. 968 // as bombs can be carried.
1032 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)
1033 { 970 {
1034 remove_ob (op); 971 op->destroy ();
1035 free_object (op);
1036 return; 972 return;
1037 } 973 }
1038 974
1039 /* This copies a lot of the code from the fire bullet, 975 /* This copies a lot of the code from the fire bullet,
1040 * but using the cast_bullet isn't really feasible, 976 * but using the cast_bullet isn't really feasible,
1041 * so just set up the appropriate values. 977 * so just set up the appropriate values.
1042 */ 978 */
1043 at = archetype::find (SPLINT); 979 if (archetype *at = archetype::find (SPLINT))
1044 if (at)
1045 { 980 {
1046 for (i = 1; i < 9; i++) 981 for (i = 1; i < 9; i++)
1047 { 982 {
1048 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]))
1049 continue; 984 continue;
985
1050 tmp = arch_to_object (at); 986 tmp = arch_to_object (at);
1051 tmp->direction = i; 987 tmp->direction = i;
1052 tmp->range = op->range; 988 tmp->range = op->range;
1053 tmp->stats.dam = op->stats.dam; 989 tmp->stats.dam = op->stats.dam;
1054 tmp->duration = op->duration; 990 tmp->duration = op->duration;
1055 tmp->attacktype = op->attacktype; 991 tmp->attacktype = op->attacktype;
1056 copy_owner (tmp, op); 992 tmp->set_owner (op);
1057 if (op->skill && op->skill != tmp->skill) 993 if (op->skill && op->skill != tmp->skill)
1058 {
1059 tmp->skill = op->skill; 994 tmp->skill = op->skill;
1060 } 995
1061 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 996 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
1062 SET_ANIMATION (tmp, i); 997 SET_ANIMATION (tmp, i);
1063 tmp->x = op->x + freearr_x[i]; 998
1064 tmp->y = op->y + freearr_x[i]; 999 op->map->insert (tmp, op->x + freearr_x[i], op->y + freearr_x[i], op);
1065 insert_ob_in_map (tmp, op->map, op, 0);
1066 move_bullet (tmp); 1000 move_bullet (tmp);
1067 } 1001 }
1068 } 1002 }
1069 1003
1070 explode_bullet (op); 1004 explode_bullet (op);
… …
1075{ 1009{
1076 1010
1077 object *tmp; 1011 object *tmp;
1078 int mflags; 1012 int mflags;
1079 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];
1080 mapstruct *m; 1014 maptile *m;
1081 1015
1082 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy); 1016 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy);
1083 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))
1084 { 1018 {
1085 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.");
… …
1091 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 1025 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
1092 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);
1093 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 1027 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
1094 tmp->attacktype = spell->attacktype; 1028 tmp->attacktype = spell->attacktype;
1095 1029
1096 set_owner (tmp, op); 1030 tmp->set_owner (op);
1097 set_spell_skill (op, caster, spell, tmp); 1031 set_spell_skill (op, caster, spell, tmp);
1098 tmp->x = dx; 1032
1099 tmp->y = dy; 1033 m->insert (tmp, dx, dy, op);
1100 insert_ob_in_map (tmp, m, op, 0);
1101 return 1; 1034 return 1;
1102} 1035}
1103 1036
1104/**************************************************************************** 1037/****************************************************************************
1105 * 1038 *
… …
1121get_pointed_target (object *op, int dir, int range, int type) 1054get_pointed_target (object *op, int dir, int range, int type)
1122{ 1055{
1123 object *target; 1056 object *target;
1124 sint16 x, y; 1057 sint16 x, y;
1125 int dist, mflags; 1058 int dist, mflags;
1126 mapstruct *mp; 1059 maptile *mp;
1127 1060
1128 if (dir == 0) 1061 if (dir == 0)
1129 return NULL; 1062 return NULL;
1130 1063
1131 for (dist = 1; dist < range; dist++) 1064 for (dist = 1; dist < range; dist++)
… …
1144 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW) 1077 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
1145 return NULL; 1078 return NULL;
1146 1079
1147 if (mflags & P_IS_ALIVE) 1080 if (mflags & P_IS_ALIVE)
1148 { 1081 {
1149 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)
1150 { 1083 {
1151 if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER)) 1084 if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER))
1152 { 1085 {
1153 return target; 1086 return target;
1154 } 1087 }
… …
1221 if (effect->attacktype & AT_DEATH) 1154 if (effect->attacktype & AT_DEATH)
1222 { 1155 {
1223 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1156 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1224 1157
1225 /* casting death spells at undead isn't a good thing */ 1158 /* casting death spells at undead isn't a good thing */
1226 if QUERY_FLAG
1227 (target, FLAG_UNDEAD) 1159 if (QUERY_FLAG (target, FLAG_UNDEAD))
1228 { 1160 {
1229 if (random_roll (0, 2, op, PREFER_LOW)) 1161 if (random_roll (0, 2, op, PREFER_LOW))
1230 { 1162 {
1231 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!"); 1163 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");
1232 effect->x = op->x; 1164 effect->x = op->x;
… …
1234 } 1166 }
1235 else 1167 else
1236 { 1168 {
1237 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));
1238 target->stats.hp = target->stats.maxhp * 2; 1170 target->stats.hp = target->stats.maxhp * 2;
1239 free_object (effect); 1171 effect->destroy ();
1240 return 0; 1172 return 0;
1241 } 1173 }
1242 } 1174 }
1243 } 1175 }
1244 else 1176 else
1245 { 1177 {
1246 /* how much woe to inflict :) */ 1178 /* how much woe to inflict :) */
1247 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);
1248 } 1180 }
1249 1181
1250 set_owner (effect, op); 1182 effect->set_owner (op);
1251 set_spell_skill (op, caster, spell, effect); 1183 set_spell_skill (op, caster, spell, effect);
1252 1184
1253 /* ok, tell it where to be, and insert! */ 1185 /* ok, tell it where to be, and insert! */
1254 effect->x = target->x; 1186 effect->insert_at (target, op);
1255 effect->y = target->y;
1256 insert_ob_in_map (effect, target->map, op, 0);
1257 1187
1258 return 1; 1188 return 1;
1259} 1189}
1260 1190
1261 1191
… …
1271move_missile (object *op) 1201move_missile (object *op)
1272{ 1202{
1273 int i, mflags; 1203 int i, mflags;
1274 object *owner; 1204 object *owner;
1275 sint16 new_x, new_y; 1205 sint16 new_x, new_y;
1276 mapstruct *m; 1206 maptile *m;
1277 1207
1278 if (op->range-- <= 0) 1208 if (op->range-- <= 0)
1279 { 1209 {
1280 remove_ob (op); 1210 op->destroy ();
1281 free_object (op);
1282 return; 1211 return;
1283 } 1212 }
1284 1213
1285 owner = get_owner (op); 1214 owner = op->owner;
1286#if 0 1215#if 0
1287 /* 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
1288 * monster that are then killed would continue to survive 1217 * monster that are then killed would continue to survive
1289 */ 1218 */
1290 if (owner == NULL) 1219 if (owner == NULL)
1291 { 1220 {
1292 remove_ob (op); 1221 op->destroy ();
1293 free_object (op);
1294 return; 1222 return;
1295 } 1223 }
1296#endif 1224#endif
1297 1225
1298 new_x = op->x + DIRX (op); 1226 new_x = op->x + DIRX (op);
… …
1300 1228
1301 mflags = get_map_flags (op->map, &m, new_x, new_y, &new_x, &new_y); 1229 mflags = get_map_flags (op->map, &m, new_x, new_y, &new_x, &new_y);
1302 1230
1303 if (!(mflags & P_OUT_OF_MAP) && ((mflags & P_IS_ALIVE) || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y)))) 1231 if (!(mflags & P_OUT_OF_MAP) && ((mflags & P_IS_ALIVE) || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))))
1304 { 1232 {
1305 tag_t tag = op->count;
1306
1307 hit_map (op, op->direction, AT_MAGIC, 1); 1233 hit_map (op, op->direction, AT_MAGIC, 1);
1308 /* Basically, missile only hits one thing then goes away. 1234 /* Basically, missile only hits one thing then goes away.
1309 * 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.
1310 */ 1236 */
1311 if (!was_destroyed (op, tag)) 1237 if (!op->destroyed ())
1312 { 1238 op->destroy ();
1313 remove_ob (op); 1239
1314 free_object (op);
1315 }
1316 return; 1240 return;
1317 } 1241 }
1318 1242
1319 remove_ob (op); 1243 op->remove ();
1244
1320 if (!op->direction || (mflags & P_OUT_OF_MAP)) 1245 if (!op->direction || (mflags & P_OUT_OF_MAP))
1321 { 1246 {
1322 free_object (op); 1247 op->destroy ();
1323 return; 1248 return;
1324 } 1249 }
1325 op->x = new_x; 1250
1326 op->y = new_y; 1251 i = spell_find_dir (m, new_x, new_y, op->owner);
1327 op->map = m;
1328 i = spell_find_dir (op->map, op->x, op->y, get_owner (op));
1329 if (i > 0 && i != op->direction) 1252 if (i > 0 && i != op->direction)
1330 { 1253 {
1331 op->direction = i; 1254 op->direction = i;
1332 SET_ANIMATION (op, op->direction); 1255 SET_ANIMATION (op, op->direction);
1333 } 1256 }
1334 insert_ob_in_map (op, op->map, op, 0); 1257
1258 m->insert (op, new_x, new_y, op);
1335} 1259}
1336 1260
1337/**************************************************************************** 1261/****************************************************************************
1338 * Destruction 1262 * Destruction
1339 ****************************************************************************/ 1263 ****************************************************************************/
… …
1384int 1308int
1385cast_destruction (object *op, object *caster, object *spell_ob) 1309cast_destruction (object *op, object *caster, object *spell_ob)
1386{ 1310{
1387 int i, j, range, mflags, friendly = 0, dam, dur; 1311 int i, j, range, mflags, friendly = 0, dam, dur;
1388 sint16 sx, sy; 1312 sint16 sx, sy;
1389 mapstruct *m; 1313 maptile *m;
1390 object *tmp; 1314 object *tmp;
1391 const char *skill; 1315 const char *skill;
1392 1316
1393 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob); 1317 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
1394 dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 1318 dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
… …
1417 for (j = -range; j < range; j++) 1341 for (j = -range; j < range; j++)
1418 { 1342 {
1419 m = op->map; 1343 m = op->map;
1420 sx = op->x + i; 1344 sx = op->x + i;
1421 sy = op->y + j; 1345 sy = op->y + j;
1346
1422 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy); 1347 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
1423 if (mflags & P_OUT_OF_MAP) 1348 if (mflags & P_OUT_OF_MAP)
1424 continue; 1349 continue;
1350
1425 if (mflags & P_IS_ALIVE) 1351 if (mflags & P_IS_ALIVE)
1426 { 1352 {
1427 for (tmp = get_map_ob (m, sx, sy); tmp; tmp = tmp->above) 1353 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)
1428 {
1429 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER) 1354 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER)
1430 break; 1355 break;
1431 } 1356
1432 if (tmp) 1357 if (tmp)
1433 { 1358 {
1434 if (tmp->head) 1359 if (tmp->head)
1435 tmp = tmp->head; 1360 tmp = tmp->head;
1436 1361
… …
1439 { 1364 {
1440 if (spell_ob->subtype == SP_DESTRUCTION) 1365 if (spell_ob->subtype == SP_DESTRUCTION)
1441 { 1366 {
1442 hit_player (tmp, dam, op, spell_ob->attacktype, 0); 1367 hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1443 if (spell_ob->other_arch) 1368 if (spell_ob->other_arch)
1444 {
1445 tmp = arch_to_object (spell_ob->other_arch); 1369 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op);
1446 tmp->x = sx;
1447 tmp->y = sy;
1448 insert_ob_in_map (tmp, m, op, 0);
1449 }
1450 } 1370 }
1451 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100) 1371 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100)
1452 { 1372 {
1453 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch) 1373 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1454 {
1455 object *effect = arch_to_object (spell_ob->other_arch); 1374 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op);
1456
1457 effect->x = sx;
1458 effect->y = sy;
1459 insert_ob_in_map (effect, m, op, 0);
1460 }
1461 } 1375 }
1462 } 1376 }
1463 } 1377 }
1464 } 1378 }
1465 } 1379 }
1466 } 1380 }
1381
1467 op->skill = skill; 1382 op->skill = skill;
1468 return 1; 1383 return 1;
1469} 1384}
1470 1385
1471/*************************************************************************** 1386/***************************************************************************
… …
1531 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect."); 1446 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1532 } 1447 }
1533 return 1; 1448 return 1;
1534 } 1449 }
1535 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; 1450 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1536 force->speed = 1.0; 1451 force->speed = 1.f;
1537 force->speed_left = -1.0; 1452 force->speed_left = -1.f;
1538 SET_FLAG (force, FLAG_APPLIED); 1453 SET_FLAG (force, FLAG_APPLIED);
1539 1454
1540 if (god) 1455 if (god)
1541 { 1456 {
1542 if (spell_ob->last_grace) 1457 if (spell_ob->last_grace)
… …
1555 force->stats.ac = spell_ob->stats.ac; 1470 force->stats.ac = spell_ob->stats.ac;
1556 force->stats.wc = spell_ob->stats.wc; 1471 force->stats.wc = spell_ob->stats.wc;
1557 1472
1558 change_abil (tmp, force); /* Mostly to display any messages */ 1473 change_abil (tmp, force); /* Mostly to display any messages */
1559 insert_ob_in_ob (force, tmp); 1474 insert_ob_in_ob (force, tmp);
1560 fix_player (tmp); 1475 tmp->update_stats ();
1561 return 1; 1476 return 1;
1562 1477
1563} 1478}
1564
1565 1479
1566/********************************************************************** 1480/**********************************************************************
1567 * mood change 1481 * mood change
1568 * Arguably, this may or may not be an attack spell. But since it 1482 * Arguably, this may or may not be an attack spell. But since it
1569 * effects monsters, it seems best to put it into this file 1483 * effects monsters, it seems best to put it into this file
… …
1576mood_change (object *op, object *caster, object *spell) 1490mood_change (object *op, object *caster, object *spell)
1577{ 1491{
1578 object *tmp, *god, *head; 1492 object *tmp, *god, *head;
1579 int done_one, range, mflags, level, at, best_at; 1493 int done_one, range, mflags, level, at, best_at;
1580 sint16 x, y, nx, ny; 1494 sint16 x, y, nx, ny;
1581 mapstruct *m; 1495 maptile *m;
1582 const char *race; 1496 const char *race;
1583 1497
1584 /* We precompute some values here so that we don't have to keep 1498 /* We precompute some values here so that we don't have to keep
1585 * doing it over and over again. 1499 * doing it over and over again.
1586 */ 1500 */
… …
1599 else if (god && !strcmp (spell->race, "GOD_FRIEND")) 1513 else if (god && !strcmp (spell->race, "GOD_FRIEND"))
1600 race = god->race; 1514 race = god->race;
1601 else 1515 else
1602 race = spell->race; 1516 race = spell->race;
1603 1517
1604
1605 for (x = op->x - range; x <= op->x + range; x++) 1518 for (x = op->x - range; x <= op->x + range; x++)
1606 for (y = op->y - range; y <= op->y + range; y++) 1519 for (y = op->y - range; y <= op->y + range; y++)
1607 { 1520 {
1608
1609 done_one = 0; 1521 done_one = 0;
1610 m = op->map; 1522 m = op->map;
1611 nx = x; 1523 nx = x;
1612 ny = y; 1524 ny = y;
1613 mflags = get_map_flags (m, &m, x, y, &nx, &ny); 1525 mflags = get_map_flags (m, &m, x, y, &nx, &ny);
… …
1616 1528
1617 /* If there is nothing living on this space, no need to go further */ 1529 /* If there is nothing living on this space, no need to go further */
1618 if (!(mflags & P_IS_ALIVE)) 1530 if (!(mflags & P_IS_ALIVE))
1619 continue; 1531 continue;
1620 1532
1533 // players can only affect spaces that they can actually see
1534 if (caster && caster->contr
1535 && caster->contr->visibility_at (m, nx, ny) < 70)
1536 continue;
1537
1621 for (tmp = get_map_ob (m, nx, ny); tmp; tmp = tmp->above) 1538 for (tmp = GET_MAP_TOP (m, nx, ny); tmp; tmp = tmp->below)
1622 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 1539 if (QUERY_FLAG (tmp, FLAG_MONSTER))
1623 break; 1540 break;
1624 1541
1625 /* There can be living objects that are not monsters */ 1542 /* There can be living objects that are not monsters */
1626 if (!tmp || tmp->type == PLAYER) 1543 if (!tmp || tmp->type == PLAYER)
… …
1633 head = tmp; 1550 head = tmp;
1634 1551
1635 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */ 1552 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */
1636 if (race && head->race && !strstr (race, head->race)) 1553 if (race && head->race && !strstr (race, head->race))
1637 continue; 1554 continue;
1555
1638 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD)) 1556 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD))
1639 continue; 1557 continue;
1640 1558
1641 /* Now do a bunch of stuff related to saving throws */ 1559 /* Now do a bunch of stuff related to saving throws */
1642 best_at = -1; 1560 best_at = -1;
… …
1679 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level)))) 1597 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level))))
1680 /* Failed, no effect */ 1598 /* Failed, no effect */
1681 continue; 1599 continue;
1682 } 1600 }
1683 1601
1684 /* Done with saving throw. Now start effecting the monster */ 1602 /* Done with saving throw. Now start affecting the monster */
1685 1603
1686 /* aggravation */ 1604 /* aggravation */
1687 if (QUERY_FLAG (spell, FLAG_MONSTER)) 1605 if (QUERY_FLAG (spell, FLAG_MONSTER))
1688 { 1606 {
1689 CLEAR_FLAG (head, FLAG_SLEEP); 1607 CLEAR_FLAG (head, FLAG_SLEEP);
1690 if (QUERY_FLAG (head, FLAG_FRIENDLY))
1691 remove_friendly_object (head); 1608 remove_friendly_object (head);
1692
1693 done_one = 1; 1609 done_one = 1;
1694 head->enemy = op; 1610 head->enemy = op;
1695 } 1611 }
1696 1612
1697 /* calm monsters */ 1613 /* calm monsters */
… …
1706 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK)) 1622 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK))
1707 { 1623 {
1708 SET_FLAG (head, FLAG_BERSERK); 1624 SET_FLAG (head, FLAG_BERSERK);
1709 done_one = 1; 1625 done_one = 1;
1710 } 1626 }
1627
1711 /* charm */ 1628 /* charm */
1712 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY)) 1629 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY))
1713 { 1630 {
1714 SET_FLAG (head, FLAG_FRIENDLY);
1715 /* Prevent uncontolled outbreaks of self replicating monsters. 1631 /* Prevent uncontolled outbreaks of self replicating monsters.
1716 Typical use case is charm, go somwhere, use aggravation to make hostile. 1632 Typical use case is charm, go somwhere, use aggravation to make hostile.
1717 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */ 1633 This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1718 CLEAR_FLAG (head, FLAG_GENERATOR); 1634 CLEAR_FLAG (head, FLAG_GENERATOR);
1719 set_owner (head, op); 1635 head->set_owner (op);
1720 set_spell_skill (op, caster, spell, head); 1636 set_spell_skill (op, caster, spell, head);
1721 add_friendly_object (head); 1637 add_friendly_object (head);
1722 head->attack_movement = PETMOVE; 1638 head->attack_movement = PETMOVE;
1723 done_one = 1; 1639 done_one = 1;
1724 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL); 1640 change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL);
1725 head->stats.exp = 0; 1641 head->stats.exp = 0;
1726 } 1642 }
1727 1643
1728 /* If a monster was effected, put an effect in */ 1644 /* If a monster was effected, put an effect in */
1729 if (done_one && spell->other_arch) 1645 if (done_one && spell->other_arch)
1730 {
1731 tmp = arch_to_object (spell->other_arch); 1646 m->insert (arch_to_object (spell->other_arch), nx, ny, op);
1732 tmp->x = nx;
1733 tmp->y = ny;
1734 insert_ob_in_map (tmp, m, op, 0);
1735 }
1736 } /* for y */ 1647 } /* for y */
1737 1648
1738 return 1; 1649 return 1;
1739} 1650}
1740 1651
… …
1750move_ball_spell (object *op) 1661move_ball_spell (object *op)
1751{ 1662{
1752 int i, j, dam_save, dir, mflags; 1663 int i, j, dam_save, dir, mflags;
1753 sint16 nx, ny, hx, hy; 1664 sint16 nx, ny, hx, hy;
1754 object *owner; 1665 object *owner;
1755 mapstruct *m; 1666 maptile *m;
1756 1667
1757 owner = get_owner (op); 1668 owner = op->owner;
1758 1669
1759 /* the following logic makes sure that the ball doesn't move into a wall, 1670 /* the following logic makes sure that the ball doesn't move into a wall,
1760 * and makes sure that it will move along a wall to try and get at it's 1671 * and makes sure that it will move along a wall to try and get at it's
1761 * victim. The block immediately below more or less chooses a random 1672 * victim. The block immediately below more or less chooses a random
1762 * offset to move the ball, eg, keep it mostly on course, with some 1673 * offset to move the ball, eg, keep it mostly on course, with some
… …
1791 nx = op->x; 1702 nx = op->x;
1792 ny = op->y; 1703 ny = op->y;
1793 m = op->map; 1704 m = op->map;
1794 } 1705 }
1795 1706
1796 remove_ob (op); 1707 m->insert (op, nx, ny, op);
1797 op->y = ny;
1798 op->x = nx;
1799 insert_ob_in_map (op, m, op, 0);
1800 1708
1801 dam_save = op->stats.dam; /* save the original dam: we do halfdam on 1709 dam_save = op->stats.dam; /* save the original dam: we do halfdam on
1802 surrounding squares */ 1710 surrounding squares */
1803 1711
1804 /* loop over current square and neighbors to hit. 1712 /* loop over current square and neighbors to hit.
1805 * if this has an other_arch field, we insert that in 1713 * if this has an other_arch field, we insert that in
1806 * the surround spaces. 1714 * the surround spaces.
1807 */ 1715 */
1808 for (j = 0; j < 9; j++) 1716 for (j = 0; j < 9; j++)
1809 { 1717 {
1810 object *new_ob;
1811
1812 hx = nx + freearr_x[j]; 1718 hx = nx + freearr_x[j];
1813 hy = ny + freearr_y[j]; 1719 hy = ny + freearr_y[j];
1814 1720
1815 m = op->map; 1721 m = op->map;
1816 mflags = get_map_flags (m, &m, hx, hy, &hx, &hy); 1722 mflags = get_map_flags (m, &m, hx, hy, &hx, &hy);
… …
1830 1736
1831 } 1737 }
1832 1738
1833 /* insert the other arch */ 1739 /* insert the other arch */
1834 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))) 1740 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))))
1835 { 1741 m->insert (arch_to_object (op->other_arch), hx, hy, op);
1836 new_ob = arch_to_object (op->other_arch);
1837 new_ob->x = hx;
1838 new_ob->y = hy;
1839 insert_ob_in_map (new_ob, m, op, 0);
1840 }
1841 } 1742 }
1842 1743
1843 /* restore to the center location and damage */ 1744 /* restore to the center location and damage */
1844 op->stats.dam = dam_save; 1745 op->stats.dam = dam_save;
1845 1746
1846 i = spell_find_dir (op->map, op->x, op->y, get_owner (op)); 1747 i = spell_find_dir (op->map, op->x, op->y, op->owner);
1847 1748
1848 if (i >= 0) 1749 if (i >= 0)
1849 { /* we have a preferred direction! */ 1750 { /* we have a preferred direction! */
1850 /* pick another direction if the preferred dir is blocked. */ 1751 /* pick another direction if the preferred dir is blocked. */
1851 if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP || 1752 if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP ||
1852 OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))) 1753 OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))
1853 {
1854 i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */ 1754 i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */
1855 } 1755
1856 op->direction = i; 1756 op->direction = i;
1857 } 1757 }
1858} 1758}
1859 1759
1860 1760
… …
1872#if 0 1772#if 0
1873 static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 }; 1773 static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 };
1874 static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 }; 1774 static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 };
1875 sint16 target_x, target_y, origin_x, origin_y; 1775 sint16 target_x, target_y, origin_x, origin_y;
1876 int adjustdir; 1776 int adjustdir;
1877 mapstruct *m; 1777 maptile *m;
1878#endif 1778#endif
1879 int basedir; 1779 int basedir;
1880 object *owner; 1780 object *owner;
1881 1781
1882 owner = get_owner (op); 1782 owner = op->owner;
1883 if (op->duration == 0 || owner == NULL) 1783 if (op->duration == 0 || owner == NULL)
1884 { 1784 {
1885 remove_ob (op); 1785 op->destroy ();
1886 free_object (op);
1887 return; 1786 return;
1888 } 1787 }
1788
1889 op->duration--; 1789 op->duration--;
1890 1790
1891 basedir = op->direction; 1791 basedir = op->direction;
1892 if (basedir == 0) 1792 if (basedir == 0)
1893 { 1793 {
… …
1898#if 0 1798#if 0
1899 // this is bogus: it causes wrong places to be checked below 1799 // this is bogus: it causes wrong places to be checked below
1900 // (a wall 2 cells away will block the effect...) and 1800 // (a wall 2 cells away will block the effect...) and
1901 // doesn't work for SP_BULLET anyhow, so again tests the wrong 1801 // doesn't work for SP_BULLET anyhow, so again tests the wrong
1902 // space. 1802 // space.
1903 // should be fixed later, but correctness before featurs... 1803 // should be fixed later, but correctness before features...
1904 // (schmorp) 1804 // (schmorp)
1905 1805
1906 /* new offset calculation to make swarm element distribution 1806 /* new offset calculation to make swarm element distribution
1907 * more uniform 1807 * more uniform
1908 */ 1808 */
… …
1990 1890
1991 if (!spell->other_arch) 1891 if (!spell->other_arch)
1992 return 0; 1892 return 0;
1993 1893
1994 tmp = get_archetype (SWARM_SPELL); 1894 tmp = get_archetype (SWARM_SPELL);
1995 tmp->x = op->x;
1996 tmp->y = op->y;
1997 set_owner (tmp, op); /* needed so that if swarm elements kill, caster gets xp. */ 1895 tmp->set_owner (op); /* needed so that if swarm elements kill, caster gets xp. */
1998 set_spell_skill (op, caster, spell, tmp); 1896 set_spell_skill (op, caster, spell, tmp);
1999 1897
2000 tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */ 1898 tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */
2001 tmp->spell = arch_to_object (spell->other_arch); 1899 tmp->spell = arch_to_object (spell->other_arch);
2002 1900
2003 tmp->attacktype = tmp->spell->attacktype; 1901 tmp->attacktype = tmp->spell->attacktype;
2004 1902
2005 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 1903 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
2006 {
2007 if (!tailor_god_spell (tmp, op)) 1904 if (!tailor_god_spell (tmp, op))
2008 return 1; 1905 return 1;
2009 } 1906
2010 tmp->duration = SP_level_duration_adjust (caster, spell); 1907 tmp->duration = SP_level_duration_adjust (caster, spell);
2011 for (i = 0; i < spell->duration; i++) 1908 for (i = 0; i < spell->duration; i++)
2012 tmp->duration += die_roll (1, 3, op, PREFER_HIGH); 1909 tmp->duration += die_roll (1, 3, op, PREFER_HIGH);
2013 1910
2014 tmp->direction = dir; 1911 tmp->direction = dir;
2015 tmp->invisible = 1; 1912 tmp->invisible = 1;
2016 insert_ob_in_map (tmp, op->map, op, 0); 1913
1914 tmp->insert_at (op, op);
2017 return 1; 1915 return 1;
2018} 1916}
2019 1917
2020 1918
2021/* See the spells documentation file for why this is its own 1919/* See the spells documentation file for why this is its own
… …
2025cast_light (object *op, object *caster, object *spell, int dir) 1923cast_light (object *op, object *caster, object *spell, int dir)
2026{ 1924{
2027 object *target = NULL, *tmp = NULL; 1925 object *target = NULL, *tmp = NULL;
2028 sint16 x, y; 1926 sint16 x, y;
2029 int dam, mflags; 1927 int dam, mflags;
2030 mapstruct *m; 1928 maptile *m;
2031 1929
2032 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1930 dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
2033 1931
2034 if (!dir) 1932 if (!dir)
2035 { 1933 {
… …
2049 return 0; 1947 return 0;
2050 } 1948 }
2051 1949
2052 if (mflags & P_IS_ALIVE && spell->attacktype) 1950 if (mflags & P_IS_ALIVE && spell->attacktype)
2053 { 1951 {
2054 for (target = get_map_ob (m, x, y); target; target = target->above) 1952 for (target = GET_MAP_OB (m, x, y); target; target = target->above)
2055 if (QUERY_FLAG (target, FLAG_MONSTER)) 1953 if (QUERY_FLAG (target, FLAG_MONSTER))
2056 { 1954 {
2057 /* oky doky. got a target monster. Lets make a blinding attack */ 1955 /* oky doky. got a target monster. Lets make a blinding attack */
2058 if (target->head) 1956 if (target->head)
2059 target = target->head; 1957 target = target->head;
… …
2081 { 1979 {
2082 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell); 1980 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell);
2083 if (tmp->glow_radius > MAX_LIGHT_RADII) 1981 if (tmp->glow_radius > MAX_LIGHT_RADII)
2084 tmp->glow_radius = MAX_LIGHT_RADII; 1982 tmp->glow_radius = MAX_LIGHT_RADII;
2085 } 1983 }
2086 tmp->x = x; 1984
2087 tmp->y = y; 1985 m->insert (tmp, x, y, op);
2088 insert_ob_in_map (tmp, m, op, 0);
2089 return 1; 1986 return 1;
2090} 1987}
2091 1988
2092 1989
2093 1990
… …
2103cast_cause_disease (object *op, object *caster, object *spell, int dir) 2000cast_cause_disease (object *op, object *caster, object *spell, int dir)
2104{ 2001{
2105 sint16 x, y; 2002 sint16 x, y;
2106 int i, mflags, range, dam_mod, dur_mod; 2003 int i, mflags, range, dam_mod, dur_mod;
2107 object *walk; 2004 object *walk;
2108 mapstruct *m; 2005 maptile *m;
2109 2006
2110 x = op->x; 2007 x = op->x;
2111 y = op->y; 2008 y = op->y;
2112 2009
2113 /* If casting from a scroll, no direction will be available, so refer to the 2010 /* If casting from a scroll, no direction will be available, so refer to the
… …
2141 2038
2142 /* Only bother looking on this space if there is something living here */ 2039 /* Only bother looking on this space if there is something living here */
2143 if (mflags & P_IS_ALIVE) 2040 if (mflags & P_IS_ALIVE)
2144 { 2041 {
2145 /* search this square for a victim */ 2042 /* search this square for a victim */
2146 for (walk = get_map_ob (m, x, y); walk; walk = walk->above) 2043 for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above)
2147 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER)) 2044 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER))
2148 { /* found a victim */ 2045 { /* found a victim */
2149 object *disease = arch_to_object (spell->other_arch); 2046 object *disease = arch_to_object (spell->other_arch);
2150 2047
2151 set_owner (disease, op); 2048 disease->set_owner (op);
2152 set_spell_skill (op, caster, spell, disease); 2049 set_spell_skill (op, caster, spell, disease);
2153 disease->stats.exp = 0; 2050 disease->stats.exp = 0;
2154 disease->level = caster_level (caster, spell); 2051 disease->level = caster_level (caster, spell);
2155 2052
2156 /* do level adjustments */ 2053 /* do level adjustments */
… …
2201 if (disease->stats.sp) 2098 if (disease->stats.sp)
2202 disease->stats.sp -= dam_mod; 2099 disease->stats.sp -= dam_mod;
2203 2100
2204 if (infect_object (walk, disease, 1)) 2101 if (infect_object (walk, disease, 1))
2205 { 2102 {
2206 object *flash; /* visual effect for inflicting disease */
2207
2208 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name); 2103 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
2209 2104
2210 free_object (disease); /* don't need this one anymore */ 2105 disease->destroy (); /* don't need this one anymore */
2211 flash = get_archetype (ARCH_DETECT_MAGIC); 2106 walk->map->insert (get_archetype (ARCH_DETECT_MAGIC), x, y, op);
2212 flash->x = x;
2213 flash->y = y;
2214 flash->map = walk->map;
2215 insert_ob_in_map (flash, walk->map, op, 0);
2216 return 1; 2107 return 1;
2217 } 2108 }
2218 free_object (disease); 2109
2110 disease->destroy ();
2219 } 2111 }
2220 } /* if living creature */ 2112 } /* if living creature */
2221 } /* for range of spaces */ 2113 } /* for range of spaces */
2114
2222 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!"); 2115 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!");
2223 return 1; 2116 return 1;
2224} 2117}

Diff Legend

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