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.77 by root, Wed Dec 31 17:35:38 2008 UTC vs.
Revision 1.95 by elmex, Tue Jan 19 16:13:05 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/* This file contains all the spell attack code. Grouping this code 25/* This file contains all the spell attack code. Grouping this code
… …
36/* this function checks to see if a spell pushes objects as well 37/* this function checks to see if a spell pushes objects as well
37 * as flies over and damages them (only used for cones for now) 38 * as flies over and damages them (only used for cones for now)
38 * but moved here so it could be applied to bolts too 39 * but moved here so it could be applied to bolts too
39 * op is the spell object. 40 * op is the spell object.
40 */ 41 */
41void 42static void
42check_spell_knockback (object *op) 43check_spell_knockback (object *op)
43{ 44{
44 int weight_move; 45 int weight_move;
45 int frictionmod = 2; /*poor man's physics - multipy targets weight by this amount */ 46 int frictionmod = 2; /*poor man's physics - multipy targets weight by this amount */
46 47
… …
107 ***************************************************************************/ 108 ***************************************************************************/
108 109
109/* Causes op to fork. op is the original bolt, tmp 110/* Causes op to fork. op is the original bolt, tmp
110 * is the first piece of the fork. 111 * is the first piece of the fork.
111 */ 112 */
112void 113static void
113forklightning (object *op, object *tmp) 114forklightning (object *op, object *tmp)
114{ 115{
115 int new_dir = 1; /* direction or -1 for left, +1 for right 0 if no new bolt */ 116 int new_dir = 1; /* direction or -1 for left, +1 for right 0 if no new bolt */
116 int t_dir; /* stores temporary dir calculation */ 117 int t_dir; /* stores temporary dir calculation */
117 maptile *m; 118 maptile *m;
… …
276 int mflags; 277 int mflags;
277 278
278 if (!spob->other_arch) 279 if (!spob->other_arch)
279 return 0; 280 return 0;
280 281
281 tmp = arch_to_object (spob->other_arch); 282 tmp = spob->other_arch->instance ();
282 if (tmp == NULL) 283 if (tmp == NULL)
283 return 0; 284 return 0;
284 285
285 /* peterm: level dependency for bolts */ 286 /* peterm: level dependency for bolts */
286 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob); 287 tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob);
… …
388 389
389/* Causes an object to explode, eg, a firebullet, 390/* Causes an object to explode, eg, a firebullet,
390 * poison cloud ball, etc. op is the object to 391 * poison cloud ball, etc. op is the object to
391 * explode. 392 * explode.
392 */ 393 */
393void 394static void
394explode_bullet (object *op) 395explode_bullet (object *op)
395{ 396{
396 object *tmp, *owner; 397 object *tmp, *owner;
397 398
398 if (!op->other_arch) 399 if (!op->other_arch)
… …
438 if (op->destroyed ()) 439 if (op->destroyed ())
439 return; 440 return;
440 } 441 }
441 442
442 /* other_arch contains what this explodes into */ 443 /* other_arch contains what this explodes into */
443 tmp = arch_to_object (op->other_arch); 444 tmp = op->other_arch->instance ();
444 445
445 tmp->set_owner (op); 446 tmp->set_owner (op);
446 tmp->skill = op->skill; 447 tmp->skill = op->skill;
447 448
448 owner = op->owner; 449 owner = op->owner;
… …
545 * fired arches (eg, bolts). 546 * fired arches (eg, bolts).
546 */ 547 */
547void 548void
548move_bullet (object *op) 549move_bullet (object *op)
549{ 550{
550 sint16 new_x, new_y;
551 int mflags;
552 maptile *m;
553
554#if 0 551#if 0
555 /* We need a better general purpose way to do this */ 552 /* We need a better general purpose way to do this */
556 553
557 /* peterm: added to make comet leave a trail of burnouts 554 /* peterm: added to make comet leave a trail of burnouts
558 it's an unadulterated hack, but the effect is cool. */ 555 it's an unadulterated hack, but the effect is cool. */
… …
573 op->destroy (); 570 op->destroy ();
574 571
575 return; 572 return;
576 } 573 }
577 574
578 new_x = op->x + DIRX (op); 575 mapxy pos (op);
579 new_y = op->y + DIRY (op); 576 pos.move (op->direction);
580 m = op->map;
581 mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y);
582 577
583 if (mflags & P_OUT_OF_MAP) 578 if (!pos.normalise ())
584 { 579 {
585 op->destroy (); 580 op->destroy ();
586 return; 581 return;
587 } 582 }
588 583
589 if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))) 584 mapspace &ms = pos.ms ();
585
586 ms.update ();
587
588 if (!op->direction || OB_TYPE_MOVE_BLOCK (op, ms.move_block))
590 { 589 {
591 if (op->other_arch) 590 if (op->other_arch)
592 explode_bullet (op); 591 explode_bullet (op);
593 else 592 else
594 op->destroy (); 593 op->destroy ();
595 594
596 return; 595 return;
597 } 596 }
598 597
599 if (!(op = m->insert (op, new_x, new_y, op))) 598 if (!(op = pos.insert (op, op)))
600 return; 599 return;
601 600
602 if (reflwall (op->map, op->x, op->y, op)) 601 if (reflwall (op->map, op->x, op->y, op))
603 { 602 {
604 op->direction = absdir (op->direction + 4); 603 op->direction = absdir (op->direction + 4);
… …
661 return 0; 660 return 0;
662 } 661 }
663 662
664 tmp->map = newmap; 663 tmp->map = newmap;
665 664
665 // in case the bullet has direction 0 we explode it in place.
666 // direction 0 is possible for instance when a poison cloud trap springs.
667 if (tmp->direction == 0)
668 {
669 if (tmp->other_arch
670 && (tmp = tmp->insert_at (tmp, op))) // insert before explode cleanly
671 explode_bullet (tmp); // explode object will/should remove tmp
672 else
673 tmp->destroy ();
674
675 return 0;
676 }
677
666 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y))) 678 if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
667 { 679 {
668 if (!QUERY_FLAG (tmp, FLAG_REFLECTING)) 680 if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
669 { 681 {
670 tmp->destroy (); 682 tmp->destroy ();
… …
688 * CONE RELATED FUNCTIONS 700 * CONE RELATED FUNCTIONS
689 * 701 *
690 *****************************************************************************/ 702 *****************************************************************************/
691 703
692/* drops an object based on what is in the cone's "other_arch" */ 704/* drops an object based on what is in the cone's "other_arch" */
693void 705static void
694cone_drop (object *op) 706cone_drop (object *op)
695{ 707{
696 object *new_ob = arch_to_object (op->other_arch); 708 object *new_ob = op->other_arch->instance ();
697 709
698 new_ob->level = op->level; 710 new_ob->level = op->level;
699 new_ob->set_owner (op->owner); 711 new_ob->set_owner (op->owner);
700 712
701 /* preserve skill ownership */ 713 /* preserve skill ownership */
… …
828 */ 840 */
829 movetype = spell->other_arch->move_type; 841 movetype = spell->other_arch->move_type;
830 842
831 for (i = range_min; i <= range_max; i++) 843 for (i = range_min; i <= range_max; i++)
832 { 844 {
833 sint16 x, y, d; 845 sint16 x, y;
834 846
835 /* We can't use absdir here, because it never returns 847 /* We can't use absdir here, because it never returns
836 * 0. If this is a rune, we want to hit the person on top 848 * 0. If this is a rune, we want to hit the person on top
837 * of the trap (d==0). If it is not a rune, then we don't want 849 * of the trap (d==0). If it is not a rune, then we don't want
838 * to hit that person. 850 * to hit that person.
839 */ 851 */
840 d = (dir + i) % 9; 852 int d = dir ? absdir (dir + i) : i;
841 853
842 /* If it's not a rune, we don't want to blast the caster. 854 /* If it's not a rune, we don't want to blast the caster.
843 * In that case, we have to see - if dir is specified, 855 * In that case, we have to see - if dir is specified,
844 * turn this into direction 8. If dir is not specified (all 856 * turn this into direction 8. If dir is not specified (all
845 * direction) skip - otherwise, one line would do more damage 857 * direction) skip - otherwise, one line would do more damage
… …
862 874
863 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype) 875 if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype)
864 continue; 876 continue;
865 877
866 success = 1; 878 success = 1;
867 tmp = arch_to_object (spell->other_arch); 879 tmp = spell->other_arch->instance ();
868 tmp->set_owner (op); 880 tmp->set_owner (op);
869 set_spell_skill (op, caster, spell, tmp); 881 set_spell_skill (op, caster, spell, tmp);
870 tmp->level = casting_level (caster, spell); 882 tmp->level = casting_level (caster, spell);
871 tmp->attacktype = spell->attacktype; 883 tmp->attacktype = spell->attacktype;
872 884
… …
947 959
948 object *env = op->outer_env (); 960 object *env = op->outer_env ();
949 961
950 if (op->env) 962 if (op->env)
951 { 963 {
952 if (env->map == NULL) 964 if (!env->map)
953 return; 965 return;
954 966
955 if (!(op = op->insert_at (env, op))) 967 if (!(op = op->insert_at (env, op)))
956 return; 968 return;
957 } 969 }
958 970
959 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding 971 // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding
960 // on a safe map. I don't like this special casing, but it seems to be neccessary 972 // on a safe map. I don't like this special casing, but it seems to be neccessary
961 // as bombs can be carried. 973 // as bombs can be carried.
962 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 974 if (op->ms ().flags () & P_SAFE)
963 { 975 {
964 op->destroy (); 976 op->destroy ();
965 return; 977 return;
966 } 978 }
967 979
… …
974 for (int i = 1; i < 9; i++) 986 for (int i = 1; i < 9; i++)
975 { 987 {
976 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i])) 988 if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i]))
977 continue; 989 continue;
978 990
979 object *tmp = arch_to_object (at); 991 object *tmp = at->instance ();
980 tmp->direction = i; 992 tmp->direction = i;
981 tmp->range = op->range; 993 tmp->range = op->range;
982 tmp->stats.dam = op->stats.dam; 994 tmp->stats.dam = op->stats.dam;
983 tmp->duration = op->duration; 995 tmp->duration = op->duration;
984 tmp->attacktype = op->attacktype; 996 tmp->attacktype = op->attacktype;
… …
1018 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 1030 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
1019 return 0; 1031 return 0;
1020 } 1032 }
1021 } 1033 }
1022 1034
1023 tmp = arch_to_object (spell->other_arch); 1035 tmp = spell->other_arch->instance ();
1024 1036
1025 /* level dependencies for bomb */ 1037 /* level dependencies for bomb */
1026 tmp->range = spell->range + SP_level_range_adjust (caster, spell); 1038 tmp->range = spell->range + SP_level_range_adjust (caster, spell);
1027 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell); 1039 tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1028 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell); 1040 tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
… …
1048 * dir is the direction to look in. 1060 * dir is the direction to look in.
1049 * range is how far out to look. 1061 * range is how far out to look.
1050 * type is the type of spell - either SPELL_MANA or SPELL_GRACE. 1062 * type is the type of spell - either SPELL_MANA or SPELL_GRACE.
1051 * this info is used for blocked magic/unholy spaces. 1063 * this info is used for blocked magic/unholy spaces.
1052 */ 1064 */
1053object * 1065static object *
1054get_pointed_target (object *op, int dir, int range, int type) 1066get_pointed_target (object *op, int dir, int range, int type)
1055{ 1067{
1056 object *target; 1068 object *target;
1057 sint16 x, y; 1069 sint16 x, y;
1058 int dist, mflags; 1070 int dist, mflags;
… …
1114 */ 1126 */
1115 1127
1116 if (!target 1128 if (!target
1117 || target->flag [FLAG_REFL_SPELL] 1129 || target->flag [FLAG_REFL_SPELL]
1118 || (!god && spell->stats.grace) 1130 || (!god && spell->stats.grace)
1119 || (target->title && god && target->title == god->name) 1131 || (god && target->title == god->name)
1120 || (target->race && god && strstr (target->race, god->race))) 1132 || (god && target->race.contains (god->race)))
1121 { 1133 {
1122 new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded."); 1134 new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded.");
1123 return 0; 1135 return 0;
1124 } 1136 }
1125 1137
1126 if (spell->other_arch) 1138 if (spell->other_arch)
1127 effect = arch_to_object (spell->other_arch); 1139 effect = spell->other_arch->instance ();
1128 else 1140 else
1129 return 0; 1141 return 0;
1130 1142
1131 /* tailor the effect by priest level and worshipped God */ 1143 /* tailor the effect by priest level and worshipped God */
1132 effect->level = casting_level (caster, spell); 1144 effect->level = casting_level (caster, spell);
… …
1245 * we do this by creating a force and inserting it in the 1257 * we do this by creating a force and inserting it in the
1246 * object. if time is 0, the object glows permanently. To truely 1258 * object. if time is 0, the object glows permanently. To truely
1247 * make this work for non-living objects, we would have to 1259 * make this work for non-living objects, we would have to
1248 * give them the capability to have an inventory. b.t. 1260 * give them the capability to have an inventory. b.t.
1249 */ 1261 */
1250int 1262static int
1251make_object_glow (object *op, int radius, int time) 1263make_object_glow (object *op, int radius, int time)
1252{ 1264{
1253 /* some things are unaffected... */ 1265 /* some things are unaffected... */
1254 if (op->path_denied & PATH_LIGHT) 1266 if (op->path_denied & PATH_LIGHT)
1255 return 0; 1267 return 0;
1256 1268
1257 object *tmp = get_archetype (FORCE_NAME); 1269 object *tmp = get_archetype (FORCE_NAME);
1258 tmp->speed = 0.01; 1270 tmp->speed = 0.01;
1259 tmp->stats.food = time; 1271 tmp->stats.food = time;
1260 SET_FLAG (tmp, FLAG_IS_USED_UP); 1272 SET_FLAG (tmp, FLAG_IS_USED_UP);
1261 tmp->glow_radius = min (MAX_LIGHT_RADIUS, radius); 1273 tmp->set_glow_radius (min (MAX_LIGHT_RADIUS, radius));
1262 tmp = insert_ob_in_ob (tmp, op); 1274 tmp = insert_ob_in_ob (tmp, op);
1263 1275
1264 if (tmp->glow_radius > op->glow_radius) 1276 if (tmp->glow_radius > op->glow_radius)
1265 op->glow_radius = tmp->glow_radius; 1277 op->set_glow_radius (tmp->glow_radius);
1266 1278
1267 return 1; 1279 return 1;
1268} 1280}
1269 1281
1270int 1282int
… …
1293 unordered_mapwalk (op, -range, -range, range, range) 1305 unordered_mapwalk (op, -range, -range, range, range)
1294 { 1306 {
1295 mapspace &ms = m->at (nx, ny); 1307 mapspace &ms = m->at (nx, ny);
1296 1308
1297 if (ms.flags () & P_IS_ALIVE) 1309 if (ms.flags () & P_IS_ALIVE)
1298 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1310 for (object *next, *tmp = ms.bot; tmp; tmp = next)
1311 {
1312 next = tmp->above;
1313
1299 if (tmp->flag [FLAG_ALIVE] || tmp->is_player ()) 1314 if (tmp->flag [FLAG_ALIVE] || tmp->is_player ())
1300 { 1315 {
1301 tmp = tmp->head_ (); 1316 tmp = tmp->head_ ();
1302 1317
1303 if ((friendly && !tmp->flag [FLAG_FRIENDLY] && !tmp->is_player ()) 1318 if ((friendly && !tmp->flag [FLAG_FRIENDLY] && !tmp->is_player ())
1304 || (!friendly && (tmp->flag [FLAG_FRIENDLY] || tmp->is_player ()))) 1319 || (!friendly && (tmp->flag [FLAG_FRIENDLY] || tmp->is_player ())))
1305 { 1320 {
1306 if (spell_ob->subtype == SP_DESTRUCTION) 1321 if (spell_ob->subtype == SP_DESTRUCTION)
1307 { 1322 {
1308 hit_player (tmp, dam, op, spell_ob->attacktype, 0); 1323 hit_player (tmp, dam, op, spell_ob->attacktype, 0);
1309 1324
1310 if (spell_ob->other_arch) 1325 if (spell_ob->other_arch)
1311 m->insert (arch_to_object (spell_ob->other_arch), nx, ny, op); 1326 m->insert (spell_ob->other_arch->instance (), nx, ny, op);
1312 } 1327 }
1313 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist [ATNR_MAGIC] != 100) 1328 else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist [ATNR_MAGIC] != 100)
1314 { 1329 {
1315 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch) 1330 if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1316 m->insert (arch_to_object (spell_ob->other_arch), nx, ny, op); 1331 m->insert (spell_ob->other_arch->instance (), nx, ny, op);
1317 } 1332 }
1318 } 1333 }
1319 } 1334 }
1335 }
1320 } 1336 }
1321 1337
1322 op->skill = skill; 1338 op->skill = skill;
1323 return 1; 1339 return 1;
1324} 1340}
… …
1326/*************************************************************************** 1342/***************************************************************************
1327 * 1343 *
1328 * CURSE 1344 * CURSE
1329 * 1345 *
1330 ***************************************************************************/ 1346 ***************************************************************************/
1331
1332int 1347int
1333cast_curse (object *op, object *caster, object *spell_ob, int dir) 1348cast_curse (object *op, object *caster, object *spell_ob, int dir)
1334{ 1349{
1335 object *god = find_god (determine_god (op)); 1350 object *god = find_god (determine_god (op));
1336 object *tmp, *force; 1351 object *tmp, *force;
… …
1414 force->stats.wc = spell_ob->stats.wc; 1429 force->stats.wc = spell_ob->stats.wc;
1415 1430
1416 change_abil (tmp, force); /* Mostly to display any messages */ 1431 change_abil (tmp, force); /* Mostly to display any messages */
1417 insert_ob_in_ob (force, tmp); 1432 insert_ob_in_ob (force, tmp);
1418 tmp->update_stats (); 1433 tmp->update_stats ();
1434
1419 return 1; 1435 return 1;
1420
1421} 1436}
1422 1437
1423/********************************************************************** 1438/**********************************************************************
1424 * mood change 1439 * mood change
1425 * Arguably, this may or may not be an attack spell. But since it 1440 * Arguably, this may or may not be an attack spell. But since it
… …
1447 * so even if the player doesn't worship a god, if race=GOD_.., it 1462 * so even if the player doesn't worship a god, if race=GOD_.., it
1448 * won't ever match anything. 1463 * won't ever match anything.
1449 */ 1464 */
1450 if (!spell->race) 1465 if (!spell->race)
1451 race = NULL; 1466 race = NULL;
1452 else if (god && !strcmp (spell->race, "GOD_SLAYING")) 1467 else if (god && spell->race == shstr_GOD_SLAYING)
1453 race = god->slaying; 1468 race = god->slaying;
1454 else if (god && !strcmp (spell->race, "GOD_FRIEND")) 1469 else if (god && spell->race == shstr_GOD_FRIEND)
1455 race = god->race; 1470 race = god->race;
1456 else 1471 else
1457 race = spell->race; 1472 race = spell->race;
1458 1473
1459 unordered_mapwalk (op, -range, -range, range, range) 1474 unordered_mapwalk (op, -range, -range, range, range)
… …
1526 Ryo, august 14th 1541 Ryo, august 14th
1527 */ 1542 */
1528 if (head->level > level) 1543 if (head->level > level)
1529 continue; 1544 continue;
1530 1545
1531 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level)))) 1546 if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + min (50, 2 * (level - head->level))))
1532 /* Failed, no effect */ 1547 /* Failed, no effect */
1533 continue; 1548 continue;
1534 } 1549 }
1535 1550
1536 /* Done with saving throw. Now start affecting the monster */ 1551 /* Done with saving throw. Now start affecting the monster */
… …
1578 head->stats.exp = 0; 1593 head->stats.exp = 0;
1579 } 1594 }
1580 1595
1581 /* If a monster was effected, put an effect in */ 1596 /* If a monster was effected, put an effect in */
1582 if (done_one && spell->other_arch) 1597 if (done_one && spell->other_arch)
1583 m->insert (arch_to_object (spell->other_arch), nx, ny, op); 1598 m->insert (spell->other_arch->instance (), nx, ny, op);
1584 } 1599 }
1585 1600
1586 return 1; 1601 return 1;
1587} 1602}
1588 1603
… …
1671 hit_map (op, j, op->attacktype, 1); 1686 hit_map (op, j, op->attacktype, 1);
1672 } 1687 }
1673 1688
1674 /* insert the other arch */ 1689 /* insert the other arch */
1675 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))) 1690 if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))))
1676 m->insert (arch_to_object (op->other_arch), hx, hy, op); 1691 m->insert (op->other_arch->instance (), hx, hy, op);
1677 } 1692 }
1678 1693
1679 /* restore to the center location and damage */ 1694 /* restore to the center location and damage */
1680 op->stats.dam = dam_save; 1695 op->stats.dam = dam_save;
1681 1696
… …
1897 return 0; 1912 return 0;
1898 } 1913 }
1899 } 1914 }
1900 1915
1901 /* ok, looks groovy to just insert a new light on the map */ 1916 /* ok, looks groovy to just insert a new light on the map */
1902 tmp = arch_to_object (spell->other_arch); 1917 tmp = spell->other_arch->instance ();
1903 if (!tmp) 1918 if (!tmp)
1904 { 1919 {
1905 LOG (llevError, "Error: spell arch for cast_light() missing.\n"); 1920 LOG (llevError, "Error: spell arch for cast_light() missing.\n");
1906 return 0; 1921 return 0;
1907 } 1922 }
1908 1923
1909 tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell); 1924 tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell);
1910 1925
1911 if (tmp->glow_radius) 1926 if (tmp->glow_radius)
1912 tmp->glow_radius = min (MAX_LIGHT_RADIUS, spell->range + SP_level_range_adjust (caster, spell)); 1927 tmp->set_glow_radius (
1928 clamp (spell->range + SP_level_range_adjust (caster, spell), 1, MAX_LIGHT_RADIUS)
1929 );
1913 1930
1914 if (dir) 1931 if (dir)
1915 m->insert (tmp, x, y, op); 1932 m->insert (tmp, x, y, op);
1916 else 1933 else
1917 caster->outer_env ()->insert (tmp); 1934 caster->outer_env_or_self ()->insert (tmp);
1918 1935
1919 return 1; 1936 return 1;
1920} 1937}
1921 1938
1922/* cast_cause_disease: this spell looks along <dir> from the 1939/* cast_cause_disease: this spell looks along <dir> from the
… …
1971 { 1988 {
1972 /* search this square for a victim */ 1989 /* search this square for a victim */
1973 for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above) 1990 for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above)
1974 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER)) 1991 if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER))
1975 { /* found a victim */ 1992 { /* found a victim */
1976 object *disease = arch_to_object (spell->other_arch); 1993 object *disease = spell->other_arch->instance ();
1977 1994
1978 disease->set_owner (op); 1995 disease->set_owner (op);
1979 set_spell_skill (op, caster, spell, disease); 1996 set_spell_skill (op, caster, spell, disease);
1980 disease->stats.exp = 0; 1997 disease->stats.exp = 0;
1981 disease->level = casting_level (caster, spell); 1998 disease->level = casting_level (caster, spell);
… …
2031 if (infect_object (walk, disease, 1)) 2048 if (infect_object (walk, disease, 1))
2032 { 2049 {
2033 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name); 2050 new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
2034 2051
2035 disease->destroy (); /* don't need this one anymore */ 2052 disease->destroy (); /* don't need this one anymore */
2036 walk->map->insert (get_archetype ("detect_magic"), x, y, op); 2053 walk->map->insert (get_archetype (shstr_detect_magic), x, y, op);
2037 return 1; 2054 return 1;
2038 } 2055 }
2039 2056
2040 disease->destroy (); 2057 disease->destroy ();
2041 } 2058 }

Diff Legend

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