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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.115 by root, Fri Apr 27 02:43:04 2007 UTC vs.
Revision 1.126 by root, Sat May 12 16:06:42 2007 UTC

… …
21 * 21 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author can be reached via e-mail to <crossfire@schmorp.de>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <pwd.h>
27#include <sproto.h> 26#include <sproto.h>
28#include <sounds.h> 27#include <sounds.h>
29#include <living.h> 28#include <living.h>
30#include <object.h> 29#include <object.h>
31#include <spells.h> 30#include <spells.h>
… …
202 201
203 ob->remove (); 202 ob->remove ();
204 ob->map = 0; 203 ob->map = 0;
205 party = 0; 204 party = 0;
206 205
207 // for weird reasons, this is often "ob", keeping a circular reference 206 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
208 ranges [range_skill] = 0;
209 207
210 players.erase (this); 208 players.erase (this);
211} 209}
212 210
213// connect the player with a specific client 211// connect the player with a specific client
214// also changed, rationalises, and fixes some incorrect settings 212// also changes, rationalises, and fixes some incorrect settings
215void 213void
216player::connect (client *ns) 214player::connect (client *ns)
217{ 215{
218 this->ns = ns; 216 this->ns = ns;
219 ns->pl = this; 217 ns->pl = this;
… …
230 ns->reset_stats (); 228 ns->reset_stats ();
231 229
232 /* make sure he's a player -- needed because of class change. */ 230 /* make sure he's a player -- needed because of class change. */
233 ob->type = PLAYER; // we are paranoid 231 ob->type = PLAYER; // we are paranoid
234 ob->race = ob->arch->clone.race; 232 ob->race = ob->arch->clone.race;
235
236 if (!legal_range (ob, shoottype))
237 shoottype = range_none;
238 233
239 ob->carrying = sum_weight (ob); 234 ob->carrying = sum_weight (ob);
240 link_player_skills (ob); 235 link_player_skills (ob);
241 236
242 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 237 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
… …
263 258
264 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 259 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
265 260
266 esrv_new_player (this, ob->weight + ob->carrying); 261 esrv_new_player (this, ob->weight + ob->carrying);
267 262
263 for (object *op = ob->inv; op; op = op->below)
264 if (op->flag [FLAG_APPLIED])
265 switch (op->type)
266 {
267 case WAND:
268 case ROD:
269 case HORN:
270 case BOW:
271 case SKILL:
272 case SKILL_TOOL:
273 case WEAPON:
274 apply_special (ob, op, AP_UNAPPLY);
275 apply_special (ob, op, AP_APPLY);
276 break;
277 }
278
268 ob->update_stats (); 279 ob->update_stats ();
269 ns->floorbox_update (); 280 ns->floorbox_update ();
270 281
271 esrv_send_inventory (ob, ob); 282 esrv_send_inventory (ob, ob);
272 esrv_add_spells (this, 0); 283 esrv_add_spells (this, 0);
… …
325 unapply = unapply_nochoice; 336 unapply = unapply_nochoice;
326 337
327 savebed_map = first_map_path; /* Init. respawn position */ 338 savebed_map = first_map_path; /* Init. respawn position */
328 339
329 gen_sp_armour = 10; 340 gen_sp_armour = 10;
330 shoottype = range_none;
331 bowtype = bow_normal; 341 bowtype = bow_normal;
332 petmode = pet_normal; 342 petmode = pet_normal;
333 listening = 10; 343 listening = 10;
334 usekeys = containers; 344 usekeys = containers;
335 peaceful = 1; /* default peaceful */ 345 peaceful = 1; /* default peaceful */
… …
1014 /* Cornered, get rid of scared */ 1024 /* Cornered, get rid of scared */
1015 CLEAR_FLAG (op, FLAG_SCARED); 1025 CLEAR_FLAG (op, FLAG_SCARED);
1016 op->enemy = NULL; 1026 op->enemy = NULL;
1017} 1027}
1018 1028
1019
1020/* check_pick sees if there is stuff to be picked up/picks up stuff. 1029/* check_pick sees if there is stuff to be picked up/picks up stuff.
1021 * IT returns 1 if the player should keep on moving, 0 if he should 1030 * It returns 1 if the player should keep on moving, 0 if he should
1022 * stop. 1031 * stop.
1023 */ 1032 */
1024int 1033int
1025check_pick (object *op) 1034check_pick (object *op)
1026{ 1035{
… …
1464 * find_better_arrow to find a decent arrow to use. 1473 * find_better_arrow to find a decent arrow to use.
1465 * op = the shooter 1474 * op = the shooter
1466 * type = bow->race 1475 * type = bow->race
1467 * dir = fire direction 1476 * dir = fire direction
1468 */ 1477 */
1469
1470object * 1478object *
1471pick_arrow_target (object *op, const char *type, int dir) 1479pick_arrow_target (object *op, const char *type, int dir)
1472{ 1480{
1473 object *tmp = NULL; 1481 object *tmp = NULL;
1474 maptile *m; 1482 maptile *m;
… …
1548 { 1556 {
1549 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1557 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1550 return 0; 1558 return 0;
1551 } 1559 }
1552 1560
1553 if (op->type == PLAYER) 1561 if (player *pl = op->contr)
1554 bow = op->contr->ranges[range_bow]; 1562 {
1563 bow = pl->ranged_ob;
1564 if (!op->change_weapon (bow))
1565 return 0;
1566 }
1555 else 1567 else
1556 { 1568 {
1557 for (bow = op->inv; bow; bow = bow->below) 1569 for (bow = op->inv; bow; bow = bow->below)
1558 /* Don't check for applied - monsters don't apply bows - in that way, they 1570 /* Don't check for applied - monsters don't apply bows - in that way, they
1559 * don't need to switch back and forth between bows and weapons. 1571 * don't need to switch back and forth between bows and weapons.
… …
1564 if (!bow) 1576 if (!bow)
1565 { 1577 {
1566 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1578 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1567 return 0; 1579 return 0;
1568 } 1580 }
1581
1582 // optimisation: move object to top so we will find it quickly again
1583 if (bow->below)
1584 {
1585 bow->remove ();
1586 op->insert (bow);
1587 }
1588
1569 } 1589 }
1570 1590
1571 if (!bow->race || !bow->skill) 1591 if (!bow->race || !bow->skill)
1572 { 1592 {
1573 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1593 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
… …
1590 if (op->type == PLAYER) 1610 if (op->type == PLAYER)
1591 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1611 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1592 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1612 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1593 else 1613 else
1594 CLEAR_FLAG (op, FLAG_READY_BOW); 1614 CLEAR_FLAG (op, FLAG_READY_BOW);
1615
1595 return 0; 1616 return 0;
1596 } 1617 }
1597 } 1618 }
1598 1619
1599 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1620 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
… …
1623 1644
1624 arrow->set_owner (op); 1645 arrow->set_owner (op);
1625 arrow->skill = bow->skill; 1646 arrow->skill = bow->skill;
1626 arrow->direction = dir; 1647 arrow->direction = dir;
1627 1648
1649 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1650 arrow->stats.hp = arrow->stats.dam;
1651 arrow->stats.grace = arrow->attacktype;
1652
1653 if (arrow->slaying)
1654 arrow->spellarg = strdup (arrow->slaying);
1655
1628 if (op->type == PLAYER) 1656 if (op->type == PLAYER)
1629 { 1657 {
1630 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed; 1658 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1631 op->update_stats (); 1659 op->update_stats ();
1632 } 1660 }
1633 1661
1634 SET_ANIMATION (arrow, arrow->direction); 1662 SET_ANIMATION (arrow, arrow->direction);
1635 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1636 arrow->stats.hp = arrow->stats.dam;
1637 arrow->stats.grace = arrow->attacktype;
1638 if (arrow->slaying != NULL)
1639 arrow->spellarg = strdup (arrow->slaying);
1640 1663
1641 /* Note that this was different for monsters - they got their level 1664 arrow->stats.dam += op->stats.dam + arrow->magic;
1642 * added to the damage. I think the strength bonus is more proper.
1643 */
1644
1645 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1646 1665
1647 /* update the speed */ 1666 /* update the speed */
1648 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 1667 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0
1649 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0; 1668 + bow->stats.dam / 7.0;
1650 1669
1651 arrow->set_speed (max (arrow->speed, 1.0)); 1670 arrow->set_speed (max (arrow->speed, 2.0));
1652 arrow->speed_left = 0; 1671 arrow->speed_left = 0;
1653 1672
1673 arrow->stats.wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1674
1654 if (op->type == PLAYER) 1675 if (op->type == PLAYER)
1655 { 1676 {
1656 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1657 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1658 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1659
1660 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 1677 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1678 arrow->stats.wc -= dex_bonus[op->stats.Dex];
1679
1680 if (!arrow->slaying)
1681 arrow->slaying = op->slaying;
1682
1683 arrow->attacktype |= op->attacktype;
1661 } 1684 }
1662 else 1685 else
1663 { 1686 {
1664 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1665 arrow->level = op->level; 1687 arrow->level = op->level;
1666 } 1688 arrow->stats.wc -= bow->magic;
1667 1689
1668 if (arrow->attacktype == AT_PHYSICAL) 1690 if (!arrow->slaying)
1691 arrow->slaying = bow->slaying;
1692
1669 arrow->attacktype |= bow->attacktype; 1693 arrow->attacktype |= bow->attacktype;
1694 }
1670 1695
1671 if (bow->slaying) 1696 arrow->stats.wc -= arrow->level;
1672 arrow->slaying = bow->slaying;
1673 1697
1674 arrow->move_type = MOVE_FLY_LOW; 1698 arrow->move_type = MOVE_FLY_LOW;
1675 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1699 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1676 1700
1677 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1701 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
… …
1703{ 1727{
1704 int ret = 0, wcmod = 0; 1728 int ret = 0, wcmod = 0;
1705 1729
1706 if (op->contr->bowtype == bow_bestarrow) 1730 if (op->contr->bowtype == bow_bestarrow)
1707 { 1731 {
1708 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); 1732 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1709 } 1733 }
1710 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1734 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1711 { 1735 {
1712 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1736 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1713 wcmod = -1; 1737 wcmod = -1;
… …
1723 else if (op->contr->bowtype == bow_spreadshot) 1747 else if (op->contr->bowtype == bow_spreadshot)
1724 { 1748 {
1725 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1749 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1726 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1750 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1727 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1751 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1728
1729 } 1752 }
1730 else 1753 else
1731 { 1754 {
1732 /* Simple case */ 1755 /* Simple case */
1733 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1756 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1734 } 1757 }
1758
1735 return ret; 1759 return ret;
1736} 1760}
1737 1761
1738 1762
1739/* Fires a misc (wand/rod/horn) object in 'dir'. 1763/* Fires a misc (wand/rod/horn) object in 'dir'.
1740 * Broken apart from 'fire' to keep it more readable. 1764 * Broken apart from 'fire' to keep it more readable.
1741 */ 1765 */
1742void 1766void
1743fire_misc_object (object *op, int dir) 1767fire_misc_object (object *op, int dir)
1744{ 1768{
1745 object *item; 1769 object *item = op->contr->ranged_ob;
1746 1770
1747 if (!op->contr->ranges[range_misc]) 1771 if (!item)
1748 { 1772 {
1749 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); 1773 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1750 return; 1774 return;
1751 } 1775 }
1752 1776
1753 item = op->contr->ranges[range_misc];
1754 if (!item->inv) 1777 if (!item->inv)
1755 { 1778 {
1756 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1779 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1757 return; 1780 return;
1758 } 1781 }
1782
1783 if (!op->change_weapon (item))
1784 return;
1785
1759 if (item->type == WAND) 1786 if (item->type == WAND)
1760 { 1787 {
1761 if (item->stats.food <= 0) 1788 if (item->stats.food <= 0)
1762 { 1789 {
1763 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1790 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1764 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1791 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1792
1765 return; 1793 return;
1766 } 1794 }
1767 } 1795 }
1768 else if (item->type == ROD || item->type == HORN) 1796 else if (item->type == ROD || item->type == HORN)
1769 { 1797 {
1770 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1798 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1771 { 1799 {
1772 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1800 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1801
1773 if (item->type == ROD) 1802 if (item->type == ROD)
1774 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1803 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1775 else 1804 else
1776 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1805 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1806
1777 return; 1807 return;
1778 } 1808 }
1779 } 1809 }
1780 1810
1781 if (cast_spell (op, item, dir, item->inv, NULL)) 1811 if (cast_spell (op, item, dir, item->inv, NULL))
… …
1812 1842
1813 /* check for loss of invisiblity/hide */ 1843 /* check for loss of invisiblity/hide */
1814 if (action_makes_visible (op)) 1844 if (action_makes_visible (op))
1815 make_visible (op); 1845 make_visible (op);
1816 1846
1817 switch (op->contr->shoottype) 1847 player *pl = op->contr;
1848
1849 if (pl->golem)
1818 { 1850 {
1819 case range_none: 1851 control_golem (op->contr->golem, dir);
1820 return; 1852 return;
1853 }
1821 1854
1822 case range_bow: 1855 object *ob = pl->ranged_ob;
1856
1857 if (!ob)
1858 return;
1859
1860 switch (ob->type)
1861 {
1862 case BOW:
1823 player_fire_bow (op, dir); 1863 player_fire_bow (op, dir);
1824 return; 1864 break;
1825 1865
1826 case range_magic: /* Casting spells */ 1866 case SPELL:
1827 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); 1867 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1828 return; 1868 break;
1829 1869
1830 case range_misc: 1870 case BUILDER:
1871 apply_map_builder (op, dir);
1872 break;
1873
1874 case SKILL:
1875 case SKILL_TOOL:
1876 do_skill (op, op, ob, dir, 0);
1877 break;
1878
1879 default:
1831 fire_misc_object (op, dir); 1880 fire_misc_object (op, dir);
1832 return; 1881 break;
1833
1834 case range_golem: /* Control summoned monsters from scrolls */
1835 control_golem (op->contr->ranges[range_golem], dir);
1836 return;
1837
1838 case range_skill:
1839 if (!op->chosen_skill)
1840 {
1841 if (op->type == PLAYER)
1842 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1843
1844 return;
1845 }
1846
1847 do_skill (op, op, op->chosen_skill, dir, NULL);
1848 return;
1849 case range_builder:
1850 apply_map_builder (op, dir);
1851 return;
1852 default:
1853 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1854 return;
1855 } 1882 }
1856} 1883}
1857 1884
1858/* find_key 1885/* find_key
1859 * We try to find a key for the door as passed. If we find a key 1886 * We try to find a key for the door as passed. If we find a key
… …
1959 if (key) 1986 if (key)
1960 { 1987 {
1961 object *container = key->env; 1988 object *container = key->env;
1962 1989
1963 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); 1990 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1991
1964 if (action_makes_visible (op)) 1992 if (action_makes_visible (op))
1965 make_visible (op); 1993 make_visible (op);
1994
1966 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1995 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1967 spring_trap (door->inv, op); 1996 spring_trap (door->inv, op);
1968 1997
1969 if (door->type == DOOR) 1998 if (door->type == DOOR)
1970 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1999 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
… …
2000 */ 2029 */
2001void 2030void
2002move_player_attack (object *op, int dir) 2031move_player_attack (object *op, int dir)
2003{ 2032{
2004 object *tmp, *mon; 2033 object *tmp, *mon;
2005 sint16 nx, ny;
2006 int on_battleground; 2034 int on_battleground;
2007 maptile *m; 2035 maptile *m;
2008 2036
2009 nx = freearr_x[dir] + op->x; 2037 sint16 nx = freearr_x[dir] + op->x;
2010 ny = freearr_y[dir] + op->y; 2038 sint16 ny = freearr_y[dir] + op->y;
2011 2039
2012 on_battleground = op_on_battleground (op, 0, 0); 2040 on_battleground = op_on_battleground (op, 0, 0);
2013 2041
2014 /* If braced, or can't move to the square, and it is not out of the 2042 /* If braced, or can't move to the square, and it is not out of the
2015 * map, attack it. Note order of if statement is important - don't 2043 * map, attack it. Note order of if statement is important - don't
… …
2095 /* If we're braced, we don't want to switch places with it */ 2123 /* If we're braced, we don't want to switch places with it */
2096 if (op->contr->braced) 2124 if (op->contr->braced)
2097 return; 2125 return;
2098 2126
2099 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2127 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2100 (void) push_ob (mon, dir, op); 2128 push_ob (mon, dir, op);
2101 if (op->contr->tmp_invis || op->hide) 2129 if (op->contr->tmp_invis || op->hide)
2102 make_visible (op); 2130 make_visible (op);
2103 2131
2104 return; 2132 return;
2105 } 2133 }
… …
2448 gen_grace = op->stats.maxgrace; 2476 gen_grace = op->stats.maxgrace;
2449 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2477 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2450 } 2478 }
2451 2479
2452 /* Regenerate Spell Points */ 2480 /* Regenerate Spell Points */
2453 if (!op->contr->ranges[range_golem] && --op->last_sp < 0) 2481 if (!op->contr->golem && --op->last_sp < 0)
2454 { 2482 {
2455 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); 2483 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2456 if (op->stats.sp < op->stats.maxsp) 2484 if (op->stats.sp < op->stats.maxsp)
2457 { 2485 {
2458 op->stats.sp++; 2486 op->stats.sp++;
… …
3493 * not readied. 3521 * not readied.
3494 */ 3522 */
3495void 3523void
3496player_unready_range_ob (player *pl, object *ob) 3524player_unready_range_ob (player *pl, object *ob)
3497{ 3525{
3498 for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3526 if (pl->ob->current_weapon == ob)
3527 pl->ob->current_weapon = 0;
3528
3529 if (pl->combat_ob == ob)
3530 pl->combat_ob = 0;
3531
3499 if (pl->ranges[i] == ob) 3532 if (pl->ranged_ob == ob)
3500 {
3501 pl->ranges[i] = 0; 3533 pl->ranged_ob = 0;
3502 if (pl->shoottype == i)
3503 pl->shoottype = range_none;
3504 }
3505} 3534}
3506 3535
3507sint8 3536sint8
3508player::visibility_at (maptile *map, int x, int y) const 3537player::visibility_at (maptile *map, int x, int y) const
3509{ 3538{

Diff Legend

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