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

Comparing deliantra/server/server/spell_effect.C (file contents):
Revision 1.124 by root, Sun Apr 11 00:34:06 2010 UTC vs.
Revision 1.131 by root, Fri Apr 23 04:32:47 2010 UTC

… …
58} 58}
59 59
60int 60int
61recharge (object *op, object *caster, object *spell_ob) 61recharge (object *op, object *caster, object *spell_ob)
62{ 62{
63 object *wand, *tmp;
64 int ncharges; 63 int ncharges;
65 64
66 wand = find_marked_object (op); 65 object *wand = op->mark ();
66
67 if (!wand || wand->type != WAND) 67 if (!wand || wand->type != WAND)
68 { 68 {
69 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark the wand you want to recharge."); 69 op->failmsg ("You need to mark the wand you want to recharge.");
70 return 0; 70 return 0;
71 } 71 }
72
72 if (!(random_roll (0, 3, op, PREFER_HIGH))) 73 if (!(random_roll (0, 3, op, PREFER_HIGH)))
73 { 74 {
74 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s vibrates violently, then explodes!", query_name (wand)); 75 op->failmsgf ("The %s vibrates violently, then explodes!", query_name (wand));
75 op->play_sound (sound_find ("ob_explode")); 76 op->play_sound (sound_find ("ob_explode"));
76 wand->destroy (); 77 wand->destroy ();
77 tmp = get_archetype (shstr_fireball); 78 object *tmp = get_archetype (shstr_fireball);
78 tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10; 79 tmp->stats.dam = (spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob)) / 10;
79 80
80 if (!tmp->stats.dam) 81 if (!tmp->stats.dam)
81 tmp->stats.dam = 1; 82 tmp->stats.dam = 1;
82 83
… …
93 94
94 if (wand->inv && wand->inv->level) 95 if (wand->inv && wand->inv->level)
95 ncharges /= wand->inv->level; 96 ncharges /= wand->inv->level;
96 else 97 else
97 { 98 {
98 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", query_name (wand)); 99 op->failmsgf ("Your %s is broken.", query_name (wand));
99 return 0; 100 return 0;
100 } 101 }
101 102
102 if (!ncharges) 103 if (!ncharges)
103 ncharges = 1; 104 ncharges = 1;
… …
158 break; 159 break;
159 160
160 if (!al) 161 if (!al)
161 { 162 {
162 missile->destroy (); 163 missile->destroy ();
163 new_draw_info_format (NDI_UNIQUE, 0, op, "No such object %ss of %s", missile_name, spellparam); 164 op->failmsgf ("No such object %ss of %s", missile_name, spellparam);
164 return 0; 165 return 0;
165 } 166 }
166 167
167 if (al->item->slaying) 168 if (al->item->slaying)
168 { 169 {
169 missile->destroy (); 170 missile->destroy ();
170 new_draw_info_format (NDI_UNIQUE, 0, op, "You are not allowed to create %ss of %s", missile_name, spellparam); 171 op->failmsgf ("You are not allowed to create %ss of %s", missile_name, spellparam);
171 return 0; 172 return 0;
172 } 173 }
173 174
174 give_artifact_abilities (missile, al->item); 175 give_artifact_abilities (missile, al->item);
175 /* These special arrows cost something extra. Don't have them also be magical - 176 /* These special arrows cost something extra. Don't have them also be magical -
… …
257 /* Pretty unlikely (there are some very low food items), but you never 258 /* Pretty unlikely (there are some very low food items), but you never
258 * know 259 * know
259 */ 260 */
260 if (!at) 261 if (!at)
261 { 262 {
262 new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough experience to create any food."); 263 op->failmsgf ("You don't have enough experience to create any food.");
263 return 0; 264 return 0;
264 } 265 }
265 266
266 food_value /= at->stats.food; 267 food_value /= at->stats.food;
267 new_op = at->instance (); 268 new_op = at->instance ();
… …
380int 381int
381cast_invisible (object *op, object *caster, object *spell_ob) 382cast_invisible (object *op, object *caster, object *spell_ob)
382{ 383{
383 if (op->invisible > 1000) 384 if (op->invisible > 1000)
384 { 385 {
385 new_draw_info (NDI_UNIQUE, 0, op, "You can not extend the duration of your invisibility any further"); 386 op->failmsg ("You can not extend the duration of your invisibility any further");
386 return 0; 387 return 0;
387 } 388 }
388 389
389 /* Remove the switch with 90% duplicate code - just handle the differences with 390 /* Remove the switch with 90% duplicate code - just handle the differences with
390 * and if statement or two. 391 * and if statement or two.
… …
460 461
461void 462void
462execute_word_of_recall (object *op) 463execute_word_of_recall (object *op)
463{ 464{
464 if (object *pl = op->in_player ()) 465 if (object *pl = op->in_player ())
465 {
466 if (pl->ms ().flags () & P_NO_CLERIC && !pl->flag [FLAG_WIZCAST]) 466 if (pl->ms ().flags () & P_NO_CLERIC && !pl->flag [FLAG_WIZCAST])
467 new_draw_info (NDI_UNIQUE, 0, pl, "You feel something fizzle inside you."); 467 new_draw_info (NDI_UNIQUE, 0, pl, "You feel something fizzle inside you.");
468 else 468 else
469 pl->player_goto (op->slaying, op->stats.hp, op->stats.sp); 469 pl->player_goto (op->slaying, op->stats.hp, op->stats.sp);
470 }
471 470
472 op->destroy (); 471 op->destroy ();
473} 472}
474 473
475/* Word of recall causes the player to return 'home'. 474/* Word of recall causes the player to return 'home'.
… …
477 * time delay effect. 476 * time delay effect.
478 */ 477 */
479int 478int
480cast_word_of_recall (object *op, object *caster, object *spell_ob) 479cast_word_of_recall (object *op, object *caster, object *spell_ob)
481{ 480{
482 object *dummy; 481 if (!op->is_player ())
483 int time;
484
485 if (op->type != PLAYER)
486 return 0; 482 return 0;
487 483
488 if (find_obj_by_type_subtype (op, SPELL_EFFECT, SP_WORD_OF_RECALL)) 484 if (find_obj_by_type_subtype (op, SPELL_EFFECT, SP_WORD_OF_RECALL))
489 { 485 {
490 new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you."); 486 new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you.");
491 return 1; 487 return 1;
492 } 488 }
493 489
494 dummy = get_archetype (FORCE_NAME); 490 object *dummy = get_archetype (FORCE_NAME);
495 491
496 if (!dummy)
497 {
498 new_draw_info (NDI_UNIQUE, 0, op, "Oops, program error!");
499 LOG (llevError, "cast_word_of_recall: get_archetype(force) failed!\n");
500 return 0;
501 }
502
503 time = spell_ob->duration - SP_level_duration_adjust (caster, spell_ob); 492 int time = max (1, spell_ob->duration - SP_level_duration_adjust (caster, spell_ob));
504 if (time < 1)
505 time = 1;
506 493
507 /* value of speed really doesn't make much difference, as long as it is 494 /* value of speed really doesn't make much difference, as long as it is
508 * positive. Lower value may be useful so that the problem doesn't 495 * positive. Lower value may be useful so that the problem doesn't
509 * do anything really odd if it say a -1000 or something. 496 * do anything really odd if it say a -1000 or something.
510 */ 497 */
511 dummy->set_speed (0.002); 498 dummy->set_speed (0.002);
512 dummy->speed_left = -dummy->speed * time; 499 dummy->speed_left = -dummy->speed * time;
513 dummy->type = SPELL_EFFECT; 500 dummy->type = SPELL_EFFECT;
514 dummy->subtype = SP_WORD_OF_RECALL; 501 dummy->subtype = SP_WORD_OF_RECALL;
515 502 dummy->slaying = op->contr->savebed_map;
516 /* If we could take advantage of enter_player_savebed() here, it would be 503 dummy->stats.hp = op->contr->bed_x;
517 * nice, but until the map load fails, we can't. 504 dummy->stats.sp = op->contr->bed_y;
518 */
519 EXIT_PATH (dummy) = op->contr->savebed_map;
520 EXIT_X (dummy) = op->contr->bed_x;
521 EXIT_Y (dummy) = op->contr->bed_y;
522 505
523 op->insert (dummy); 506 op->insert (dummy);
524 507
525 new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you."); 508 new_draw_info (NDI_UNIQUE, 0, op, "You feel a force starting to build up inside you.");
526 509
… …
645 628
646 if ((spell_ob->move_block || x != op->x || y != op->y) && 629 if ((spell_ob->move_block || x != op->x || y != op->y) &&
647 (get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE) || 630 (get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE) ||
648 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) == spell_ob->move_block))) 631 ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) == spell_ob->move_block)))
649 { 632 {
650 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 633 op->failmsg ("Something is in the way.");
651 return 0; 634 return 0;
652 } 635 }
653 636
654 if (spell_ob->other_arch) 637 if (spell_ob->other_arch)
655 tmp = spell_ob->other_arch->instance (); 638 tmp = spell_ob->other_arch->instance ();
… …
805 { 788 {
806 int count = atoi (spellparam); 789 int count = atoi (spellparam);
807 790
808 if (count > maxdist) 791 if (count > maxdist)
809 { 792 {
810 new_draw_info (NDI_UNIQUE, 0, op, "You can't dimension door that far!"); 793 op->failmsg ("You can't dimension door that far!");
811 return 0; 794 return 0;
812 } 795 }
813 796
814 for (dist = 0; dist < count; dist++) 797 for (dist = 0; dist < count; dist++)
815 { 798 {
… …
876 break; 859 break;
877 860
878 } 861 }
879 if (!dist) 862 if (!dist)
880 { 863 {
881 new_draw_info (NDI_UNIQUE, 0, op, "Your spell failed!\n"); 864 op->failmsg ("Your spell failed!\n");
882 return 0; 865 return 0;
883 } 866 }
884 } 867 }
885 868
886 /* Actually move the player now */ 869 /* Actually move the player now */
… …
1062 break; 1045 break;
1063 } 1046 }
1064 else if (spell_ob->race && spell_ob->race == tmp2->name) 1047 else if (spell_ob->race && spell_ob->race == tmp2->name)
1065 { 1048 {
1066 if (!silent) 1049 if (!silent)
1067 new_draw_info_format (NDI_UNIQUE, 0, op,
1068 "You can not cast %s while %s is in effect", 1050 op->failmsgf ("You can not cast %s while %s is in effect",
1069 &spell_ob->name, &tmp2->name_pl); 1051 &spell_ob->name, &tmp2->name_pl);
1070 1052
1071 return 0; 1053 return 0;
1072 } 1054 }
1073 } 1055 }
1074 } 1056 }
… …
1469 1451
1470 int num_ident = max (1, spell->stats.dam + SP_level_dam_adjust (caster, spell)); 1452 int num_ident = max (1, spell->stats.dam + SP_level_dam_adjust (caster, spell));
1471 1453
1472 for (tmp = op->inv; tmp; tmp = tmp->below) 1454 for (tmp = op->inv; tmp; tmp = tmp->below)
1473 { 1455 {
1474 if (!tmp->flag [FLAG_IDENTIFIED] && !tmp->invisible && need_identify (tmp)) 1456 if (!tmp->flag [FLAG_IDENTIFIED] && !tmp->invisible && tmp->need_identify ())
1475 { 1457 {
1476 identify (tmp); 1458 identify (tmp);
1477 1459
1478 if (op->type == PLAYER) 1460 if (op->type == PLAYER)
1479 { 1461 {
… …
1493 * was not fully used. 1475 * was not fully used.
1494 */ 1476 */
1495 if (num_ident) 1477 if (num_ident)
1496 { 1478 {
1497 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above) 1479 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
1498 if (!tmp->flag [FLAG_IDENTIFIED] && !tmp->invisible && need_identify (tmp)) 1480 if (!tmp->flag [FLAG_IDENTIFIED] && !tmp->invisible && tmp->need_identify ())
1499 { 1481 {
1500 identify (tmp); 1482 identify (tmp);
1501 1483
1502 if (object *pl = tmp->visible_to ()) 1484 if (object *pl = tmp->visible_to ())
1503 { 1485 {
… …
1552 * floor. But this is not true for show invisible. 1534 * floor. But this is not true for show invisible.
1553 * Basically, we just go and find the top object and work 1535 * Basically, we just go and find the top object and work
1554 * down - that is easier than working up. 1536 * down - that is easier than working up.
1555 */ 1537 */
1556 1538
1557 for (last = NULL, tmp = m->at (nx, ny).bot; tmp; tmp = tmp->above) 1539 for (last = 0, tmp = m->at (nx, ny).bot; tmp; tmp = tmp->above)
1558 last = tmp; 1540 last = tmp;
1559 1541
1560 /* Shouldn't happen, but if there are no objects on a space, this 1542 /* Shouldn't happen, but if there are no objects on a space, this
1561 * would happen. 1543 * would happen.
1562 */ 1544 */
1563 if (!last) 1545 if (!last)
1564 continue; 1546 continue;
1565 1547
1566 done_one = 0; 1548 done_one = 0;
1567 floor = 0; 1549 floor = 0;
1568 detect = NULL; 1550 detect = 0;
1569 for (tmp = last; tmp; tmp = tmp->below) 1551 for (tmp = last; tmp; tmp = tmp->below)
1570 { 1552 {
1571 /* show invisible */ 1553 /* show invisible */
1572 if (spell->flag [FLAG_MAKE_INVIS] 1554 if (spell->flag [FLAG_MAKE_INVIS]
1573 /* Might there be other objects that we can make visible? */ 1555 /* Might there be other objects that we can make visible? */
… …
1581 || tmp->type == TELEPORTER 1563 || tmp->type == TELEPORTER
1582 || tmp->type == GATE 1564 || tmp->type == GATE
1583 || tmp->type == LOCKED_DOOR 1565 || tmp->type == LOCKED_DOOR
1584 || tmp->type == WEAPON 1566 || tmp->type == WEAPON
1585 || tmp->type == ALTAR 1567 || tmp->type == ALTAR
1586 || tmp->type == SIGN 1568 || (tmp->type == SIGN && tmp->face != magicmouth_face)
1587 || tmp->type == TRIGGER_PEDESTAL 1569 || tmp->type == TRIGGER_PEDESTAL
1588 || tmp->type == SPECIAL_KEY 1570 || tmp->type == SPECIAL_KEY
1589 || tmp->type == TREASURE 1571 || tmp->type == TREASURE
1590 || tmp->type == BOOK 1572 || tmp->type == BOOK
1591 || tmp->type == HOLY_ALTAR 1573 || tmp->type == HOLY_ALTAR
1592 || tmp->type == CONTAINER))) 1574 || tmp->type == CONTAINER)))
1593 { 1575 {
1576 printf ("show inv %s\n", tmp->debug_desc());//D
1594 if (random_roll (0, skill->level - 1, op, PREFER_HIGH) > level / 4) 1577 if (random_roll (0, skill->level - 1, op, PREFER_HIGH) > level / 4)
1595 { 1578 {
1596 tmp->invisible = 0; 1579 tmp->invisible = 0;
1597 done_one = 1; 1580 done_one = 1;
1598 } 1581 }
… …
1615 * difficult to see what object is magical/cursed, so the 1598 * difficult to see what object is magical/cursed, so the
1616 * effect wouldn't be as apparent. 1599 * effect wouldn't be as apparent.
1617 */ 1600 */
1618 1601
1619 /* detect magic */ 1602 /* detect magic */
1620 if (spell->flag [FLAG_KNOWN_MAGICAL] && 1603 if (spell->flag [FLAG_KNOWN_MAGICAL]
1621 !tmp->flag [FLAG_KNOWN_MAGICAL] && !tmp->flag [FLAG_IDENTIFIED] && is_magical (tmp)) 1604 && !tmp->flag [FLAG_KNOWN_MAGICAL]
1605 && !tmp->flag [FLAG_IDENTIFIED]
1606 && tmp->need_identify ()
1607 && is_magical (tmp))
1622 { 1608 {
1623 tmp->set_flag (FLAG_KNOWN_MAGICAL); 1609 tmp->set_flag (FLAG_KNOWN_MAGICAL);
1624 /* make runes more visible */ 1610 /* make runes more visible */
1625 if (tmp->type == RUNE && tmp->attacktype & AT_MAGIC) 1611 if (tmp->type == RUNE && tmp->attacktype & AT_MAGIC)
1626 tmp->stats.Cha /= 4; 1612 tmp->stats.Cha /= 4;
… …
1649 1635
1650 if (!detect) 1636 if (!detect)
1651 detect = tmp; 1637 detect = tmp;
1652 } 1638 }
1653 1639
1654 if (spell->flag [FLAG_KNOWN_CURSED] && !tmp->flag [FLAG_KNOWN_CURSED] && 1640 if (spell->flag [FLAG_KNOWN_CURSED]
1641 && !tmp->flag [FLAG_KNOWN_CURSED]
1642 && tmp->need_identify ()
1655 (tmp->flag [FLAG_CURSED] || tmp->flag [FLAG_DAMNED])) 1643 && (tmp->flag [FLAG_CURSED] || tmp->flag [FLAG_DAMNED]))
1656 { 1644 {
1657 tmp->set_flag (FLAG_KNOWN_CURSED); 1645 tmp->set_flag (FLAG_KNOWN_CURSED);
1658 done_one = 1; 1646 done_one = 1;
1659 } 1647 }
1660 1648
… …
1802 if (plyr != op && plyr->flag [FLAG_ALIVE]) 1790 if (plyr != op && plyr->flag [FLAG_ALIVE])
1803 break; 1791 break;
1804 1792
1805 if (!plyr) 1793 if (!plyr)
1806 { 1794 {
1807 new_draw_info (NDI_BLACK, 0, op, "There is no one there."); 1795 op->failmsg ("There is no one there.");
1808 return 0; 1796 return 0;
1809 } 1797 }
1810 /* give sp */ 1798 /* give sp */
1811 if (spell->stats.dam > 0) 1799 if (spell->stats.dam > 0)
1812 { 1800 {
… …
1927 1915
1928 object *tmp, *god = find_god (determine_god (op)); 1916 object *tmp, *god = find_god (determine_god (op));
1929 1917
1930 if (!god) 1918 if (!god)
1931 { 1919 {
1932 new_draw_info (NDI_UNIQUE, 0, op, "You can't consecrate anything if you don't worship a god!"); 1920 op->failmsg ("You can't consecrate anything if you don't worship a god!");
1933 return 0; 1921 return 0;
1934 } 1922 }
1935 1923
1936 for (tmp = op->below; tmp; tmp = tmp->below) 1924 for (tmp = op->below; tmp; tmp = tmp->below)
1937 { 1925 {
… …
1940 if (tmp->type == HOLY_ALTAR) 1928 if (tmp->type == HOLY_ALTAR)
1941 { 1929 {
1942 1930
1943 if (tmp->level > casting_level (caster, spell)) 1931 if (tmp->level > casting_level (caster, spell))
1944 { 1932 {
1945 new_draw_info_format (NDI_UNIQUE, 0, op, "You are not powerful enough to reconsecrate the %s", &tmp->name); 1933 op->failmsgf ("You are not powerful enough to reconsecrate the %s", &tmp->name);
1946 return 0; 1934 return 0;
1947 } 1935 }
1948 else 1936 else
1949 { 1937 {
1950 /* If we got here, we are consecrating an altar */ 1938 /* If we got here, we are consecrating an altar */
… …
1959 new_draw_info_format (NDI_UNIQUE, 0, op, "You consecrated the altar to %s!", &god->name); 1947 new_draw_info_format (NDI_UNIQUE, 0, op, "You consecrated the altar to %s!", &god->name);
1960 return 1; 1948 return 1;
1961 } 1949 }
1962 } 1950 }
1963 } 1951 }
1964 new_draw_info (NDI_UNIQUE, 0, op, "You are not standing over an altar!"); 1952
1953 op->failmsg ("You are not standing over an altar!");
1965 return 0; 1954 return 0;
1966} 1955}
1967 1956
1968/* animate_weapon - 1957/* animate_weapon -
1969 * Generalization of staff_to_snake. Makes a golem out of the caster's weapon. 1958 * Generalization of staff_to_snake. Makes a golem out of the caster's weapon.
… …
1976 * player checks. MSW 2003-01-06 1965 * player checks. MSW 2003-01-06
1977 */ 1966 */
1978int 1967int
1979animate_weapon (object *op, object *caster, object *spell, int dir) 1968animate_weapon (object *op, object *caster, object *spell, int dir)
1980{ 1969{
1981 object *weapon, *tmp;
1982 char buf[MAX_BUF]; 1970 char buf[MAX_BUF];
1983 int a, i; 1971 int a, i;
1984 sint16 x, y; 1972 sint16 x, y;
1985 maptile *m; 1973 maptile *m;
1986 1974
… …
2011 1999
2012 /* if there's no place to put the golem, abort */ 2000 /* if there's no place to put the golem, abort */
2013 if (dir < 0 || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP) 2001 if (dir < 0 || (get_map_flags (m, &m, x, y, &x, &y) & P_OUT_OF_MAP)
2014 || ((spell->other_arch->move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->move_type)) 2002 || ((spell->other_arch->move_type & GET_MAP_MOVE_BLOCK (m, x, y)) == spell->other_arch->move_type))
2015 { 2003 {
2016 new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way."); 2004 op->failmsg ("There is something in the way.");
2017 return 0; 2005 return 0;
2018 } 2006 }
2019 2007
2020 /* Use the weapon marked by the player. */ 2008 /* Use the weapon marked by the player. */
2021 weapon = find_marked_object (op); 2009 object *weapon = op->mark ();
2022 2010
2023 if (!weapon) 2011 if (!weapon)
2024 { 2012 {
2025 new_draw_info (NDI_BLACK, 0, op, "You must mark a weapon to use with this spell!"); 2013 op->failmsg ("You must mark a weapon to use with this spell!");
2026 return 0; 2014 return 0;
2027 } 2015 }
2028 2016
2029 if (spell->race && weapon->arch->archname != spell->race) 2017 if (spell->race && weapon->arch->archname != spell->race)
2030 { 2018 {
2031 new_draw_info (NDI_UNIQUE, 0, op, "The spell fails to transform your weapon."); 2019 op->failmsg ("The spell fails to transform your weapon.");
2032 return 0; 2020 return 0;
2033 } 2021 }
2034 2022
2035 if (weapon->type != WEAPON) 2023 if (weapon->type != WEAPON)
2036 { 2024 {
2037 new_draw_info (NDI_UNIQUE, 0, op, "You need to wield a weapon to animate it."); 2025 op->failmsg ("You need to wield a weapon to animate it.");
2038 return 0; 2026 return 0;
2039 } 2027 }
2040 2028
2041 if (weapon->flag [FLAG_APPLIED]) 2029 if (weapon->flag [FLAG_APPLIED])
2042 { 2030 {
2043 new_draw_info_format (NDI_BLACK, 0, op, "You need to unequip %s before using it in this spell", query_name (weapon)); 2031 op->failmsgf ("You need to unequip %s before using it in this spell", query_name (weapon));
2044 return 0; 2032 return 0;
2045 } 2033 }
2046 2034
2047 weapon = weapon->split (); 2035 weapon = weapon->split ();
2048 2036
2049 /* create the golem object */ 2037 /* create the golem object */
2050 tmp = spell->other_arch->instance (); 2038 object *tmp = spell->other_arch->instance ();
2051 2039
2052 /* if animated by a player, give the player control of the golem */ 2040 /* if animated by a player, give the player control of the golem */
2053 tmp->clr_flag (FLAG_MONSTER); 2041 tmp->clr_flag (FLAG_MONSTER);
2054 tmp->stats.exp = 0; 2042 tmp->stats.exp = 0;
2055 add_friendly_object (tmp); 2043 add_friendly_object (tmp);
… …
2167 success = op->map->change_map_light (spell->stats.dam); 2155 success = op->map->change_map_light (spell->stats.dam);
2168 2156
2169 if (!success) 2157 if (!success)
2170 { 2158 {
2171 if (spell->stats.dam < 0) 2159 if (spell->stats.dam < 0)
2172 new_draw_info (NDI_UNIQUE, 0, op, "It can be no brighter here."); 2160 op->failmsg ("It can be no brighter here.");
2173 else 2161 else
2174 new_draw_info (NDI_UNIQUE, 0, op, "It can be no darker here."); 2162 op->failmsg ("It can be no darker here.");
2175 } 2163 }
2176 2164
2177 return success; 2165 return success;
2178} 2166}
2179 2167
… …
2332int 2320int
2333write_mark (object *op, object *spell, const char *msg) 2321write_mark (object *op, object *spell, const char *msg)
2334{ 2322{
2335 if (!msg || msg[0] == 0) 2323 if (!msg || msg[0] == 0)
2336 { 2324 {
2337 new_draw_info (NDI_UNIQUE, 0, op, "Write what?"); 2325 op->failmsg ("Write what?");
2338 return 0; 2326 return 0;
2339 } 2327 }
2340 2328
2341 if (!msg_is_safe (msg)) 2329 if (!msg_is_safe (msg))
2342 { 2330 {
2343 new_draw_info (NDI_UNIQUE, 0, op, "Trying to cheat are we?"); 2331 op->failmsg ("Trying to cheat are we? H<@-signs are not allowed in marking runes.>");
2344 LOG (llevInfo, "write_mark: player %s tried to write bogus rune %s\n", &op->name, msg); 2332 LOG (llevInfo, "write_mark: player %s tried to write bogus rune %s\n", &op->name, msg);
2345 return 0; 2333 return 0;
2346 } 2334 }
2347 2335
2348 if (!spell->other_arch) 2336 if (!spell->other_arch)

Diff Legend

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