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.153 by root, Tue Jul 10 05:51:38 2007 UTC vs.
Revision 1.161 by root, Thu Aug 23 15:20:33 2007 UTC

… …
284} 284}
285 285
286void 286void
287player::disconnect () 287player::disconnect ()
288{ 288{
289 if (ob)
290 {
291 ob->close_container (); //TODO: client-specific
292 ob->drop_unpaid_items ();
293 }
294
289 if (ns) 295 if (ns)
290 { 296 {
291 if (active) 297 if (active)
292 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0)); 298 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
293 299
… …
295 301
296 ns->reset_stats (); 302 ns->reset_stats ();
297 ns->pl = 0; 303 ns->pl = 0;
298 ns = 0; 304 ns = 0;
299 } 305 }
300
301 if (ob)
302 ob->close_container (); //TODO: client-specific
303 306
304 observe = ob; 307 observe = ob;
305 308
306 deactivate (); 309 deactivate ();
307} 310}
… …
422 unsigned lastdist; 425 unsigned lastdist;
423 rv_vector rv; 426 rv_vector rv;
424 427
425 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next) 428 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
426 { 429 {
427 /* We should not find free objects on this friendly list, but it
428 * does periodically happen. Given that, lets deal with it.
429 * While unlikely, it is possible the next object on the friendly
430 * list is also free, so encapsulate this in a while loop.
431 */
432 while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
433 {
434 object *tmp = ol->ob;
435
436 /* Can't do much more other than log the fact, because the object
437 * itself will have been cleared.
438 */
439 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
440 tmp->debug_desc ());
441 ol = ol->next;
442 remove_friendly_object (tmp);
443 if (!ol)
444 return op;
445 }
446
447 /* Remove special check for player from this. First, it looks to cause
448 * some crashes (ol->ob->contr not set properly?), but secondly, a more
449 * complicated method of state checking would be needed in any case -
450 * as it was, a clever player could type quit, and the function would
451 * skip them over while waiting for confirmation. Remove
452 * on_same_map check, as can_detect_enemy also does this
453 */
454 if (!can_detect_enemy (mon, ol->ob, &rv)) 430 if (!can_detect_enemy (mon, ol->ob, &rv))
455 continue; 431 continue;
456 432
457 if (lastdist > rv.distance) 433 if (lastdist > rv.distance)
458 { 434 {
… …
1185 pick_up (op, tmp); 1161 pick_up (op, tmp);
1186 continue; 1162 continue;
1187 } 1163 }
1188 1164
1189 if (op->contr->mode & PU_READABLES) 1165 if (op->contr->mode & PU_READABLES)
1190 if (tmp->type == BOOK || tmp->type == SCROLL) 1166 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1191 { 1167 {
1192 pick_up (op, tmp); 1168 pick_up (op, tmp);
1193 continue; 1169 continue;
1194 } 1170 }
1195 1171
… …
1680 1656
1681 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC); 1657 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1682 arrow->move_type = MOVE_FLY_LOW; 1658 arrow->move_type = MOVE_FLY_LOW;
1683 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1659 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1684 1660
1685 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1661 op->play_sound (sound_find ("fire_arrow"));
1686 m->insert (arrow, sx, sy, op); 1662 m->insert (arrow, sx, sy, op);
1687 1663
1688 if (!arrow->destroyed ()) 1664 if (!arrow->destroyed ())
1689 move_arrow (arrow); 1665 move_arrow (arrow);
1690 1666
… …
1768 1744
1769 if (item->type == WAND) 1745 if (item->type == WAND)
1770 { 1746 {
1771 if (item->stats.food <= 0) 1747 if (item->stats.food <= 0)
1772 { 1748 {
1773 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1749 op->contr->play_sound (sound_find ("wand_poof"));
1774 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));
1775 1751
1776 return; 1752 return;
1777 } 1753 }
1778 } 1754 }
1779 else if (item->type == ROD || item->type == HORN) 1755 else if (item->type == ROD || item->type == HORN)
1780 { 1756 {
1781 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))
1782 { 1758 {
1783 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1759 op->contr->play_sound (sound_find ("wand_poof"));
1784 1760
1785 if (item->type == ROD) 1761 if (item->type == ROD)
1786 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));
1787 else 1763 else
1788 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));
… …
1977 /* If we found a key, do some extra work */ 1953 /* If we found a key, do some extra work */
1978 if (key) 1954 if (key)
1979 { 1955 {
1980 object *container = key->env; 1956 object *container = key->env;
1981 1957
1982 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1983
1984 if (action_makes_visible (op)) 1958 if (action_makes_visible (op))
1985 make_visible (op); 1959 make_visible (op);
1986 1960
1987 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1961 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1988 spring_trap (door->inv, op); 1962 spring_trap (door->inv, op);
… …
2101 2075
2102 if (op->speed_left > 0.f) 2076 if (op->speed_left > 0.f)
2103 { 2077 {
2104 --op->speed_left; 2078 --op->speed_left;
2105 2079
2106 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2080 op->play_sound (sound_find ("push_player"));
2107 push_ob (mon, dir, op); 2081 push_ob (mon, dir, op);
2108 2082
2109 if (op->contr->tmp_invis || op->hide) 2083 if (op->contr->tmp_invis || op->hide)
2110 make_visible (op); 2084 make_visible (op);
2111 2085
… …
2130 { 2104 {
2131 --op->speed_left; 2105 --op->speed_left;
2132 2106
2133 if (!op->contr->braced) 2107 if (!op->contr->braced)
2134 { 2108 {
2135 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2109 op->play_sound (sound_find ("push_player"));
2136 push_ob (mon, dir, op); 2110 push_ob (mon, dir, op);
2137 } 2111 }
2138 else 2112 else
2139 new_draw_info (0, 0, op, "You withhold your attack"); 2113 new_draw_info (0, 0, op, "You withhold your attack");
2140 2114
… …
2283 return 0; 2257 return 0;
2284 2258
2285 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2259 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2286 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2260 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2287 { 2261 {
2288 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2262 op->play_sound (sound_find ("ob_evaporate"));
2289 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));
2290 2264
2291 if (op->contr) 2265 if (op->contr)
2292 esrv_del_item (op->contr, tmp->count); 2266 esrv_del_item (op->contr, tmp->count);
2293 2267
… …
2313/* 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
2314 * 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
2315 * 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
2316 * from. 2290 * from.
2317 */ 2291 */
2318void 2292static void
2319remove_unpaid_objects (object *op, object *env) 2293drop_unpaid_items (object *op, object *env)
2320{ 2294{
2321 while (op) 2295 while (op)
2322 { 2296 {
2323 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' */
2324 2298
… …
2328 esrv_del_item (env->contr, op->count); 2302 esrv_del_item (env->contr, op->count);
2329 2303
2330 op->insert_at (env); 2304 op->insert_at (env);
2331 } 2305 }
2332 else if (op->inv) 2306 else if (op->inv)
2333 remove_unpaid_objects (op->inv, env); 2307 drop_unpaid_items (op->inv, env);
2334 2308
2335 op = next; 2309 op = next;
2336 } 2310 }
2311}
2312
2313void
2314object::drop_unpaid_items ()
2315{
2316 if (!flag [FLAG_REMOVED])
2317 ::drop_unpaid_items (inv, this);
2337} 2318}
2338 2319
2339/* 2320/*
2340 * Returns pointer a static string containing gravestone text 2321 * Returns pointer a static string containing gravestone text
2341 * Moved from apply.c to player.c - player.c is what 2322 * Moved from apply.c to player.c - player.c is what
… …
2436 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2417 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2437 else 2418 else
2438 { 2419 {
2439 gen_grace = op->stats.maxgrace; 2420 gen_grace = op->stats.maxgrace;
2440 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2421 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2441 }
2442
2443 /* Regenerate Spell Points */
2444 if (!op->contr->golem && --op->last_sp < 0)
2445 {
2446 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2447 if (op->stats.sp < op->stats.maxsp)
2448 {
2449 op->stats.sp++;
2450 /* dms do not consume food */
2451 if (!QUERY_FLAG (op, FLAG_WIZ))
2452 {
2453 op->stats.food--;
2454 if (op->contr->digestion < 0)
2455 op->stats.food += op->contr->digestion;
2456 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2457 op->stats.food = last_food;
2458 }
2459 }
2460
2461 if (max_sp > 1)
2462 {
2463 over_sp = (gen_sp + 10) / rate_sp;
2464 if (over_sp > 0)
2465 {
2466 if (op->stats.sp < op->stats.maxsp)
2467 {
2468 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2469
2470 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2471 op->stats.sp--;
2472
2473 if (op->stats.sp > op->stats.maxsp)
2474 op->stats.sp = op->stats.maxsp;
2475 }
2476 op->last_sp = 0;
2477 }
2478 else
2479 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2480 }
2481 else
2482 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2483 } 2422 }
2484 2423
2485 /* Regenerate Grace */ 2424 /* Regenerate Grace */
2486 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2425 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2487 if (--op->last_grace < 0) 2426 if (--op->last_grace < 0)
… …
2508 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2447 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2509 } 2448 }
2510 /* wearing stuff doesn't detract from grace generation. */ 2449 /* wearing stuff doesn't detract from grace generation. */
2511 } 2450 }
2512 2451
2452 if (op->stats.food > 0)
2453 {
2513 /* Regenerate Hit Points */ 2454 /* Regenerate Spell Points */
2514 if (--op->last_heal < 0) 2455 if (!op->contr->golem && --op->last_sp < 0)
2515 {
2516 if (op->stats.hp < op->stats.maxhp)
2517 { 2456 {
2518 op->stats.hp++; 2457 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2519 /* dms do not consume food */ 2458
2520 if (!QUERY_FLAG (op, FLAG_WIZ)) 2459 if (op->stats.sp < op->stats.maxsp)
2521 { 2460 {
2461 op->stats.sp++;
2462
2463 /* dms do not consume food */
2464 if (!QUERY_FLAG (op, FLAG_WIZ))
2465 {
2522 op->stats.food--; 2466 op->stats.food--;
2467
2523 if (op->contr->digestion < 0) 2468 if (op->contr->digestion < 0)
2524 op->stats.food += op->contr->digestion; 2469 op->stats.food += op->contr->digestion;
2525 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2470 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2526 op->stats.food = last_food; 2471 op->stats.food = last_food;
2472 }
2527 } 2473 }
2528 }
2529 2474
2530 if (max_hp > 1) 2475 if (max_sp > 1)
2531 {
2532 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2533 if (over_hp > 0)
2534 { 2476 {
2535 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2477 over_sp = (gen_sp + 10) / rate_sp;
2478 if (over_sp > 0)
2479 {
2480 if (op->stats.sp < op->stats.maxsp)
2481 {
2482 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2483
2484 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2485 op->stats.sp--;
2486
2487 if (op->stats.sp > op->stats.maxsp)
2488 op->stats.sp = op->stats.maxsp;
2489 }
2490
2536 op->last_heal = 0; 2491 op->last_sp = 0;
2492 }
2493 else
2494 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2537 } 2495 }
2538 else 2496 else
2497 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2498 }
2499
2500 /* Regenerate Hit Points */
2501 if (--op->last_heal < 0)
2502 {
2503 if (op->stats.hp < op->stats.maxhp)
2539 { 2504 {
2540 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2505 op->stats.hp++;
2506
2507 /* dms do not consume food */
2508 if (!QUERY_FLAG (op, FLAG_WIZ))
2509 {
2510 op->stats.food--;
2511
2512 if (op->contr->digestion < 0)
2513 op->stats.food += op->contr->digestion;
2514 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2515 op->stats.food = last_food;
2516 }
2541 } 2517 }
2518
2519 if (max_hp > 1)
2520 {
2521 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2522
2523 if (over_hp > 0)
2524 {
2525 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2526 op->last_heal = 0;
2527 }
2528 else
2529 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2542 } 2530 }
2543 else 2531 else
2544 {
2545 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2532 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2546 } 2533 }
2547 } 2534 }
2548 2535
2549 /* Digestion */ 2536 /* Digestion */
2550 if (--op->last_eat < 0) 2537 if (--op->last_eat < 0)
2551 { 2538 {
2552 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0; 2539 int bonus = max (0, op->contr->digestion),
2540 penalty = max (0, -op->contr->digestion);
2553 2541
2554 if (op->contr->gen_hp > 0)
2555 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2542 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2556 else
2557 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2558 2543
2559 /* dms do not consume food */ 2544 /* dms do not consume food */
2560 if (!QUERY_FLAG (op, FLAG_WIZ)) 2545 if (!QUERY_FLAG (op, FLAG_WIZ))
2561 op->stats.food--; 2546 op->stats.food--;
2562 } 2547 }
… …
2589 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2574 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2590 manual_apply (op, flesh, 0); 2575 manual_apply (op, flesh, 0);
2591 } 2576 }
2592 } 2577 }
2593 2578
2594 while (op->stats.food < 0 && op->stats.hp >= 0) 2579 if (op->stats.food < 0)
2595 op->stats.food++, op->stats.hp--; 2580 {
2581 op->stats.hp += op->stats.food;
2582 op->stats.food = 0;
2583 }
2596 2584
2597 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2585 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2598 kill_player (op); 2586 kill_player (op);
2599 } 2587 }
2600} 2588}
… …
2622 archetype *at; 2610 archetype *at;
2623 object *tmp; 2611 object *tmp;
2624 2612
2625 if (save_life (op)) 2613 if (save_life (op))
2626 return; 2614 return;
2627
2628 2615
2629 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2616 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2630 * in cities ONLY!!! It is very important that this doesn't get abused. 2617 * in cities ONLY!!! It is very important that this doesn't get abused.
2631 * Look at op_on_battleground() for more info --AndreasV 2618 * Look at op_on_battleground() for more info --AndreasV
2632 */ 2619 */
… …
2685 strcpy (op->contr->killer, "starvation"); 2672 strcpy (op->contr->killer, "starvation");
2686 } 2673 }
2687 else 2674 else
2688 sprintf (buf, "%s died.", &op->name); 2675 sprintf (buf, "%s died.", &op->name);
2689 2676
2690 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2677 op->contr->play_sound (sound_find ("player_dies"));
2691 2678
2692 /* save the map location for corpse, gravestone */ 2679 /* save the map location for corpse, gravestone */
2693 x = op->x; 2680 x = op->x;
2694 y = op->y; 2681 y = op->y;
2695 map = op->map; 2682 map = op->map;
… …
2872 2859
2873 /* 2860 /*
2874 * Check to see if the player has any unpaid items. If so, remove them 2861 * Check to see if the player has any unpaid items. If so, remove them
2875 * and put them back in the map. 2862 * and put them back in the map.
2876 */ 2863 */
2877 remove_unpaid_objects (op->inv, op); 2864 op->drop_unpaid_items ();
2878 2865
2879 /****************************************/ 2866 /****************************************/
2880 /* */ 2867 /* */
2881 /* Move player to his current respawn- */ 2868 /* Move player to his current respawn- */
2882 /* position (usually last savebed) */ 2869 /* position (usually last savebed) */

Diff Legend

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