… | |
… | |
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> |
… | |
… | |
146 | } |
145 | } |
147 | |
146 | |
148 | draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, |
147 | draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, |
149 | MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news); |
148 | MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news); |
150 | close_and_delete (fp, comp); |
149 | close_and_delete (fp, comp); |
|
|
150 | } |
|
|
151 | |
|
|
152 | float |
|
|
153 | player::weapon_speed () const |
|
|
154 | { |
|
|
155 | return ob->speed / weapon_sp * .5f;//TODO, the .5 is arbitrary |
151 | } |
156 | } |
152 | |
157 | |
153 | /* This loads the first map an puts the player on it. */ |
158 | /* This loads the first map an puts the player on it. */ |
154 | static void |
159 | static void |
155 | set_first_map (object *op) |
160 | set_first_map (object *op) |
… | |
… | |
202 | |
207 | |
203 | ob->remove (); |
208 | ob->remove (); |
204 | ob->map = 0; |
209 | ob->map = 0; |
205 | party = 0; |
210 | party = 0; |
206 | |
211 | |
207 | // for weird reasons, this is often "ob", keeping a circular reference |
212 | combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this |
208 | ranges [range_skill] = 0; |
|
|
209 | |
213 | |
210 | players.erase (this); |
214 | players.erase (this); |
211 | } |
215 | } |
212 | |
216 | |
213 | // connect the player with a specific client |
217 | // connect the player with a specific client |
214 | // also changed, rationalises, and fixes some incorrect settings |
218 | // also changes, rationalises, and fixes some incorrect settings |
215 | void |
219 | void |
216 | player::connect (client *ns) |
220 | player::connect (client *ns) |
217 | { |
221 | { |
218 | this->ns = ns; |
222 | this->ns = ns; |
219 | ns->pl = this; |
223 | ns->pl = this; |
… | |
… | |
230 | ns->reset_stats (); |
234 | ns->reset_stats (); |
231 | |
235 | |
232 | /* make sure he's a player -- needed because of class change. */ |
236 | /* make sure he's a player -- needed because of class change. */ |
233 | ob->type = PLAYER; // we are paranoid |
237 | ob->type = PLAYER; // we are paranoid |
234 | ob->race = ob->arch->clone.race; |
238 | ob->race = ob->arch->clone.race; |
235 | |
|
|
236 | if (!legal_range (ob, shoottype)) |
|
|
237 | shoottype = range_none; |
|
|
238 | |
239 | |
239 | ob->carrying = sum_weight (ob); |
240 | ob->carrying = sum_weight (ob); |
240 | link_player_skills (ob); |
241 | link_player_skills (ob); |
241 | |
242 | |
242 | CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); |
243 | CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); |
… | |
… | |
263 | |
264 | |
264 | new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); |
265 | new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); |
265 | |
266 | |
266 | esrv_new_player (this, ob->weight + ob->carrying); |
267 | esrv_new_player (this, ob->weight + ob->carrying); |
267 | |
268 | |
|
|
269 | ob->flag [FLAG_READY_WEAPON] = false; |
|
|
270 | ob->flag [FLAG_READY_SKILL] = false; |
|
|
271 | ob->flag [FLAG_READY_BOW] = false; |
|
|
272 | |
|
|
273 | for (object *op = ob->inv; op; op = op->below) |
|
|
274 | if (op->flag [FLAG_APPLIED]) |
|
|
275 | switch (op->type) |
|
|
276 | { |
|
|
277 | case WAND: |
|
|
278 | case ROD: |
|
|
279 | case HORN: |
|
|
280 | case BOW: |
|
|
281 | case SKILL_TOOL: |
|
|
282 | case WEAPON: |
|
|
283 | op->flag [FLAG_APPLIED] = false; |
|
|
284 | apply_special (ob, op, AP_APPLY); |
|
|
285 | break; |
|
|
286 | |
|
|
287 | case SKILL: |
|
|
288 | op->flag [FLAG_APPLIED] = false; |
|
|
289 | break; |
|
|
290 | } |
|
|
291 | |
|
|
292 | ob->change_weapon (combat_ob ? combat_ob : ranged_ob); |
268 | ob->update_stats (); |
293 | ob->update_stats (); |
|
|
294 | |
269 | ns->floorbox_update (); |
295 | ns->floorbox_update (); |
270 | |
|
|
271 | esrv_send_inventory (ob, ob); |
296 | esrv_send_inventory (ob, ob); |
272 | esrv_add_spells (this, 0); |
297 | esrv_add_spells (this, 0); |
273 | |
298 | |
274 | activate (); |
299 | activate (); |
275 | |
300 | |
… | |
… | |
308 | player::set_object (object *op) |
333 | player::set_object (object *op) |
309 | { |
334 | { |
310 | ob = op; |
335 | ob = op; |
311 | ob->contr = this; /* this aren't yet in archetype */ |
336 | ob->contr = this; /* this aren't yet in archetype */ |
312 | |
337 | |
313 | ob->speed_left = 0.5; |
338 | ob->speed_left = 0.5f; |
314 | ob->speed = 1.0; |
339 | ob->speed = 1.0f; |
315 | ob->direction = 5; /* So player faces south */ |
340 | ob->direction = 5; /* So player faces south */ |
316 | } |
341 | } |
317 | |
342 | |
318 | player::player () |
343 | player::player () |
319 | { |
344 | { |
… | |
… | |
325 | unapply = unapply_nochoice; |
350 | unapply = unapply_nochoice; |
326 | |
351 | |
327 | savebed_map = first_map_path; /* Init. respawn position */ |
352 | savebed_map = first_map_path; /* Init. respawn position */ |
328 | |
353 | |
329 | gen_sp_armour = 10; |
354 | gen_sp_armour = 10; |
330 | shoottype = range_none; |
|
|
331 | bowtype = bow_normal; |
355 | bowtype = bow_normal; |
332 | petmode = pet_normal; |
356 | petmode = pet_normal; |
333 | listening = 10; |
357 | listening = 10; |
334 | usekeys = containers; |
358 | usekeys = containers; |
335 | peaceful = 1; /* default peaceful */ |
359 | peaceful = 1; /* default peaceful */ |
… | |
… | |
774 | } |
798 | } |
775 | |
799 | |
776 | void |
800 | void |
777 | object::roll_stats () |
801 | object::roll_stats () |
778 | { |
802 | { |
779 | int statsort [7]; |
803 | int statsort [NUM_STATS]; |
780 | |
804 | |
781 | for (;;) |
805 | for (;;) |
782 | { |
806 | { |
783 | int sum = 0; |
807 | int sum = 0; |
784 | for (int i = 7; i--; ) |
808 | for (int i = NUM_STATS; i--; ) |
785 | sum += statsort [i] = roll_stat (); |
809 | sum += statsort [i] = roll_stat (); |
786 | |
810 | |
787 | if (sum >= 82 && sum <= 116) |
811 | if (sum >= 82 && sum <= 116) |
788 | break; |
812 | break; |
789 | } |
813 | } |
790 | |
814 | |
791 | // Sort the stats so that rerolling is easier... |
815 | // Sort the stats so that rerolling is easier... |
792 | std::sort (statsort, statsort + 7, std::greater<int>()); |
816 | std::sort (statsort, statsort + NUM_STATS, std::greater<int>()); |
793 | |
817 | |
|
|
818 | for (int i = 0; i < NUM_STATS; ++i) |
794 | stats.Str = statsort[0]; |
819 | stats.stat (i) = statsort [i]; |
795 | stats.Dex = statsort[1]; |
|
|
796 | stats.Con = statsort[2]; |
|
|
797 | stats.Int = statsort[3]; |
|
|
798 | stats.Wis = statsort[4]; |
|
|
799 | stats.Pow = statsort[5]; |
|
|
800 | stats.Cha = statsort[6]; |
|
|
801 | |
820 | |
802 | stats.exp = 0; |
821 | stats.exp = 0; |
803 | stats.ac = 0; |
822 | stats.ac = 0; |
804 | |
823 | |
805 | stats.hp = stats.maxhp; |
824 | stats.hp = stats.maxhp; |
… | |
… | |
817 | } |
836 | } |
818 | |
837 | |
819 | void |
838 | void |
820 | object::swap_stats (int a, int b) |
839 | object::swap_stats (int a, int b) |
821 | { |
840 | { |
822 | int tmp = get_attr_value (&contr->orig_stats, a); |
841 | swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b)); |
823 | set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b)); |
|
|
824 | set_attr_value (&contr->orig_stats, b, tmp); |
|
|
825 | |
842 | |
|
|
843 | for (int i = 0; i < NUM_STATS; ++i) |
826 | stats.Str = contr->orig_stats.Str; |
844 | stats.stat (i) = contr->orig_stats.stat (i); |
827 | stats.Dex = contr->orig_stats.Dex; |
|
|
828 | stats.Con = contr->orig_stats.Con; |
|
|
829 | stats.Int = contr->orig_stats.Int; |
|
|
830 | stats.Wis = contr->orig_stats.Wis; |
|
|
831 | stats.Pow = contr->orig_stats.Pow; |
|
|
832 | stats.Cha = contr->orig_stats.Cha; |
|
|
833 | |
845 | |
834 | //TODO: the following code looks so borked and should, at the very least, |
846 | //TODO: the following code looks so borked and should, at the very least, |
835 | // be merged with the similar code in roll_stats |
847 | // be merged with the similar code in roll_stats |
836 | stats.ac = 0; |
848 | stats.ac = 0; |
837 | |
849 | |
… | |
… | |
1014 | /* Cornered, get rid of scared */ |
1026 | /* Cornered, get rid of scared */ |
1015 | CLEAR_FLAG (op, FLAG_SCARED); |
1027 | CLEAR_FLAG (op, FLAG_SCARED); |
1016 | op->enemy = NULL; |
1028 | op->enemy = NULL; |
1017 | } |
1029 | } |
1018 | |
1030 | |
1019 | |
|
|
1020 | /* check_pick sees if there is stuff to be picked up/picks up stuff. |
1031 | /* 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 |
1032 | * It returns 1 if the player should keep on moving, 0 if he should |
1022 | * stop. |
1033 | * stop. |
1023 | */ |
1034 | */ |
1024 | int |
1035 | int |
1025 | check_pick (object *op) |
1036 | check_pick (object *op) |
1026 | { |
1037 | { |
… | |
… | |
1464 | * find_better_arrow to find a decent arrow to use. |
1475 | * find_better_arrow to find a decent arrow to use. |
1465 | * op = the shooter |
1476 | * op = the shooter |
1466 | * type = bow->race |
1477 | * type = bow->race |
1467 | * dir = fire direction |
1478 | * dir = fire direction |
1468 | */ |
1479 | */ |
1469 | |
|
|
1470 | object * |
1480 | object * |
1471 | pick_arrow_target (object *op, const char *type, int dir) |
1481 | pick_arrow_target (object *op, const char *type, int dir) |
1472 | { |
1482 | { |
1473 | object *tmp = NULL; |
1483 | object *tmp = NULL; |
1474 | maptile *m; |
1484 | maptile *m; |
… | |
… | |
1539 | */ |
1549 | */ |
1540 | int |
1550 | int |
1541 | fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy) |
1551 | fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy) |
1542 | { |
1552 | { |
1543 | object *left, *bow; |
1553 | object *left, *bow; |
1544 | int bowspeed, mflags; |
1554 | int mflags; |
1545 | maptile *m; |
1555 | maptile *m; |
1546 | |
1556 | |
1547 | if (!dir) |
1557 | if (!dir) |
1548 | { |
1558 | { |
1549 | new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); |
1559 | new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); |
1550 | return 0; |
1560 | return 0; |
1551 | } |
1561 | } |
1552 | |
1562 | |
1553 | if (op->type == PLAYER) |
1563 | if (op->contr) |
1554 | bow = op->contr->ranges[range_bow]; |
1564 | bow = op->current_weapon; |
1555 | else |
1565 | else |
1556 | { |
1566 | { |
1557 | for (bow = op->inv; bow; bow = bow->below) |
1567 | for (bow = op->inv; bow; bow = bow->below) |
1558 | /* Don't check for applied - monsters don't apply bows - in that way, they |
1568 | /* 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. |
1569 | * don't need to switch back and forth between bows and weapons. |
… | |
… | |
1564 | if (!bow) |
1574 | if (!bow) |
1565 | { |
1575 | { |
1566 | LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); |
1576 | LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); |
1567 | return 0; |
1577 | return 0; |
1568 | } |
1578 | } |
|
|
1579 | |
|
|
1580 | // optimisation: move object to top so we will find it quickly again |
|
|
1581 | if (bow->below) |
|
|
1582 | { |
|
|
1583 | bow->remove (); |
|
|
1584 | op->insert (bow); |
|
|
1585 | } |
|
|
1586 | |
1569 | } |
1587 | } |
1570 | |
1588 | |
1571 | if (!bow->race || !bow->skill) |
1589 | if (!bow->race || !bow->skill) |
1572 | { |
1590 | { |
1573 | new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); |
1591 | new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); |
1574 | return 0; |
1592 | return 0; |
1575 | } |
1593 | } |
1576 | |
|
|
1577 | bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex]; |
|
|
1578 | |
|
|
1579 | /* penalize ROF for bestarrow */ |
|
|
1580 | if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow) |
|
|
1581 | bowspeed -= dex_bonus[op->stats.Dex] + 5; |
|
|
1582 | |
|
|
1583 | if (bowspeed < 1) |
|
|
1584 | bowspeed = 1; |
|
|
1585 | |
1594 | |
1586 | if (arrow == NULL) |
1595 | if (arrow == NULL) |
1587 | { |
1596 | { |
1588 | if ((arrow = find_arrow (op, bow->race)) == NULL) |
1597 | if ((arrow = find_arrow (op, bow->race)) == NULL) |
1589 | { |
1598 | { |
1590 | if (op->type == PLAYER) |
1599 | if (op->type == PLAYER) |
1591 | new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); |
1600 | 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 */ |
1601 | /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ |
1593 | else |
1602 | else |
1594 | CLEAR_FLAG (op, FLAG_READY_BOW); |
1603 | CLEAR_FLAG (op, FLAG_READY_BOW); |
|
|
1604 | |
1595 | return 0; |
1605 | return 0; |
1596 | } |
1606 | } |
1597 | } |
1607 | } |
1598 | |
1608 | |
1599 | mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); |
1609 | mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); |
… | |
… | |
1623 | |
1633 | |
1624 | arrow->set_owner (op); |
1634 | arrow->set_owner (op); |
1625 | arrow->skill = bow->skill; |
1635 | arrow->skill = bow->skill; |
1626 | arrow->direction = dir; |
1636 | arrow->direction = dir; |
1627 | |
1637 | |
|
|
1638 | arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */ |
|
|
1639 | arrow->stats.hp = arrow->stats.dam; |
|
|
1640 | arrow->stats.grace = arrow->attacktype; |
|
|
1641 | |
|
|
1642 | if (arrow->slaying) |
|
|
1643 | arrow->spellarg = strdup (arrow->slaying); |
|
|
1644 | |
|
|
1645 | if (player *pl = op->contr) |
|
|
1646 | { |
|
|
1647 | if (!pl->has_hit) |
|
|
1648 | { |
|
|
1649 | pl->has_hit = 1; |
|
|
1650 | pl->ob->speed_left += pl->weapon_speed () - pl->ob->speed; |
|
|
1651 | } |
|
|
1652 | #if 0 |
|
|
1653 | float speed = pl->weapon_sp; |
|
|
1654 | |
|
|
1655 | /* penalize ROF for bestarrow */ |
|
|
1656 | if (pl->bowtype == bow_bestarrow) |
|
|
1657 | speed *= .9f; |
|
|
1658 | else |
|
|
1659 | speed *= 1.f + dex_bonus[op->stats.Dex] * .2f; |
|
|
1660 | |
|
|
1661 | op->speed_left += speed - op->speed; |
|
|
1662 | #endif |
|
|
1663 | } |
|
|
1664 | |
|
|
1665 | SET_ANIMATION (arrow, arrow->direction); |
|
|
1666 | |
|
|
1667 | /* update the speed */ |
|
|
1668 | arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 |
|
|
1669 | + bow->stats.dam / 7.0; |
|
|
1670 | |
|
|
1671 | arrow->set_speed (max (arrow->speed, 2.0)); |
|
|
1672 | arrow->speed_left = 0; |
|
|
1673 | |
|
|
1674 | int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc; |
|
|
1675 | |
1628 | if (op->type == PLAYER) |
1676 | if (op->type == PLAYER) |
1629 | { |
1677 | { |
1630 | op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed; |
|
|
1631 | op->update_stats (); |
|
|
1632 | } |
|
|
1633 | |
|
|
1634 | 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 | |
|
|
1641 | /* Note that this was different for monsters - they got their level |
|
|
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 | |
|
|
1647 | /* update the speed */ |
|
|
1648 | arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? |
|
|
1649 | 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0; |
|
|
1650 | |
|
|
1651 | arrow->set_speed (max (arrow->speed, 1.0)); |
|
|
1652 | arrow->speed_left = 0; |
|
|
1653 | |
|
|
1654 | if (op->type == PLAYER) |
|
|
1655 | { |
|
|
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; |
1678 | arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; |
|
|
1679 | wc -= dex_bonus[op->stats.Dex]; |
|
|
1680 | |
|
|
1681 | if (!arrow->slaying) |
|
|
1682 | arrow->slaying = op->slaying; |
|
|
1683 | |
|
|
1684 | arrow->attacktype |= op->attacktype; |
1661 | } |
1685 | } |
1662 | else |
1686 | else |
1663 | { |
1687 | { |
1664 | arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod; |
|
|
1665 | arrow->level = op->level; |
1688 | arrow->level = op->level; |
1666 | } |
1689 | arrow->stats.wc -= bow->magic; |
1667 | |
1690 | |
1668 | if (arrow->attacktype == AT_PHYSICAL) |
1691 | if (!arrow->slaying) |
|
|
1692 | arrow->slaying = bow->slaying; |
|
|
1693 | |
1669 | arrow->attacktype |= bow->attacktype; |
1694 | arrow->attacktype |= bow->attacktype; |
|
|
1695 | } |
1670 | |
1696 | |
1671 | if (bow->slaying) |
1697 | wc -= arrow->level; |
1672 | arrow->slaying = bow->slaying; |
1698 | arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM); |
1673 | |
1699 | |
|
|
1700 | arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC); |
1674 | arrow->move_type = MOVE_FLY_LOW; |
1701 | arrow->move_type = MOVE_FLY_LOW; |
1675 | arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; |
1702 | arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; |
1676 | |
1703 | |
1677 | play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); |
1704 | play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); |
1678 | m->insert (arrow, sx, sy, op); |
1705 | m->insert (arrow, sx, sy, op); |
… | |
… | |
1703 | { |
1730 | { |
1704 | int ret = 0, wcmod = 0; |
1731 | int ret = 0, wcmod = 0; |
1705 | |
1732 | |
1706 | if (op->contr->bowtype == bow_bestarrow) |
1733 | if (op->contr->bowtype == bow_bestarrow) |
1707 | { |
1734 | { |
1708 | ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); |
1735 | ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y); |
1709 | } |
1736 | } |
1710 | else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) |
1737 | else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) |
1711 | { |
1738 | { |
1712 | if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) |
1739 | if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) |
1713 | wcmod = -1; |
1740 | wcmod = -1; |
… | |
… | |
1723 | else if (op->contr->bowtype == bow_spreadshot) |
1750 | else if (op->contr->bowtype == bow_spreadshot) |
1724 | { |
1751 | { |
1725 | ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); |
1752 | 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); |
1753 | 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); |
1754 | ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); |
1728 | |
|
|
1729 | } |
1755 | } |
1730 | else |
1756 | else |
1731 | { |
1757 | { |
1732 | /* Simple case */ |
1758 | /* Simple case */ |
1733 | ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); |
1759 | ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); |
1734 | } |
1760 | } |
|
|
1761 | |
1735 | return ret; |
1762 | return ret; |
1736 | } |
1763 | } |
1737 | |
|
|
1738 | |
1764 | |
1739 | /* Fires a misc (wand/rod/horn) object in 'dir'. |
1765 | /* Fires a misc (wand/rod/horn) object in 'dir'. |
1740 | * Broken apart from 'fire' to keep it more readable. |
1766 | * Broken apart from 'fire' to keep it more readable. |
1741 | */ |
1767 | */ |
1742 | void |
1768 | void |
1743 | fire_misc_object (object *op, int dir) |
1769 | fire_misc_object (object *op, int dir) |
1744 | { |
1770 | { |
1745 | object *item; |
1771 | object *item = op->contr->ranged_ob; |
1746 | |
1772 | |
1747 | if (!op->contr->ranges[range_misc]) |
1773 | if (!item) |
1748 | { |
1774 | { |
1749 | new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); |
1775 | new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); |
1750 | return; |
1776 | return; |
1751 | } |
1777 | } |
1752 | |
1778 | |
1753 | item = op->contr->ranges[range_misc]; |
|
|
1754 | if (!item->inv) |
1779 | if (!item->inv) |
1755 | { |
1780 | { |
1756 | LOG (llevError, "Object %s lacks a spell\n", &item->name); |
1781 | LOG (llevError, "Object %s lacks a spell\n", &item->name); |
1757 | return; |
1782 | return; |
1758 | } |
1783 | } |
|
|
1784 | |
|
|
1785 | if (!op->change_weapon (item)) |
|
|
1786 | return; |
|
|
1787 | |
1759 | if (item->type == WAND) |
1788 | if (item->type == WAND) |
1760 | { |
1789 | { |
1761 | if (item->stats.food <= 0) |
1790 | if (item->stats.food <= 0) |
1762 | { |
1791 | { |
1763 | play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); |
1792 | 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)); |
1793 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); |
|
|
1794 | |
1765 | return; |
1795 | return; |
1766 | } |
1796 | } |
1767 | } |
1797 | } |
1768 | else if (item->type == ROD || item->type == HORN) |
1798 | else if (item->type == ROD || item->type == HORN) |
1769 | { |
1799 | { |
1770 | if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) |
1800 | if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) |
1771 | { |
1801 | { |
1772 | play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); |
1802 | play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); |
|
|
1803 | |
1773 | if (item->type == ROD) |
1804 | 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)); |
1805 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); |
1775 | else |
1806 | else |
1776 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); |
1807 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); |
|
|
1808 | |
1777 | return; |
1809 | return; |
1778 | } |
1810 | } |
1779 | } |
1811 | } |
1780 | |
1812 | |
1781 | if (cast_spell (op, item, dir, item->inv, NULL)) |
1813 | if (cast_spell (op, item, dir, item->inv, NULL)) |
… | |
… | |
1812 | |
1844 | |
1813 | /* check for loss of invisiblity/hide */ |
1845 | /* check for loss of invisiblity/hide */ |
1814 | if (action_makes_visible (op)) |
1846 | if (action_makes_visible (op)) |
1815 | make_visible (op); |
1847 | make_visible (op); |
1816 | |
1848 | |
1817 | switch (op->contr->shoottype) |
1849 | player *pl = op->contr; |
|
|
1850 | |
|
|
1851 | if (pl->golem) |
1818 | { |
1852 | { |
1819 | case range_none: |
1853 | control_golem (op->contr->golem, dir); |
1820 | return; |
1854 | return; |
|
|
1855 | } |
1821 | |
1856 | |
1822 | case range_bow: |
1857 | object *ob = pl->ranged_ob; |
|
|
1858 | |
|
|
1859 | if (!ob) |
|
|
1860 | return; |
|
|
1861 | |
|
|
1862 | if (!op->change_weapon (ob)) |
|
|
1863 | return; |
|
|
1864 | |
|
|
1865 | switch (ob->type) |
|
|
1866 | { |
|
|
1867 | case BOW: |
1823 | player_fire_bow (op, dir); |
1868 | player_fire_bow (op, dir); |
1824 | return; |
1869 | break; |
1825 | |
1870 | |
1826 | case range_magic: /* Casting spells */ |
1871 | case SPELL: |
1827 | spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); |
1872 | spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0); |
1828 | return; |
1873 | break; |
1829 | |
1874 | |
1830 | case range_misc: |
1875 | case BUILDER: |
|
|
1876 | apply_map_builder (op, dir); |
|
|
1877 | break; |
|
|
1878 | |
|
|
1879 | case SKILL: |
|
|
1880 | do_skill (op, op, ob, dir, 0); |
|
|
1881 | break; |
|
|
1882 | |
|
|
1883 | default: |
1831 | fire_misc_object (op, dir); |
1884 | fire_misc_object (op, dir); |
1832 | return; |
1885 | 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 | } |
1886 | } |
1856 | } |
1887 | } |
1857 | |
1888 | |
1858 | /* find_key |
1889 | /* find_key |
1859 | * We try to find a key for the door as passed. If we find a key |
1890 | * We try to find a key for the door as passed. If we find a key |
… | |
… | |
1959 | if (key) |
1990 | if (key) |
1960 | { |
1991 | { |
1961 | object *container = key->env; |
1992 | object *container = key->env; |
1962 | |
1993 | |
1963 | play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); |
1994 | play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); |
|
|
1995 | |
1964 | if (action_makes_visible (op)) |
1996 | if (action_makes_visible (op)) |
1965 | make_visible (op); |
1997 | make_visible (op); |
|
|
1998 | |
1966 | if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) |
1999 | if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) |
1967 | spring_trap (door->inv, op); |
2000 | spring_trap (door->inv, op); |
1968 | |
2001 | |
1969 | if (door->type == DOOR) |
2002 | if (door->type == DOOR) |
1970 | hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ |
2003 | hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ |
… | |
… | |
2000 | */ |
2033 | */ |
2001 | void |
2034 | void |
2002 | move_player_attack (object *op, int dir) |
2035 | move_player_attack (object *op, int dir) |
2003 | { |
2036 | { |
2004 | object *tmp, *mon; |
2037 | object *tmp, *mon; |
2005 | sint16 nx, ny; |
|
|
2006 | int on_battleground; |
2038 | int on_battleground; |
2007 | maptile *m; |
2039 | maptile *m; |
2008 | |
2040 | |
2009 | nx = freearr_x[dir] + op->x; |
2041 | sint16 nx = freearr_x[dir] + op->x; |
2010 | ny = freearr_y[dir] + op->y; |
2042 | sint16 ny = freearr_y[dir] + op->y; |
2011 | |
2043 | |
2012 | on_battleground = op_on_battleground (op, 0, 0); |
2044 | on_battleground = op_on_battleground (op, 0, 0); |
2013 | |
2045 | |
2014 | /* If braced, or can't move to the square, and it is not out of the |
2046 | /* 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 |
2047 | * map, attack it. Note order of if statement is important - don't |
… | |
… | |
2080 | |
2112 | |
2081 | /* If the creature is a pet, push it even if the player is not |
2113 | /* If the creature is a pet, push it even if the player is not |
2082 | * peaceful. Our assumption is the creature is a pet if the |
2114 | * peaceful. Our assumption is the creature is a pet if the |
2083 | * player owns it and it is either friendly or unagressive. |
2115 | * player owns it and it is either friendly or unagressive. |
2084 | */ |
2116 | */ |
2085 | if ((op->type == PLAYER) |
2117 | if (op->type == PLAYER |
2086 | #if COZY_SERVER |
|
|
2087 | && |
|
|
2088 | ((mon->owner && mon->owner->contr |
2118 | && ((mon->owner && mon->owner->contr |
2089 | && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op) |
2119 | && same_party (mon->owner->contr->party, op->contr->party)) |
2090 | #else |
|
|
2091 | && mon->owner == op |
2120 | || mon->owner == op) |
2092 | #endif |
|
|
2093 | && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) |
2121 | && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) |
2094 | { |
2122 | { |
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 | } |
… | |
… | |
2107 | /* in certain circumstances, you shouldn't attack friendly |
2135 | /* in certain circumstances, you shouldn't attack friendly |
2108 | * creatures. Note that if you are braced, you can't push |
2136 | * creatures. Note that if you are braced, you can't push |
2109 | * someone, but put it inside this loop so that you won't |
2137 | * someone, but put it inside this loop so that you won't |
2110 | * attack them either. |
2138 | * attack them either. |
2111 | */ |
2139 | */ |
2112 | if ((mon->type == PLAYER || mon->enemy != op) && |
2140 | if ((mon->type == PLAYER || mon->enemy != op) |
2113 | (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( |
2141 | && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) |
2114 | #ifdef PROHIBIT_PLAYERKILL |
|
|
2115 | (op->contr->peaceful |
2142 | && ((op->contr->peaceful |
2116 | || (mon->type == PLAYER |
2143 | || (mon->type == PLAYER && mon->contr->peaceful)) |
2117 | && mon->contr-> |
|
|
2118 | peaceful)) && |
|
|
2119 | #else |
|
|
2120 | op->contr->peaceful && |
|
|
2121 | #endif |
|
|
2122 | !on_battleground)) |
2144 | && !on_battleground)) |
2123 | { |
2145 | { |
2124 | if (!op->contr->braced) |
2146 | if (!op->contr->braced) |
2125 | { |
2147 | { |
2126 | play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); |
2148 | play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); |
2127 | push_ob (mon, dir, op); |
2149 | push_ob (mon, dir, op); |
… | |
… | |
2150 | * that party_number -1 is no party, so attacks can still happen. |
2172 | * that party_number -1 is no party, so attacks can still happen. |
2151 | */ |
2173 | */ |
2152 | else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && |
2174 | else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && |
2153 | ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) |
2175 | ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) |
2154 | { |
2176 | { |
2155 | |
|
|
2156 | /* If the player hasn't hit something this tick, and does |
|
|
2157 | * so, give them speed boost based on weapon speed. Doing |
|
|
2158 | * it here is better than process_players2, which basically |
|
|
2159 | * incurred a 1 tick offset. |
|
|
2160 | */ |
|
|
2161 | if (!op->contr->has_hit) |
2177 | if (!op->contr->has_hit) |
2162 | { |
2178 | { |
|
|
2179 | op->contr->has_hit = 1; |
2163 | op->speed_left += op->speed / op->contr->weapon_sp; |
2180 | op->speed_left += op->contr->weapon_speed () - op->speed; |
2164 | |
|
|
2165 | op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */ |
|
|
2166 | } |
2181 | } |
2167 | |
2182 | |
2168 | skill_attack (mon, op, 0, 0, 0); |
2183 | skill_attack (mon, op, 0, 0, 0); |
2169 | |
2184 | |
2170 | /* If attacking another player, that player gets automatic |
2185 | /* If attacking another player, that player gets automatic |
… | |
… | |
2248 | handle_newcs_player (object *op) |
2263 | handle_newcs_player (object *op) |
2249 | { |
2264 | { |
2250 | if (QUERY_FLAG (op, FLAG_SCARED)) |
2265 | if (QUERY_FLAG (op, FLAG_SCARED)) |
2251 | { |
2266 | { |
2252 | flee_player (op); |
2267 | flee_player (op); |
|
|
2268 | |
2253 | /* If player is still scared, that is his action for this tick */ |
2269 | /* If player is still scared, that is his action for this tick */ |
2254 | if (QUERY_FLAG (op, FLAG_SCARED)) |
2270 | if (op->flag [FLAG_SCARED]) |
2255 | { |
2271 | { |
2256 | op->speed_left--; |
2272 | --op->speed_left; |
2257 | return 0; |
2273 | return 0; |
2258 | } |
2274 | } |
2259 | } |
2275 | } |
2260 | |
2276 | |
2261 | /* call this here - we also will call this in do_ericserver, but |
2277 | /* call this here - we also will call this in do_ericserver, but |
… | |
… | |
2263 | * called, so we recheck it here. |
2279 | * called, so we recheck it here. |
2264 | */ |
2280 | */ |
2265 | if (op->contr->ns->handle_command ()) |
2281 | if (op->contr->ns->handle_command ()) |
2266 | return 1; |
2282 | return 1; |
2267 | |
2283 | |
2268 | if (op->speed_left > 0) |
2284 | if (op->speed_left > 0.f) |
2269 | { |
2285 | { |
2270 | if (op->direction && (op->contr->run_on || op->contr->fire_on)) |
2286 | if (op->direction && (op->contr->run_on || op->contr->fire_on)) |
2271 | { |
2287 | { |
2272 | /* All move commands take 1 tick, at least for now */ |
2288 | /* All move commands take 1 tick, at least for now */ |
2273 | op->speed_left--; |
2289 | --op->speed_left; |
2274 | |
2290 | |
2275 | /* Instead of all the stuff below, let move_player take care |
2291 | /* Instead of all the stuff below, let move_player take care |
2276 | * of it. Also, some of the skill stuff is only put in |
2292 | * of it. Also, some of the skill stuff is only put in |
2277 | * there, as well as the confusion stuff. |
2293 | * there, as well as the confusion stuff. |
2278 | */ |
2294 | */ |
2279 | move_player (op, op->direction); |
2295 | move_player (op, op->direction); |
2280 | |
2296 | |
2281 | return op->speed_left > 0; |
2297 | return op->speed_left > 0.f; |
2282 | } |
2298 | } |
2283 | } |
2299 | } |
2284 | |
2300 | |
2285 | return 0; |
2301 | return 0; |
2286 | } |
2302 | } |
… | |
… | |
2448 | gen_grace = op->stats.maxgrace; |
2464 | gen_grace = op->stats.maxgrace; |
2449 | rate_grace -= rate_grace / 2 * op->contr->gen_grace; |
2465 | rate_grace -= rate_grace / 2 * op->contr->gen_grace; |
2450 | } |
2466 | } |
2451 | |
2467 | |
2452 | /* Regenerate Spell Points */ |
2468 | /* Regenerate Spell Points */ |
2453 | if (!op->contr->ranges[range_golem] && --op->last_sp < 0) |
2469 | if (!op->contr->golem && --op->last_sp < 0) |
2454 | { |
2470 | { |
2455 | gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); |
2471 | 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) |
2472 | if (op->stats.sp < op->stats.maxsp) |
2457 | { |
2473 | { |
2458 | op->stats.sp++; |
2474 | op->stats.sp++; |
… | |
… | |
2556 | } |
2572 | } |
2557 | |
2573 | |
2558 | /* Digestion */ |
2574 | /* Digestion */ |
2559 | if (--op->last_eat < 0) |
2575 | if (--op->last_eat < 0) |
2560 | { |
2576 | { |
2561 | #ifdef COZY_SERVER |
|
|
2562 | int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion; |
|
|
2563 | int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0; |
|
|
2564 | #else |
|
|
2565 | int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0; |
2577 | int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0; |
2566 | #endif |
|
|
2567 | |
2578 | |
2568 | if (op->contr->gen_hp > 0) |
2579 | if (op->contr->gen_hp > 0) |
2569 | op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); |
2580 | op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); |
2570 | else |
2581 | else |
2571 | op->last_eat = 25 * (1 + bonus) / (penalty + 1); |
2582 | op->last_eat = 25 * (1 + bonus) / (penalty + 1); |
… | |
… | |
2916 | object *force; |
2927 | object *force; |
2917 | int at; |
2928 | int at; |
2918 | |
2929 | |
2919 | force = get_archetype (FORCE_NAME); |
2930 | force = get_archetype (FORCE_NAME); |
2920 | /* 50 ticks should be enough time for the spell to abate */ |
2931 | /* 50 ticks should be enough time for the spell to abate */ |
2921 | force->speed = 0.1; |
2932 | force->speed = 0.1f; |
2922 | force->speed_left = -5.0; |
2933 | force->speed_left = -5.f; |
2923 | SET_FLAG (force, FLAG_APPLIED); |
2934 | SET_FLAG (force, FLAG_APPLIED); |
2924 | for (at = 0; at < NROFATTACKS; at++) |
2935 | for (at = 0; at < NROFATTACKS; at++) |
2925 | if (will_kill_again & (1 << at)) |
2936 | if (will_kill_again & (1 << at)) |
2926 | force->resist[at] = 100; |
2937 | force->resist[at] = 100; |
2927 | |
2938 | |
… | |
… | |
3493 | * not readied. |
3504 | * not readied. |
3494 | */ |
3505 | */ |
3495 | void |
3506 | void |
3496 | player_unready_range_ob (player *pl, object *ob) |
3507 | player_unready_range_ob (player *pl, object *ob) |
3497 | { |
3508 | { |
3498 | for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) |
3509 | if (pl->ob->current_weapon == ob) |
|
|
3510 | pl->ob->current_weapon = 0; |
|
|
3511 | |
|
|
3512 | if (pl->combat_ob == ob) |
|
|
3513 | pl->combat_ob = 0; |
|
|
3514 | |
3499 | if (pl->ranges[i] == ob) |
3515 | if (pl->ranged_ob == ob) |
3500 | { |
|
|
3501 | pl->ranges[i] = 0; |
3516 | pl->ranged_ob = 0; |
3502 | if (pl->shoottype == i) |
|
|
3503 | pl->shoottype = range_none; |
|
|
3504 | } |
|
|
3505 | } |
3517 | } |
3506 | |
3518 | |
3507 | sint8 |
3519 | sint8 |
3508 | player::visibility_at (maptile *map, int x, int y) const |
3520 | player::visibility_at (maptile *map, int x, int y) const |
3509 | { |
3521 | { |