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.12 by root, Thu Sep 14 21:16:13 2006 UTC vs.
Revision 1.41 by root, Sat Jun 9 21:16:12 2007 UTC

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

Diff Legend

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