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.187 by root, Mon Apr 21 07:07:36 2008 UTC vs.
Revision 1.199 by root, Sat May 17 14:57:23 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
… …
122 continue; 122 continue;
123 123
124 if (*buf == '%') 124 if (*buf == '%')
125 { /* send one news */ 125 { /* send one news */
126 if (size > 0) 126 if (size > 0)
127 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", (char *)"%s\n%s", subject, news); /*send previously read news */ 127 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
128 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS,
129 "INFORMATION: %s\n%s", (char *)"%s\n%s",
130 subject, news); /*send previously read news */
128 131
129 strcpy (subject, buf + 1); 132 strcpy (subject, buf + 1);
130 strip_endline (subject); 133 strip_endline (subject);
131 size = 0; 134 size = 0;
132 news[0] = '\0'; 135 news[0] = '\0';
… …
239 set_dragon_name (ob, abil, skin); 242 set_dragon_name (ob, abil, skin);
240 } 243 }
241 244
242 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 245 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
243 246
244 esrv_new_player (this, ob->weight + ob->carrying); 247 esrv_new_player (this);
245 248
246 ob->update_stats (); 249 ob->update_stats ();
247 250
248 ns->floorbox_update (); 251 ns->floorbox_update ();
249 esrv_send_inventory (ob, ob); 252 esrv_send_inventory (ob, ob);
… …
291player::set_object (object *op) 294player::set_object (object *op)
292{ 295{
293 ob = observe = op; 296 ob = observe = op;
294 ob->contr = this; /* this aren't yet in archetype */ 297 ob->contr = this; /* this aren't yet in archetype */
295 298
296 ob->speed = 1.0f; 299 ob->speed = 1.0f;
297 ob->speed_left = 0.5f; 300 ob->speed_left = 0.5f;
298 301
299 ob->direction = 5; /* So player faces south */ 302 ob->direction = 5; /* So player faces south */
300 303
301 ob->flag [FLAG_READY_WEAPON] = false; 304 ob->flag [FLAG_READY_WEAPON] = false;
302 ob->flag [FLAG_READY_SKILL] = false; 305 ob->flag [FLAG_READY_SKILL] = false;
303 ob->flag [FLAG_READY_BOW] = false; 306 ob->flag [FLAG_READY_BOW] = false;
304 307
… …
321 combat_ob = op; 324 combat_ob = op;
322 break; 325 break;
323 } 326 }
324 327
325 ob->change_weapon (combat_ob ? combat_ob : ranged_ob); 328 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
326 ob->deactivate (); // change_Weapon activates, fix this better 329 ob->deactivate (); // change_weapon activates, fix this better
327} 330}
328 331
329void 332void
330player::set_observe (object *op) 333player::set_observe (object *op)
331{ 334{
… …
851 */ 854 */
852void 855void
853player::chargen_race_done () 856player::chargen_race_done ()
854{ 857{
855 /* this must before then initial items are given */ 858 /* this must before then initial items are given */
856 esrv_new_player (ob->contr, ob->weight + ob->carrying); 859 esrv_new_player (ob->contr);
857 860
858 treasurelist *tl = treasurelist::find ("starting_wealth"); 861 treasurelist *tl = treasurelist::find ("starting_wealth");
859 if (tl) 862 if (tl)
860 create_treasure (tl, ob, 0, 0, 0); 863 create_treasure (tl, ob, 0, 0, 0);
861 864
… …
864 867
865 ob->contr->ns->state = ST_PLAYING; 868 ob->contr->ns->state = ST_PLAYING;
866 869
867 if (ob->msg) 870 if (ob->msg)
868 ob->msg = 0; 871 ob->msg = 0;
869
870 /* We create this now because some of the unique maps will need it
871 * to save here.
872 */
873 {
874 char buf[MAX_BUF];
875 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
876 make_path_to_file (buf);
877 }
878 872
879 start_info (ob); 873 start_info (ob);
880 CLEAR_FLAG (ob, FLAG_WIZ); 874 CLEAR_FLAG (ob, FLAG_WIZ);
881 give_initial_items (ob, ob->randomitems); 875 give_initial_items (ob, ob->randomitems);
882 link_player_skills (ob); 876 link_player_skills (ob);
… …
885 879
886 /* This moves the player to a different start map, if there 880 /* This moves the player to a different start map, if there
887 * is one for this race 881 * is one for this race
888 */ 882 */
889 if (*first_map_ext_path) 883 if (*first_map_ext_path)
890 { 884 ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
891 object *tmp;
892 char mapname[MAX_BUF];
893
894 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
895 tmp = object::create ();
896 EXIT_PATH (tmp) = mapname;
897 EXIT_X (tmp) = ob->x;
898 EXIT_Y (tmp) = ob->y;
899 ob->enter_exit (tmp); /* we don't really care if it succeeded;
900 * if the map isn't there, then stay on the
901 * default initial map */
902 tmp->destroy ();
903 }
904 else 885 else
905 LOG (llevDebug, "first_map_ext_path not set\n"); 886 LOG (llevDebug, "first_map_ext_path not set\n");
906} 887}
907 888
908void 889void
… …
1405 } 1386 }
1406 } 1387 }
1407 else if (arrow->type == ARROW && arrow->race == type) 1388 else if (arrow->type == ARROW && arrow->race == type)
1408 { 1389 {
1409 /* allways prefer assasination/slaying */ 1390 /* allways prefer assasination/slaying */
1410 if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race)) 1391 if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))
1411 { 1392 {
1412 if (arrow->attacktype & AT_DEATH) 1393 if (arrow->attacktype & AT_DEATH)
1413 { 1394 {
1414 *better = 100; 1395 *better = 100;
1415 return arrow; 1396 return arrow;
… …
1443 betterby = 1 + arrow->magic + arrow->stats.dam; 1424 betterby = 1 + arrow->magic + arrow->stats.dam;
1444 } 1425 }
1445 } 1426 }
1446 } 1427 }
1447 } 1428 }
1429
1448 if (tmp == NULL && arrow == NULL) 1430 if (tmp == NULL && arrow == NULL)
1449 return find_arrow (op, type); 1431 return find_arrow (op, type);
1450 1432
1451 *better = betterby; 1433 *better = betterby;
1452 return tmp; 1434 return tmp;
… …
1763 return; 1745 return;
1764 } 1746 }
1765 } 1747 }
1766 else if (item->type == ROD || item->type == HORN) 1748 else if (item->type == ROD || item->type == HORN)
1767 { 1749 {
1768 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1750 sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
1751
1752 // using the maximum of the rods charge allows at least one spell cast
1753 // for a rod or horn, this fixes some broken rods.
1754 if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
1769 { 1755 {
1770 op->contr->play_sound (sound_find ("wand_poof")); 1756 op->contr->play_sound (sound_find ("wand_poof"));
1771 1757
1772 if (item->type == ROD) 1758 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)); 1759 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); 1778 CLEAR_FLAG (item, FLAG_ANIMATE);
1793 item->face = item->arch->face; 1779 item->face = item->arch->face;
1794 item->set_speed (0); 1780 item->set_speed (0);
1795 } 1781 }
1796 1782
1797 if ((tmp = item->in_player ())) 1783 if (object *pl = item->visible_to ())
1798 esrv_update_item (UPD_ANIM, tmp, item); 1784 esrv_update_item (UPD_ANIM, pl, item);
1799 } 1785 }
1800 } 1786 }
1801 else if (item->type == ROD || item->type == HORN) 1787 else if (item->type == ROD || item->type == HORN)
1802 drain_rod_charge (item); 1788 drain_rod_charge (item);
1803 } 1789 }
… …
1980 remove_door2 (door); /* remove door without violence ;-) */ 1966 remove_door2 (door); /* remove door without violence ;-) */
1981 } 1967 }
1982 1968
1983 /* Do this after we print the message */ 1969 /* Do this after we print the message */
1984 key->decrease (); /* Use up one of the keys */ 1970 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 1971
1989 return 1; /* Nothing more to do below */ 1972 return 1; /* Nothing more to do below */
1990 } 1973 }
1991 else if (door->type == LOCKED_DOOR) 1974 else if (door->type == LOCKED_DOOR)
1992 { 1975 {
… …
2271 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2254 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2272 { 2255 {
2273 op->play_sound (sound_find ("ob_evaporate")); 2256 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)); 2257 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2275 2258
2276 if (op->contr)
2277 esrv_del_item (op->contr, tmp->count);
2278
2279 tmp->destroy (); 2259 tmp->destroy ();
2280 CLEAR_FLAG (op, FLAG_LIFESAVE); 2260 CLEAR_FLAG (op, FLAG_LIFESAVE);
2281 2261
2282 if (op->stats.hp < 0) 2262 if (op->stats.hp < 0)
2283 op->stats.hp = op->stats.maxhp; 2263 op->stats.hp = op->stats.maxhp;
… …
2295 return 0; 2275 return 0;
2296} 2276}
2297 2277
2298/* This goes throws the inventory and removes unpaid objects, and puts them 2278/* 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 2279 * 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 2280 * function will descend into containers. op is the object to start the search
2301 * from. 2281 * from.
2302 */ 2282 */
2303static void 2283static void
2304drop_unpaid_items (object *op, object *env) 2284drop_unpaid_items (object *op, object *env)
2305{ 2285{
2306 while (op) 2286 while (op)
2307 { 2287 {
2308 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2288 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2309 2289
2310 if (QUERY_FLAG (op, FLAG_UNPAID)) 2290 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); 2291 op->insert_at (env);
2316 }
2317 else if (op->inv) 2292 else if (op->inv)
2318 drop_unpaid_items (op->inv, env); 2293 drop_unpaid_items (op->inv, env);
2319 2294
2320 op = next; 2295 op = next;
2321 } 2296 }
… …
2333 * Moved from apply.c to player.c - player.c is what 2308 * Moved from apply.c to player.c - player.c is what
2334 * actually uses this function. player.c may not be quite the 2309 * actually uses this function. player.c may not be quite the
2335 * best, a misc file for object actions is probably better, 2310 * best, a misc file for object actions is probably better,
2336 * but there isn't one in the server directory. 2311 * but there isn't one in the server directory.
2337 */ 2312 */
2338char * 2313const char *
2339gravestone_text (object *op) 2314gravestone_text (object *op)
2340{ 2315{
2341 static char buf2[MAX_BUF]; 2316 static dynbuf_text buf;
2342 char buf[MAX_BUF];
2343 time_t now = time (NULL);
2344 2317
2345 strcpy (buf2, " R.I.P.\n\n"); 2318 buf << "---- R.I.P. ----\n\n";
2319 op->name;
2320
2346 if (op->type == PLAYER) 2321 if (op->type == PLAYER)
2347 sprintf (buf, "%s the %s\n", &op->name, op->contr->title); 2322 buf << " the " << op->contr->title;
2348 else
2349 sprintf (buf, "%s\n", &op->name);
2350 2323
2351 strncat (buf2, " ", 20 - strlen (buf) / 2); 2324 buf << "\n\n";
2352 strcat (buf2, buf); 2325
2326 buf << "who was level ";
2327 buf << (sint32)op->level << "\n\n" // OO breakdown
2328 << " when " << (op->contr ? "killed" : "died") << "\n\n";
2329
2353 if (op->type == PLAYER) 2330 if (op->type == PLAYER)
2354 sprintf (buf, "who was in level %d when killed\n", op->level); 2331 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 2332
2358 strncat (buf2, " ", 20 - strlen (buf) / 2);
2359 strcat (buf2, buf);
2360 if (op->type == PLAYER)
2361 { 2333 {
2362 sprintf (buf, "by %s.\n\n", op->contr->killer); 2334 static char buf2[128];
2363 strncat (buf2, " ", 21 - strlen (buf) / 2); 2335 time_t now = time (NULL);
2364 strcat (buf2, buf);
2365 }
2366
2367 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now)); 2336 strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2368 strncat (buf2, " ", 20 - strlen (buf) / 2); 2337 buf << buf2;
2369 strcat (buf2, buf); 2338 }
2370 2339
2371 return buf2; 2340 return buf;
2372} 2341}
2373 2342
2374void 2343void
2375do_some_living (object *op) 2344do_some_living (object *op)
2376{ 2345{
… …
2557 op->stats.food--; 2526 op->stats.food--;
2558 } 2527 }
2559 2528
2560 if (op->stats.food < 0 && op->stats.hp >= 0) 2529 if (op->stats.food < 0 && op->stats.hp >= 0)
2561 { 2530 {
2562 object *tmp, *flesh = 0; 2531 object *flesh = 0;
2563 2532
2564 for (tmp = op->inv; tmp; tmp = tmp->below) 2533 for_inv_removable (op, tmp)
2565 { 2534 {
2566 if (!QUERY_FLAG (tmp, FLAG_UNPAID)) 2535 if (QUERY_FLAG (tmp, FLAG_UNPAID))
2536 continue;
2537
2538 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2567 { 2539 {
2568 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2540 op->statusmsg ("You blindly grab for a bite of food. "
2569 { 2541 "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); 2542 manual_apply (op, tmp, 0);
2543
2572 if (op->stats.food >= 0 || op->stats.hp < 0) 2544 if (op->stats.food >= 0 || op->stats.hp < 0)
2573 break; 2545 break;
2574 } 2546 }
2575 else if (tmp->type == FLESH) 2547 else if (tmp->type == FLESH)
2576 flesh = tmp; 2548 flesh = tmp;
2577 } /* End if paid for object */ 2549 }
2578 } /* end of for loop */
2579 2550
2580 /* If player is still starving, it means they don't have any food, so 2551 /* If player is still starving, it means they don't have any food, so
2581 * eat flesh instead. 2552 * eat flesh instead.
2582 */ 2553 */
2583 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2554 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2584 { 2555 {
2585 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2556 op->statusmsg ("You blindly grab for a bite of food. "
2557 "H<To prevent you from starving, you ate some random item from your backpack.>");
2586 manual_apply (op, flesh, 0); 2558 manual_apply (op, flesh, 0);
2587 } 2559 }
2560
2561 // If player is still starving, alert him!
2562 if (op->stats.food < 0)
2563 op->failmsg ("You are starving! "
2564 "H<Eat some food to increase your food and prevent you from an untimely death.>");
2588 } 2565 }
2589 2566
2590 if (op->stats.food < 0) 2567 if (op->stats.food < 0)
2591 { 2568 {
2592 op->stats.hp += op->stats.food; 2569 op->stats.hp += op->stats.food;
2593 op->stats.food = 0; 2570 op->stats.food = 0;
2594 } 2571 }
2595 2572
2596 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) 2573 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2597 kill_player (op); 2574 kill_player (op);
… …
2650 { 2627 {
2651 tmp->name = format ("%s's finger" , &op->name); 2628 tmp->name = format ("%s's finger" , &op->name);
2652 tmp->name_pl = format ("%s's fingers", &op->name); 2629 tmp->name_pl = format ("%s's fingers", &op->name);
2653 tmp->msg = format ( 2630 tmp->msg = format (
2654 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n", 2631 "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 2632 &op->name, op->contr->title,
2633 (int)op->level,
2634 op->contr->killer_name ()
2656 ); 2635 );
2657 tmp->value = 0, tmp->type = 0; 2636 tmp->value = 0, tmp->type = 0;
2658 tmp->materialname = "organics"; 2637 tmp->materialname = "organics";
2659 tmp->insert_at (op, tmp); 2638 tmp->insert_at (op, tmp);
2660 } 2639 }
… …
2668 INVOKE_PLAYER (DEATH, op->contr); 2647 INVOKE_PLAYER (DEATH, op->contr);
2669 2648
2670 command_kill_pets (op, 0); 2649 command_kill_pets (op, 0);
2671 2650
2672 if (op->stats.food < 0) 2651 if (op->stats.food < 0)
2673 strcpy (op->contr->killer, "starvation"); 2652 {
2653 op->contr->killer = archetype::get ("killer_starvation");
2654 op->contr->killer->destroy ();
2655 }
2674 2656
2675 op->contr->play_sound (sound_find ("player_dies")); 2657 op->contr->play_sound (sound_find ("player_dies"));
2676 2658
2677 /* save the map location for corpse, gravestone */ 2659 /* save the map location for corpse, gravestone */
2678 x = op->x; 2660 x = op->x;
… …
2787 lost_a_stat = 1; 2769 lost_a_stat = 1;
2788 } 2770 }
2789 } 2771 }
2790 } 2772 }
2791 } 2773 }
2774
2792 /* If no stat lost, tell the player. */ 2775 /* If no stat lost, tell the player. */
2793 if (!lost_a_stat) 2776 if (!lost_a_stat)
2794 { 2777 {
2795 /* determine_god() seems to not work sometimes... why is this? 2778 /* determine_god() seems to not work sometimes... why is this?
2796 Should I be using something else? GD */ 2779 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); 2783 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);
2801 else 2784 else
2802 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you."); 2785 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
2803 } 2786 }
2804#else 2787#else
2805 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely."); 2788 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely.");
2806#endif 2789#endif
2807 2790
2808 /* Put a gravestone up where the character 'almost' died. List the 2791 /* Put a gravestone up where the character 'almost' died. List the
2809 * exp loss on the stone. 2792 * exp loss on the stone.
2810 */ 2793 */
2811 tmp = arch_to_object (archetype::find ("gravestone")); 2794 tmp = arch_to_object (archetype::find ("gravestone"));
2812 sprintf (buf, "%s's gravestone", &op->name); 2795 tmp->name = format ("%s's gravestone", &op->name);
2813 tmp->name = buf; 2796 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); 2797 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; 2798 tmp->x = op->x, tmp->y = op->y;
2819 insert_ob_in_map (tmp, op->map, NULL, 0); 2799 insert_ob_in_map (tmp, op->map, NULL, 0);
2820 2800
2821 /**************************************/ 2801 /**************************************/
2822 /* */ 2802 /* */
… …
2845 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2825 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2846 } 2826 }
2847 2827
2848 cure_disease (op, 0, 0); /* remove any disease */ 2828 cure_disease (op, 0, 0); /* remove any disease */
2849 2829
2830 // remove all spell effects that are active
2831 // to avoid long-term effects such as word-of-recall
2832 for (object *item = op->inv; item; )
2833 {
2834 object *next = item->below;
2835
2836 if (item->type == SPELL_EFFECT && item->active)
2837 item->destroy ();
2838
2839 item = next;
2840 }
2841
2850 /*add_exp(op, (op->stats.exp * -0.20)); */ 2842 /*add_exp(op, (op->stats.exp * -0.20)); */
2851 apply_death_exp_penalty (op); 2843 apply_death_exp_penalty (op);
2844
2852 if (op->stats.food < 100) 2845 if (op->stats.food < 100)
2853 op->stats.food = 900; 2846 op->stats.food = 900;
2847
2854 op->stats.hp = op->stats.maxhp; 2848 op->stats.hp = op->stats.maxhp;
2855 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2849 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2856 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2850 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2857 2851
2858 /* 2852 /*
… …
3079 * spot (surrounded by clear terrain in broad daylight). -b.t. 3073 * spot (surrounded by clear terrain in broad daylight). -b.t.
3080 */ 3074 */
3081void 3075void
3082do_hidden_move (object *op) 3076do_hidden_move (object *op)
3083{ 3077{
3084 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3078 int hide = 0;
3085 object *skop;
3086 3079
3087 if (!op || !op->map) 3080 if (!op || !op->map)
3088 return; 3081 return;
3089 3082
3090 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3083 object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3084 int num = random_roll (0, 19, op, PREFER_LOW);
3091 3085
3092 /* its *extremely* hard to run and sneak/hide at the same time! */ 3086 /* its *extremely* hard to run and sneak/hide at the same time! */
3093 if (op->type == PLAYER && op->contr->run_on) 3087 if (op->type == PLAYER && op->contr->run_on)
3094 if (!skop || num >= skop->level) 3088 if (!skop || num >= skop->level)
3095 { 3089 {
… …
3105 num -= hide; 3099 num -= hide;
3106 3100
3107 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3101 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3108 { 3102 {
3109 make_visible (op); 3103 make_visible (op);
3104
3110 if (op->type == PLAYER) 3105 if (op->type == PLAYER)
3111 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3106 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3112 } 3107 }
3113 else if (op->type == PLAYER && skop) 3108 else if (op->type == PLAYER && skop)
3114 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3109 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
… …
3455 else 3450 else
3456 { 3451 {
3457 /* generate misc. treasure */ 3452 /* generate misc. treasure */
3458 tmp = arch_to_object (tr->item); 3453 tmp = arch_to_object (tr->item);
3459 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp)); 3454 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3460 tmp = insert_ob_in_ob (tmp, who); 3455 who->insert (tmp);
3461 if (who->type == PLAYER)
3462 esrv_send_item (who, tmp);
3463 } 3456 }
3464} 3457}
3465 3458
3466/** 3459/**
3467 * Unready an object for a player. This function does nothing if the object was 3460 * Unready an object for a player. This function does nothing if the object was

Diff Legend

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