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.181 by root, Tue Apr 15 14:21:04 2008 UTC vs.
Revision 1.198 by root, Sat May 17 00:17:02 2008 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
… …
215 215
216 /* make sure he's a player -- needed because of class change. */ 216 /* make sure he's a player -- needed because of class change. */
217 ob->type = PLAYER; // we are paranoid 217 ob->type = PLAYER; // we are paranoid
218 ob->race = ob->arch->race; 218 ob->race = ob->arch->race;
219 219
220 ob->carrying = sum_weight (ob); 220 ob->update_weight ();
221 link_player_skills (ob); 221 link_player_skills (ob);
222 222
223 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 223 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
224 224
225 assign (title, ob->arch->object::name); 225 assign (title, ob->arch->object::name);
… …
239 set_dragon_name (ob, abil, skin); 239 set_dragon_name (ob, abil, skin);
240 } 240 }
241 241
242 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 242 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
243 243
244 esrv_new_player (this, ob->weight + ob->carrying); 244 esrv_new_player (this);
245 245
246 ob->update_stats (); 246 ob->update_stats ();
247 247
248 ns->floorbox_update (); 248 ns->floorbox_update ();
249 esrv_send_inventory (ob, ob); 249 esrv_send_inventory (ob, ob);
… …
291player::set_object (object *op) 291player::set_object (object *op)
292{ 292{
293 ob = observe = op; 293 ob = observe = op;
294 ob->contr = this; /* this aren't yet in archetype */ 294 ob->contr = this; /* this aren't yet in archetype */
295 295
296 ob->speed = 1.0f; 296 ob->speed = 1.0f;
297 ob->speed_left = 0.5f; 297 ob->speed_left = 0.5f;
298 298
299 ob->direction = 5; /* So player faces south */ 299 ob->direction = 5; /* So player faces south */
300 300
301 ob->flag [FLAG_READY_WEAPON] = false; 301 ob->flag [FLAG_READY_WEAPON] = false;
302 ob->flag [FLAG_READY_SKILL] = false; 302 ob->flag [FLAG_READY_SKILL] = false;
303 ob->flag [FLAG_READY_BOW] = false; 303 ob->flag [FLAG_READY_BOW] = false;
304 304
… …
321 combat_ob = op; 321 combat_ob = op;
322 break; 322 break;
323 } 323 }
324 324
325 ob->change_weapon (combat_ob ? combat_ob : ranged_ob); 325 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
326 ob->deactivate (); // change_Weapon activates, fix this better 326 ob->deactivate (); // change_weapon activates, fix this better
327} 327}
328 328
329void 329void
330player::set_observe (object *op) 330player::set_observe (object *op)
331{ 331{
… …
404 * Note: there MUST be at least one player archetype! 404 * Note: there MUST be at least one player archetype!
405 */ 405 */
406archetype * 406archetype *
407get_player_archetype (archetype *at) 407get_player_archetype (archetype *at)
408{ 408{
409 // archetypes could have been reloaded
410 archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
411
412 if (!nat)
413 return at;
414
409 archvec::iterator i = at ? archetypes.find (at) : archetypes.begin (); 415 archvec::iterator i = archetypes.find (nat);
410 416
411 for (;;) 417 for (;;)
412 { 418 {
413 if (++i == archetypes.end ()) 419 if (++i == archetypes.end ())
414 i = archetypes.begin (); 420 i = archetypes.begin ();
… …
632 638
633 return firstdir; 639 return firstdir;
634} 640}
635 641
636void 642void
637give_initial_items (object *pl, treasurelist * items) 643give_initial_items (object *pl, treasurelist *items)
638{ 644{
639 if (pl->randomitems) 645 if (pl->randomitems)
640 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0); 646 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
641 647
642 for (object *next, *op = pl->inv; op; op = next) 648 for (object *next, *op = pl->inv; op; op = next)
… …
652 /* we never give weapons/armour if these cannot be used 658 /* we never give weapons/armour if these cannot be used
653 * by this player due to race restrictions 659 * by this player due to race restrictions
654 */ 660 */
655 if (pl->type == PLAYER) 661 if (pl->type == PLAYER)
656 { 662 {
657 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) && 663 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
664 &&
658 (op->type == ARMOUR || op->type == BOOTS || 665 (op->type == ARMOUR || op->type == BOOTS
659 op->type == CLOAK || op->type == HELMET || 666 || op->type == CLOAK || op->type == HELMET
660 op->type == SHIELD || op->type == GLOVES || 667 || op->type == SHIELD || op->type == GLOVES
668 || op->type == BRACERS || op->type == GIRDLE))
661 op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON)) 669 || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
662 { 670 {
663 op->destroy (); 671 op->destroy ();
664 continue; 672 continue;
665 } 673 }
666 } 674 }
… …
692 700
693 if (op->type == SPELLBOOK && op->inv) 701 if (op->type == SPELLBOOK && op->inv)
694 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 702 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
695 703
696 /* Give starting characters identified, uncursed, and undamned 704 /* Give starting characters identified, uncursed, and undamned
697 * items. Just don't identify gold or silver, or it won't be 705 * items. Just don't identify gold or silver, or it won't be
698 * merged properly. 706 * merged properly.
699 */ 707 */
700 if (need_identify (op)) 708 if (need_identify (op))
701 { 709 {
702 SET_FLAG (op, FLAG_IDENTIFIED); 710 SET_FLAG (op, FLAG_IDENTIFIED);
703 CLEAR_FLAG (op, FLAG_CURSED); 711 CLEAR_FLAG (op, FLAG_CURSED);
704 CLEAR_FLAG (op, FLAG_DAMNED); 712 CLEAR_FLAG (op, FLAG_DAMNED);
705 } 713 }
714
706 if (op->type == SPELL) 715 if (op->type == SPELL)
707 { 716 {
708 op->destroy (); 717 op->destroy ();
709 continue; 718 continue;
710 } 719 }
… …
712 { 721 {
713 SET_FLAG (op, FLAG_CAN_USE_SKILL); 722 SET_FLAG (op, FLAG_CAN_USE_SKILL);
714 op->stats.exp = 0; 723 op->stats.exp = 0;
715 op->level = 1; 724 op->level = 1;
716 } 725 }
717 /* lock all 'normal items by default */ 726 else /* lock all 'normal items by default */
718 else
719 SET_FLAG (op, FLAG_INV_LOCKED); 727 SET_FLAG (op, FLAG_INV_LOCKED);
720 } /* for loop of objects in player inv */ 728 } /* for loop of objects in player inv */
721 729
722 /* Need to set up the skill pointers */ 730 /* Need to set up the skill pointers */
723 link_player_skills (pl); 731 link_player_skills (pl);
… …
843 */ 851 */
844void 852void
845player::chargen_race_done () 853player::chargen_race_done ()
846{ 854{
847 /* this must before then initial items are given */ 855 /* this must before then initial items are given */
848 esrv_new_player (ob->contr, ob->weight + ob->carrying); 856 esrv_new_player (ob->contr);
849 857
850 treasurelist *tl = treasurelist::find ("starting_wealth"); 858 treasurelist *tl = treasurelist::find ("starting_wealth");
851 if (tl) 859 if (tl)
852 create_treasure (tl, ob, 0, 0, 0); 860 create_treasure (tl, ob, 0, 0, 0);
853 861
… …
856 864
857 ob->contr->ns->state = ST_PLAYING; 865 ob->contr->ns->state = ST_PLAYING;
858 866
859 if (ob->msg) 867 if (ob->msg)
860 ob->msg = 0; 868 ob->msg = 0;
861
862 /* We create this now because some of the unique maps will need it
863 * to save here.
864 */
865 {
866 char buf[MAX_BUF];
867 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
868 make_path_to_file (buf);
869 }
870 869
871 start_info (ob); 870 start_info (ob);
872 CLEAR_FLAG (ob, FLAG_WIZ); 871 CLEAR_FLAG (ob, FLAG_WIZ);
873 give_initial_items (ob, ob->randomitems); 872 give_initial_items (ob, ob->randomitems);
874 link_player_skills (ob); 873 link_player_skills (ob);
… …
877 876
878 /* This moves the player to a different start map, if there 877 /* This moves the player to a different start map, if there
879 * is one for this race 878 * is one for this race
880 */ 879 */
881 if (*first_map_ext_path) 880 if (*first_map_ext_path)
882 { 881 ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
883 object *tmp;
884 char mapname[MAX_BUF];
885
886 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
887 tmp = object::create ();
888 EXIT_PATH (tmp) = mapname;
889 EXIT_X (tmp) = ob->x;
890 EXIT_Y (tmp) = ob->y;
891 ob->enter_exit (tmp); /* we don't really care if it succeeded;
892 * if the map isn't there, then stay on the
893 * default initial map */
894 tmp->destroy ();
895 }
896 else 882 else
897 LOG (llevDebug, "first_map_ext_path not set\n"); 883 LOG (llevDebug, "first_map_ext_path not set\n");
898} 884}
899 885
900void 886void
… …
1397 } 1383 }
1398 } 1384 }
1399 else if (arrow->type == ARROW && arrow->race == type) 1385 else if (arrow->type == ARROW && arrow->race == type)
1400 { 1386 {
1401 /* allways prefer assasination/slaying */ 1387 /* allways prefer assasination/slaying */
1402 if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race)) 1388 if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))
1403 { 1389 {
1404 if (arrow->attacktype & AT_DEATH) 1390 if (arrow->attacktype & AT_DEATH)
1405 { 1391 {
1406 *better = 100; 1392 *better = 100;
1407 return arrow; 1393 return arrow;
… …
1435 betterby = 1 + arrow->magic + arrow->stats.dam; 1421 betterby = 1 + arrow->magic + arrow->stats.dam;
1436 } 1422 }
1437 } 1423 }
1438 } 1424 }
1439 } 1425 }
1426
1440 if (tmp == NULL && arrow == NULL) 1427 if (tmp == NULL && arrow == NULL)
1441 return find_arrow (op, type); 1428 return find_arrow (op, type);
1442 1429
1443 *better = betterby; 1430 *better = betterby;
1444 return tmp; 1431 return tmp;
… …
1595 arrow->destroy (); 1582 arrow->destroy ();
1596 return 0; 1583 return 0;
1597 } 1584 }
1598 1585
1599 left = arrow; /* these are arrows left to the player */ 1586 left = arrow; /* these are arrows left to the player */
1600 arrow = get_split_ob (arrow, 1); 1587 arrow = arrow->split ();
1601 if (!arrow) 1588 if (!arrow)
1602 { 1589 {
1603 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1590 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1604 return 0; 1591 return 0;
1605 } 1592 }
… …
1672 op->play_sound (sound_find ("fire_arrow")); 1659 op->play_sound (sound_find ("fire_arrow"));
1673 m->insert (arrow, sx, sy, op); 1660 m->insert (arrow, sx, sy, op);
1674 1661
1675 if (!arrow->destroyed ()) 1662 if (!arrow->destroyed ())
1676 move_arrow (arrow); 1663 move_arrow (arrow);
1677
1678 if (op->type == PLAYER)
1679 {
1680 if (left->destroyed ())
1681 esrv_del_item (op->contr, left->count);
1682 else
1683 esrv_send_item (op, left);
1684 }
1685 1664
1686 return 1; 1665 return 1;
1687} 1666}
1688 1667
1689/* Special fire code for players - this takes into 1668/* Special fire code for players - this takes into
… …
1763 return; 1742 return;
1764 } 1743 }
1765 } 1744 }
1766 else if (item->type == ROD || item->type == HORN) 1745 else if (item->type == ROD || item->type == HORN)
1767 { 1746 {
1768 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1747 sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
1748
1749 // using the maximum of the rods charge allows at least one spell cast
1750 // for a rod or horn, this fixes some broken rods.
1751 if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
1769 { 1752 {
1770 op->contr->play_sound (sound_find ("wand_poof")); 1753 op->contr->play_sound (sound_find ("wand_poof"));
1771 1754
1772 if (item->type == ROD) 1755 if (item->type == ROD)
1773 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1756 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
… …
1792 CLEAR_FLAG (item, FLAG_ANIMATE); 1775 CLEAR_FLAG (item, FLAG_ANIMATE);
1793 item->face = item->arch->face; 1776 item->face = item->arch->face;
1794 item->set_speed (0); 1777 item->set_speed (0);
1795 } 1778 }
1796 1779
1797 if ((tmp = item->in_player ())) 1780 if (object *pl = item->visible_to ())
1798 esrv_update_item (UPD_ANIM, tmp, item); 1781 esrv_update_item (UPD_ANIM, pl, item);
1799 } 1782 }
1800 } 1783 }
1801 else if (item->type == ROD || item->type == HORN) 1784 else if (item->type == ROD || item->type == HORN)
1802 drain_rod_charge (item); 1785 drain_rod_charge (item);
1803 } 1786 }
… …
1979 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN); 1962 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1980 remove_door2 (door); /* remove door without violence ;-) */ 1963 remove_door2 (door); /* remove door without violence ;-) */
1981 } 1964 }
1982 1965
1983 /* Do this after we print the message */ 1966 /* Do this after we print the message */
1984 decrease_ob (key); /* Use up one of the keys */ 1967 key->decrease (); /* Use up one of the keys */
1985 /* Need to update the weight the container the key was in */
1986 if (container != op)
1987 esrv_update_item (UPD_WEIGHT, op, container);
1988 1968
1989 return 1; /* Nothing more to do below */ 1969 return 1; /* Nothing more to do below */
1990 } 1970 }
1991 else if (door->type == LOCKED_DOOR) 1971 else if (door->type == LOCKED_DOOR)
1992 { 1972 {
… …
2271 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2251 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2272 { 2252 {
2273 op->play_sound (sound_find ("ob_evaporate")); 2253 op->play_sound (sound_find ("ob_evaporate"));
2274 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2254 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2275 2255
2276 if (op->contr)
2277 esrv_del_item (op->contr, tmp->count);
2278
2279 tmp->destroy (); 2256 tmp->destroy ();
2280 CLEAR_FLAG (op, FLAG_LIFESAVE); 2257 CLEAR_FLAG (op, FLAG_LIFESAVE);
2281 2258
2282 if (op->stats.hp < 0) 2259 if (op->stats.hp < 0)
2283 op->stats.hp = op->stats.maxhp; 2260 op->stats.hp = op->stats.maxhp;
… …
2295 return 0; 2272 return 0;
2296} 2273}
2297 2274
2298/* This goes throws the inventory and removes unpaid objects, and puts them 2275/* This goes throws the inventory and removes unpaid objects, and puts them
2299 * back in the map (location and map determined by values of env). This 2276 * back in the map (location and map determined by values of env). This
2300 * function will descend into containers. op is the object to start the search 2277 * function will descend into containers. op is the object to start the search
2301 * from. 2278 * from.
2302 */ 2279 */
2303static void 2280static void
2304drop_unpaid_items (object *op, object *env) 2281drop_unpaid_items (object *op, object *env)
2305{ 2282{
2306 while (op) 2283 while (op)
2307 { 2284 {
2308 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2285 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2309 2286
2310 if (QUERY_FLAG (op, FLAG_UNPAID)) 2287 if (QUERY_FLAG (op, FLAG_UNPAID))
2311 {
2312 if (env->type == PLAYER)
2313 esrv_del_item (env->contr, op->count);
2314
2315 op->insert_at (env); 2288 op->insert_at (env);
2316 }
2317 else if (op->inv) 2289 else if (op->inv)
2318 drop_unpaid_items (op->inv, env); 2290 drop_unpaid_items (op->inv, env);
2319 2291
2320 op = next; 2292 op = next;
2321 } 2293 }
… …
2333 * Moved from apply.c to player.c - player.c is what 2305 * Moved from apply.c to player.c - player.c is what
2334 * actually uses this function. player.c may not be quite the 2306 * actually uses this function. player.c may not be quite the
2335 * best, a misc file for object actions is probably better, 2307 * best, a misc file for object actions is probably better,
2336 * but there isn't one in the server directory. 2308 * but there isn't one in the server directory.
2337 */ 2309 */
2338char * 2310const char *
2339gravestone_text (object *op) 2311gravestone_text (object *op)
2340{ 2312{
2341 static char buf2[MAX_BUF]; 2313 static dynbuf_text buf;
2342 char buf[MAX_BUF];
2343 time_t now = time (NULL);
2344 2314
2345 strcpy (buf2, " R.I.P.\n\n"); 2315 buf << "---- R.I.P. ----\n\n";
2316 op->name;
2317
2346 if (op->type == PLAYER) 2318 if (op->type == PLAYER)
2347 sprintf (buf, "%s the %s\n", &op->name, op->contr->title); 2319 buf << " the " << op->contr->title;
2348 else
2349 sprintf (buf, "%s\n", &op->name);
2350 2320
2351 strncat (buf2, " ", 20 - strlen (buf) / 2); 2321 buf << "\n\n";
2352 strcat (buf2, buf); 2322
2323 buf << "who was level ";
2324 buf << (sint32)op->level << "\n\n" // OO breakdown
2325 << " when " << (op->contr ? "killed" : "died") << "\n\n";
2326
2353 if (op->type == PLAYER) 2327 if (op->type == PLAYER)
2354 sprintf (buf, "who was in level %d when killed\n", op->level); 2328 buf << "by " << op->contr->killer_name () << ".\n\n";
2355 else
2356 sprintf (buf, "who was in level %d when died.\n\n", op->level);
2357 2329
2358 strncat (buf2, " ", 20 - strlen (buf) / 2);
2359 strcat (buf2, buf);
2360 if (op->type == PLAYER)
2361 { 2330 {
2362 sprintf (buf, "by %s.\n\n", op->contr->killer); 2331 static char buf2[128];
2363 strncat (buf2, " ", 21 - strlen (buf) / 2); 2332 time_t now = time (NULL);
2364 strcat (buf2, buf);
2365 }
2366
2367 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now)); 2333 strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2368 strncat (buf2, " ", 20 - strlen (buf) / 2); 2334 buf << buf2;
2369 strcat (buf2, buf); 2335 }
2370 2336
2371 return buf2; 2337 return buf;
2372} 2338}
2373 2339
2374void 2340void
2375do_some_living (object *op) 2341do_some_living (object *op)
2376{ 2342{
… …
2557 op->stats.food--; 2523 op->stats.food--;
2558 } 2524 }
2559 2525
2560 if (op->stats.food < 0 && op->stats.hp >= 0) 2526 if (op->stats.food < 0 && op->stats.hp >= 0)
2561 { 2527 {
2562 object *tmp, *flesh = 0; 2528 object *flesh = 0;
2563 2529
2564 for (tmp = op->inv; tmp; tmp = tmp->below) 2530 for_inv_removable (op, tmp)
2565 { 2531 {
2566 if (!QUERY_FLAG (tmp, FLAG_UNPAID)) 2532 if (QUERY_FLAG (tmp, FLAG_UNPAID))
2533 continue;
2534
2535 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2567 { 2536 {
2568 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2537 op->statusmsg ("You blindly grab for a bite of food. "
2569 { 2538 "H<To prevent you from starving, you ate some random item from your backpack.>");
2570 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2571 manual_apply (op, tmp, 0); 2539 manual_apply (op, tmp, 0);
2540
2572 if (op->stats.food >= 0 || op->stats.hp < 0) 2541 if (op->stats.food >= 0 || op->stats.hp < 0)
2573 break; 2542 break;
2574 } 2543 }
2575 else if (tmp->type == FLESH) 2544 else if (tmp->type == FLESH)
2576 flesh = tmp; 2545 flesh = tmp;
2577 } /* End if paid for object */ 2546 }
2578 } /* end of for loop */
2579 2547
2580 /* If player is still starving, it means they don't have any food, so 2548 /* If player is still starving, it means they don't have any food, so
2581 * eat flesh instead. 2549 * eat flesh instead.
2582 */ 2550 */
2583 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2551 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2584 { 2552 {
2585 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2553 op->statusmsg ("You blindly grab for a bite of food. "
2554 "H<To prevent you from starving, you ate some random item from your backpack.>");
2586 manual_apply (op, flesh, 0); 2555 manual_apply (op, flesh, 0);
2587 } 2556 }
2557
2558 // If player is still starving, alert him!
2559 if (op->stats.food < 0)
2560 op->failmsg ("You are starving! "
2561 "H<Eat some food to increase your food and prevent you from an untimely death.>");
2588 } 2562 }
2589 2563
2590 if (op->stats.food < 0) 2564 if (op->stats.food < 0)
2591 { 2565 {
2592 op->stats.hp += op->stats.food; 2566 op->stats.hp += op->stats.food;
2593 op->stats.food = 0; 2567 op->stats.food = 0;
2594 } 2568 }
2595 2569
2596 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2570 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2597 kill_player (op); 2571 kill_player (op);
… …
2650 { 2624 {
2651 tmp->name = format ("%s's finger" , &op->name); 2625 tmp->name = format ("%s's finger" , &op->name);
2652 tmp->name_pl = format ("%s's fingers", &op->name); 2626 tmp->name_pl = format ("%s's fingers", &op->name);
2653 tmp->msg = format ( 2627 tmp->msg = format (
2654 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n", 2628 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2655 &op->name, op->contr->title, (int) (op->level), op->contr->killer 2629 &op->name, op->contr->title,
2630 (int)op->level,
2631 op->contr->killer_name ()
2656 ); 2632 );
2657 tmp->value = 0, tmp->type = 0; 2633 tmp->value = 0, tmp->type = 0;
2658 tmp->materialname = "organics"; 2634 tmp->materialname = "organics";
2659 tmp->insert_at (op, tmp); 2635 tmp->insert_at (op, tmp);
2660 } 2636 }
… …
2668 INVOKE_PLAYER (DEATH, op->contr); 2644 INVOKE_PLAYER (DEATH, op->contr);
2669 2645
2670 command_kill_pets (op, 0); 2646 command_kill_pets (op, 0);
2671 2647
2672 if (op->stats.food < 0) 2648 if (op->stats.food < 0)
2673 strcpy (op->contr->killer, "starvation"); 2649 {
2650 op->contr->killer = archetype::get ("killer_starvation");
2651 op->contr->killer->destroy ();
2652 }
2674 2653
2675 op->contr->play_sound (sound_find ("player_dies")); 2654 op->contr->play_sound (sound_find ("player_dies"));
2676 2655
2677 /* save the map location for corpse, gravestone */ 2656 /* save the map location for corpse, gravestone */
2678 x = op->x; 2657 x = op->x;
… …
2787 lost_a_stat = 1; 2766 lost_a_stat = 1;
2788 } 2767 }
2789 } 2768 }
2790 } 2769 }
2791 } 2770 }
2771
2792 /* If no stat lost, tell the player. */ 2772 /* If no stat lost, tell the player. */
2793 if (!lost_a_stat) 2773 if (!lost_a_stat)
2794 { 2774 {
2795 /* determine_god() seems to not work sometimes... why is this? 2775 /* determine_god() seems to not work sometimes... why is this?
2796 Should I be using something else? GD */ 2776 Should I be using something else? GD */
… …
2800 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god); 2780 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);
2801 else 2781 else
2802 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you."); 2782 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
2803 } 2783 }
2804#else 2784#else
2805 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely."); 2785 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely.");
2806#endif 2786#endif
2807 2787
2808 /* Put a gravestone up where the character 'almost' died. List the 2788 /* Put a gravestone up where the character 'almost' died. List the
2809 * exp loss on the stone. 2789 * exp loss on the stone.
2810 */ 2790 */
2811 tmp = arch_to_object (archetype::find ("gravestone")); 2791 tmp = arch_to_object (archetype::find ("gravestone"));
2812 sprintf (buf, "%s's gravestone", &op->name); 2792 tmp->name = format ("%s's gravestone", &op->name);
2813 tmp->name = buf; 2793 tmp->name_pl = format ("%s's gravestones", &op->name);
2814 sprintf (buf, "%s's gravestones", &op->name);
2815 tmp->name_pl = buf;
2816 sprintf (buf, "RIP\nHere rests the hero %s the %s,\n" "who was killed\n" "by %s.\n", &op->name, op->contr->title, op->contr->killer); 2794 tmp->msg = format ("RIP\nHere rests the hero %s the %s,\nwho was killed\nby %s.\n", &op->name, op->contr->title, op->contr->killer_name ());
2817 tmp->msg = buf;
2818 tmp->x = op->x, tmp->y = op->y; 2795 tmp->x = op->x, tmp->y = op->y;
2819 insert_ob_in_map (tmp, op->map, NULL, 0); 2796 insert_ob_in_map (tmp, op->map, NULL, 0);
2820 2797
2821 /**************************************/ 2798 /**************************************/
2822 /* */ 2799 /* */
… …
2845 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2822 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2846 } 2823 }
2847 2824
2848 cure_disease (op, 0, 0); /* remove any disease */ 2825 cure_disease (op, 0, 0); /* remove any disease */
2849 2826
2827 // remove all spell effects that are active
2828 // to avoid long-term effects such as word-of-recall
2829 for (object *item = op->inv; item; )
2830 {
2831 object *next = item->below;
2832
2833 if (item->type == SPELL_EFFECT && item->active)
2834 item->destroy ();
2835
2836 item = next;
2837 }
2838
2850 /*add_exp(op, (op->stats.exp * -0.20)); */ 2839 /*add_exp(op, (op->stats.exp * -0.20)); */
2851 apply_death_exp_penalty (op); 2840 apply_death_exp_penalty (op);
2841
2852 if (op->stats.food < 100) 2842 if (op->stats.food < 100)
2853 op->stats.food = 900; 2843 op->stats.food = 900;
2844
2854 op->stats.hp = op->stats.maxhp; 2845 op->stats.hp = op->stats.maxhp;
2855 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2846 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2856 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2847 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2857 2848
2858 /* 2849 /*
… …
2926 2917
2927 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3)))) 2918 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2928 { 2919 {
2929 if (tmp->nrof > 1) 2920 if (tmp->nrof > 1)
2930 { 2921 {
2931 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2922 tmp->decrease (rndm (1, tmp->nrof - 1));
2932 tmp2->destroy ();
2933 insert_ob_in_map (tmp, op->map, NULL, 0); 2923 insert_ob_in_map (tmp, op->map, NULL, 0);
2934 } 2924 }
2935 else 2925 else
2936 tmp->destroy (); 2926 tmp->destroy ();
2937 } 2927 }
… …
2948void 2938void
2949fix_weight (void) 2939fix_weight (void)
2950{ 2940{
2951 for_all_players (pl) 2941 for_all_players (pl)
2952 { 2942 {
2953 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 2943 sint32 old = pl->ob->carrying;
2954 2944
2955 if (old == sum) 2945 pl->ob->update_weight ();
2956 continue; 2946
2947 if (old != pl->ob->carrying)
2948 {
2957 pl->ob->update_stats (); 2949 pl->ob->update_stats ();
2958 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum); 2950 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
2951 }
2959 } 2952 }
2960} 2953}
2961 2954
2962void 2955void
2963fix_luck (void) 2956fix_luck (void)
… …
3049 * as bad as carrying a light on a pitch dark map */ 3042 * as bad as carrying a light on a pitch dark map */
3050 if (has_carried_lights (ob)) 3043 if (has_carried_lights (ob))
3051 level = -(10 + (2 * ob->map->darkness)); 3044 level = -(10 + (2 * ob->map->darkness));
3052 3045
3053 /* scan through all nearby squares for terrain to hide in */ 3046 /* scan through all nearby squares for terrain to hide in */
3054 for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i]) 3047 for (i = 0, x = ob->x, y = ob->y;
3048 i <= SIZEOFFREE1;
3049 i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3055 { 3050 {
3056 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL); 3051 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3057 if (mflag & P_OUT_OF_MAP) 3052 if (mflag & P_OUT_OF_MAP)
3058 {
3059 continue; 3053 continue;
3060 } 3054
3061 if (mflag & P_BLOCKSVIEW) /* something to hide near! */ 3055 if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3062 level += 2; 3056 level += 2;
3063 else /* open terrain! */ 3057 else /* open terrain! */
3064 level -= 1; 3058 level -= 1;
3065 } 3059 }
… …
3076 * spot (surrounded by clear terrain in broad daylight). -b.t. 3070 * spot (surrounded by clear terrain in broad daylight). -b.t.
3077 */ 3071 */
3078void 3072void
3079do_hidden_move (object *op) 3073do_hidden_move (object *op)
3080{ 3074{
3081 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3075 int hide = 0;
3082 object *skop;
3083 3076
3084 if (!op || !op->map) 3077 if (!op || !op->map)
3085 return; 3078 return;
3086 3079
3087 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3080 object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3081 int num = random_roll (0, 19, op, PREFER_LOW);
3088 3082
3089 /* its *extremely* hard to run and sneak/hide at the same time! */ 3083 /* its *extremely* hard to run and sneak/hide at the same time! */
3090 if (op->type == PLAYER && op->contr->run_on) 3084 if (op->type == PLAYER && op->contr->run_on)
3091 if (!skop || num >= skop->level) 3085 if (!skop || num >= skop->level)
3092 { 3086 {
… …
3102 num -= hide; 3096 num -= hide;
3103 3097
3104 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3098 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3105 { 3099 {
3106 make_visible (op); 3100 make_visible (op);
3101
3107 if (op->type == PLAYER) 3102 if (op->type == PLAYER)
3108 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3103 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3109 } 3104 }
3110 else if (op->type == PLAYER && skop) 3105 else if (op->type == PLAYER && skop)
3111 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3106 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
… …
3452 else 3447 else
3453 { 3448 {
3454 /* generate misc. treasure */ 3449 /* generate misc. treasure */
3455 tmp = arch_to_object (tr->item); 3450 tmp = arch_to_object (tr->item);
3456 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp)); 3451 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3457 tmp = insert_ob_in_ob (tmp, who); 3452 who->insert (tmp);
3458 if (who->type == PLAYER)
3459 esrv_send_item (who, tmp);
3460 } 3453 }
3461} 3454}
3462 3455
3463/** 3456/**
3464 * Unready an object for a player. This function does nothing if the object was 3457 * Unready an object for a player. This function does nothing if the object was

Diff Legend

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