… | |
… | |
226 | /* if it's a dragon player, set the correct title here */ |
226 | /* if it's a dragon player, set the correct title here */ |
227 | if (is_dragon_pl (ob)) |
227 | if (is_dragon_pl (ob)) |
228 | { |
228 | { |
229 | object *tmp, *abil = 0, *skin = 0; |
229 | object *tmp, *abil = 0, *skin = 0; |
230 | |
230 | |
231 | shstr_cmp dragon_ability_force ("dragon_ability_force"); |
|
|
232 | shstr_cmp dragon_skin_force ("dragon_skin_force"); |
|
|
233 | |
|
|
234 | for (tmp = ob->inv; tmp; tmp = tmp->below) |
231 | for (tmp = ob->inv; tmp; tmp = tmp->below) |
235 | if (tmp->type == FORCE) |
232 | if (tmp->type == FORCE) |
236 | if (tmp->arch->archname == dragon_ability_force) |
233 | if (tmp->arch->archname == shstr_dragon_ability_force) |
237 | abil = tmp; |
234 | abil = tmp; |
238 | else if (tmp->arch->archname == dragon_skin_force) |
235 | else if (tmp->arch->archname == shstr_dragon_skin_force) |
239 | skin = tmp; |
236 | skin = tmp; |
240 | |
237 | |
241 | set_dragon_name (ob, abil, skin); |
238 | set_dragon_name (ob, abil, skin); |
242 | } |
239 | } |
243 | |
240 | |
… | |
… | |
287 | } |
284 | } |
288 | |
285 | |
289 | void |
286 | void |
290 | player::disconnect () |
287 | player::disconnect () |
291 | { |
288 | { |
|
|
289 | if (ob) |
|
|
290 | { |
|
|
291 | ob->close_container (); //TODO: client-specific |
|
|
292 | ob->drop_unpaid_items (); |
|
|
293 | } |
|
|
294 | |
292 | if (ns) |
295 | if (ns) |
293 | { |
296 | { |
294 | if (active) |
297 | if (active) |
295 | INVOKE_PLAYER (LOGOUT, this, ARG_INT (0)); |
298 | INVOKE_PLAYER (LOGOUT, this, ARG_INT (0)); |
296 | |
299 | |
… | |
… | |
298 | |
301 | |
299 | ns->reset_stats (); |
302 | ns->reset_stats (); |
300 | ns->pl = 0; |
303 | ns->pl = 0; |
301 | ns = 0; |
304 | ns = 0; |
302 | } |
305 | } |
303 | |
|
|
304 | if (ob) |
|
|
305 | ob->close_container (); //TODO: client-specific |
|
|
306 | |
306 | |
307 | observe = ob; |
307 | observe = ob; |
308 | |
308 | |
309 | deactivate (); |
309 | deactivate (); |
310 | } |
310 | } |
… | |
… | |
425 | unsigned lastdist; |
425 | unsigned lastdist; |
426 | rv_vector rv; |
426 | rv_vector rv; |
427 | |
427 | |
428 | for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next) |
428 | for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next) |
429 | { |
429 | { |
430 | /* We should not find free objects on this friendly list, but it |
|
|
431 | * does periodically happen. Given that, lets deal with it. |
|
|
432 | * While unlikely, it is possible the next object on the friendly |
|
|
433 | * list is also free, so encapsulate this in a while loop. |
|
|
434 | */ |
|
|
435 | while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY)) |
|
|
436 | { |
|
|
437 | object *tmp = ol->ob; |
|
|
438 | |
|
|
439 | /* Can't do much more other than log the fact, because the object |
|
|
440 | * itself will have been cleared. |
|
|
441 | */ |
|
|
442 | LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n", |
|
|
443 | tmp->debug_desc ()); |
|
|
444 | ol = ol->next; |
|
|
445 | remove_friendly_object (tmp); |
|
|
446 | if (!ol) |
|
|
447 | return op; |
|
|
448 | } |
|
|
449 | |
|
|
450 | /* Remove special check for player from this. First, it looks to cause |
|
|
451 | * some crashes (ol->ob->contr not set properly?), but secondly, a more |
|
|
452 | * complicated method of state checking would be needed in any case - |
|
|
453 | * as it was, a clever player could type quit, and the function would |
|
|
454 | * skip them over while waiting for confirmation. Remove |
|
|
455 | * on_same_map check, as can_detect_enemy also does this |
|
|
456 | */ |
|
|
457 | if (!can_detect_enemy (mon, ol->ob, &rv)) |
430 | if (!can_detect_enemy (mon, ol->ob, &rv)) |
458 | continue; |
431 | continue; |
459 | |
432 | |
460 | if (lastdist > rv.distance) |
433 | if (lastdist > rv.distance) |
461 | { |
434 | { |
… | |
… | |
1188 | pick_up (op, tmp); |
1161 | pick_up (op, tmp); |
1189 | continue; |
1162 | continue; |
1190 | } |
1163 | } |
1191 | |
1164 | |
1192 | if (op->contr->mode & PU_READABLES) |
1165 | if (op->contr->mode & PU_READABLES) |
1193 | if (tmp->type == BOOK || tmp->type == SCROLL) |
1166 | if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE) |
1194 | { |
1167 | { |
1195 | pick_up (op, tmp); |
1168 | pick_up (op, tmp); |
1196 | continue; |
1169 | continue; |
1197 | } |
1170 | } |
1198 | |
1171 | |
… | |
… | |
1683 | |
1656 | |
1684 | arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC); |
1657 | arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC); |
1685 | arrow->move_type = MOVE_FLY_LOW; |
1658 | arrow->move_type = MOVE_FLY_LOW; |
1686 | arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; |
1659 | arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; |
1687 | |
1660 | |
1688 | play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); |
1661 | op->play_sound (sound_find ("fire_arrow")); |
1689 | m->insert (arrow, sx, sy, op); |
1662 | m->insert (arrow, sx, sy, op); |
1690 | |
1663 | |
1691 | if (!arrow->destroyed ()) |
1664 | if (!arrow->destroyed ()) |
1692 | move_arrow (arrow); |
1665 | move_arrow (arrow); |
1693 | |
1666 | |
… | |
… | |
1771 | |
1744 | |
1772 | if (item->type == WAND) |
1745 | if (item->type == WAND) |
1773 | { |
1746 | { |
1774 | if (item->stats.food <= 0) |
1747 | if (item->stats.food <= 0) |
1775 | { |
1748 | { |
1776 | play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); |
1749 | op->contr->play_sound (sound_find ("wand_poof")); |
1777 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); |
1750 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); |
1778 | |
1751 | |
1779 | return; |
1752 | return; |
1780 | } |
1753 | } |
1781 | } |
1754 | } |
1782 | else if (item->type == ROD || item->type == HORN) |
1755 | else if (item->type == ROD || item->type == HORN) |
1783 | { |
1756 | { |
1784 | if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) |
1757 | if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) |
1785 | { |
1758 | { |
1786 | play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); |
1759 | op->contr->play_sound (sound_find ("wand_poof")); |
1787 | |
1760 | |
1788 | if (item->type == ROD) |
1761 | if (item->type == ROD) |
1789 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); |
1762 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); |
1790 | else |
1763 | else |
1791 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); |
1764 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); |
… | |
… | |
1980 | /* If we found a key, do some extra work */ |
1953 | /* If we found a key, do some extra work */ |
1981 | if (key) |
1954 | if (key) |
1982 | { |
1955 | { |
1983 | object *container = key->env; |
1956 | object *container = key->env; |
1984 | |
1957 | |
1985 | play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); |
|
|
1986 | |
|
|
1987 | if (action_makes_visible (op)) |
1958 | if (action_makes_visible (op)) |
1988 | make_visible (op); |
1959 | make_visible (op); |
1989 | |
1960 | |
1990 | if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) |
1961 | if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) |
1991 | spring_trap (door->inv, op); |
1962 | spring_trap (door->inv, op); |
… | |
… | |
2104 | |
2075 | |
2105 | if (op->speed_left > 0.f) |
2076 | if (op->speed_left > 0.f) |
2106 | { |
2077 | { |
2107 | --op->speed_left; |
2078 | --op->speed_left; |
2108 | |
2079 | |
2109 | play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); |
2080 | op->play_sound (sound_find ("push_player")); |
2110 | push_ob (mon, dir, op); |
2081 | push_ob (mon, dir, op); |
2111 | |
2082 | |
2112 | if (op->contr->tmp_invis || op->hide) |
2083 | if (op->contr->tmp_invis || op->hide) |
2113 | make_visible (op); |
2084 | make_visible (op); |
2114 | |
2085 | |
… | |
… | |
2133 | { |
2104 | { |
2134 | --op->speed_left; |
2105 | --op->speed_left; |
2135 | |
2106 | |
2136 | if (!op->contr->braced) |
2107 | if (!op->contr->braced) |
2137 | { |
2108 | { |
2138 | play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); |
2109 | op->play_sound (sound_find ("push_player")); |
2139 | push_ob (mon, dir, op); |
2110 | push_ob (mon, dir, op); |
2140 | } |
2111 | } |
2141 | else |
2112 | else |
2142 | new_draw_info (0, 0, op, "You withhold your attack"); |
2113 | new_draw_info (0, 0, op, "You withhold your attack"); |
2143 | |
2114 | |
… | |
… | |
2286 | return 0; |
2257 | return 0; |
2287 | |
2258 | |
2288 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
2259 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
2289 | if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) |
2260 | if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) |
2290 | { |
2261 | { |
2291 | play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); |
2262 | op->play_sound (sound_find ("ob_evaporate")); |
2292 | new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); |
2263 | new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); |
2293 | |
2264 | |
2294 | if (op->contr) |
2265 | if (op->contr) |
2295 | esrv_del_item (op->contr, tmp->count); |
2266 | esrv_del_item (op->contr, tmp->count); |
2296 | |
2267 | |
… | |
… | |
2316 | /* This goes throws the inventory and removes unpaid objects, and puts them |
2287 | /* This goes throws the inventory and removes unpaid objects, and puts them |
2317 | * back in the map (location and map determined by values of env). This |
2288 | * back in the map (location and map determined by values of env). This |
2318 | * function will descend into containers. op is the object to start the search |
2289 | * function will descend into containers. op is the object to start the search |
2319 | * from. |
2290 | * from. |
2320 | */ |
2291 | */ |
2321 | void |
2292 | static void |
2322 | remove_unpaid_objects (object *op, object *env) |
2293 | drop_unpaid_items (object *op, object *env) |
2323 | { |
2294 | { |
2324 | while (op) |
2295 | while (op) |
2325 | { |
2296 | { |
2326 | object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ |
2297 | object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ |
2327 | |
2298 | |
… | |
… | |
2331 | esrv_del_item (env->contr, op->count); |
2302 | esrv_del_item (env->contr, op->count); |
2332 | |
2303 | |
2333 | op->insert_at (env); |
2304 | op->insert_at (env); |
2334 | } |
2305 | } |
2335 | else if (op->inv) |
2306 | else if (op->inv) |
2336 | remove_unpaid_objects (op->inv, env); |
2307 | drop_unpaid_items (op->inv, env); |
2337 | |
2308 | |
2338 | op = next; |
2309 | op = next; |
2339 | } |
2310 | } |
|
|
2311 | } |
|
|
2312 | |
|
|
2313 | void |
|
|
2314 | object::drop_unpaid_items () |
|
|
2315 | { |
|
|
2316 | if (!flag [FLAG_REMOVED]) |
|
|
2317 | ::drop_unpaid_items (inv, this); |
2340 | } |
2318 | } |
2341 | |
2319 | |
2342 | /* |
2320 | /* |
2343 | * Returns pointer a static string containing gravestone text |
2321 | * Returns pointer a static string containing gravestone text |
2344 | * Moved from apply.c to player.c - player.c is what |
2322 | * Moved from apply.c to player.c - player.c is what |
… | |
… | |
2550 | } |
2528 | } |
2551 | |
2529 | |
2552 | /* Digestion */ |
2530 | /* Digestion */ |
2553 | if (--op->last_eat < 0) |
2531 | if (--op->last_eat < 0) |
2554 | { |
2532 | { |
2555 | int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0; |
2533 | int bonus = max (0, op->contr->digestion), |
|
|
2534 | penalty = max (0, -op->contr->digestion); |
2556 | |
2535 | |
2557 | if (op->contr->gen_hp > 0) |
|
|
2558 | op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); |
2536 | op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1); |
2559 | else |
|
|
2560 | op->last_eat = 25 * (1 + bonus) / (penalty + 1); |
|
|
2561 | |
2537 | |
2562 | /* dms do not consume food */ |
2538 | /* dms do not consume food */ |
2563 | if (!QUERY_FLAG (op, FLAG_WIZ)) |
2539 | if (!QUERY_FLAG (op, FLAG_WIZ)) |
2564 | op->stats.food--; |
2540 | op->stats.food--; |
2565 | } |
2541 | } |
… | |
… | |
2626 | object *tmp; |
2602 | object *tmp; |
2627 | |
2603 | |
2628 | if (save_life (op)) |
2604 | if (save_life (op)) |
2629 | return; |
2605 | return; |
2630 | |
2606 | |
2631 | |
|
|
2632 | /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas |
2607 | /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas |
2633 | * in cities ONLY!!! It is very important that this doesn't get abused. |
2608 | * in cities ONLY!!! It is very important that this doesn't get abused. |
2634 | * Look at op_on_battleground() for more info --AndreasV |
2609 | * Look at op_on_battleground() for more info --AndreasV |
2635 | */ |
2610 | */ |
2636 | if (op_on_battleground (op, &x, &y)) |
2611 | if (op_on_battleground (op, &x, &y)) |
… | |
… | |
2688 | strcpy (op->contr->killer, "starvation"); |
2663 | strcpy (op->contr->killer, "starvation"); |
2689 | } |
2664 | } |
2690 | else |
2665 | else |
2691 | sprintf (buf, "%s died.", &op->name); |
2666 | sprintf (buf, "%s died.", &op->name); |
2692 | |
2667 | |
2693 | play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); |
2668 | op->contr->play_sound (sound_find ("player_dies")); |
2694 | |
2669 | |
2695 | /* save the map location for corpse, gravestone */ |
2670 | /* save the map location for corpse, gravestone */ |
2696 | x = op->x; |
2671 | x = op->x; |
2697 | y = op->y; |
2672 | y = op->y; |
2698 | map = op->map; |
2673 | map = op->map; |
… | |
… | |
2875 | |
2850 | |
2876 | /* |
2851 | /* |
2877 | * Check to see if the player has any unpaid items. If so, remove them |
2852 | * Check to see if the player has any unpaid items. If so, remove them |
2878 | * and put them back in the map. |
2853 | * and put them back in the map. |
2879 | */ |
2854 | */ |
2880 | remove_unpaid_objects (op->inv, op); |
2855 | op->drop_unpaid_items (); |
2881 | |
2856 | |
2882 | /****************************************/ |
2857 | /****************************************/ |
2883 | /* */ |
2858 | /* */ |
2884 | /* Move player to his current respawn- */ |
2859 | /* Move player to his current respawn- */ |
2885 | /* position (usually last savebed) */ |
2860 | /* position (usually last savebed) */ |
… | |
… | |
3422 | { |
3397 | { |
3423 | /* forces in the treasurelist can alter the player's stats */ |
3398 | /* forces in the treasurelist can alter the player's stats */ |
3424 | object *skin; |
3399 | object *skin; |
3425 | |
3400 | |
3426 | /* first get the dragon skin force */ |
3401 | /* first get the dragon skin force */ |
3427 | shstr_cmp dragon_skin_force ("dragon_skin_force"); |
|
|
3428 | for (skin = who->inv; skin && !(skin->arch->archname == dragon_skin_force); skin = skin->below) |
3402 | for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below) |
3429 | ; |
3403 | ; |
3430 | |
3404 | |
3431 | if (!skin) |
3405 | if (!skin) |
3432 | return; |
3406 | return; |
3433 | |
3407 | |