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.24 by root, Tue Dec 26 08:55:00 2006 UTC vs.
Revision 1.25 by root, Tue Dec 26 20:04:09 2006 UTC

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

Diff Legend

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