ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/spell_attack.C
(Generate patch)

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

Diff Legend

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