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.23 by root, Mon Dec 25 11:25:50 2006 UTC vs.
Revision 1.25 by root, Tue Dec 26 20:04:09 2006 UTC

… …
27 */ 27 */
28 28
29#include <global.h> 29#include <global.h>
30#include <object.h> 30#include <object.h>
31#include <living.h> 31#include <living.h>
32#ifndef __CEXTRACT__
33# include <sproto.h> 32#include <sproto.h>
34#endif
35#include <spells.h> 33#include <spells.h>
36#include <sounds.h> 34#include <sounds.h>
37 35
38/* 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
39 * 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)
… …
149 tmp->stats.Dex -= 10; /* less forks from main bolt too */ 147 tmp->stats.Dex -= 10; /* less forks from main bolt too */
150 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */ 148 new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */
151 new_bolt->speed_left = -0.1; 149 new_bolt->speed_left = -0.1;
152 new_bolt->direction = t_dir; 150 new_bolt->direction = t_dir;
153 new_bolt->duration++; 151 new_bolt->duration++;
154 new_bolt->x = sx;
155 new_bolt->y = sy;
156 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */ 152 new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */
157 new_bolt->stats.dam++; 153 new_bolt->stats.dam++;
158 tmp->stats.dam /= 2; /* reduce father bolt damage */ 154 tmp->stats.dam /= 2; /* reduce father bolt damage */
159 tmp->stats.dam++; 155 tmp->stats.dam++;
160 new_bolt = insert_ob_in_map (new_bolt, m, op, 0); 156 if ((new_bolt = m->insert (new_bolt, sx, sy, op)))
161 update_turn_face (new_bolt); 157 update_turn_face (new_bolt);
162} 158}
163 159
164/* move_bolt: moves bolt 'op'. Basically, it just advances a space, 160/* move_bolt: moves bolt 'op'. Basically, it just advances a space,
165 * and checks for various things that may stop it. 161 * and checks for various things that may stop it.
166 */ 162 */
… …
171 object *tmp; 167 object *tmp;
172 int mflags; 168 int mflags;
173 sint16 x, y; 169 sint16 x, y;
174 maptile *m; 170 maptile *m;
175 171
176 if (--(op->duration) < 0) 172 if (--op->duration < 0)
177 { 173 {
178 op->destroy (); 174 op->destroy ();
179 return; 175 return;
180 } 176 }
181 177
… …
183 179
184 if (!op->direction) 180 if (!op->direction)
185 return; 181 return;
186 182
187 if (--op->range < 0) 183 if (--op->range < 0)
188 {
189 op->range = 0; 184 op->range = 0;
190 }
191 else 185 else
192 { 186 {
193 x = op->x + DIRX (op); 187 x = op->x + DIRX (op);
194 y = op->y + DIRY (op); 188 y = op->y + DIRY (op);
195 m = op->map; 189 m = op->map;
… …
203 * on the space. So only call reflwall if we think the data it returns 197 * on the space. So only call reflwall if we think the data it returns
204 * will be useful. 198 * will be useful.
205 */ 199 */
206 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op))) 200 if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op)))
207 { 201 {
208
209 if (!QUERY_FLAG (op, FLAG_REFLECTING)) 202 if (!QUERY_FLAG (op, FLAG_REFLECTING))
210 return; 203 return;
211 204
212 /* Since walls don't run diagonal, if the bolt is in 205 /* Since walls don't run diagonal, if the bolt is in
213 * one of 4 main directions, it just reflects back in the 206 * one of 4 main directions, it just reflects back in the
… …
243 else if (left) 236 else if (left)
244 op->direction = absdir (op->direction + 2); 237 op->direction = absdir (op->direction + 2);
245 else if (right) 238 else if (right)
246 op->direction = absdir (op->direction - 2); 239 op->direction = absdir (op->direction - 2);
247 } 240 }
241
248 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */ 242 update_turn_face (op); /* A bolt *must* be IS_TURNABLE */
249 return; 243 return;
250 } 244 }
251 else 245 else
252 { /* Create a copy of this object and put it ahead */ 246 { /* Create a copy of this object and put it ahead */
253 tmp = op->clone (); 247 object *tmp = op->clone ();
254 248
249 m->insert (tmp, x, y, op);
255 tmp->speed_left = -0.1; 250 tmp->speed_left = -0.1;
256 tmp->x += DIRX (tmp), tmp->y += DIRY (tmp);
257 tmp = insert_ob_in_map (tmp, op->map, op, 0);
258 /* To make up for the decrease at the top of the function */ 251 /* To make up for the decrease at the top of the function */
259 tmp->duration++; 252 tmp->duration++;
260 253
261 /* New forking code. Possibly create forks of this object 254 /* New forking code. Possibly create forks of this object
262 * going off in other directions. 255 * going off in other directions.
263 */ 256 */
264
265 if (rndm (0, 99) < tmp->stats.Dex) 257 if (rndm (0, 99) < tmp->stats.Dex)
266 { /* stats.Dex % of forking */ 258 { /* stats.Dex % of forking */
267 forklightning (op, tmp); 259 forklightning (op, tmp);
268 } 260 }
261
269 /* In this way, the object left behind sticks on the space, but 262 /* In this way, the object left behind sticks on the space, but
270 * doesn't create any bolts that continue to move onward. 263 * doesn't create any bolts that continue to move onward.
271 */ 264 */
272 op->range = 0; 265 op->range = 0;
273 } /* copy object and move it along */ 266 } /* copy object and move it along */
… …
338 tmp->y = op->y; 331 tmp->y = op->y;
339 tmp->direction = absdir (tmp->direction + 4); 332 tmp->direction = absdir (tmp->direction + 4);
340 tmp->map = op->map; 333 tmp->map = op->map;
341 } 334 }
342 335
343 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL) 336 if ((tmp = tmp->insert_at (tmp, op)))
344 move_bolt (tmp); 337 move_bolt (tmp);
345 338
346 return 1; 339 return 1;
347} 340}
348 341
… …
359 * At least that is what I think this does. 352 * At least that is what I think this does.
360 */ 353 */
361void 354void
362explosion (object *op) 355explosion (object *op)
363{ 356{
364 object *tmp;
365 maptile *m = op->map; 357 maptile *m = op->map;
366 int i; 358 int i;
367 359
368 if (--(op->duration) < 0) 360 if (--op->duration < 0)
369 { 361 {
370 op->destroy (); 362 op->destroy ();
371 return; 363 return;
372 } 364 }
373 365
… …
379 { 371 {
380 sint16 dx, dy; 372 sint16 dx, dy;
381 373
382 dx = op->x + freearr_x[i]; 374 dx = op->x + freearr_x[i];
383 dy = op->y + freearr_y[i]; 375 dy = op->y + freearr_y[i];
376
384 /* ok_to_put_more already does things like checks for walls, 377 /* ok_to_put_more already does things like checks for walls,
385 * out of map, etc. 378 * out of map, etc.
386 */ 379 */
387 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype)) 380 if (ok_to_put_more (op->map, dx, dy, op, op->attacktype))
388 { 381 {
389 tmp = op->clone (); 382 object *tmp = op->clone ();
383
390 tmp->state = 0; 384 tmp->state = 0;
391 tmp->speed_left = -0.21; 385 tmp->speed_left = -0.21;
392 tmp->range--; 386 tmp->range--;
393 tmp->value = 0; 387 tmp->value = 0;
394 tmp->x = dx; 388
395 tmp->y = dy; 389 m->insert (tmp, dx, dy, op);
396 insert_ob_in_map (tmp, m, op, 0);
397 } 390 }
398 } 391 }
399 } 392 }
400} 393}
401 394
… …
416 return; 409 return;
417 } 410 }
418 411
419 if (op->env) 412 if (op->env)
420 { 413 {
421 object *env;
422
423 env = object_get_env_recursive (op); 414 object *env = object_get_env_recursive (op);
424 if (env->map == NULL || out_of_map (env->map, env->x, env->y)) 415 if (env->map == NULL || out_of_map (env->map, env->x, env->y))
425 { 416 {
426 LOG (llevError, "BUG: explode_bullet(): env out of map\n"); 417 LOG (llevError, "BUG: explode_bullet(): env out of map\n");
427 op->destroy (); 418 op->destroy ();
428 return; 419 return;
429 } 420 }
430 421
431 op->remove (); 422 op->insert_at (env, op, INS_NO_MERGE | INS_NO_WALK_ON);
432 op->x = env->x;
433 op->y = env->y;
434 insert_ob_in_map (op, env->map, op, INS_NO_MERGE | INS_NO_WALK_ON);
435 } 423 }
436 else if (out_of_map (op->map, op->x, op->y)) 424 else if (out_of_map (op->map, op->x, op->y))
437 { 425 {
438 LOG (llevError, "BUG: explode_bullet(): op out of map\n"); 426 LOG (llevError, "BUG: explode_bullet(): op out of map\n");
439 op->destroy (); 427 op->destroy ();
… …
468 { 456 {
469 op->destroy (); 457 op->destroy ();
470 return; 458 return;
471 } 459 }
472 460
473 tmp->x = op->x;
474 tmp->y = op->y;
475
476 /* special for bombs - it actually has sane values for these */ 461 /* special for bombs - it actually has sane values for these */
477 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB) 462 if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB)
478 { 463 {
479 tmp->attacktype = op->attacktype; 464 tmp->attacktype = op->attacktype;
480 tmp->range = op->range; 465 tmp->range = op->range;
… …
483 } 468 }
484 else 469 else
485 { 470 {
486 if (op->attacktype & AT_MAGIC) 471 if (op->attacktype & AT_MAGIC)
487 tmp->attacktype |= AT_MAGIC; 472 tmp->attacktype |= AT_MAGIC;
473
488 /* Spell doc describes what is going on here */ 474 /* Spell doc describes what is going on here */
489 tmp->stats.dam = op->dam_modifier; 475 tmp->stats.dam = op->dam_modifier;
490 tmp->range = op->stats.maxhp; 476 tmp->range = op->stats.maxhp;
491 tmp->duration = op->stats.hp; 477 tmp->duration = op->stats.hp;
492 /* Used for spell tracking - just need a unique val for this spell - 478 /* Used for spell tracking - just need a unique val for this spell -
… …
500 tmp->stats.sp = op->direction; 486 tmp->stats.sp = op->direction;
501 487
502 /* Prevent recursion */ 488 /* Prevent recursion */
503 op->move_on = 0; 489 op->move_on = 0;
504 490
505 insert_ob_in_map (tmp, op->map, op, 0); 491 tmp->insert_at (op, op);
506 /* remove the firebullet */ 492 /* remove the firebullet */
507 if (!op->destroyed ())
508 {
509 op->destroy (); 493 op->destroy ();
510 }
511} 494}
512
513
514 495
515/* checks to see what op should do, given the space it is on 496/* checks to see what op should do, given the space it is on
516 * (eg, explode, damage player, etc) 497 * (eg, explode, damage player, etc)
517 */ 498 */
518
519void 499void
520check_bullet (object *op) 500check_bullet (object *op)
521{ 501{
522 object *tmp; 502 object *tmp;
523 int dam, mflags; 503 int dam, mflags;
… …
612 op->destroy (); 592 op->destroy ();
613 593
614 return; 594 return;
615 } 595 }
616 596
617 op->remove (); 597 if (!(op = m->insert (op, new_x, new_y, op)))
618 op->x = new_x;
619 op->y = new_y;
620 if ((op = insert_ob_in_map (op, m, op, 0)) == NULL)
621 return; 598 return;
622 599
623 if (reflwall (op->map, op->x, op->y, op)) 600 if (reflwall (op->map, op->x, op->y, op))
624 { 601 {
625 op->direction = absdir (op->direction + 4); 602 op->direction = absdir (op->direction + 4);
… …
700 tmp->y = op->y; 677 tmp->y = op->y;
701 tmp->direction = absdir (tmp->direction + 4); 678 tmp->direction = absdir (tmp->direction + 4);
702 tmp->map = op->map; 679 tmp->map = op->map;
703 } 680 }
704 681
705 if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0))) 682 if ((tmp = tmp->insert_at (tmp, op)))
706 check_bullet (tmp); 683 check_bullet (tmp);
707 684
708 return 1; 685 return 1;
709} 686}
710 687
… …
722void 699void
723cone_drop (object *op) 700cone_drop (object *op)
724{ 701{
725 object *new_ob = arch_to_object (op->other_arch); 702 object *new_ob = arch_to_object (op->other_arch);
726 703
727 new_ob->x = op->x;
728 new_ob->y = op->y;
729 new_ob->level = op->level; 704 new_ob->level = op->level;
730 new_ob->set_owner (op->owner); 705 new_ob->set_owner (op->owner);
731 706
732 /* preserve skill ownership */ 707 /* preserve skill ownership */
733 if (op->skill && op->skill != new_ob->skill) 708 if (op->skill && op->skill != new_ob->skill)
734 {
735 new_ob->skill = op->skill; 709 new_ob->skill = op->skill;
736 }
737 insert_ob_in_map (new_ob, op->map, op, 0);
738 710
711 new_ob->insert_at (op, op);
739} 712}
740 713
741/* move_cone: causes cone object 'op' to move a space/hit creatures */ 714/* move_cone: causes cone object 'op' to move a space/hit creatures */
742 715
743void 716void
… …
747 720
748 /* if no map then hit_map will crash so just ignore object */ 721 /* if no map then hit_map will crash so just ignore object */
749 if (!op->map) 722 if (!op->map)
750 { 723 {
751 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown"); 724 LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown");
752 op->speed = 0; 725 op->set_speed (0);
753 update_ob_speed (op);
754 return; 726 return;
755 } 727 }
756 728
757 /* lava saves it's life, but not yours :) */ 729 /* lava saves it's life, but not yours :) */
758 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 730 if (QUERY_FLAG (op, FLAG_LIFESAVE))
… …
806 778
807 if (ok_to_put_more (op->map, x, y, op, op->attacktype)) 779 if (ok_to_put_more (op->map, x, y, op, op->attacktype))
808 { 780 {
809 object *tmp = op->clone (); 781 object *tmp = op->clone ();
810 782
811 tmp->x = x;
812 tmp->y = y;
813
814 tmp->duration = op->duration + 1; 783 tmp->duration = op->duration + 1;
815 784
816 /* Use for spell tracking - see ok_to_put_more() */ 785 /* Use for spell tracking - see ok_to_put_more() */
817 tmp->stats.maxhp = op->stats.maxhp; 786 tmp->stats.maxhp = op->stats.maxhp;
818 insert_ob_in_map (tmp, op->map, op, 0); 787
788 op->map->insert (tmp, x, y, op);
789
819 if (tmp->other_arch) 790 if (tmp->other_arch)
820 cone_drop (tmp); 791 cone_drop (tmp);
821 } 792 }
822 } 793 }
823} 794}
… …
902 success = 1; 873 success = 1;
903 tmp = arch_to_object (spell->other_arch); 874 tmp = arch_to_object (spell->other_arch);
904 tmp->set_owner (op); 875 tmp->set_owner (op);
905 set_spell_skill (op, caster, spell, tmp); 876 set_spell_skill (op, caster, spell, tmp);
906 tmp->level = caster_level (caster, spell); 877 tmp->level = caster_level (caster, spell);
907 tmp->x = sx;
908 tmp->y = sy;
909 tmp->attacktype = spell->attacktype; 878 tmp->attacktype = spell->attacktype;
910 879
911 /* holy word stuff */ 880 /* holy word stuff */
912 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER)) 881 if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER))
913 if (!tailor_god_spell (tmp, op)) 882 if (!tailor_god_spell (tmp, op))
… …
950 919
951 if (!(tmp->move_type & MOVE_FLY_LOW)) 920 if (!(tmp->move_type & MOVE_FLY_LOW))
952 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->name); 921 LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->name);
953 922
954 if (!tmp->move_on && tmp->stats.dam) 923 if (!tmp->move_on && tmp->stats.dam)
955 {
956 LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->name); 924 LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->name);
957 }
958 925
959 insert_ob_in_map (tmp, m, op, 0); 926 m->insert (tmp, sx, sy, op);
960 927
961 /* This is used for tracking spells so that one effect doesn't hit 928 /* This is used for tracking spells so that one effect doesn't hit
962 * a single space too many times. 929 * a single space too many times.
963 */ 930 */
964 tmp->stats.maxhp = tmp->count; 931 tmp->stats.maxhp = tmp->count;
… …
983void 950void
984animate_bomb (object *op) 951animate_bomb (object *op)
985{ 952{
986 int i; 953 int i;
987 object *env, *tmp; 954 object *env, *tmp;
988 archetype *at;
989 955
990 if (op->state != NUM_ANIMATIONS (op) - 1) 956 if (op->state != NUM_ANIMATIONS (op) - 1)
991 return; 957 return;
992 958
993 env = object_get_env_recursive (op); 959 env = object_get_env_recursive (op);
… …
998 return; 964 return;
999 965
1000 if (env->type == PLAYER) 966 if (env->type == PLAYER)
1001 esrv_del_item (env->contr, op->count); 967 esrv_del_item (env->contr, op->count);
1002 968
1003 op->remove (); 969 if (!(op = op->insert_at (env, op)))
1004 op->x = env->x;
1005 op->y = env->y;
1006 if ((op = insert_ob_in_map (op, env->map, op, 0)) == NULL)
1007 return; 970 return;
1008 } 971 }
1009 972
1010 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding 973 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding
1011 // on a safe map. I don't like this special casing, but it seems to be neccessary 974 // on a safe map. I don't like this special casing, but it seems to be neccessary
… …
1018 981
1019 /* This copies a lot of the code from the fire bullet, 982 /* This copies a lot of the code from the fire bullet,
1020 * but using the cast_bullet isn't really feasible, 983 * but using the cast_bullet isn't really feasible,
1021 * so just set up the appropriate values. 984 * so just set up the appropriate values.
1022 */ 985 */
1023 at = archetype::find (SPLINT); 986 if (archetype *at = archetype::find (SPLINT))
1024 if (at)
1025 { 987 {
1026 for (i = 1; i < 9; i++) 988 for (i = 1; i < 9; i++)
1027 { 989 {
1028 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i])) 990 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i]))
1029 continue; 991 continue;
992
1030 tmp = arch_to_object (at); 993 tmp = arch_to_object (at);
1031 tmp->direction = i; 994 tmp->direction = i;
1032 tmp->range = op->range; 995 tmp->range = op->range;
1033 tmp->stats.dam = op->stats.dam; 996 tmp->stats.dam = op->stats.dam;
1034 tmp->duration = op->duration; 997 tmp->duration = op->duration;
1035 tmp->attacktype = op->attacktype; 998 tmp->attacktype = op->attacktype;
1036 tmp->set_owner (op); 999 tmp->set_owner (op);
1037 if (op->skill && op->skill != tmp->skill) 1000 if (op->skill && op->skill != tmp->skill)
1038 {
1039 tmp->skill = op->skill; 1001 tmp->skill = op->skill;
1040 } 1002
1041 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE)) 1003 if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
1042 SET_ANIMATION (tmp, i); 1004 SET_ANIMATION (tmp, i);
1043 tmp->x = op->x + freearr_x[i]; 1005
1044 tmp->y = op->y + freearr_x[i]; 1006 op->map->insert (tmp, op->x + freearr_x[i], op->y + freearr_x[i], op);
1045 insert_ob_in_map (tmp, op->map, op, 0);
1046 move_bullet (tmp); 1007 move_bullet (tmp);
1047 } 1008 }
1048 } 1009 }
1049 1010
1050 explode_bullet (op); 1011 explode_bullet (op);
… …
1073 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 1034 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
1074 tmp->attacktype = spell->attacktype; 1035 tmp->attacktype = spell->attacktype;
1075 1036
1076 tmp->set_owner (op); 1037 tmp->set_owner (op);
1077 set_spell_skill (op, caster, spell, tmp); 1038 set_spell_skill (op, caster, spell, tmp);
1078 tmp->x = dx; 1039
1079 tmp->y = dy; 1040 m->insert (tmp, dx, dy, op);
1080 insert_ob_in_map (tmp, m, op, 0);
1081 return 1; 1041 return 1;
1082} 1042}
1083 1043
1084/**************************************************************************** 1044/****************************************************************************
1085 * 1045 *
… …
1228 1188
1229 effect->set_owner (op); 1189 effect->set_owner (op);
1230 set_spell_skill (op, caster, spell, effect); 1190 set_spell_skill (op, caster, spell, effect);
1231 1191
1232 /* ok, tell it where to be, and insert! */ 1192 /* ok, tell it where to be, and insert! */
1233 effect->x = target->x; 1193 effect->insert_at (target, op);
1234 effect->y = target->y;
1235 insert_ob_in_map (effect, target->map, op, 0);
1236 1194
1237 return 1; 1195 return 1;
1238} 1196}
1239 1197
1240 1198
… …
1295 { 1253 {
1296 op->destroy (); 1254 op->destroy ();
1297 return; 1255 return;
1298 } 1256 }
1299 1257
1300 op->x = new_x;
1301 op->y = new_y;
1302 op->map = m;
1303 i = spell_find_dir (op->map, op->x, op->y, op->owner); 1258 i = spell_find_dir (m, new_x, new_y, op->owner);
1304 if (i > 0 && i != op->direction) 1259 if (i > 0 && i != op->direction)
1305 { 1260 {
1306 op->direction = i; 1261 op->direction = i;
1307 SET_ANIMATION (op, op->direction); 1262 SET_ANIMATION (op, op->direction);
1308 } 1263 }
1309 1264
1310 insert_ob_in_map (op, op->map, op, 0); 1265 m->insert (op, new_x, new_y, op);
1311} 1266}
1312 1267
1313/**************************************************************************** 1268/****************************************************************************
1314 * Destruction 1269 * Destruction
1315 ****************************************************************************/ 1270 ****************************************************************************/
… …
1393 for (j = -range; j < range; j++) 1348 for (j = -range; j < range; j++)
1394 { 1349 {
1395 m = op->map; 1350 m = op->map;
1396 sx = op->x + i; 1351 sx = op->x + i;
1397 sy = op->y + j; 1352 sy = op->y + j;
1353
1398 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy); 1354 mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
1399 if (mflags & P_OUT_OF_MAP) 1355 if (mflags & P_OUT_OF_MAP)
1400 continue; 1356 continue;
1357
1401 if (mflags & P_IS_ALIVE) 1358 if (mflags & P_IS_ALIVE)
1402 { 1359 {
1403 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 1360 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)
1404 {
1405 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER) 1361 if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER)
1406 break; 1362 break;
1407 } 1363
1408 if (tmp) 1364 if (tmp)
1409 { 1365 {
1410 if (tmp->head) 1366 if (tmp->head)
1411 tmp = tmp->head; 1367 tmp = tmp->head;
1412 1368
… …
1415 { 1371 {
1416 if (spell_ob->subtype == SP_DESTRUCTION) 1372 if (spell_ob->subtype == SP_DESTRUCTION)
1417 { 1373 {
1418 hit_player (tmp, dam, op, spell_ob->attacktype, 0); 1374 hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1419 if (spell_ob->other_arch) 1375 if (spell_ob->other_arch)
1420 {
1421 tmp = arch_to_object (spell_ob->other_arch); 1376 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op);
1422 tmp->x = sx;
1423 tmp->y = sy;
1424 insert_ob_in_map (tmp, m, op, 0);
1425 }
1426 } 1377 }
1427 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100) 1378 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100)
1428 { 1379 {
1429 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch) 1380 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1430 {
1431 object *effect = arch_to_object (spell_ob->other_arch); 1381 m->insert (arch_to_object (spell_ob->other_arch), sx, sy, op);
1432
1433 effect->x = sx;
1434 effect->y = sy;
1435 insert_ob_in_map (effect, m, op, 0);
1436 }
1437 } 1382 }
1438 } 1383 }
1439 } 1384 }
1440 } 1385 }
1441 } 1386 }
1442 } 1387 }
1388
1443 op->skill = skill; 1389 op->skill = skill;
1444 return 1; 1390 return 1;
1445} 1391}
1446 1392
1447/*************************************************************************** 1393/***************************************************************************
… …
1701 head->stats.exp = 0; 1647 head->stats.exp = 0;
1702 } 1648 }
1703 1649
1704 /* If a monster was effected, put an effect in */ 1650 /* If a monster was effected, put an effect in */
1705 if (done_one && spell->other_arch) 1651 if (done_one && spell->other_arch)
1706 {
1707 tmp = arch_to_object (spell->other_arch); 1652 m->insert (arch_to_object (spell->other_arch), nx, ny, op);
1708 tmp->x = nx;
1709 tmp->y = ny;
1710 insert_ob_in_map (tmp, m, op, 0);
1711 }
1712 } /* for y */ 1653 } /* for y */
1713 1654
1714 return 1; 1655 return 1;
1715} 1656}
1716 1657
… …
1767 nx = op->x; 1708 nx = op->x;
1768 ny = op->y; 1709 ny = op->y;
1769 m = op->map; 1710 m = op->map;
1770 } 1711 }
1771 1712
1772 op->remove (); 1713 m->insert (op, nx, ny, op);
1773 op->y = ny;
1774 op->x = nx;
1775 insert_ob_in_map (op, m, op, 0);
1776 1714
1777 dam_save = op->stats.dam; /* save the original dam: we do halfdam on 1715 dam_save = op->stats.dam; /* save the original dam: we do halfdam on
1778 surrounding squares */ 1716 surrounding squares */
1779 1717
1780 /* loop over current square and neighbors to hit. 1718 /* loop over current square and neighbors to hit.
… …
1806 1744
1807 } 1745 }
1808 1746
1809 /* insert the other arch */ 1747 /* insert the other arch */
1810 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))) 1748 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))))
1811 { 1749 m->insert (arch_to_object (op->other_arch), hx, hy, op);
1812 new_ob = arch_to_object (op->other_arch);
1813 new_ob->x = hx;
1814 new_ob->y = hy;
1815 insert_ob_in_map (new_ob, m, op, 0);
1816 }
1817 } 1750 }
1818 1751
1819 /* restore to the center location and damage */ 1752 /* restore to the center location and damage */
1820 op->stats.dam = dam_save; 1753 op->stats.dam = dam_save;
1821 1754
… …
1824 if (i >= 0) 1757 if (i >= 0)
1825 { /* we have a preferred direction! */ 1758 { /* we have a preferred direction! */
1826 /* pick another direction if the preferred dir is blocked. */ 1759 /* pick another direction if the preferred dir is blocked. */
1827 if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP || 1760 if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP ||
1828 OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))) 1761 OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))
1829 {
1830 i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */ 1762 i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */
1831 } 1763
1832 op->direction = i; 1764 op->direction = i;
1833 } 1765 }
1834} 1766}
1835 1767
1836 1768
… …
1966 1898
1967 if (!spell->other_arch) 1899 if (!spell->other_arch)
1968 return 0; 1900 return 0;
1969 1901
1970 tmp = get_archetype (SWARM_SPELL); 1902 tmp = get_archetype (SWARM_SPELL);
1971 tmp->x = op->x;
1972 tmp->y = op->y;
1973 tmp->set_owner (op); /* needed so that if swarm elements kill, caster gets xp. */ 1903 tmp->set_owner (op); /* needed so that if swarm elements kill, caster gets xp. */
1974 set_spell_skill (op, caster, spell, tmp); 1904 set_spell_skill (op, caster, spell, tmp);
1975 1905
1976 tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */ 1906 tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */
1977 tmp->spell = arch_to_object (spell->other_arch); 1907 tmp->spell = arch_to_object (spell->other_arch);
1978 1908
1979 tmp->attacktype = tmp->spell->attacktype; 1909 tmp->attacktype = tmp->spell->attacktype;
1980 1910
1981 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) 1911 if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
1982 {
1983 if (!tailor_god_spell (tmp, op)) 1912 if (!tailor_god_spell (tmp, op))
1984 return 1; 1913 return 1;
1985 } 1914
1986 tmp->duration = SP_level_duration_adjust (caster, spell); 1915 tmp->duration = SP_level_duration_adjust (caster, spell);
1987 for (i = 0; i < spell->duration; i++) 1916 for (i = 0; i < spell->duration; i++)
1988 tmp->duration += die_roll (1, 3, op, PREFER_HIGH); 1917 tmp->duration += die_roll (1, 3, op, PREFER_HIGH);
1989 1918
1990 tmp->direction = dir; 1919 tmp->direction = dir;
1991 tmp->invisible = 1; 1920 tmp->invisible = 1;
1992 insert_ob_in_map (tmp, op->map, op, 0); 1921
1922 tmp->insert_at (op, op);
1993 return 1; 1923 return 1;
1994} 1924}
1995 1925
1996 1926
1997/* See the spells documentation file for why this is its own 1927/* See the spells documentation file for why this is its own
… …
2057 { 1987 {
2058 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell); 1988 tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell);
2059 if (tmp->glow_radius > MAX_LIGHT_RADII) 1989 if (tmp->glow_radius > MAX_LIGHT_RADII)
2060 tmp->glow_radius = MAX_LIGHT_RADII; 1990 tmp->glow_radius = MAX_LIGHT_RADII;
2061 } 1991 }
2062 tmp->x = x; 1992
2063 tmp->y = y; 1993 m->insert (tmp, x, y, op);
2064 insert_ob_in_map (tmp, m, op, 0);
2065 return 1; 1994 return 1;
2066} 1995}
2067 1996
2068 1997
2069 1998
… …
2182 object *flash; /* visual effect for inflicting disease */ 2111 object *flash; /* visual effect for inflicting disease */
2183 2112
2184 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name); 2113 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
2185 2114
2186 disease->destroy (); /* don't need this one anymore */ 2115 disease->destroy (); /* don't need this one anymore */
2187 flash = get_archetype (ARCH_DETECT_MAGIC); 2116 walk->map->insert (get_archetype (ARCH_DETECT_MAGIC), x, y, op);
2188 flash->x = x;
2189 flash->y = y;
2190 flash->map = walk->map;
2191 insert_ob_in_map (flash, walk->map, op, 0);
2192 return 1; 2117 return 1;
2193 } 2118 }
2194 2119
2195 disease->destroy (); 2120 disease->destroy ();
2196 } 2121 }
2197 } /* if living creature */ 2122 } /* if living creature */
2198 } /* for range of spaces */ 2123 } /* for range of spaces */
2124
2199 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!"); 2125 new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!");
2200 return 1; 2126 return 1;
2201} 2127}

Diff Legend

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