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.116 by root, Sun Apr 29 03:44:36 2007 UTC vs.
Revision 1.121 by root, Thu May 3 10:39:46 2007 UTC

… …
202 202
203 ob->remove (); 203 ob->remove ();
204 ob->map = 0; 204 ob->map = 0;
205 party = 0; 205 party = 0;
206 206
207 // for weird reasons, this is often "ob", keeping a circular reference 207 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
208 ranges [range_skill] = 0;
209 208
210 players.erase (this); 209 players.erase (this);
211} 210}
212 211
213// connect the player with a specific client 212// connect the player with a specific client
… …
230 ns->reset_stats (); 229 ns->reset_stats ();
231 230
232 /* make sure he's a player -- needed because of class change. */ 231 /* make sure he's a player -- needed because of class change. */
233 ob->type = PLAYER; // we are paranoid 232 ob->type = PLAYER; // we are paranoid
234 ob->race = ob->arch->clone.race; 233 ob->race = ob->arch->clone.race;
235
236 if (!legal_range (ob, shoottype))
237 shoottype = range_none;
238 234
239 ob->carrying = sum_weight (ob); 235 ob->carrying = sum_weight (ob);
240 link_player_skills (ob); 236 link_player_skills (ob);
241 237
242 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 238 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
… …
325 unapply = unapply_nochoice; 321 unapply = unapply_nochoice;
326 322
327 savebed_map = first_map_path; /* Init. respawn position */ 323 savebed_map = first_map_path; /* Init. respawn position */
328 324
329 gen_sp_armour = 10; 325 gen_sp_armour = 10;
330 shoottype = range_none;
331 bowtype = bow_normal; 326 bowtype = bow_normal;
332 petmode = pet_normal; 327 petmode = pet_normal;
333 listening = 10; 328 listening = 10;
334 usekeys = containers; 329 usekeys = containers;
335 peaceful = 1; /* default peaceful */ 330 peaceful = 1; /* default peaceful */
… …
1464 * find_better_arrow to find a decent arrow to use. 1459 * find_better_arrow to find a decent arrow to use.
1465 * op = the shooter 1460 * op = the shooter
1466 * type = bow->race 1461 * type = bow->race
1467 * dir = fire direction 1462 * dir = fire direction
1468 */ 1463 */
1469
1470object * 1464object *
1471pick_arrow_target (object *op, const char *type, int dir) 1465pick_arrow_target (object *op, const char *type, int dir)
1472{ 1466{
1473 object *tmp = NULL; 1467 object *tmp = NULL;
1474 maptile *m; 1468 maptile *m;
… …
1548 { 1542 {
1549 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1543 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1550 return 0; 1544 return 0;
1551 } 1545 }
1552 1546
1553 if (op->type == PLAYER) 1547 if (player *pl = op->contr)
1554 bow = op->contr->ranges[range_bow]; 1548 {
1549 bow = pl->ranged_ob;
1550 op->set_weapon (bow);
1551 }
1555 else 1552 else
1556 { 1553 {
1557 for (bow = op->inv; bow; bow = bow->below) 1554 for (bow = op->inv; bow; bow = bow->below)
1558 /* Don't check for applied - monsters don't apply bows - in that way, they 1555 /* 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. 1556 * don't need to switch back and forth between bows and weapons.
… …
1564 if (!bow) 1561 if (!bow)
1565 { 1562 {
1566 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1563 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1567 return 0; 1564 return 0;
1568 } 1565 }
1566
1567 // optimisation: move object to top so we will find it quickly again
1568 if (bow->below)
1569 {
1570 bow->remove ();
1571 op->insert (bow);
1572 }
1573
1569 } 1574 }
1570 1575
1571 if (!bow->race || !bow->skill) 1576 if (!bow->race || !bow->skill)
1572 { 1577 {
1573 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1578 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
… …
1705{ 1710{
1706 int ret = 0, wcmod = 0; 1711 int ret = 0, wcmod = 0;
1707 1712
1708 if (op->contr->bowtype == bow_bestarrow) 1713 if (op->contr->bowtype == bow_bestarrow)
1709 { 1714 {
1710 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); 1715 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1711 } 1716 }
1712 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1717 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1713 { 1718 {
1714 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1719 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1715 wcmod = -1; 1720 wcmod = -1;
… …
1725 else if (op->contr->bowtype == bow_spreadshot) 1730 else if (op->contr->bowtype == bow_spreadshot)
1726 { 1731 {
1727 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1732 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1728 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1733 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1729 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1734 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1730
1731 } 1735 }
1732 else 1736 else
1733 { 1737 {
1734 /* Simple case */ 1738 /* Simple case */
1735 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1739 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1736 } 1740 }
1741
1737 return ret; 1742 return ret;
1738} 1743}
1739 1744
1740 1745
1741/* Fires a misc (wand/rod/horn) object in 'dir'. 1746/* Fires a misc (wand/rod/horn) object in 'dir'.
1742 * Broken apart from 'fire' to keep it more readable. 1747 * Broken apart from 'fire' to keep it more readable.
1743 */ 1748 */
1744void 1749void
1745fire_misc_object (object *op, int dir) 1750fire_misc_object (object *op, int dir)
1746{ 1751{
1747 object *item; 1752 object *item = op->contr->ranged_ob;
1748 1753
1749 if (!op->contr->ranges[range_misc]) 1754 if (!item)
1750 { 1755 {
1751 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); 1756 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1752 return; 1757 return;
1753 } 1758 }
1754 1759
1755 item = op->contr->ranges[range_misc];
1756 if (!item->inv) 1760 if (!item->inv)
1757 { 1761 {
1758 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1762 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1759 return; 1763 return;
1760 } 1764 }
1765
1766 op->set_weapon (item);
1767
1761 if (item->type == WAND) 1768 if (item->type == WAND)
1762 { 1769 {
1763 if (item->stats.food <= 0) 1770 if (item->stats.food <= 0)
1764 { 1771 {
1765 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1772 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1766 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1773 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1774
1767 return; 1775 return;
1768 } 1776 }
1769 } 1777 }
1770 else if (item->type == ROD || item->type == HORN) 1778 else if (item->type == ROD || item->type == HORN)
1771 { 1779 {
1772 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1780 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1773 { 1781 {
1774 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1782 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1783
1775 if (item->type == ROD) 1784 if (item->type == ROD)
1776 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1785 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1777 else 1786 else
1778 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1787 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1788
1779 return; 1789 return;
1780 } 1790 }
1781 } 1791 }
1782 1792
1783 if (cast_spell (op, item, dir, item->inv, NULL)) 1793 if (cast_spell (op, item, dir, item->inv, NULL))
… …
1814 1824
1815 /* check for loss of invisiblity/hide */ 1825 /* check for loss of invisiblity/hide */
1816 if (action_makes_visible (op)) 1826 if (action_makes_visible (op))
1817 make_visible (op); 1827 make_visible (op);
1818 1828
1819 switch (op->contr->shoottype) 1829 player *pl = op->contr;
1830
1831 if (pl->golem)
1820 { 1832 {
1821 case range_none: 1833 control_golem (op->contr->golem, dir);
1822 return; 1834 return;
1835 }
1823 1836
1824 case range_bow: 1837 object *ob = pl->ranged_ob;
1838
1839 if (!ob)
1840 return;
1841
1842 switch (ob->type)
1843 {
1844 case BOW:
1825 player_fire_bow (op, dir); 1845 player_fire_bow (op, dir);
1826 return; 1846 break;
1827 1847
1828 case range_magic: /* Casting spells */ 1848 case SPELL:
1829 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); 1849 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1830 return; 1850 break;
1831 1851
1832 case range_misc: 1852 case BUILDER:
1853 apply_map_builder (op, dir);
1854 break;
1855
1856 case SKILL:
1857 case SKILL_TOOL:
1858 do_skill (op, op, ob, dir, 0);
1859 break;
1860
1861 default:
1833 fire_misc_object (op, dir); 1862 fire_misc_object (op, dir);
1834 return; 1863 break;
1835
1836 case range_golem: /* Control summoned monsters from scrolls */
1837 control_golem (op->contr->ranges[range_golem], dir);
1838 return;
1839
1840 case range_skill:
1841 if (!op->chosen_skill)
1842 {
1843 if (op->type == PLAYER)
1844 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1845
1846 return;
1847 }
1848
1849 do_skill (op, op, op->chosen_skill, dir, NULL);
1850 return;
1851 case range_builder:
1852 apply_map_builder (op, dir);
1853 return;
1854 default:
1855 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1856 return;
1857 } 1864 }
1858} 1865}
1859 1866
1860/* find_key 1867/* find_key
1861 * We try to find a key for the door as passed. If we find a key 1868 * We try to find a key for the door as passed. If we find a key
… …
1961 if (key) 1968 if (key)
1962 { 1969 {
1963 object *container = key->env; 1970 object *container = key->env;
1964 1971
1965 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); 1972 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1973
1966 if (action_makes_visible (op)) 1974 if (action_makes_visible (op))
1967 make_visible (op); 1975 make_visible (op);
1976
1968 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1977 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1969 spring_trap (door->inv, op); 1978 spring_trap (door->inv, op);
1970 1979
1971 if (door->type == DOOR) 1980 if (door->type == DOOR)
1972 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1981 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
… …
2002 */ 2011 */
2003void 2012void
2004move_player_attack (object *op, int dir) 2013move_player_attack (object *op, int dir)
2005{ 2014{
2006 object *tmp, *mon; 2015 object *tmp, *mon;
2007 sint16 nx, ny;
2008 int on_battleground; 2016 int on_battleground;
2009 maptile *m; 2017 maptile *m;
2010 2018
2011 nx = freearr_x[dir] + op->x; 2019 sint16 nx = freearr_x[dir] + op->x;
2012 ny = freearr_y[dir] + op->y; 2020 sint16 ny = freearr_y[dir] + op->y;
2013 2021
2014 on_battleground = op_on_battleground (op, 0, 0); 2022 on_battleground = op_on_battleground (op, 0, 0);
2015 2023
2016 /* If braced, or can't move to the square, and it is not out of the 2024 /* If braced, or can't move to the square, and it is not out of the
2017 * map, attack it. Note order of if statement is important - don't 2025 * map, attack it. Note order of if statement is important - don't
… …
2097 /* If we're braced, we don't want to switch places with it */ 2105 /* If we're braced, we don't want to switch places with it */
2098 if (op->contr->braced) 2106 if (op->contr->braced)
2099 return; 2107 return;
2100 2108
2101 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2109 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2102 (void) push_ob (mon, dir, op); 2110 push_ob (mon, dir, op);
2103 if (op->contr->tmp_invis || op->hide) 2111 if (op->contr->tmp_invis || op->hide)
2104 make_visible (op); 2112 make_visible (op);
2105 2113
2106 return; 2114 return;
2107 } 2115 }
… …
2450 gen_grace = op->stats.maxgrace; 2458 gen_grace = op->stats.maxgrace;
2451 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2459 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2452 } 2460 }
2453 2461
2454 /* Regenerate Spell Points */ 2462 /* Regenerate Spell Points */
2455 if (!op->contr->ranges[range_golem] && --op->last_sp < 0) 2463 if (!op->contr->golem && --op->last_sp < 0)
2456 { 2464 {
2457 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); 2465 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2458 if (op->stats.sp < op->stats.maxsp) 2466 if (op->stats.sp < op->stats.maxsp)
2459 { 2467 {
2460 op->stats.sp++; 2468 op->stats.sp++;
… …
3495 * not readied. 3503 * not readied.
3496 */ 3504 */
3497void 3505void
3498player_unready_range_ob (player *pl, object *ob) 3506player_unready_range_ob (player *pl, object *ob)
3499{ 3507{
3500 for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3508 if (pl->ob->current_weapon == ob)
3509 pl->ob->current_weapon = 0;
3510
3511 if (pl->combat_ob == ob)
3512 pl->combat_ob = 0;
3513
3501 if (pl->ranges[i] == ob) 3514 if (pl->ranged_ob == ob)
3502 {
3503 pl->ranges[i] = 0; 3515 pl->ranged_ob = 0;
3504 if (pl->shoottype == i)
3505 pl->shoottype = range_none;
3506 }
3507} 3516}
3508 3517
3509sint8 3518sint8
3510player::visibility_at (maptile *map, int x, int y) const 3519player::visibility_at (maptile *map, int x, int y) const
3511{ 3520{

Diff Legend

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