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.54 by root, Wed Apr 30 10:31:04 2008 UTC

1
2/* 1/*
3 * static char *rcsid_spell_attack_c = 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
4 * "$Id: spell_attack.C,v 1.9 2006/09/10 15:59:57 root Exp $"; 3 *
5 */ 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra 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 <support@deliantra.net>
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 *
357 ***************************************************************************/ 345 ***************************************************************************/
358 346
359/* expands an explosion. op is a piece of the 347/* expands an explosion. op is a piece of the
360 * explosion - this expans it in the different directions. 348 * explosion - this expands it in the different directions.
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; 410 object *env = op->outer_env ();
427 411
428 env = object_get_env_recursive (op);
429 if (env->map == NULL || out_of_map (env->map, env->x, env->y)) 412 if (!env->map || out_of_map (env->map, env->x, env->y))
430 { 413 {
431 LOG (llevError, "BUG: explode_bullet(): env out of map\n"); 414 LOG (llevError, "BUG: explode_bullet(): env out of map\n");
432 remove_ob (op); 415 op->destroy ();
433 free_object (op);
434 return; 416 return;
435 } 417 }
436 remove_ob (op); 418
437 op->x = env->x; 419 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 } 420 }
441 else if (out_of_map (op->map, op->x, op->y)) 421 else if (out_of_map (op->map, op->x, op->y))
442 { 422 {
443 LOG (llevError, "BUG: explode_bullet(): op out of map\n"); 423 LOG (llevError, "BUG: explode_bullet(): op out of map\n");
444 remove_ob (op); 424 op->destroy ();
445 free_object (op);
446 return; 425 return;
447 } 426 }
448 427
449 // 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
450 // 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
451 // bad at the moment that might happen from this. 430 // 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) 431 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
453 { 432 {
454 remove_ob (op); 433 op->destroy ();
455 free_object (op);
456 return; 434 return;
457 } 435 }
458 436
459 if (op->attacktype) 437 if (op->attacktype)
460 { 438 {
461 hit_map (op, 0, op->attacktype, 1); 439 hit_map (op, 0, op->attacktype, 1);
462 if (was_destroyed (op, op_tag)) 440 if (op->destroyed ())
463 return; 441 return;
464 } 442 }
465 443
466 /* other_arch contains what this explodes into */ 444 /* other_arch contains what this explodes into */
467 tmp = arch_to_object (op->other_arch); 445 tmp = arch_to_object (op->other_arch);
468 446
469 copy_owner (tmp, op); 447 tmp->set_owner (op);
470 tmp->skill = op->skill; 448 tmp->skill = op->skill;
471 449
472 owner = get_owner (op); 450 owner = op->owner;
451
473 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))
474 { 453 {
475 remove_ob (op); 454 op->destroy ();
476 free_object (op);
477 return; 455 return;
478 } 456 }
479 tmp->x = op->x;
480 tmp->y = op->y;
481 457
482 /* special for bombs - it actually has sane values for these */ 458 /* special for bombs - it actually has sane values for these */
483 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB) 459 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB)
484 { 460 {
485 tmp->attacktype = op->attacktype; 461 tmp->attacktype = op->attacktype;
… …
489 } 465 }
490 else 466 else
491 { 467 {
492 if (op->attacktype & AT_MAGIC) 468 if (op->attacktype & AT_MAGIC)
493 tmp->attacktype |= AT_MAGIC; 469 tmp->attacktype |= AT_MAGIC;
470
494 /* Spell doc describes what is going on here */ 471 /* Spell doc describes what is going on here */
495 tmp->stats.dam = op->dam_modifier; 472 tmp->stats.dam = op->dam_modifier;
496 tmp->range = op->stats.maxhp; 473 tmp->range = op->stats.maxhp;
497 tmp->duration = op->stats.hp; 474 tmp->duration = op->stats.hp;
498 /* 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 -
… …
506 tmp->stats.sp = op->direction; 483 tmp->stats.sp = op->direction;
507 484
508 /* Prevent recursion */ 485 /* Prevent recursion */
509 op->move_on = 0; 486 op->move_on = 0;
510 487
511 insert_ob_in_map (tmp, op->map, op, 0); 488 tmp->insert_at (op, op);
489 tmp->play_sound (tmp->sound);
490
512 /* remove the firebullet */ 491 /* remove the firebullet */
513 if (!was_destroyed (op, op_tag)) 492 op->destroy ();
514 {
515 remove_ob (op);
516 free_object (op);
517 }
518} 493}
519
520
521 494
522/* checks to see what op should do, given the space it is on 495/* checks to see what op should do, given the space it is on
523 * (eg, explode, damage player, etc) 496 * (eg, explode, damage player, etc)
524 */ 497 */
525
526void 498void
527check_bullet (object *op) 499check_bullet (object *op)
528{ 500{
529 tag_t op_tag = op->count, tmp_tag;
530 object *tmp; 501 object *tmp;
531 int dam, mflags; 502 int dam, mflags;
532 mapstruct *m; 503 maptile *m;
533 sint16 sx, sy; 504 sint16 sx, sy;
534 505
535 mflags = get_map_flags (op->map, &m, op->x, op->y, &sx, &sy); 506 mflags = get_map_flags (op->map, &m, op->x, op->y, &sx, &sy);
536 507
537 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy))) 508 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, sx, sy)))
… …
546 517
547 /* If nothing alive on this space, no reason to do anything further */ 518 /* If nothing alive on this space, no reason to do anything further */
548 if (!(mflags & P_IS_ALIVE)) 519 if (!(mflags & P_IS_ALIVE))
549 return; 520 return;
550 521
551 for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 522 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
552 { 523 {
553 if (QUERY_FLAG (tmp, FLAG_ALIVE)) 524 if (QUERY_FLAG (tmp, FLAG_ALIVE))
554 { 525 {
555 tmp_tag = tmp->count;
556 dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1); 526 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) 527 if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
558 { 528 {
559 if (!QUERY_FLAG (op, FLAG_REMOVED)) 529 if (!QUERY_FLAG (op, FLAG_REMOVED))
560 { 530 {
561 remove_ob (op); 531 op->destroy ();
562 free_object (op);
563 return; 532 return;
564 } 533 }
565 } 534 }
566 } 535 }
567 } 536 }
568} 537}
569
570 538
571/* Basically, we move 'op' one square, and if it hits something, 539/* Basically, we move 'op' one square, and if it hits something,
572 * call check_bullet. 540 * call check_bullet.
573 * This function is only applicable to bullets, but not to all 541 * This function is only applicable to bullets, but not to all
574 * fired arches (eg, bolts). 542 * fired arches (eg, bolts).
575 */ 543 */
576
577void 544void
578move_bullet (object *op) 545move_bullet (object *op)
579{ 546{
580 sint16 new_x, new_y; 547 sint16 new_x, new_y;
581 int mflags; 548 int mflags;
582 mapstruct *m; 549 maptile *m;
583 550
584#if 0 551#if 0
585 /* We need a better general purpose way to do this */ 552 /* We need a better general purpose way to do this */
586 553
587 /* peterm: added to make comet leave a trail of burnouts 554 /* peterm: added to make comet leave a trail of burnouts
588 it's an unadulterated hack, but the effect is cool. */ 555 it's an unadulterated hack, but the effect is cool. */
589 if (op->stats.sp == SP_METEOR) 556 if (op->stats.sp == SP_METEOR)
590 { 557 {
591 replace_insert_ob_in_map ("fire_trail", op); 558 replace_insert_ob_in_map ("fire_trail", op);
592 if (was_destroyed (op, op_tag)) 559 if (op->destroyed ())
593 return; 560 return;
594 } /* end addition. */ 561 } /* end addition. */
595#endif 562#endif
596 563
597 /* Reached the end of its life - remove it */ 564 /* Reached the end of its life - remove it */
598 if (--op->range <= 0) 565 if (--op->range <= 0)
599 { 566 {
600 if (op->other_arch) 567 if (op->other_arch)
601 {
602 explode_bullet (op); 568 explode_bullet (op);
603 }
604 else 569 else
605 { 570 op->destroy ();
606 remove_ob (op); 571
607 free_object (op);
608 }
609 return; 572 return;
610 } 573 }
611 574
612 new_x = op->x + DIRX (op); 575 new_x = op->x + DIRX (op);
613 new_y = op->y + DIRY (op); 576 new_y = op->y + DIRY (op);
614 m = op->map; 577 m = op->map;
615 mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y); 578 mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y);
616 579
617 if (mflags & P_OUT_OF_MAP) 580 if (mflags & P_OUT_OF_MAP)
618 { 581 {
619 remove_ob (op); 582 op->destroy ();
620 free_object (op);
621 return; 583 return;
622 } 584 }
623 585
624 if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))) 586 if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y)))
625 { 587 {
626 if (op->other_arch) 588 if (op->other_arch)
627 {
628 explode_bullet (op); 589 explode_bullet (op);
629 }
630 else 590 else
631 { 591 op->destroy ();
632 remove_ob (op);
633 free_object (op);
634 }
635 return;
636 }
637 592
638 remove_ob (op); 593 return;
639 op->x = new_x; 594 }
640 op->y = new_y; 595
641 if ((op = insert_ob_in_map (op, m, op, 0)) == NULL) 596 if (!(op = m->insert (op, new_x, new_y, op)))
642 return; 597 return;
643 598
644 if (reflwall (op->map, op->x, op->y, op)) 599 if (reflwall (op->map, op->x, op->y, op))
645 { 600 {
646 op->direction = absdir (op->direction + 4); 601 op->direction = absdir (op->direction + 4);
647 update_turn_face (op); 602 update_turn_face (op);
648 } 603 }
649 else 604 else
650 {
651 check_bullet (op); 605 check_bullet (op);
652 }
653} 606}
654
655
656
657 607
658/* fire_bullet 608/* fire_bullet
659 * object op (cast from caster) files a bolt in dir. 609 * object op (cast from caster) files a bolt in dir.
660 * spob is the spell object for the bolt. 610 * spob is the spell object for the bolt.
661 * we remove the magic flag - that can be derived from 611 * we remove the magic flag - that can be derived from
662 * spob->attacktype. 612 * spob->attacktype.
663 * This function sets up the appropriate owner and skill 613 * This function sets up the appropriate owner and skill
664 * pointers. 614 * pointers.
665 */ 615 */
666
667int 616int
668fire_bullet (object *op, object *caster, int dir, object *spob) 617fire_bullet (object *op, object *caster, int dir, object *spob)
669{ 618{
670 object *tmp = NULL; 619 object *tmp = NULL;
671 int mflags; 620 int mflags;
… …
692 641
693 tmp->direction = dir; 642 tmp->direction = dir;
694 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 643 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
695 SET_ANIMATION (tmp, dir); 644 SET_ANIMATION (tmp, dir);
696 645
697 set_owner (tmp, op); 646 tmp->set_owner (op);
698 set_spell_skill (op, caster, spob, tmp); 647 set_spell_skill (op, caster, spob, tmp);
699 648
700 tmp->x = op->x + freearr_x[dir]; 649 tmp->x = op->x + freearr_x[dir];
701 tmp->y = op->y + freearr_y[dir]; 650 tmp->y = op->y + freearr_y[dir];
702 tmp->map = op->map; 651 tmp->map = op->map;
703 652
653 maptile *newmap;
704 mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y); 654 mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
705 if (mflags & P_OUT_OF_MAP) 655 if (mflags & P_OUT_OF_MAP)
706 { 656 {
707 free_object (tmp); 657 tmp->destroy ();
708 return 0; 658 return 0;
709 } 659 }
660
661 tmp->map = newmap;
662
710 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 663 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
711 { 664 {
712 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 665 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
713 { 666 {
714 free_object (tmp); 667 tmp->destroy ();
715 return 0; 668 return 0;
716 } 669 }
670
717 tmp->x = op->x; 671 tmp->x = op->x;
718 tmp->y = op->y; 672 tmp->y = op->y;
719 tmp->direction = absdir (tmp->direction + 4); 673 tmp->direction = absdir (tmp->direction + 4);
720 tmp->map = op->map; 674 tmp->map = op->map;
721 } 675 }
722 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL) 676
723 { 677 if ((tmp = tmp->insert_at (tmp, op)))
724 check_bullet (tmp); 678 check_bullet (tmp);
725 } 679
726 return 1; 680 return 1;
727} 681}
728
729
730
731 682
732/***************************************************************************** 683/*****************************************************************************
733 * 684 *
734 * CONE RELATED FUNCTIONS 685 * CONE RELATED FUNCTIONS
735 * 686 *
736 *****************************************************************************/ 687 *****************************************************************************/
737 688
738
739/* drops an object based on what is in the cone's "other_arch" */ 689/* drops an object based on what is in the cone's "other_arch" */
740void 690void
741cone_drop (object *op) 691cone_drop (object *op)
742{ 692{
743 object *new_ob = arch_to_object (op->other_arch); 693 object *new_ob = arch_to_object (op->other_arch);
744 694
745 new_ob->x = op->x;
746 new_ob->y = op->y;
747 new_ob->level = op->level; 695 new_ob->level = op->level;
748 set_owner (new_ob, op->owner); 696 new_ob->set_owner (op->owner);
749 697
750 /* preserve skill ownership */ 698 /* preserve skill ownership */
751 if (op->skill && op->skill != new_ob->skill) 699 if (op->skill && op->skill != new_ob->skill)
752 {
753 new_ob->skill = op->skill; 700 new_ob->skill = op->skill;
754 }
755 insert_ob_in_map (new_ob, op->map, op, 0);
756 701
702 new_ob->insert_at (op, op);
757} 703}
758 704
759/* move_cone: causes cone object 'op' to move a space/hit creatures */ 705/* move_cone: causes cone object 'op' to move a space/hit creatures */
760 706
761void 707void
762move_cone (object *op) 708move_cone (object *op)
763{ 709{
764 int i; 710 int i;
765 tag_t tag;
766 711
767 /* if no map then hit_map will crash so just ignore object */ 712 /* if no map then hit_map will crash so just ignore object */
768 if (!op->map) 713 if (!op->map)
769 { 714 {
770 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown"); 715 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown");
771 op->speed = 0; 716 op->set_speed (0);
772 update_ob_speed (op);
773 return; 717 return;
774 } 718 }
775 719
776 /* lava saves it's life, but not yours :) */ 720 /* lava saves it's life, but not yours :) */
777 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 721 if (QUERY_FLAG (op, FLAG_LIFESAVE))
… …
783#if 0 727#if 0
784 /* Disable this - enabling it makes monsters easier, as 728 /* Disable this - enabling it makes monsters easier, as
785 * when their cone dies when they die. 729 * when their cone dies when they die.
786 */ 730 */
787 /* If no owner left, the spell dies out. */ 731 /* If no owner left, the spell dies out. */
788 if (get_owner (op) == NULL) 732 if (op->owner == NULL)
789 { 733 {
790 remove_ob (op); 734 op->destroy ();
791 free_object (op);
792 return; 735 return;
793 } 736 }
794#endif 737#endif
795 738
796 tag = op->count;
797 hit_map (op, 0, op->attacktype, 0); 739 hit_map (op, 0, op->attacktype, 0);
798 740
799 /* Check to see if we should push anything. 741 /* Check to see if we should push anything.
800 * Spell objects with weight push whatever they encounter to some 742 * Spell objects with weight push whatever they encounter to some
801 * degree. 743 * degree.
802 */ 744 */
803 if (op->weight) 745 if (op->weight)
804 check_spell_knockback (op); 746 check_spell_knockback (op);
805 747
806 if (was_destroyed (op, tag)) 748 if (op->destroyed ())
807 return; 749 return;
808 750
809 if ((op->duration--) < 0) 751 if ((op->duration--) < 0)
810 { 752 {
811 remove_ob (op); 753 op->destroy ();
812 free_object (op);
813 return; 754 return;
814 } 755 }
815 /* Object has hit maximum range, so don't have it move 756 /* Object has hit maximum range, so don't have it move
816 * any further. When the duration above expires, 757 * any further. When the duration above expires,
817 * then the object will get removed. 758 * then the object will get removed.
… …
826 { 767 {
827 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)]; 768 sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)];
828 769
829 if (ok_to_put_more (op->map, x, y, op, op->attacktype)) 770 if (ok_to_put_more (op->map, x, y, op, op->attacktype))
830 { 771 {
831 object *tmp = get_object (); 772 object *tmp = op->clone ();
832
833 copy_object (op, tmp);
834 tmp->x = x;
835 tmp->y = y;
836 773
837 tmp->duration = op->duration + 1; 774 tmp->duration = op->duration + 1;
838 775
839 /* Use for spell tracking - see ok_to_put_more() */ 776 /* Use for spell tracking - see ok_to_put_more() */
840 tmp->stats.maxhp = op->stats.maxhp; 777 tmp->stats.maxhp = op->stats.maxhp;
841 insert_ob_in_map (tmp, op->map, op, 0); 778
779 op->map->insert (tmp, x, y, op);
780
842 if (tmp->other_arch) 781 if (tmp->other_arch)
843 cone_drop (tmp); 782 cone_drop (tmp);
844 } 783 }
845 } 784 }
846} 785}
… …
856int 795int
857cast_cone (object *op, object *caster, int dir, object *spell) 796cast_cone (object *op, object *caster, int dir, object *spell)
858{ 797{
859 object *tmp; 798 object *tmp;
860 int i, success = 0, range_min = -1, range_max = 1; 799 int i, success = 0, range_min = -1, range_max = 1;
861 mapstruct *m; 800 maptile *m;
862 sint16 sx, sy; 801 sint16 sx, sy;
863 MoveType movetype; 802 MoveType movetype;
864 803
865 if (!spell->other_arch) 804 if (!spell->other_arch)
866 return 0; 805 return 0;
… …
879 818
880 /* Need to know what the movetype of the object we are about 819 /* 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 820 * to create is, so we can know if the space we are about to
882 * insert it into is blocked. 821 * insert it into is blocked.
883 */ 822 */
884 movetype = spell->other_arch->clone.move_type; 823 movetype = spell->other_arch->move_type;
885 824
886 for (i = range_min; i <= range_max; i++) 825 for (i = range_min; i <= range_max; i++)
887 { 826 {
888 sint16 x, y, d; 827 sint16 x, y, d;
889 828
… …
922 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype) 861 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype)
923 continue; 862 continue;
924 863
925 success = 1; 864 success = 1;
926 tmp = arch_to_object (spell->other_arch); 865 tmp = arch_to_object (spell->other_arch);
927 set_owner (tmp, op); 866 tmp->set_owner (op);
928 set_spell_skill (op, caster, spell, tmp); 867 set_spell_skill (op, caster, spell, tmp);
929 tmp->level = caster_level (caster, spell); 868 tmp->level = caster_level (caster, spell);
930 tmp->x = sx;
931 tmp->y = sy;
932 tmp->attacktype = spell->attacktype; 869 tmp->attacktype = spell->attacktype;
933 870
934 /* holy word stuff */ 871 /* holy word stuff */
935 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) 872 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER))
936 {
937 if (!tailor_god_spell (tmp, op)) 873 if (!tailor_god_spell (tmp, op))
938 return 0; 874 return 0;
939 }
940 875
941 if (dir) 876 if (dir)
942 tmp->stats.sp = dir; 877 tmp->stats.sp = dir;
943 else 878 else
944 tmp->stats.sp = i; 879 tmp->stats.sp = i;
… …
950 { 885 {
951 tmp->range /= 4; 886 tmp->range /= 4;
952 if (tmp->range < 2 && spell->range >= 2) 887 if (tmp->range < 2 && spell->range >= 2)
953 tmp->range = 2; 888 tmp->range = 2;
954 } 889 }
890
955 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 891 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
956 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 892 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
957 893
958 /* Special bonus for fear attacks */ 894 /* Special bonus for fear attacks */
959 if (tmp->attacktype & AT_FEAR) 895 if (tmp->attacktype & AT_FEAR)
… …
961 if (caster->type == PLAYER) 897 if (caster->type == PLAYER)
962 tmp->duration += fear_bonus[caster->stats.Cha]; 898 tmp->duration += fear_bonus[caster->stats.Cha];
963 else 899 else
964 tmp->duration += caster->level / 3; 900 tmp->duration += caster->level / 3;
965 } 901 }
902
966 if (tmp->attacktype & (AT_HOLYWORD | AT_TURN_UNDEAD)) 903 if (tmp->attacktype & (AT_HOLYWORD | AT_TURN_UNDEAD))
967 { 904 {
968 if (caster->type == PLAYER) 905 if (caster->type == PLAYER)
969 tmp->duration += turn_bonus[caster->stats.Wis] / 5; 906 tmp->duration += turn_bonus[caster->stats.Wis] / 5;
970 else 907 else
971 tmp->duration += caster->level / 3; 908 tmp->duration += caster->level / 3;
972 } 909 }
973 910
974
975 if (!(tmp->move_type & MOVE_FLY_LOW)) 911 if (!(tmp->move_type & MOVE_FLY_LOW))
976 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->name); 912 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->archname);
977 913
978 if (!tmp->move_on && tmp->stats.dam) 914 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); 915 LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->archname);
981 } 916
982 insert_ob_in_map (tmp, m, op, 0); 917 m->insert (tmp, sx, sy, op);
983 918
984 /* This is used for tracking spells so that one effect doesn't hit 919 /* This is used for tracking spells so that one effect doesn't hit
985 * a single space too many times. 920 * a single space too many times.
986 */ 921 */
987 tmp->stats.maxhp = tmp->count; 922 tmp->stats.maxhp = tmp->count;
988 923
989 if (tmp->other_arch) 924 if (tmp->other_arch)
990 cone_drop (tmp); 925 cone_drop (tmp);
991 } 926 }
927
992 return success; 928 return success;
993} 929}
994 930
995/**************************************************************************** 931/****************************************************************************
996 * 932 *
997 * BOMB related code 933 * BOMB related code
998 * 934 *
999 ****************************************************************************/ 935 ****************************************************************************/
1000 936
1001
1002/* This handles an exploding bomb. 937/* This handles an exploding bomb.
1003 * op is the original bomb object. 938 * op is the original bomb object.
1004 */ 939 */
1005void 940void
1006animate_bomb (object *op) 941animate_bomb (object *op)
1007{ 942{
1008 int i;
1009 object *env, *tmp;
1010 archetype *at;
1011
1012 if (op->state != NUM_ANIMATIONS (op) - 1) 943 if (op->state != NUM_ANIMATIONS (op) - 1)
1013 return; 944 return;
1014 945
1015 946 object *env = op->outer_env ();
1016 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 (!(op = op->insert_at (env, op)))
1024 esrv_del_item (env->contr, op->count);
1025
1026 remove_ob (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; 954 return;
1031 } 955 }
1032 956
1033 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding 957 // 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 958 // on a safe map. I don't like this special casing, but it seems to be neccessary
1035 // as bombs can be carried. 959 // as bombs can be carried.
1036 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 960 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
1037 { 961 {
1038 remove_ob (op); 962 op->destroy ();
1039 free_object (op);
1040 return; 963 return;
1041 } 964 }
1042 965
1043 /* This copies a lot of the code from the fire bullet, 966 /* This copies a lot of the code from the fire bullet,
1044 * but using the cast_bullet isn't really feasible, 967 * but using the cast_bullet isn't really feasible,
1045 * so just set up the appropriate values. 968 * so just set up the appropriate values.
1046 */ 969 */
1047 at = find_archetype (SPLINT); 970 if (archetype *at = archetype::find (SPLINT))
1048 if (at)
1049 { 971 {
1050 for (i = 1; i < 9; i++) 972 for (int i = 1; i < 9; i++)
1051 { 973 {
1052 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i])) 974 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i]))
1053 continue; 975 continue;
976
1054 tmp = arch_to_object (at); 977 object *tmp = arch_to_object (at);
1055 tmp->direction = i; 978 tmp->direction = i;
1056 tmp->range = op->range; 979 tmp->range = op->range;
1057 tmp->stats.dam = op->stats.dam; 980 tmp->stats.dam = op->stats.dam;
1058 tmp->duration = op->duration; 981 tmp->duration = op->duration;
1059 tmp->attacktype = op->attacktype; 982 tmp->attacktype = op->attacktype;
1060 copy_owner (tmp, op); 983 tmp->set_owner (op);
1061 if (op->skill && op->skill != tmp->skill) 984 if (op->skill && op->skill != tmp->skill)
1062 {
1063 tmp->skill = op->skill; 985 tmp->skill = op->skill;
1064 } 986
1065 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 987 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
1066 SET_ANIMATION (tmp, i); 988 SET_ANIMATION (tmp, i);
1067 tmp->x = op->x + freearr_x[i]; 989
1068 tmp->y = op->y + freearr_x[i]; 990 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); 991 move_bullet (tmp);
1071 } 992 }
1072 } 993 }
1073 994
1074 explode_bullet (op); 995 explode_bullet (op);
1075} 996}
1076 997
1077int 998int
1078create_bomb (object *op, object *caster, int dir, object *spell) 999create_bomb (object *op, object *caster, int dir, object *spell)
1079{ 1000{
1080
1081 object *tmp; 1001 object *tmp;
1082 int mflags; 1002 int mflags;
1083 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir]; 1003 sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir];
1084 mapstruct *m; 1004 maptile *m;
1085 1005
1086 mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy); 1006 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)) 1007 if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
1088 { 1008 {
1089 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1009 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
1090 return 0; 1010 return 0;
1091 } 1011 }
1012
1092 tmp = arch_to_object (spell->other_arch); 1013 tmp = arch_to_object (spell->other_arch);
1093 1014
1094 /* level dependencies for bomb */ 1015 /* level dependencies for bomb */
1095 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 1016 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
1096 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1017 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1097 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 1018 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
1098 tmp->attacktype = spell->attacktype; 1019 tmp->attacktype = spell->attacktype;
1099 1020
1100 set_owner (tmp, op); 1021 tmp->set_owner (op);
1101 set_spell_skill (op, caster, spell, tmp); 1022 set_spell_skill (op, caster, spell, tmp);
1102 tmp->x = dx; 1023
1103 tmp->y = dy; 1024 m->insert (tmp, dx, dy, op);
1104 insert_ob_in_map (tmp, m, op, 0);
1105 return 1; 1025 return 1;
1106} 1026}
1107 1027
1108/**************************************************************************** 1028/****************************************************************************
1109 * 1029 *
… …
1118 * dir is the direction to look in. 1038 * dir is the direction to look in.
1119 * range is how far out to look. 1039 * range is how far out to look.
1120 * type is the type of spell - either SPELL_MANA or SPELL_GRACE. 1040 * type is the type of spell - either SPELL_MANA or SPELL_GRACE.
1121 * this info is used for blocked magic/unholy spaces. 1041 * this info is used for blocked magic/unholy spaces.
1122 */ 1042 */
1123
1124object * 1043object *
1125get_pointed_target (object *op, int dir, int range, int type) 1044get_pointed_target (object *op, int dir, int range, int type)
1126{ 1045{
1127 object *target; 1046 object *target;
1128 sint16 x, y; 1047 sint16 x, y;
1129 int dist, mflags; 1048 int dist, mflags;
1130 mapstruct *mp; 1049 maptile *mp;
1131 1050
1132 if (dir == 0) 1051 if (dir == 0)
1133 return NULL; 1052 return NULL;
1134 1053
1135 for (dist = 1; dist < range; dist++) 1054 for (dist = 1; dist < range; dist++)
… …
1147 return NULL; 1066 return NULL;
1148 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW) 1067 if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
1149 return NULL; 1068 return NULL;
1150 1069
1151 if (mflags & P_IS_ALIVE) 1070 if (mflags & P_IS_ALIVE)
1152 {
1153 for (target = get_map_ob (mp, x, y); target; target = target->above) 1071 for (target = GET_MAP_OB (mp, x, y); target; target = target->above)
1154 { 1072 if (QUERY_FLAG (target, FLAG_MONSTER))
1155 if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER))
1156 {
1157 return target; 1073 return target;
1158 }
1159 }
1160 }
1161 } 1074 }
1075
1162 return NULL; 1076 return NULL;
1163} 1077}
1164
1165 1078
1166/* cast_smite_arch() - the priest points to a creature and causes 1079/* cast_smite_arch() - the priest points to a creature and causes
1167 * a 'godly curse' to decend. 1080 * a 'godly curse' to decend.
1168 * usual params - 1081 * usual params -
1169 * op = player 1082 * op = player
1170 * caster = object casting the spell. 1083 * caster = object casting the spell.
1171 * dir = direction being cast 1084 * dir = direction being cast
1172 * spell = spell object 1085 * spell = spell object
1173 */ 1086 */
1174
1175int 1087int
1176cast_smite_spell (object *op, object *caster, int dir, object *spell) 1088cast_smite_spell (object *op, object *caster, int dir, object *spell)
1177{ 1089{
1178 object *effect, *target; 1090 object *effect, *target;
1179 object *god = find_god (determine_god (op)); 1091 object *god = find_god (determine_god (op));
… …
1225 if (effect->attacktype & AT_DEATH) 1137 if (effect->attacktype & AT_DEATH)
1226 { 1138 {
1227 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1139 effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1228 1140
1229 /* casting death spells at undead isn't a good thing */ 1141 /* casting death spells at undead isn't a good thing */
1230 if QUERY_FLAG
1231 (target, FLAG_UNDEAD) 1142 if (QUERY_FLAG (target, FLAG_UNDEAD))
1232 { 1143 {
1233 if (random_roll (0, 2, op, PREFER_LOW)) 1144 if (random_roll (0, 2, op, PREFER_LOW))
1234 { 1145 {
1235 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!"); 1146 new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");
1236 effect->x = op->x; 1147 effect->x = op->x;
… …
1238 } 1149 }
1239 else 1150 else
1240 { 1151 {
1241 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target)); 1152 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target));
1242 target->stats.hp = target->stats.maxhp * 2; 1153 target->stats.hp = target->stats.maxhp * 2;
1243 free_object (effect); 1154 effect->destroy ();
1244 return 0; 1155 return 0;
1245 } 1156 }
1246 } 1157 }
1247 } 1158 }
1248 else 1159 else
1249 { 1160 {
1250 /* how much woe to inflict :) */ 1161 /* how much woe to inflict :) */
1251 effect->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1162 effect->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1252 } 1163 }
1253 1164
1254 set_owner (effect, op); 1165 effect->set_owner (op);
1255 set_spell_skill (op, caster, spell, effect); 1166 set_spell_skill (op, caster, spell, effect);
1256 1167
1257 /* ok, tell it where to be, and insert! */ 1168 /* ok, tell it where to be, and insert! */
1258 effect->x = target->x; 1169 effect->insert_at (target, op);
1259 effect->y = target->y;
1260 insert_ob_in_map (effect, target->map, op, 0);
1261 1170
1262 return 1; 1171 return 1;
1263} 1172}
1264
1265 1173
1266/**************************************************************************** 1174/****************************************************************************
1267 * 1175 *
1268 * MAGIC MISSILE code. 1176 * MAGIC MISSILE code.
1269 * note that the fire_bullet is used to fire the missile. The 1177 * note that the fire_bullet is used to fire the missile. The
… …
1275move_missile (object *op) 1183move_missile (object *op)
1276{ 1184{
1277 int i, mflags; 1185 int i, mflags;
1278 object *owner; 1186 object *owner;
1279 sint16 new_x, new_y; 1187 sint16 new_x, new_y;
1280 mapstruct *m; 1188 maptile *m;
1281 1189
1282 if (op->range-- <= 0) 1190 if (op->range-- <= 0)
1283 { 1191 {
1284 remove_ob (op); 1192 op->destroy ();
1285 free_object (op);
1286 return; 1193 return;
1287 } 1194 }
1288 1195
1289 owner = get_owner (op); 1196 owner = op->owner;
1290#if 0 1197#if 0
1291 /* It'd make things nastier if this wasn't here - spells cast by 1198 /* It'd make things nastier if this wasn't here - spells cast by
1292 * monster that are then killed would continue to survive 1199 * monster that are then killed would continue to survive
1293 */ 1200 */
1294 if (owner == NULL) 1201 if (owner == NULL)
1295 { 1202 {
1296 remove_ob (op); 1203 op->destroy ();
1297 free_object (op);
1298 return; 1204 return;
1299 } 1205 }
1300#endif 1206#endif
1301 1207
1302 new_x = op->x + DIRX (op); 1208 new_x = op->x + DIRX (op);
… …
1304 1210
1305 mflags = get_map_flags (op->map, &m, new_x, new_y, &new_x, &new_y); 1211 mflags = get_map_flags (op->map, &m, new_x, new_y, &new_x, &new_y);
1306 1212
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)))) 1213 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 { 1214 {
1309 tag_t tag = op->count;
1310
1311 hit_map (op, op->direction, AT_MAGIC, 1); 1215 hit_map (op, op->direction, AT_MAGIC, 1);
1312 /* Basically, missile only hits one thing then goes away. 1216 /* Basically, missile only hits one thing then goes away.
1313 * we need to remove it if someone hasn't already done so. 1217 * we need to remove it if someone hasn't already done so.
1314 */ 1218 */
1315 if (!was_destroyed (op, tag)) 1219 if (!op->destroyed ())
1316 { 1220 op->destroy ();
1317 remove_ob (op);
1318 free_object (op);
1319 }
1320 return;
1321 }
1322 1221
1323 remove_ob (op); 1222 return;
1223 }
1224
1225 op->remove ();
1226
1324 if (!op->direction || (mflags & P_OUT_OF_MAP)) 1227 if (!op->direction || (mflags & P_OUT_OF_MAP))
1325 { 1228 {
1326 free_object (op); 1229 op->destroy ();
1327 return; 1230 return;
1328 } 1231 }
1329 op->x = new_x; 1232
1330 op->y = new_y; 1233 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) 1234 if (i > 0 && i != op->direction)
1334 { 1235 {
1335 op->direction = i; 1236 op->direction = i;
1336 SET_ANIMATION (op, op->direction); 1237 SET_ANIMATION (op, op->direction);
1337 } 1238 }
1338 insert_ob_in_map (op, op->map, op, 0); 1239
1240 m->insert (op, new_x, new_y, op);
1339} 1241}
1340 1242
1341/**************************************************************************** 1243/****************************************************************************
1342 * Destruction 1244 * Destruction
1343 ****************************************************************************/ 1245 ****************************************************************************/
… …
1346 * we do this by creating a force and inserting it in the 1248 * we do this by creating a force and inserting it in the
1347 * object. if time is 0, the object glows permanently. To truely 1249 * object. if time is 0, the object glows permanently. To truely
1348 * make this work for non-living objects, we would have to 1250 * make this work for non-living objects, we would have to
1349 * give them the capability to have an inventory. b.t. 1251 * give them the capability to have an inventory. b.t.
1350 */ 1252 */
1351
1352int 1253int
1353make_object_glow (object *op, int radius, int time) 1254make_object_glow (object *op, int radius, int time)
1354{ 1255{
1355 object *tmp;
1356
1357 /* some things are unaffected... */ 1256 /* some things are unaffected... */
1358 if (op->path_denied & PATH_LIGHT) 1257 if (op->path_denied & PATH_LIGHT)
1359 return 0; 1258 return 0;
1360 1259
1361 tmp = get_archetype (FORCE_NAME); 1260 object *tmp = get_archetype (FORCE_NAME);
1362 tmp->speed = 0.01; 1261 tmp->speed = 0.01;
1363 tmp->stats.food = time; 1262 tmp->stats.food = time;
1364 SET_FLAG (tmp, FLAG_IS_USED_UP); 1263 SET_FLAG (tmp, FLAG_IS_USED_UP);
1365 tmp->glow_radius = radius; 1264 tmp->glow_radius = radius;
1366 if (tmp->glow_radius > MAX_LIGHT_RADII) 1265 if (tmp->glow_radius > MAX_LIGHT_RADII)
1367 tmp->glow_radius = MAX_LIGHT_RADII; 1266 tmp->glow_radius = MAX_LIGHT_RADII;
1368 1267
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); 1268 tmp = insert_ob_in_ob (tmp, op);
1269
1374 if (tmp->glow_radius > op->glow_radius) 1270 if (tmp->glow_radius > op->glow_radius)
1375 op->glow_radius = tmp->glow_radius; 1271 op->glow_radius = tmp->glow_radius;
1376 1272
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; 1273 return 1;
1383} 1274}
1384
1385
1386
1387 1275
1388int 1276int
1389cast_destruction (object *op, object *caster, object *spell_ob) 1277cast_destruction (object *op, object *caster, object *spell_ob)
1390{ 1278{
1391 int i, j, range, mflags, friendly = 0, dam, dur; 1279 int i, j, range, mflags, friendly = 0, dam, dur;
1392 sint16 sx, sy; 1280 sint16 sx, sy;
1393 mapstruct *m; 1281 maptile *m;
1394 object *tmp; 1282 object *tmp;
1395 const char *skill; 1283 const char *skill;
1396 1284
1397 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob); 1285 range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
1398 dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob); 1286 dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
… …
1412 else if (caster->skill) 1300 else if (caster->skill)
1413 op->skill = caster->skill; 1301 op->skill = caster->skill;
1414 else 1302 else
1415 op->skill = NULL; 1303 op->skill = NULL;
1416 1304
1417 change_skill (op, find_skill_by_name (op, op->skill), 1); 1305 op->change_skill (find_skill_by_name (op, op->skill));
1418 1306
1419 for (i = -range; i < range; i++) 1307 for (i = -range; i < range; i++)
1420 { 1308 {
1421 for (j = -range; j < range; j++) 1309 for (j = -range; j < range; j++)
1422 { 1310 {
1423 m = op->map; 1311 m = op->map;
1424 sx = op->x + i; 1312 sx = op->x + i;
1425 sy = op->y + j; 1313 sy = op->y + j;
1314
1426 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy); 1315 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
1427 if (mflags & P_OUT_OF_MAP) 1316 if (mflags & P_OUT_OF_MAP)
1428 continue; 1317 continue;
1318
1429 if (mflags & P_IS_ALIVE) 1319 if (mflags & P_IS_ALIVE)
1430 { 1320 {
1431 for (tmp = get_map_ob (m, sx, sy); tmp; tmp = tmp->above) 1321 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)
1432 {
1433 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER) 1322 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER)
1434 break; 1323 break;
1435 } 1324
1436 if (tmp) 1325 if (tmp)
1437 { 1326 {
1438 if (tmp->head) 1327 if (tmp->head)
1439 tmp = tmp->head; 1328 tmp = tmp->head;
1440 1329
… …
1443 { 1332 {
1444 if (spell_ob->subtype == SP_DESTRUCTION) 1333 if (spell_ob->subtype == SP_DESTRUCTION)
1445 { 1334 {
1446 hit_player (tmp, dam, op, spell_ob->attacktype, 0); 1335 hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1447 if (spell_ob->other_arch) 1336 if (spell_ob->other_arch)
1448 {
1449 tmp = arch_to_object (spell_ob->other_arch); 1337 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 } 1338 }
1455 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100) 1339 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100)
1456 { 1340 {
1457 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch) 1341 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1458 {
1459 object *effect = arch_to_object (spell_ob->other_arch); 1342 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 } 1343 }
1466 } 1344 }
1467 } 1345 }
1468 } 1346 }
1469 } 1347 }
1470 } 1348 }
1349
1471 op->skill = skill; 1350 op->skill = skill;
1472 return 1; 1351 return 1;
1473} 1352}
1474 1353
1475/*************************************************************************** 1354/***************************************************************************
… …
1489 { 1368 {
1490 new_draw_info (NDI_UNIQUE, 0, op, "There is no one in that direction to curse."); 1369 new_draw_info (NDI_UNIQUE, 0, op, "There is no one in that direction to curse.");
1491 return 0; 1370 return 0;
1492 } 1371 }
1493 1372
1373 tmp = tmp->head_ ();
1374
1494 /* If we've already got a force of this type, don't add a new one. */ 1375 /* If we've already got a force of this type, don't add a new one. */
1495 for (force = tmp->inv; force != NULL; force = force->below) 1376 for (force = tmp->inv; force; force = force->below)
1496 { 1377 {
1497 if (force->type == FORCE && force->subtype == FORCE_CHANGE_ABILITY) 1378 if (force->type == FORCE && force->subtype == FORCE_CHANGE_ABILITY)
1498 { 1379 {
1499 if (force->name == spell_ob->name) 1380 if (force->name == spell_ob->name)
1500 { 1381 {
… …
1506 return 0; 1387 return 0;
1507 } 1388 }
1508 } 1389 }
1509 } 1390 }
1510 1391
1511 if (force == NULL) 1392 if (!force)
1512 { 1393 {
1513 force = get_archetype (FORCE_NAME); 1394 force = get_archetype (FORCE_NAME);
1514 force->subtype = FORCE_CHANGE_ABILITY; 1395 force->subtype = FORCE_CHANGE_ABILITY;
1396
1515 if (spell_ob->race) 1397 if (spell_ob->race)
1516 force->name = spell_ob->race; 1398 force->name = spell_ob->race;
1517 else 1399 else
1518 force->name = spell_ob->name; 1400 force->name = spell_ob->name;
1519 1401
… …
1529 { 1411 {
1530 force->duration = duration; 1412 force->duration = duration;
1531 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect."); 1413 new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
1532 } 1414 }
1533 else 1415 else
1534 {
1535 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect."); 1416 new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1536 } 1417
1537 return 1; 1418 return 1;
1538 } 1419 }
1420
1539 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50; 1421 force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1540 force->speed = 1.0; 1422 force->speed = 1.f;
1541 force->speed_left = -1.0; 1423 force->speed_left = -1.f;
1542 SET_FLAG (force, FLAG_APPLIED); 1424 SET_FLAG (force, FLAG_APPLIED);
1543 1425
1544 if (god) 1426 if (god)
1545 { 1427 {
1546 if (spell_ob->last_grace) 1428 if (spell_ob->last_grace)
… …
1559 force->stats.ac = spell_ob->stats.ac; 1441 force->stats.ac = spell_ob->stats.ac;
1560 force->stats.wc = spell_ob->stats.wc; 1442 force->stats.wc = spell_ob->stats.wc;
1561 1443
1562 change_abil (tmp, force); /* Mostly to display any messages */ 1444 change_abil (tmp, force); /* Mostly to display any messages */
1563 insert_ob_in_ob (force, tmp); 1445 insert_ob_in_ob (force, tmp);
1564 fix_player (tmp); 1446 tmp->update_stats ();
1565 return 1; 1447 return 1;
1566 1448
1567} 1449}
1568
1569 1450
1570/********************************************************************** 1451/**********************************************************************
1571 * mood change 1452 * mood change
1572 * Arguably, this may or may not be an attack spell. But since it 1453 * 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 1454 * effects monsters, it seems best to put it into this file
… …
1580mood_change (object *op, object *caster, object *spell) 1461mood_change (object *op, object *caster, object *spell)
1581{ 1462{
1582 object *tmp, *god, *head; 1463 object *tmp, *god, *head;
1583 int done_one, range, mflags, level, at, best_at; 1464 int done_one, range, mflags, level, at, best_at;
1584 sint16 x, y, nx, ny; 1465 sint16 x, y, nx, ny;
1585 mapstruct *m; 1466 maptile *m;
1586 const char *race; 1467 const char *race;
1587 1468
1588 /* We precompute some values here so that we don't have to keep 1469 /* We precompute some values here so that we don't have to keep
1589 * doing it over and over again. 1470 * doing it over and over again.
1590 */ 1471 */
… …
1603 else if (god && !strcmp (spell->race, "GOD_FRIEND")) 1484 else if (god && !strcmp (spell->race, "GOD_FRIEND"))
1604 race = god->race; 1485 race = god->race;
1605 else 1486 else
1606 race = spell->race; 1487 race = spell->race;
1607 1488
1608
1609 for (x = op->x - range; x <= op->x + range; x++) 1489 for (x = op->x - range; x <= op->x + range; x++)
1610 for (y = op->y - range; y <= op->y + range; y++) 1490 for (y = op->y - range; y <= op->y + range; y++)
1611 { 1491 {
1612
1613 done_one = 0; 1492 done_one = 0;
1614 m = op->map; 1493 m = op->map;
1615 nx = x; 1494 nx = x;
1616 ny = y; 1495 ny = y;
1617 mflags = get_map_flags (m, &m, x, y, &nx, &ny); 1496 mflags = get_map_flags (m, &m, x, y, &nx, &ny);
… …
1620 1499
1621 /* If there is nothing living on this space, no need to go further */ 1500 /* If there is nothing living on this space, no need to go further */
1622 if (!(mflags & P_IS_ALIVE)) 1501 if (!(mflags & P_IS_ALIVE))
1623 continue; 1502 continue;
1624 1503
1504 // players can only affect spaces that they can actually see
1505 if (caster && caster->contr
1506 && caster->contr->visibility_at (m, nx, ny) < 70)
1507 continue;
1508
1625 for (tmp = get_map_ob (m, nx, ny); tmp; tmp = tmp->above) 1509 for (tmp = GET_MAP_TOP (m, nx, ny); tmp; tmp = tmp->below)
1626 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 1510 if (QUERY_FLAG (tmp, FLAG_MONSTER))
1627 break; 1511 break;
1628 1512
1629 /* There can be living objects that are not monsters */ 1513 /* There can be living objects that are not monsters */
1630 if (!tmp || tmp->type == PLAYER) 1514 if (!tmp || tmp->type == PLAYER)
… …
1637 head = tmp; 1521 head = tmp;
1638 1522
1639 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */ 1523 /* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */
1640 if (race && head->race && !strstr (race, head->race)) 1524 if (race && head->race && !strstr (race, head->race))
1641 continue; 1525 continue;
1526
1642 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD)) 1527 if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD))
1643 continue; 1528 continue;
1644 1529
1645 /* Now do a bunch of stuff related to saving throws */ 1530 /* Now do a bunch of stuff related to saving throws */
1646 best_at = -1; 1531 best_at = -1;
… …
1663 at -= level / 5; 1548 at -= level / 5;
1664 if (did_make_save (head, head->level, at)) 1549 if (did_make_save (head, head->level, at))
1665 continue; 1550 continue;
1666 } 1551 }
1667 else /* spell->attacktype */ 1552 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 { 1553 {
1554 /*
1555 Spell has no attacktype (charm & such), so we'll have a specific saving:
1556 * if spell level < monster level, no go
1557 * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) )
1558
1559 The chance will then be in the range [20-70] percent, not too bad.
1560
1561 This is required to fix the 'charm monster' abuse, where a player level 1 can
1562 charm a level 125 monster...
1563
1564 Ryo, august 14th
1565 */
1681 if (head->level > level) 1566 if (head->level > level)
1682 continue; 1567 continue;
1568
1683 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level)))) 1569 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level))))
1684 /* Failed, no effect */ 1570 /* Failed, no effect */
1685 continue; 1571 continue;
1686 } 1572 }
1687 1573
1688 /* Done with saving throw. Now start effecting the monster */ 1574 /* Done with saving throw. Now start affecting the monster */
1689 1575
1690 /* aggravation */ 1576 /* aggravation */
1691 if (QUERY_FLAG (spell, FLAG_MONSTER)) 1577 if (QUERY_FLAG (spell, FLAG_MONSTER))
1692 { 1578 {
1693 CLEAR_FLAG (head, FLAG_SLEEP); 1579 CLEAR_FLAG (head, FLAG_SLEEP);
1694 if (QUERY_FLAG (head, FLAG_FRIENDLY))
1695 remove_friendly_object (head); 1580 remove_friendly_object (head);
1696
1697 done_one = 1; 1581 done_one = 1;
1698 head->enemy = op; 1582 head->enemy = op;
1699 } 1583 }
1700 1584
1701 /* calm monsters */ 1585 /* calm monsters */
… …
1710 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK)) 1594 if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK))
1711 { 1595 {
1712 SET_FLAG (head, FLAG_BERSERK); 1596 SET_FLAG (head, FLAG_BERSERK);
1713 done_one = 1; 1597 done_one = 1;
1714 } 1598 }
1599
1715 /* charm */ 1600 /* charm */
1716 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY)) 1601 if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY))
1717 { 1602 {
1718 SET_FLAG (head, FLAG_FRIENDLY); 1603 INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster));
1604
1719 /* Prevent uncontolled outbreaks of self replicating monsters. 1605 /* Prevent uncontrolled 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
2096
2097
2098 1962
2099/* cast_cause_disease: this spell looks along <dir> from the 1963/* cast_cause_disease: this spell looks along <dir> from the
2100 * player and infects someone. 1964 * player and infects someone.
2101 * op is the player/monster, caster is the object, dir is the direction 1965 * op is the player/monster, caster is the object, dir is the direction
2102 * to cast, disease_arch is the specific disease, and type is the spell number 1966 * to cast, disease_arch is the specific disease, and type is the spell number
2103 * perhaps this should actually be in disease.c? 1967 * perhaps this should actually be in disease.c?
2104 */ 1968 */
2105
2106int 1969int
2107cast_cause_disease (object *op, object *caster, object *spell, int dir) 1970cast_cause_disease (object *op, object *caster, object *spell, int dir)
2108{ 1971{
2109 sint16 x, y; 1972 sint16 x, y;
2110 int i, mflags, range, dam_mod, dur_mod; 1973 int i, mflags, range, dam_mod, dur_mod;
2111 object *walk; 1974 object *walk;
2112 mapstruct *m; 1975 maptile *m;
2113 1976
2114 x = op->x; 1977 x = op->x;
2115 y = op->y; 1978 y = op->y;
2116 1979
2117 /* If casting from a scroll, no direction will be available, so refer to the 1980 /* If casting from a scroll, no direction will be available, so refer to the
2118 * direction the player is pointing. 1981 * direction the player is pointing.
2119 */ 1982 */
2120 if (!dir) 1983 if (!dir)
2121 dir = op->facing; 1984 dir = op->facing;
1985
2122 if (!dir) 1986 if (!dir)
2123 return 0; /* won't find anything if casting on ourself, so just return */ 1987 return 0; /* won't find anything if casting on ourself, so just return */
2124 1988
2125 /* Calculate these once here */ 1989 /* Calculate these once here */
2126 range = spell->range + SP_level_range_adjust (caster, spell); 1990 range = spell->range + SP_level_range_adjust (caster, spell);
… …
2145 2009
2146 /* Only bother looking on this space if there is something living here */ 2010 /* Only bother looking on this space if there is something living here */
2147 if (mflags & P_IS_ALIVE) 2011 if (mflags & P_IS_ALIVE)
2148 { 2012 {
2149 /* search this square for a victim */ 2013 /* search this square for a victim */
2150 for (walk = get_map_ob (m, x, y); walk; walk = walk->above) 2014 for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above)
2151 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER)) 2015 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER))
2152 { /* found a victim */ 2016 { /* found a victim */
2153 object *disease = arch_to_object (spell->other_arch); 2017 object *disease = arch_to_object (spell->other_arch);
2154 2018
2155 set_owner (disease, op); 2019 disease->set_owner (op);
2156 set_spell_skill (op, caster, spell, disease); 2020 set_spell_skill (op, caster, spell, disease);
2157 disease->stats.exp = 0; 2021 disease->stats.exp = 0;
2158 disease->level = caster_level (caster, spell); 2022 disease->level = caster_level (caster, spell);
2159 2023
2160 /* do level adjustments */ 2024 /* do level adjustments */
2161 if (disease->stats.wc) 2025 if (disease->stats.wc)
2162 disease->stats.wc += dur_mod / 2; 2026 disease->stats.wc += dur_mod / 2;
2163 2027
2164 if (disease->magic > 0) 2028 if (disease->magic > 0)
2165 disease->magic += dur_mod / 4; 2029 disease->magic += dur_mod / 8;
2166 2030
2167 if (disease->stats.maxhp > 0) 2031 if (disease->stats.maxhp > 0)
2168 disease->stats.maxhp += dur_mod; 2032 disease->stats.maxhp += dur_mod;
2169 2033
2170 if (disease->stats.maxgrace > 0) 2034 if (disease->stats.maxgrace > 0)
… …
2205 if (disease->stats.sp) 2069 if (disease->stats.sp)
2206 disease->stats.sp -= dam_mod; 2070 disease->stats.sp -= dam_mod;
2207 2071
2208 if (infect_object (walk, disease, 1)) 2072 if (infect_object (walk, disease, 1))
2209 { 2073 {
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); 2074 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
2213 2075
2214 free_object (disease); /* don't need this one anymore */ 2076 disease->destroy (); /* don't need this one anymore */
2215 flash = get_archetype (ARCH_DETECT_MAGIC); 2077 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; 2078 return 1;
2221 } 2079 }
2222 free_object (disease); 2080
2081 disease->destroy ();
2223 } 2082 }
2224 } /* if living creature */ 2083 } /* if living creature */
2225 } /* for range of spaces */ 2084 } /* for range of spaces */
2085
2226 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!"); 2086 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!");
2227 return 1; 2087 return 1;
2228} 2088}

Diff Legend

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