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.178 by root, Sat Jan 5 06:11:28 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} 327}
327 328
328void 329void
329player::set_observe (object *op) 330player::set_observe (object *op)
330{ 331{
… …
403 * Note: there MUST be at least one player archetype! 404 * Note: there MUST be at least one player archetype!
404 */ 405 */
405archetype * 406archetype *
406get_player_archetype (archetype *at) 407get_player_archetype (archetype *at)
407{ 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
408 archvec::iterator i = at ? archetypes.find (at) : archetypes.begin (); 415 archvec::iterator i = archetypes.find (nat);
409 416
410 for (;;) 417 for (;;)
411 { 418 {
412 if (++i == archetypes.end ()) 419 if (++i == archetypes.end ())
413 i = archetypes.begin (); 420 i = archetypes.begin ();
… …
631 638
632 return firstdir; 639 return firstdir;
633} 640}
634 641
635void 642void
636give_initial_items (object *pl, treasurelist * items) 643give_initial_items (object *pl, treasurelist *items)
637{ 644{
638 if (pl->randomitems) 645 if (pl->randomitems)
639 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0); 646 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
640 647
641 for (object *next, *op = pl->inv; op; op = next) 648 for (object *next, *op = pl->inv; op; op = next)
… …
651 /* we never give weapons/armour if these cannot be used 658 /* we never give weapons/armour if these cannot be used
652 * by this player due to race restrictions 659 * by this player due to race restrictions
653 */ 660 */
654 if (pl->type == PLAYER) 661 if (pl->type == PLAYER)
655 { 662 {
656 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) && 663 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
664 &&
657 (op->type == ARMOUR || op->type == BOOTS || 665 (op->type == ARMOUR || op->type == BOOTS
658 op->type == CLOAK || op->type == HELMET || 666 || op->type == CLOAK || op->type == HELMET
659 op->type == SHIELD || op->type == GLOVES || 667 || op->type == SHIELD || op->type == GLOVES
668 || op->type == BRACERS || op->type == GIRDLE))
660 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))
661 { 670 {
662 op->destroy (); 671 op->destroy ();
663 continue; 672 continue;
664 } 673 }
665 } 674 }
… …
691 700
692 if (op->type == SPELLBOOK && op->inv) 701 if (op->type == SPELLBOOK && op->inv)
693 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 702 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
694 703
695 /* Give starting characters identified, uncursed, and undamned 704 /* Give starting characters identified, uncursed, and undamned
696 * 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
697 * merged properly. 706 * merged properly.
698 */ 707 */
699 if (need_identify (op)) 708 if (need_identify (op))
700 { 709 {
701 SET_FLAG (op, FLAG_IDENTIFIED); 710 SET_FLAG (op, FLAG_IDENTIFIED);
702 CLEAR_FLAG (op, FLAG_CURSED); 711 CLEAR_FLAG (op, FLAG_CURSED);
703 CLEAR_FLAG (op, FLAG_DAMNED); 712 CLEAR_FLAG (op, FLAG_DAMNED);
704 } 713 }
714
705 if (op->type == SPELL) 715 if (op->type == SPELL)
706 { 716 {
707 op->destroy (); 717 op->destroy ();
708 continue; 718 continue;
709 } 719 }
… …
711 { 721 {
712 SET_FLAG (op, FLAG_CAN_USE_SKILL); 722 SET_FLAG (op, FLAG_CAN_USE_SKILL);
713 op->stats.exp = 0; 723 op->stats.exp = 0;
714 op->level = 1; 724 op->level = 1;
715 } 725 }
716 /* lock all 'normal items by default */ 726 else /* lock all 'normal items by default */
717 else
718 SET_FLAG (op, FLAG_INV_LOCKED); 727 SET_FLAG (op, FLAG_INV_LOCKED);
719 } /* for loop of objects in player inv */ 728 } /* for loop of objects in player inv */
720 729
721 /* Need to set up the skill pointers */ 730 /* Need to set up the skill pointers */
722 link_player_skills (pl); 731 link_player_skills (pl);
… …
842 */ 851 */
843void 852void
844player::chargen_race_done () 853player::chargen_race_done ()
845{ 854{
846 /* this must before then initial items are given */ 855 /* this must before then initial items are given */
847 esrv_new_player (ob->contr, ob->weight + ob->carrying); 856 esrv_new_player (ob->contr);
848 857
849 treasurelist *tl = treasurelist::find ("starting_wealth"); 858 treasurelist *tl = treasurelist::find ("starting_wealth");
850 if (tl) 859 if (tl)
851 create_treasure (tl, ob, 0, 0, 0); 860 create_treasure (tl, ob, 0, 0, 0);
852 861
… …
855 864
856 ob->contr->ns->state = ST_PLAYING; 865 ob->contr->ns->state = ST_PLAYING;
857 866
858 if (ob->msg) 867 if (ob->msg)
859 ob->msg = 0; 868 ob->msg = 0;
860
861 /* We create this now because some of the unique maps will need it
862 * to save here.
863 */
864 {
865 char buf[MAX_BUF];
866 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
867 make_path_to_file (buf);
868 }
869 869
870 start_info (ob); 870 start_info (ob);
871 CLEAR_FLAG (ob, FLAG_WIZ); 871 CLEAR_FLAG (ob, FLAG_WIZ);
872 give_initial_items (ob, ob->randomitems); 872 give_initial_items (ob, ob->randomitems);
873 link_player_skills (ob); 873 link_player_skills (ob);
… …
876 876
877 /* This moves the player to a different start map, if there 877 /* This moves the player to a different start map, if there
878 * is one for this race 878 * is one for this race
879 */ 879 */
880 if (*first_map_ext_path) 880 if (*first_map_ext_path)
881 { 881 ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
882 object *tmp;
883 char mapname[MAX_BUF];
884
885 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
886 tmp = object::create ();
887 EXIT_PATH (tmp) = mapname;
888 EXIT_X (tmp) = ob->x;
889 EXIT_Y (tmp) = ob->y;
890 ob->enter_exit (tmp); /* we don't really care if it succeeded;
891 * if the map isn't there, then stay on the
892 * default initial map */
893 tmp->destroy ();
894 }
895 else 882 else
896 LOG (llevDebug, "first_map_ext_path not set\n"); 883 LOG (llevDebug, "first_map_ext_path not set\n");
897} 884}
898 885
899void 886void
… …
1352 */ 1339 */
1353object * 1340object *
1354find_arrow (object *op, const char *type) 1341find_arrow (object *op, const char *type)
1355{ 1342{
1356 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1343 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1357 if (tmp->type == ARROW && !strcmp (tmp->race, type)) 1344 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1358 return splay (tmp); 1345 return splay (tmp);
1359 1346
1360 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1347 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1361 if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (tmp->race, type)) 1348 if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
1362 if (object *arrow = find_arrow (tmp, type)) 1349 if (object *arrow = find_arrow (tmp, type))
1363 { 1350 {
1364 splay (tmp); 1351 splay (tmp);
1365 return arrow; 1352 return arrow;
1366 } 1353 }
… …
1396 } 1383 }
1397 } 1384 }
1398 else if (arrow->type == ARROW && arrow->race == type) 1385 else if (arrow->type == ARROW && arrow->race == type)
1399 { 1386 {
1400 /* allways prefer assasination/slaying */ 1387 /* allways prefer assasination/slaying */
1401 if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race)) 1388 if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))
1402 { 1389 {
1403 if (arrow->attacktype & AT_DEATH) 1390 if (arrow->attacktype & AT_DEATH)
1404 { 1391 {
1405 *better = 100; 1392 *better = 100;
1406 return arrow; 1393 return arrow;
… …
1434 betterby = 1 + arrow->magic + arrow->stats.dam; 1421 betterby = 1 + arrow->magic + arrow->stats.dam;
1435 } 1422 }
1436 } 1423 }
1437 } 1424 }
1438 } 1425 }
1426
1439 if (tmp == NULL && arrow == NULL) 1427 if (tmp == NULL && arrow == NULL)
1440 return find_arrow (op, type); 1428 return find_arrow (op, type);
1441 1429
1442 *better = betterby; 1430 *better = betterby;
1443 return tmp; 1431 return tmp;
… …
1594 arrow->destroy (); 1582 arrow->destroy ();
1595 return 0; 1583 return 0;
1596 } 1584 }
1597 1585
1598 left = arrow; /* these are arrows left to the player */ 1586 left = arrow; /* these are arrows left to the player */
1599 arrow = get_split_ob (arrow, 1); 1587 arrow = arrow->split ();
1600 if (!arrow) 1588 if (!arrow)
1601 { 1589 {
1602 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);
1603 return 0; 1591 return 0;
1604 } 1592 }
… …
1671 op->play_sound (sound_find ("fire_arrow")); 1659 op->play_sound (sound_find ("fire_arrow"));
1672 m->insert (arrow, sx, sy, op); 1660 m->insert (arrow, sx, sy, op);
1673 1661
1674 if (!arrow->destroyed ()) 1662 if (!arrow->destroyed ())
1675 move_arrow (arrow); 1663 move_arrow (arrow);
1676
1677 if (op->type == PLAYER)
1678 {
1679 if (left->destroyed ())
1680 esrv_del_item (op->contr, left->count);
1681 else
1682 esrv_send_item (op, left);
1683 }
1684 1664
1685 return 1; 1665 return 1;
1686} 1666}
1687 1667
1688/* Special fire code for players - this takes into 1668/* Special fire code for players - this takes into
… …
1762 return; 1742 return;
1763 } 1743 }
1764 } 1744 }
1765 else if (item->type == ROD || item->type == HORN) 1745 else if (item->type == ROD || item->type == HORN)
1766 { 1746 {
1767 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))
1768 { 1752 {
1769 op->contr->play_sound (sound_find ("wand_poof")); 1753 op->contr->play_sound (sound_find ("wand_poof"));
1770 1754
1771 if (item->type == ROD) 1755 if (item->type == ROD)
1772 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));
… …
1791 CLEAR_FLAG (item, FLAG_ANIMATE); 1775 CLEAR_FLAG (item, FLAG_ANIMATE);
1792 item->face = item->arch->face; 1776 item->face = item->arch->face;
1793 item->set_speed (0); 1777 item->set_speed (0);
1794 } 1778 }
1795 1779
1796 if ((tmp = item->in_player ())) 1780 if (object *pl = item->visible_to ())
1797 esrv_update_item (UPD_ANIM, tmp, item); 1781 esrv_update_item (UPD_ANIM, pl, item);
1798 } 1782 }
1799 } 1783 }
1800 else if (item->type == ROD || item->type == HORN) 1784 else if (item->type == ROD || item->type == HORN)
1801 drain_rod_charge (item); 1785 drain_rod_charge (item);
1802 } 1786 }
… …
1978 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);
1979 remove_door2 (door); /* remove door without violence ;-) */ 1963 remove_door2 (door); /* remove door without violence ;-) */
1980 } 1964 }
1981 1965
1982 /* Do this after we print the message */ 1966 /* Do this after we print the message */
1983 decrease_ob (key); /* Use up one of the keys */ 1967 key->decrease (); /* Use up one of the keys */
1984 /* Need to update the weight the container the key was in */
1985 if (container != op)
1986 esrv_update_item (UPD_WEIGHT, op, container);
1987 1968
1988 return 1; /* Nothing more to do below */ 1969 return 1; /* Nothing more to do below */
1989 } 1970 }
1990 else if (door->type == LOCKED_DOOR) 1971 else if (door->type == LOCKED_DOOR)
1991 { 1972 {
… …
2172bool 2153bool
2173move_player (object *op, int dir) 2154move_player (object *op, int dir)
2174{ 2155{
2175 int pick; 2156 int pick;
2176 2157
2177 if (!op->map || op->map->in_memory != MAP_IN_MEMORY) 2158 if (!op->map || op->map->in_memory != MAP_ACTIVE)
2178 return 0; 2159 return 0;
2179 2160
2180 /* Sanity check: make sure dir is valid */ 2161 /* Sanity check: make sure dir is valid */
2181 if ((dir < 0) || (dir >= 9)) 2162 if ((dir < 0) || (dir >= 9))
2182 { 2163 {
… …
2270 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2251 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2271 { 2252 {
2272 op->play_sound (sound_find ("ob_evaporate")); 2253 op->play_sound (sound_find ("ob_evaporate"));
2273 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));
2274 2255
2275 if (op->contr)
2276 esrv_del_item (op->contr, tmp->count);
2277
2278 tmp->destroy (); 2256 tmp->destroy ();
2279 CLEAR_FLAG (op, FLAG_LIFESAVE); 2257 CLEAR_FLAG (op, FLAG_LIFESAVE);
2280 2258
2281 if (op->stats.hp < 0) 2259 if (op->stats.hp < 0)
2282 op->stats.hp = op->stats.maxhp; 2260 op->stats.hp = op->stats.maxhp;
… …
2294 return 0; 2272 return 0;
2295} 2273}
2296 2274
2297/* 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
2298 * 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
2299 * 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
2300 * from. 2278 * from.
2301 */ 2279 */
2302static void 2280static void
2303drop_unpaid_items (object *op, object *env) 2281drop_unpaid_items (object *op, object *env)
2304{ 2282{
2305 while (op) 2283 while (op)
2306 { 2284 {
2307 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' */
2308 2286
2309 if (QUERY_FLAG (op, FLAG_UNPAID)) 2287 if (QUERY_FLAG (op, FLAG_UNPAID))
2310 {
2311 if (env->type == PLAYER)
2312 esrv_del_item (env->contr, op->count);
2313
2314 op->insert_at (env); 2288 op->insert_at (env);
2315 }
2316 else if (op->inv) 2289 else if (op->inv)
2317 drop_unpaid_items (op->inv, env); 2290 drop_unpaid_items (op->inv, env);
2318 2291
2319 op = next; 2292 op = next;
2320 } 2293 }
… …
2332 * Moved from apply.c to player.c - player.c is what 2305 * Moved from apply.c to player.c - player.c is what
2333 * actually uses this function. player.c may not be quite the 2306 * actually uses this function. player.c may not be quite the
2334 * best, a misc file for object actions is probably better, 2307 * best, a misc file for object actions is probably better,
2335 * but there isn't one in the server directory. 2308 * but there isn't one in the server directory.
2336 */ 2309 */
2337char * 2310const char *
2338gravestone_text (object *op) 2311gravestone_text (object *op)
2339{ 2312{
2340 static char buf2[MAX_BUF]; 2313 static dynbuf_text buf;
2341 char buf[MAX_BUF];
2342 time_t now = time (NULL);
2343 2314
2344 strcpy (buf2, " R.I.P.\n\n"); 2315 buf << "---- R.I.P. ----\n\n";
2316 op->name;
2317
2345 if (op->type == PLAYER) 2318 if (op->type == PLAYER)
2346 sprintf (buf, "%s the %s\n", &op->name, op->contr->title); 2319 buf << " the " << op->contr->title;
2347 else
2348 sprintf (buf, "%s\n", &op->name);
2349 2320
2350 strncat (buf2, " ", 20 - strlen (buf) / 2); 2321 buf << "\n\n";
2351 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
2352 if (op->type == PLAYER) 2327 if (op->type == PLAYER)
2353 sprintf (buf, "who was in level %d when killed\n", op->level); 2328 buf << "by " << op->contr->killer_name () << ".\n\n";
2354 else
2355 sprintf (buf, "who was in level %d when died.\n\n", op->level);
2356 2329
2357 strncat (buf2, " ", 20 - strlen (buf) / 2);
2358 strcat (buf2, buf);
2359 if (op->type == PLAYER)
2360 { 2330 {
2361 sprintf (buf, "by %s.\n\n", op->contr->killer); 2331 static char buf2[128];
2362 strncat (buf2, " ", 21 - strlen (buf) / 2); 2332 time_t now = time (NULL);
2363 strcat (buf2, buf);
2364 }
2365
2366 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now)); 2333 strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2367 strncat (buf2, " ", 20 - strlen (buf) / 2); 2334 buf << buf2;
2368 strcat (buf2, buf); 2335 }
2369 2336
2370 return buf2; 2337 return buf;
2371} 2338}
2372 2339
2373void 2340void
2374do_some_living (object *op) 2341do_some_living (object *op)
2375{ 2342{
… …
2556 op->stats.food--; 2523 op->stats.food--;
2557 } 2524 }
2558 2525
2559 if (op->stats.food < 0 && op->stats.hp >= 0) 2526 if (op->stats.food < 0 && op->stats.hp >= 0)
2560 { 2527 {
2561 object *tmp, *flesh = 0; 2528 object *flesh = 0;
2562 2529
2563 for (tmp = op->inv; tmp; tmp = tmp->below) 2530 for_inv_removable (op, tmp)
2564 { 2531 {
2565 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)
2566 { 2536 {
2567 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2537 op->statusmsg ("You blindly grab for a bite of food. "
2568 { 2538 "H<To prevent you from starving, you ate some random item from your backpack.>");
2569 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2570 manual_apply (op, tmp, 0); 2539 manual_apply (op, tmp, 0);
2540
2571 if (op->stats.food >= 0 || op->stats.hp < 0) 2541 if (op->stats.food >= 0 || op->stats.hp < 0)
2572 break; 2542 break;
2573 } 2543 }
2574 else if (tmp->type == FLESH) 2544 else if (tmp->type == FLESH)
2575 flesh = tmp; 2545 flesh = tmp;
2576 } /* End if paid for object */ 2546 }
2577 } /* end of for loop */
2578 2547
2579 /* 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
2580 * eat flesh instead. 2549 * eat flesh instead.
2581 */ 2550 */
2582 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2551 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2583 { 2552 {
2584 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.>");
2585 manual_apply (op, flesh, 0); 2555 manual_apply (op, flesh, 0);
2586 } 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.>");
2587 } 2562 }
2588 2563
2589 if (op->stats.food < 0) 2564 if (op->stats.food < 0)
2590 { 2565 {
2591 op->stats.hp += op->stats.food; 2566 op->stats.hp += op->stats.food;
2592 op->stats.food = 0; 2567 op->stats.food = 0;
2593 } 2568 }
2594 2569
2595 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2570 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2596 kill_player (op); 2571 kill_player (op);
… …
2649 { 2624 {
2650 tmp->name = format ("%s's finger" , &op->name); 2625 tmp->name = format ("%s's finger" , &op->name);
2651 tmp->name_pl = format ("%s's fingers", &op->name); 2626 tmp->name_pl = format ("%s's fingers", &op->name);
2652 tmp->msg = format ( 2627 tmp->msg = format (
2653 "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",
2654 &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 ()
2655 ); 2632 );
2656 tmp->value = 0, tmp->type = 0; 2633 tmp->value = 0, tmp->type = 0;
2657 tmp->materialname = "organics"; 2634 tmp->materialname = "organics";
2658 tmp->insert_at (op, tmp); 2635 tmp->insert_at (op, tmp);
2659 } 2636 }
… …
2667 INVOKE_PLAYER (DEATH, op->contr); 2644 INVOKE_PLAYER (DEATH, op->contr);
2668 2645
2669 command_kill_pets (op, 0); 2646 command_kill_pets (op, 0);
2670 2647
2671 if (op->stats.food < 0) 2648 if (op->stats.food < 0)
2672 strcpy (op->contr->killer, "starvation"); 2649 {
2650 op->contr->killer = archetype::get ("killer_starvation");
2651 op->contr->killer->destroy ();
2652 }
2673 2653
2674 op->contr->play_sound (sound_find ("player_dies")); 2654 op->contr->play_sound (sound_find ("player_dies"));
2675 2655
2676 /* save the map location for corpse, gravestone */ 2656 /* save the map location for corpse, gravestone */
2677 x = op->x; 2657 x = op->x;
… …
2786 lost_a_stat = 1; 2766 lost_a_stat = 1;
2787 } 2767 }
2788 } 2768 }
2789 } 2769 }
2790 } 2770 }
2771
2791 /* If no stat lost, tell the player. */ 2772 /* If no stat lost, tell the player. */
2792 if (!lost_a_stat) 2773 if (!lost_a_stat)
2793 { 2774 {
2794 /* determine_god() seems to not work sometimes... why is this? 2775 /* determine_god() seems to not work sometimes... why is this?
2795 Should I be using something else? GD */ 2776 Should I be using something else? GD */
… …
2799 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);
2800 else 2781 else
2801 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.");
2802 } 2783 }
2803#else 2784#else
2804 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.");
2805#endif 2786#endif
2806 2787
2807 /* Put a gravestone up where the character 'almost' died. List the 2788 /* Put a gravestone up where the character 'almost' died. List the
2808 * exp loss on the stone. 2789 * exp loss on the stone.
2809 */ 2790 */
2810 tmp = arch_to_object (archetype::find ("gravestone")); 2791 tmp = arch_to_object (archetype::find ("gravestone"));
2811 sprintf (buf, "%s's gravestone", &op->name); 2792 tmp->name = format ("%s's gravestone", &op->name);
2812 tmp->name = buf; 2793 tmp->name_pl = format ("%s's gravestones", &op->name);
2813 sprintf (buf, "%s's gravestones", &op->name);
2814 tmp->name_pl = buf;
2815 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 ());
2816 tmp->msg = buf;
2817 tmp->x = op->x, tmp->y = op->y; 2795 tmp->x = op->x, tmp->y = op->y;
2818 insert_ob_in_map (tmp, op->map, NULL, 0); 2796 insert_ob_in_map (tmp, op->map, NULL, 0);
2819 2797
2820 /**************************************/ 2798 /**************************************/
2821 /* */ 2799 /* */
… …
2844 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2822 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2845 } 2823 }
2846 2824
2847 cure_disease (op, 0, 0); /* remove any disease */ 2825 cure_disease (op, 0, 0); /* remove any disease */
2848 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
2849 /*add_exp(op, (op->stats.exp * -0.20)); */ 2839 /*add_exp(op, (op->stats.exp * -0.20)); */
2850 apply_death_exp_penalty (op); 2840 apply_death_exp_penalty (op);
2841
2851 if (op->stats.food < 100) 2842 if (op->stats.food < 100)
2852 op->stats.food = 900; 2843 op->stats.food = 900;
2844
2853 op->stats.hp = op->stats.maxhp; 2845 op->stats.hp = op->stats.maxhp;
2854 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2846 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2855 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2847 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2856 2848
2857 /* 2849 /*
… …
2925 2917
2926 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))))
2927 { 2919 {
2928 if (tmp->nrof > 1) 2920 if (tmp->nrof > 1)
2929 { 2921 {
2930 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2922 tmp->decrease (rndm (1, tmp->nrof - 1));
2931 tmp2->destroy ();
2932 insert_ob_in_map (tmp, op->map, NULL, 0); 2923 insert_ob_in_map (tmp, op->map, NULL, 0);
2933 } 2924 }
2934 else 2925 else
2935 tmp->destroy (); 2926 tmp->destroy ();
2936 } 2927 }
… …
2947void 2938void
2948fix_weight (void) 2939fix_weight (void)
2949{ 2940{
2950 for_all_players (pl) 2941 for_all_players (pl)
2951 { 2942 {
2952 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 2943 sint32 old = pl->ob->carrying;
2953 2944
2954 if (old == sum) 2945 pl->ob->update_weight ();
2955 continue; 2946
2947 if (old != pl->ob->carrying)
2948 {
2956 pl->ob->update_stats (); 2949 pl->ob->update_stats ();
2957 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 }
2958 } 2952 }
2959} 2953}
2960 2954
2961void 2955void
2962fix_luck (void) 2956fix_luck (void)
… …
3048 * as bad as carrying a light on a pitch dark map */ 3042 * as bad as carrying a light on a pitch dark map */
3049 if (has_carried_lights (ob)) 3043 if (has_carried_lights (ob))
3050 level = -(10 + (2 * ob->map->darkness)); 3044 level = -(10 + (2 * ob->map->darkness));
3051 3045
3052 /* scan through all nearby squares for terrain to hide in */ 3046 /* scan through all nearby squares for terrain to hide in */
3053 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])
3054 { 3050 {
3055 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL); 3051 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3056 if (mflag & P_OUT_OF_MAP) 3052 if (mflag & P_OUT_OF_MAP)
3057 {
3058 continue; 3053 continue;
3059 } 3054
3060 if (mflag & P_BLOCKSVIEW) /* something to hide near! */ 3055 if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3061 level += 2; 3056 level += 2;
3062 else /* open terrain! */ 3057 else /* open terrain! */
3063 level -= 1; 3058 level -= 1;
3064 } 3059 }
… …
3075 * spot (surrounded by clear terrain in broad daylight). -b.t. 3070 * spot (surrounded by clear terrain in broad daylight). -b.t.
3076 */ 3071 */
3077void 3072void
3078do_hidden_move (object *op) 3073do_hidden_move (object *op)
3079{ 3074{
3080 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3075 int hide = 0;
3081 object *skop;
3082 3076
3083 if (!op || !op->map) 3077 if (!op || !op->map)
3084 return; 3078 return;
3085 3079
3086 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);
3087 3082
3088 /* 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! */
3089 if (op->type == PLAYER && op->contr->run_on) 3084 if (op->type == PLAYER && op->contr->run_on)
3090 if (!skop || num >= skop->level) 3085 if (!skop || num >= skop->level)
3091 { 3086 {
… …
3101 num -= hide; 3096 num -= hide;
3102 3097
3103 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3098 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3104 { 3099 {
3105 make_visible (op); 3100 make_visible (op);
3101
3106 if (op->type == PLAYER) 3102 if (op->type == PLAYER)
3107 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!");
3108 } 3104 }
3109 else if (op->type == PLAYER && skop) 3105 else if (op->type == PLAYER && skop)
3110 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);
… …
3451 else 3447 else
3452 { 3448 {
3453 /* generate misc. treasure */ 3449 /* generate misc. treasure */
3454 tmp = arch_to_object (tr->item); 3450 tmp = arch_to_object (tr->item);
3455 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));
3456 tmp = insert_ob_in_ob (tmp, who); 3452 who->insert (tmp);
3457 if (who->type == PLAYER)
3458 esrv_send_item (who, tmp);
3459 } 3453 }
3460} 3454}
3461 3455
3462/** 3456/**
3463 * 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