ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/apply.C
(Generate patch)

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.68 by root, Sat Feb 10 01:52:29 2007 UTC vs.
Revision 1.92 by root, Sat May 12 18:23:51 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 * 7 *
… …
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 21 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 23 */
24 24
25#include <cmath>
26
25#include <global.h> 27#include <global.h>
26#include <living.h> 28#include <living.h>
27#include <spells.h> 29#include <spells.h>
28#include <skills.h> 30#include <skills.h>
29#include <tod.h> 31#include <tod.h>
30 32
31#include <sproto.h> 33#include <sproto.h>
32 34
33/* Want this regardless of rplay. */ 35/* Want this regardless of rplay. */
34#include <sounds.h> 36#include <sounds.h>
35
36/* need math lib for double-precision and pow() in dragon_eat_flesh() */
37#include <math.h>
38 37
39/** 38/**
40 * Check if op should abort moving victim because of it's race or slaying. 39 * Check if op should abort moving victim because of it's race or slaying.
41 * Returns 1 if it should abort, returns 0 if it should continue. 40 * Returns 1 if it should abort, returns 0 if it should continue.
42 */ 41 */
… …
233 depl = present_arch_in_ob (at, op); 232 depl = present_arch_in_ob (at, op);
234 233
235 if (depl) 234 if (depl)
236 { 235 {
237 for (i = 0; i < NUM_STATS; i++) 236 for (i = 0; i < NUM_STATS; i++)
238 if (get_attr_value (&depl->stats, i)) 237 if (depl->stats.stat (i))
239 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]); 238 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]);
240 239
241 depl->destroy (); 240 depl->destroy ();
242 op->update_stats (); 241 op->update_stats ();
243 } 242 }
… …
375 force->stats.food *= 10; 374 force->stats.food *= 10;
376 for (i = 0; i < NROFATTACKS; i++) 375 for (i = 0; i < NROFATTACKS; i++)
377 if (force->resist[i] > 0) 376 if (force->resist[i] > 0)
378 force->resist[i] = -force->resist[i]; /* prot => vuln */ 377 force->resist[i] = -force->resist[i]; /* prot => vuln */
379 } 378 }
379
380 force->speed_left = -1; 380 force->speed_left = -1;
381 force = insert_ob_in_ob (force, op); 381 force = insert_ob_in_ob (force, op);
382 CLEAR_FLAG (tmp, FLAG_APPLIED); 382 CLEAR_FLAG (tmp, FLAG_APPLIED);
383 SET_FLAG (force, FLAG_APPLIED); 383 SET_FLAG (force, FLAG_APPLIED);
384 change_abil (op, force); 384 change_abil (op, force);
… …
765{ 765{
766 object *otmp; 766 object *otmp;
767 767
768 if (op->type != PLAYER) 768 if (op->type != PLAYER)
769 return 0; 769 return 0;
770
770 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) 771 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC))
771 { 772 {
772 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll."); 773 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll.");
773 return 0; 774 return 0;
774 } 775 }
776
775 otmp = find_marked_object (op); 777 otmp = find_marked_object (op);
776 if (!otmp) 778 if (!otmp)
777 { 779 {
778 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark a weapon object."); 780 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark a weapon object.");
779 return 0; 781 return 0;
780 } 782 }
783
781 if (otmp->type != WEAPON && otmp->type != BOW) 784 if (otmp->type != WEAPON && otmp->type != BOW)
782 { 785 {
783 new_draw_info (NDI_UNIQUE, 0, op, "Marked item is not a weapon or bow"); 786 new_draw_info (NDI_UNIQUE, 0, op, "Marked item is not a weapon or bow");
784 return 0; 787 return 0;
785 } 788 }
789
786 new_draw_info (NDI_UNIQUE, 0, op, "Applied weapon builder."); 790 new_draw_info (NDI_UNIQUE, 0, op, "Applied weapon builder.");
787 improve_weapon (op, tmp, otmp); 791 improve_weapon (op, tmp, otmp);
788 esrv_send_item (op, otmp); 792 esrv_send_item (op, otmp);
789 return 1; 793 return 1;
790} 794}
… …
1059 { 1063 {
1060 // it is in our env, so activate it, do not open yet 1064 // it is in our env, so activate it, do not open yet
1061 op->close_container (); 1065 op->close_container ();
1062 sack->flag [FLAG_APPLIED] = 1; 1066 sack->flag [FLAG_APPLIED] = 1;
1063 esrv_update_item (UPD_FLAGS, op, sack); 1067 esrv_update_item (UPD_FLAGS, op, sack);
1068 new_draw_info_format (NDI_UNIQUE, 0, op, "You ready %s.", query_name (sack));
1064 return 1; 1069 return 1;
1065 } 1070 }
1066 1071
1067 // it's locked? 1072 // it's locked?
1068 if (sack->slaying) 1073 if (sack->slaying)
… …
1570 1575
1571 readable_message_type *msgType = get_readable_message_type (tmp); 1576 readable_message_type *msgType = get_readable_message_type (tmp);
1572 1577
1573 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, 1578 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1574 msgType->message_type, msgType->message_subtype, 1579 msgType->message_type, msgType->message_subtype,
1575 "You open the %s and start reading.\n%s", "%s\n%s", long_desc (tmp, op), &tmp->msg); 1580 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1581 long_desc (tmp, op), &tmp->msg);
1576 1582
1577 /* gain xp from reading */ 1583 /* gain xp from reading */
1578 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1584 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1579 { /* only if not read before */ 1585 { /* only if not read before */
1580 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1586 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
… …
1736 return; 1742 return;
1737 } 1743 }
1738 1744
1739 if (skop->level < int (sqrtf (spell->level) * 1.5f)) 1745 if (skop->level < int (sqrtf (spell->level) * 1.5f))
1740 { 1746 {
1741 new_draw_info (NDI_UNIQUE, 0, op, "It is too hard to read at your level: You are unable to decipher the strange symbols."); 1747 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. [Your literacy level is too low]");
1742 return; 1748 return;
1743 } 1749 }
1744 1750
1745 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name); 1751 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name);
1746 1752
… …
1769 { 1775 {
1770 spell_skill = find_skill_by_name (op, spell->skill); 1776 spell_skill = find_skill_by_name (op, spell->skill);
1771 1777
1772 if (!spell_skill) 1778 if (!spell_skill)
1773 { 1779 {
1774 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use this spell", &spell->skill); 1780 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use this spell.", &spell->skill);
1775 return; 1781 return;
1776 } 1782 }
1777 1783
1778 if (spell_skill->level < spell->level) 1784 if (spell_skill->level < spell->level)
1779 { 1785 {
… …
1813 else 1819 else
1814 { 1820 {
1815 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1821 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0);
1816 new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell.\n"); 1822 new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell.\n");
1817 } 1823 }
1824
1818 decrease_ob (tmp); 1825 decrease_ob (tmp);
1819} 1826}
1820 1827
1821/** 1828/**
1822 * Handles applying a spell scroll. 1829 * Handles applying a spell scroll.
… …
2077 /* doubled chance for resistance of ability-focus */ 2084 /* doubled chance for resistance of ability-focus */
2078 if (i == abil->stats.exp) 2085 if (i == abil->stats.exp)
2079 chance = MIN (100., chance * 2.); 2086 chance = MIN (100., chance * 2.);
2080 2087
2081 /* now make the throw and save all winners (Don't insert luck bonus here!) */ 2088 /* now make the throw and save all winners (Don't insert luck bonus here!) */
2082 if (rndm (10000) < (int) (chance * 100)) 2089 if (rndm (10000) < (unsigned int) (chance * 100))
2083 { 2090 {
2084 atnr_winner[winners] = i; 2091 atnr_winner[winners] = i;
2085 winners++; 2092 winners++;
2086 } 2093 }
2087 2094
… …
2289 } 2296 }
2290 2297
2291 return 0; 2298 return 0;
2292} 2299}
2293 2300
2294
2295/** 2301/**
2296 * Main apply handler. 2302 * Main apply handler.
2297 * 2303 *
2298 * Checks for unpaid items before applying. 2304 * Checks for unpaid items before applying.
2299 * 2305 *
… …
2306 * being applied. 2312 * being applied.
2307 * 2313 *
2308 * aflag is special (always apply/unapply) flags. Nothing is done with 2314 * aflag is special (always apply/unapply) flags. Nothing is done with
2309 * them in this function - they are passed to apply_special 2315 * them in this function - they are passed to apply_special
2310 */ 2316 */
2311
2312int 2317int
2313manual_apply (object *op, object *tmp, int aflag) 2318manual_apply (object *op, object *tmp, int aflag)
2314{ 2319{
2315 if (tmp->head) 2320 if (tmp->head)
2316 tmp = tmp->head; 2321 tmp = tmp->head;
… …
2354 case EXIT: 2359 case EXIT:
2355 if (op->type != PLAYER) 2360 if (op->type != PLAYER)
2356 return 0; 2361 return 0;
2357 2362
2358 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2363 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp))
2359 {
2360 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp)); 2364 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp));
2361 }
2362 else 2365 else
2363 { 2366 {
2364 /* Don't display messages for random maps. */ 2367 /* Don't display messages for random maps. */
2365 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2)) 2368 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2))
2366 new_draw_info (NDI_NAVY, 0, op, tmp->msg); 2369 new_draw_info (NDI_NAVY, 0, op, tmp->msg);
2367 2370
2368 op->enter_exit (tmp); 2371 op->enter_exit (tmp);
2369 } 2372 }
2373
2370 return 1; 2374 return 1;
2371 2375
2372 case SIGN: 2376 case SIGN:
2373 apply_sign (op, tmp, 0); 2377 apply_sign (op, tmp, 0);
2374 return 1; 2378 return 1;
… …
2378 { 2382 {
2379 apply_book (op, tmp); 2383 apply_book (op, tmp);
2380 return 1; 2384 return 1;
2381 } 2385 }
2382 else 2386 else
2383 {
2384 return 0; 2387 return 0;
2385 }
2386 2388
2387 case SKILLSCROLL: 2389 case SKILLSCROLL:
2388 if (op->type == PLAYER) 2390 if (op->type == PLAYER)
2389 { 2391 {
2390 apply_skillscroll (op, tmp); 2392 apply_skillscroll (op, tmp);
2391 return 1; 2393 return 1;
2392 } 2394 }
2395 else
2393 return 0; 2396 return 0;
2394 2397
2395 case SPELLBOOK: 2398 case SPELLBOOK:
2396 if (op->type == PLAYER) 2399 if (op->type == PLAYER)
2397 { 2400 {
2398 apply_spellbook (op, tmp); 2401 apply_spellbook (op, tmp);
2399 return 1; 2402 return 1;
2400 } 2403 }
2404 else
2401 return 0; 2405 return 0;
2402 2406
2403 case SCROLL: 2407 case SCROLL:
2404 apply_scroll (op, tmp, 0); 2408 apply_scroll (op, tmp, 0);
2405 return 1; 2409 return 1;
2406 2410
2407 case POTION: 2411 case POTION:
2408 (void) apply_potion (op, tmp); 2412 apply_potion (op, tmp);
2409 return 1; 2413 return 1;
2410 2414
2411 /* Eneq(@csd.uu.se): Handle apply on containers. */ 2415 /* Eneq(@csd.uu.se): Handle apply on containers. */
2412 //TODO: remove, as it is unsed? 2416 //TODO: remove, as it is unsed?
2413 case CLOSE_CON: 2417 case CLOSE_CON:
… …
2446 case LAMP: 2450 case LAMP:
2447 case BUILDER: 2451 case BUILDER:
2448 case SKILL_TOOL: 2452 case SKILL_TOOL:
2449 if (tmp->env != op) 2453 if (tmp->env != op)
2450 return 2; /* not in inventory */ 2454 return 2; /* not in inventory */
2455
2451 (void) apply_special (op, tmp, aflag); 2456 apply_special (op, tmp, aflag);
2452 return 1; 2457 return 1;
2453 2458
2454 case DRINK: 2459 case DRINK:
2455 case FOOD: 2460 case FOOD:
2456 case FLESH: 2461 case FLESH:
… …
2472 } 2477 }
2473 else 2478 else
2474 return 0; 2479 return 0;
2475 2480
2476 case WEAPON_IMPROVER: 2481 case WEAPON_IMPROVER:
2477 (void) check_improve_weapon (op, tmp); 2482 check_improve_weapon (op, tmp);
2478 return 1; 2483 return 1;
2479 2484
2480 case CLOCK: 2485 case CLOCK:
2481 if (op->type == PLAYER) 2486 if (op->type == PLAYER)
2482 { 2487 {
… …
2490 play_sound_player_only (op->contr, SOUND_CLOCK, 0, 0); 2495 play_sound_player_only (op->contr, SOUND_CLOCK, 0, 0);
2491 new_draw_info (NDI_UNIQUE, 0, op, buf); 2496 new_draw_info (NDI_UNIQUE, 0, op, buf);
2492 return 1; 2497 return 1;
2493 } 2498 }
2494 else 2499 else
2495 {
2496 return 0; 2500 return 0;
2497 }
2498 2501
2499 case MENU: 2502 case MENU:
2500 if (op->type == PLAYER) 2503 if (op->type == PLAYER)
2501 { 2504 {
2502 shop_listing (op); 2505 shop_listing (tmp, op);
2503 return 1; 2506 return 1;
2504 } 2507 }
2505 else 2508 else
2506 {
2507 return 0; 2509 return 0;
2508 }
2509 2510
2510 case POWER_CRYSTAL: 2511 case POWER_CRYSTAL:
2511 apply_power_crystal (op, tmp); /* see egoitem.c */ 2512 apply_power_crystal (op, tmp); /* see egoitem.c */
2512 return 1; 2513 return 1;
2513 2514
… …
2516 { 2517 {
2517 apply_lighter (op, tmp); 2518 apply_lighter (op, tmp);
2518 return 1; 2519 return 1;
2519 } 2520 }
2520 else 2521 else
2521 {
2522 return 0; 2522 return 0;
2523 }
2524 2523
2525 case ITEM_TRANSFORMER: 2524 case ITEM_TRANSFORMER:
2526 apply_item_transformer (op, tmp); 2525 apply_item_transformer (op, tmp);
2527 return 1; 2526 return 1;
2528 2527
… …
2581/** 2580/**
2582 * player_apply_below attempts to apply the object 'below' the player. 2581 * player_apply_below attempts to apply the object 'below' the player.
2583 * If the player has an open container, we use that for below, otherwise 2582 * If the player has an open container, we use that for below, otherwise
2584 * we use the ground. 2583 * we use the ground.
2585 */ 2584 */
2586
2587void 2585void
2588player_apply_below (object *pl) 2586player_apply_below (object *pl)
2589{ 2587{
2590 int floors = 0; 2588 int floors = 0;
2591 2589
… …
2628 * to keep the size of apply_special to a more managable size. 2626 * to keep the size of apply_special to a more managable size.
2629 */ 2627 */
2630static int 2628static int
2631unapply_special (object *who, object *op, int aflags) 2629unapply_special (object *who, object *op, int aflags)
2632{ 2630{
2633 if (INVOKE_OBJECT (BE_UNREADY, op, ARG_OBJECT (who), ARG_INT (aflags)) || INVOKE_OBJECT (UNREADY, who, ARG_OBJECT (op), ARG_INT (aflags))) 2631 if (INVOKE_OBJECT (BE_UNREADY, op, ARG_OBJECT (who), ARG_INT (aflags))
2632 || INVOKE_OBJECT (UNREADY, who, ARG_OBJECT (op), ARG_INT (aflags)))
2634 return RESULT_INT (0); 2633 return RESULT_INT (0);
2635 2634
2636 object *tmp2; 2635 object *tmp2;
2637 2636
2638 CLEAR_FLAG (op, FLAG_APPLIED); 2637 CLEAR_FLAG (op, FLAG_APPLIED);
2638
2639 switch (op->type) 2639 switch (op->type)
2640 { 2640 {
2641 case WEAPON: 2641 case WEAPON:
2642 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op)); 2642 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op));
2643 2643
2644 (void) change_abil (who, op); 2644 change_abil (who, op);
2645 if (QUERY_FLAG (who, FLAG_READY_WEAPON))
2646 CLEAR_FLAG (who, FLAG_READY_WEAPON); 2645 CLEAR_FLAG (who, FLAG_READY_WEAPON);
2646
2647 if (who->contr)
2648 {
2649 if (who->contr->combat_ob == op)
2650 who->contr->combat_ob = 0;
2651
2652 if (who->current_weapon == op)
2653 who->current_weapon = 0;
2654 }
2655
2647 clear_skill (who); 2656 clear_skill (who);
2648 break; 2657 break;
2649 2658
2650 case SKILL: /* allows objects to impart skills */ 2659 case SKILL: /* allows objects to impart skills */
2651 case SKILL_TOOL: 2660 case SKILL_TOOL:
2652 if (op != who->chosen_skill) 2661 if (op != who->chosen_skill)
2653 {
2654 LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n"); 2662 LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n");
2663
2664 if (who->contr)
2655 } 2665 {
2656 if (who->type == PLAYER)
2657 {
2658 if (who->contr->shoottype == range_skill)
2659 who->contr->shoottype = range_none;
2660 if (!op->invisible) 2666 if (!op->invisible)
2661 {
2662 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op)); 2667 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op));
2663 }
2664 else 2668 else
2665 {
2666 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill); 2669 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill);
2667 } 2670 }
2668 } 2671
2669 (void) change_abil (who, op); 2672 change_abil (who, op);
2670 who->chosen_skill = NULL; 2673 who->chosen_skill = 0;
2671 CLEAR_FLAG (who, FLAG_READY_SKILL); 2674 CLEAR_FLAG (who, FLAG_READY_SKILL);
2672 break; 2675 break;
2673 2676
2674 case ARMOUR: 2677 case ARMOUR:
2675 case HELMET: 2678 case HELMET:
… …
2680 case AMULET: 2683 case AMULET:
2681 case GIRDLE: 2684 case GIRDLE:
2682 case BRACERS: 2685 case BRACERS:
2683 case CLOAK: 2686 case CLOAK:
2684 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op)); 2687 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op));
2685 (void) change_abil (who, op); 2688 change_abil (who, op);
2686 break; 2689 break;
2690
2687 case LAMP: 2691 case LAMP:
2688 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name); 2692 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name);
2689 tmp2 = arch_to_object (op->other_arch); 2693 tmp2 = arch_to_object (op->other_arch);
2690 tmp2->x = op->x; 2694 tmp2->x = op->x;
2691 tmp2->y = op->y; 2695 tmp2->y = op->y;
… …
2696 CLEAR_FLAG (tmp2, FLAG_APPLIED); 2700 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2697 2701
2698 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 2702 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2699 SET_FLAG (tmp2, FLAG_INV_LOCKED); 2703 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2700 2704
2701 if (who->type == PLAYER) 2705 if (who->contr)
2702 esrv_del_item (who->contr, op->count); 2706 esrv_del_item (who->contr, op->count);
2703 2707
2704 op->destroy (); 2708 op->destroy ();
2705 insert_ob_in_ob (tmp2, who); 2709 insert_ob_in_ob (tmp2, who);
2706 who->update_stats (); 2710 who->update_stats ();
2711
2707 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 2712 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2708 { 2713 {
2709 if (who->type == PLAYER) 2714 if (who->contr)
2710 { 2715 {
2711 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 2716 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
2712 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 2717 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2713 } 2718 }
2714 } 2719 }
2715 if (who->type == PLAYER) 2720
2721 if (who->contr)
2716 esrv_send_item (who, tmp2); 2722 esrv_send_item (who, tmp2);
2723
2717 return 1; /* otherwise, an attempt to drop causes problems */ 2724 return 1; /* otherwise, an attempt to drop causes problems */
2718 break; 2725
2719 case BOW: 2726 case BOW:
2720 case WAND: 2727 case WAND:
2721 case ROD: 2728 case ROD:
2722 case HORN: 2729 case HORN:
2723 clear_skill (who); 2730 clear_skill (who);
2731
2732 if (who->contr)
2733 {
2724 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2734 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2725 if (who->type == PLAYER) 2735
2726 { 2736 if (who->contr->ranged_ob == op)
2727 who->contr->shoottype = range_none; 2737 who->contr->ranged_ob = 0;
2738
2739 if (who->current_weapon == op)
2740 who->current_weapon = 0;
2728 } 2741 }
2729 else 2742 else
2730 { 2743 {
2731 if (op->type == BOW) 2744 if (op->type == BOW)
2732 CLEAR_FLAG (who, FLAG_READY_BOW); 2745 CLEAR_FLAG (who, FLAG_READY_BOW);
2733 else 2746 else
2734 CLEAR_FLAG (who, FLAG_READY_RANGE); 2747 CLEAR_FLAG (who, FLAG_READY_RANGE);
2735 } 2748 }
2749
2736 break; 2750 break;
2737 2751
2738 case BUILDER: 2752 case BUILDER:
2753 if (who->contr)
2754 {
2739 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2755 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2740 who->contr->shoottype = range_none; 2756
2741 who->contr->ranges[range_builder] = NULL; 2757 if (who->contr->ranged_ob == op)
2758 who->contr->ranged_ob = 0;
2759 }
2742 break; 2760 break;
2743 2761
2744 default: 2762 default:
2745 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op)); 2763 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op));
2746 break; 2764 break;
… …
2748 2766
2749 who->update_stats (); 2767 who->update_stats ();
2750 2768
2751 if (!(aflags & AP_NO_MERGE)) 2769 if (!(aflags & AP_NO_MERGE))
2752 { 2770 {
2753 object *tmp;
2754
2755 tmp = merge_ob (op, NULL); 2771 object *tmp = merge_ob (op, 0);
2756 if (who->type == PLAYER) 2772
2773 if (who->contr)
2757 { 2774 {
2758 if (tmp) 2775 if (tmp)
2759 { /* it was merged */ 2776 { /* it was merged */
2760 esrv_del_item (who->contr, op->count); 2777 esrv_del_item (who->contr, op->count);
2761 op = tmp; 2778 op = tmp;
2762 } 2779 }
2763 2780
2764 esrv_send_item (who, op); 2781 esrv_send_item (who, op);
2765 } 2782 }
2766 } 2783 }
2784
2767 return 0; 2785 return 0;
2768} 2786}
2769 2787
2770/** 2788/**
2771 * Returns the object that is using location 'loc'. 2789 * Returns the object that is using location 'loc'.
… …
2779 * loc is the index into the array we are looking for a match. 2797 * loc is the index into the array we are looking for a match.
2780 * don't return invisible objects unless they are skill objects 2798 * don't return invisible objects unless they are skill objects
2781 * invisible other objects that use 2799 * invisible other objects that use
2782 * up body locations can be used as restrictions. 2800 * up body locations can be used as restrictions.
2783 */ 2801 */
2784object * 2802static object *
2785get_item_from_body_location (object *start, int loc) 2803get_item_from_body_location (int loc, object *start)
2786{ 2804{
2787 object *tmp;
2788
2789 if (!start) 2805 if (start)
2790 return NULL;
2791
2792 for (tmp = start; tmp; tmp = tmp->below) 2806 for (object *tmp = start; tmp; tmp = tmp->below)
2793 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->body_info[loc] && (!tmp->invisible || tmp->type == SKILL)) 2807 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->slot[loc].info && (!tmp->invisible || tmp->type == SKILL))
2794 return tmp; 2808 return tmp;
2795 2809
2796 return NULL; 2810 return 0;
2797} 2811}
2798
2799
2800 2812
2801/** 2813/**
2802 * 'op' wants to apply an object, but can't because of other equipment. 2814 * 'op' wants to apply an object, but can't because of other equipment.
2803 * This should only be called when it is known 2815 * This should only be called when it is known
2804 * that there are objects to unapply. This makes pretty heavy 2816 * that there are objects to unapply. This makes pretty heavy
… …
2810 * another function that does just that. 2822 * another function that does just that.
2811 */ 2823 */
2812int 2824int
2813unapply_for_ob (object *who, object *op, int aflags) 2825unapply_for_ob (object *who, object *op, int aflags)
2814{ 2826{
2815 int i; 2827 if (op->is_range ())
2816 object *tmp = NULL, *last;
2817
2818 /* If we are applying a shield or weapon, unapply any equipped shield
2819 * or weapons first - only allowed to use one weapon/shield at a time.
2820 */
2821 if (op->type == WEAPON || op->type == SHIELD)
2822 {
2823 for (tmp = who->inv; tmp; tmp = tmp->below) 2828 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2824 {
2825 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type) 2829 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ())
2826 {
2827 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))) 2830 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)))
2828 { 2831 {
2829 if (aflags & AP_PRINT) 2832 if (aflags & AP_PRINT)
2830 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2833 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp));
2831 else 2834 else
2832 unapply_special (who, tmp, aflags); 2835 unapply_special (who, tmp, aflags);
2833 } 2836 }
2834 else 2837 else
2835 { 2838 {
2836 /* In this case, we want to try and remove a cursed item. 2839 /* In this case, we want to try and remove a cursed item.
2837 * While we know it won't work, we want unapply_special to 2840 * While we know it won't work, we want unapply_special to
2838 * at least generate the message. 2841 * at least generate the message.
2839 */ 2842 */
2840 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (tmp)); 2843 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't remove the %s.", query_name (tmp));
2841 return 1; 2844 return 1;
2842 }
2843
2844 } 2845 }
2845 }
2846 }
2847 2846
2848 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 2847 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
2849 { 2848 {
2850 /* this used up a slot that we need to free */ 2849 /* this used up a slot that we need to free */
2851 if (op->body_info[i]) 2850 if (op->slot[i].info)
2852 { 2851 {
2853 last = who->inv; 2852 object *last = who->inv;
2854 2853
2855 /* We do a while loop - may need to remove several items in order 2854 /* We do a while loop - may need to remove several items in order
2856 * to free up enough slots. 2855 * to free up enough slots.
2857 */ 2856 */
2858 while ((who->body_used[i] + op->body_info[i]) < 0) 2857 while ((who->slot[i].used + op->slot[i].info) < 0)
2859 { 2858 {
2860 tmp = get_item_from_body_location (last, i); 2859 object *tmp = get_item_from_body_location (i, last);
2860
2861 if (!tmp) 2861 if (!tmp)
2862 { 2862 {
2863#if 0 2863#if 0
2864 /* Not a bug - we'll get this if the player has cursed items 2864 /* Not a bug - we'll get this if the player has cursed items
2865 * equipped. 2865 * equipped.
2866 */ 2866 */
2867 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name); 2867 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name);
2868#endif 2868#endif
2869 return 1; 2869 return 1;
2870 } 2870 }
2871
2871 /* If we are just printing, we don't care about cursed status */ 2872 /* If we are just printing, we don't care about cursed status */
2872 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))) 2873 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))))
2873 { 2874 {
2874 if (aflags & AP_PRINT) 2875 if (aflags & AP_PRINT)
2875 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2876 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp));
… …
2883 * so it may not be critical (eg, putting on a ring and you have 2884 * so it may not be critical (eg, putting on a ring and you have
2884 * one cursed ring.) 2885 * one cursed ring.)
2885 */ 2886 */
2886 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp)); 2887 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp));
2887 } 2888 }
2889
2888 last = tmp->below; 2890 last = tmp->below;
2889 } 2891 }
2890 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the 2892 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the
2891 * return in the !tmp would have kicked in. 2893 * return in the !tmp would have kicked in.
2892 */ 2894 */
2893 } /* if op is using this body location */ 2895 } /* if op is using this body location */
2894 } /* for body lcoations */ 2896 } /* for body lcoations */
2897
2895 return 0; 2898 return 0;
2896} 2899}
2897 2900
2898/** 2901/**
2899 * Checks to see if 'who' can apply object 'op'. 2902 * Checks to see if 'who' can apply object 'op'.
2900 * Returns 0 if apply can be done without anything special. 2903 * Returns 0 if apply can be done without anything special.
2901 * Otherwise returns a bitmask - potentially several of these may be 2904 * Otherwise returns a bitmask - potentially several of these may be
2902 * set, but largely depends on circumstance - in the future, processing 2905 * set, but largely depends on circumstance - in the future, processing
2903 * may be pruned once we know some status (eg, once CAN_APPLY_NEVER 2906 * may be pruned once we know some status (eg, once CAN_APPLY_NEVER
2904 * is set, do we really are what the other flags may be?) 2907 * is set, do we really are what the other flags may be?)
2905 * 2908 *
2906 * See include/define.h for detailed description of the meaning of 2909 * See include/define.h for detailed description of the meaning of
2907 * these return values. 2910 * these return values.
2908 */ 2911 */
… …
2910can_apply_object (object *who, object *op) 2913can_apply_object (object *who, object *op)
2911{ 2914{
2912 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op))) 2915 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op)))
2913 return RESULT_INT (0); 2916 return RESULT_INT (0);
2914 2917
2915 int i, retval = 0; 2918 int retval = 0;
2916 object *tmp = NULL, *ws = NULL; 2919 object *tmp = 0, *ws = 0;
2917 2920
2918 /* Players have 2 'arm's, so they could in theory equip 2 shields or 2921 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
2919 * 2 weapons, but we don't want to let them do that. So if they are
2920 * trying to equip a weapon or shield, see if they already have one
2921 * in place and store that way.
2922 */
2923 if (op->type == WEAPON || op->type == SHIELD)
2924 { 2922 {
2925 for (tmp = who->inv; tmp && !ws; tmp = tmp->below) 2923 if (op->slot[i].info)
2926 { 2924 {
2927 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type) 2925 /* Item uses more slots than we have */
2926 if (abs (op->slot[i].info) > who->slot[i].info)
2928 { 2927 {
2929 retval = CAN_APPLY_UNAPPLY;
2930 ws = tmp;
2931 }
2932 }
2933 }
2934
2935
2936 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
2937 {
2938 if (op->body_info[i])
2939 {
2940 /* Item uses more slots than we have */
2941 if (FABS (op->body_info[i]) > who->body_info[i])
2942 {
2943 /* Could return now for efficiently - rest of info below isn' 2928 /* Could return now for efficiency - rest of info below isn't
2944 * really needed. 2929 * really needed.
2945 */ 2930 */
2946 retval |= CAN_APPLY_NEVER; 2931 retval |= CAN_APPLY_NEVER;
2947 } 2932 }
2948 else if ((who->body_used[i] + op->body_info[i]) < 0) 2933 else if ((who->slot[i].used + op->slot[i].info) < 0)
2949 { 2934 {
2950 /* in this case, equipping this would use more free spots than 2935 /* in this case, equipping this would use more free spots than
2951 * we have. 2936 * we have.
2952 */ 2937 */
2953 object *tmp1;
2954
2955 2938
2956 /* if we have an applied weapon/shield, and unapply it would free 2939 /* if we have an applied weapon/shield, and unapply it would free
2957 * enough slots to equip the new item, then just set this can 2940 * enough slots to equip the new item, then just set "can
2958 * continue. We don't care about the logic below - if you have 2941 * apply unapply". We don't care about the logic below - if you have a
2959 * shield equipped and try to equip another shield, there is only 2942 * shield equipped and try to equip another shield, there is only
2960 * one choice. However, the check for the number of body locations 2943 * one choice. However, the check for the number of body locations
2961 * does take into the account cases where what is being applied 2944 * does take into the account cases where what is being applied
2962 * may be two handed for example. 2945 * may be two handed for example.
2963 */ 2946 */
2964 if (ws) 2947 if (ws)
2965 { 2948 if ((who->slot[i].used - ws->slot[i].info + op->slot[i].info) >= 0)
2966 if ((who->body_used[i] - ws->body_info[i] + op->body_info[i]) >= 0)
2967 { 2949 {
2968 retval |= CAN_APPLY_UNAPPLY; 2950 retval |= CAN_APPLY_UNAPPLY;
2969 continue; 2951 continue;
2970 } 2952 }
2971 }
2972 2953
2973 tmp1 = get_item_from_body_location (who->inv, i); 2954 object *tmp1 = get_item_from_body_location (i, who->inv);
2974 if (!tmp1) 2955 if (!tmp1)
2975 { 2956 {
2976#if 0 2957#if 0
2977 /* This is sort of an error, but happens a lot when old players 2958 /* This is sort of an error, but happens a lot when old players
2978 * join in with more stuff equipped than they are now allowed. 2959 * join in with more stuff equipped than they are now allowed.
… …
2989 */ 2970 */
2990 retval |= CAN_APPLY_UNAPPLY; 2971 retval |= CAN_APPLY_UNAPPLY;
2991 if (!tmp) 2972 if (!tmp)
2992 tmp = tmp1; 2973 tmp = tmp1;
2993 else if (tmp != tmp1) 2974 else if (tmp != tmp1)
2994 {
2995 retval |= CAN_APPLY_UNAPPLY_MULT; 2975 retval |= CAN_APPLY_UNAPPLY_MULT;
2996 } 2976
2997 /* This object isn't using up all the slots, so there must 2977 /* This object isn't using up all the slots, so there must
2998 * be another. If so, and it the new item doesn't need all 2978 * be another. If so, and it the new item doesn't need all
2999 * the slots, the player then has a choice. 2979 * the slots, the player then has a choice.
3000 */ 2980 */
3001 if (((who->body_used[i] - tmp1->body_info[i]) != who->body_info[i]) && (FABS (op->body_info[i]) < who->body_info[i])) 2981 if ((who->slot[i].used - tmp1->slot[i].info != who->slot[i].info)
2982 && abs (op->slot[i].info) < who->slot[i].info)
3002 retval |= CAN_APPLY_UNAPPLY_CHOICE; 2983 retval |= CAN_APPLY_UNAPPLY_CHOICE;
3003 2984
3004 /* Does unequippint 'tmp1' free up enough slots for this to be 2985 /* Does unequippint 'tmp1' free up enough slots for this to be
3005 * equipped? If not, there must be something else to unapply. 2986 * equipped? If not, there must be something else to unapply.
3006 */ 2987 */
3007 if ((who->body_used[i] + op->body_info[i] - tmp1->body_info[i]) < 0) 2988 if (who->slot[i].used + op->slot[i].info < tmp1->slot[i].info)
3008 retval |= CAN_APPLY_UNAPPLY_MULT; 2989 retval |= CAN_APPLY_UNAPPLY_MULT;
3009
3010 } 2990 }
3011 } /* if not enough free slots */ 2991 } /* if not enough free slots */
3012 } /* if this object uses location i */ 2992 } /* if this object uses location i */
3013 } /* for i -> num_body_locations loop */ 2993 } /* for i -> num_body_locations loop */
3014 2994
… …
3019 * and weapons all use the same slot. Similar for horn/rod/wand - they 2999 * and weapons all use the same slot. Similar for horn/rod/wand - they
3020 * all use the same location. 3000 * all use the same location.
3021 */ 3001 */
3022 if (op->type == WEAPON && !QUERY_FLAG (who, FLAG_USE_WEAPON)) 3002 if (op->type == WEAPON && !QUERY_FLAG (who, FLAG_USE_WEAPON))
3023 retval |= CAN_APPLY_RESTRICTION; 3003 retval |= CAN_APPLY_RESTRICTION;
3004
3024 if (op->type == SHIELD && !QUERY_FLAG (who, FLAG_USE_SHIELD)) 3005 if (op->type == SHIELD && !QUERY_FLAG (who, FLAG_USE_SHIELD))
3025 retval |= CAN_APPLY_RESTRICTION; 3006 retval |= CAN_APPLY_RESTRICTION;
3026 3007
3027
3028 if (who->type != PLAYER) 3008 if (who->type != PLAYER)
3029 { 3009 {
3030 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE)) 3010 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE))
3031 retval |= CAN_APPLY_RESTRICTION; 3011 retval |= CAN_APPLY_RESTRICTION;
3012
3032 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3013 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3033 retval |= CAN_APPLY_RESTRICTION; 3014 retval |= CAN_APPLY_RESTRICTION;
3015
3034 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING)) 3016 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING))
3035 retval |= CAN_APPLY_RESTRICTION; 3017 retval |= CAN_APPLY_RESTRICTION;
3018
3036 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3019 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3037 retval |= CAN_APPLY_RESTRICTION; 3020 retval |= CAN_APPLY_RESTRICTION;
3038 } 3021 }
3022
3039 return retval; 3023 return retval;
3040} 3024}
3041
3042
3043 3025
3044/** 3026/**
3045 * who is the object using the object. It can be a monster. 3027 * who is the object using the object. It can be a monster.
3046 * op is the object they are using. op is an equipment type item, 3028 * op is the object they are using. op is an equipment type item,
3047 * eg, one which you put on and keep on for a while, and not something 3029 * eg, one which you put on and keep on for a while, and not something
… …
3066int 3048int
3067apply_special (object *who, object *op, int aflags) 3049apply_special (object *who, object *op, int aflags)
3068{ 3050{
3069 int basic_flag = aflags & AP_BASIC_FLAGS; 3051 int basic_flag = aflags & AP_BASIC_FLAGS;
3070 object *tmp, *tmp2, *skop = NULL; 3052 object *tmp, *tmp2, *skop = NULL;
3071 int i;
3072 3053
3073 if (who == NULL) 3054 if (who == NULL)
3074 { 3055 {
3075 LOG (llevError, "apply_special() from object without environment.\n"); 3056 LOG (llevError, "apply_special() from object without environment.\n");
3076 return 1; 3057 return 1;
… …
3086 if (basic_flag == AP_APPLY) 3067 if (basic_flag == AP_APPLY)
3087 return 0; 3068 return 0;
3088 3069
3089 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 3070 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
3090 { 3071 {
3091 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (op)); 3072 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't remove %s.", query_name (op));
3092 return 1; 3073 return 1;
3093 } 3074 }
3075
3094 return unapply_special (who, op, aflags); 3076 return unapply_special (who, op, aflags);
3095 } 3077 }
3096 3078
3097 if (basic_flag == AP_UNAPPLY) 3079 if (basic_flag == AP_UNAPPLY)
3098 return 0; 3080 return 0;
3099 3081
3100 i = can_apply_object (who, op); 3082 // if the item is combat/ranged, wield the relevant slot first
3083 // to resolve conflicts.
3084 if (player *pl = who->contr)
3085 switch (op->type)
3086 {
3087 case WEAPON:
3088 who->change_weapon (pl->combat_ob);
3089 break;
3090
3091 case BOW:
3092 case ROD:
3093 case WAND:
3094 case HORN:
3095 case SKILL_TOOL:
3096 who->change_weapon (pl->ranged_ob);
3097 break;
3098
3099 case SKILL:
3100 if (IS_COMBAT_SKILL (op->subtype))
3101 who->change_weapon (pl->combat_ob);
3102 else if (IS_RANGED_SKILL (op->subtype))
3103 who->change_weapon (pl->ranged_ob);
3104 break;
3105 }
3101 3106
3102 /* Can't just apply this object. Lets see what not and what to do */ 3107 /* Can't just apply this object. Lets see what not and what to do */
3103 if (i) 3108 if (int i = can_apply_object (who, op))
3104 { 3109 {
3105 if (i & CAN_APPLY_NEVER) 3110 if (i & CAN_APPLY_NEVER)
3106 { 3111 {
3107 new_draw_info_format (NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name (op)); 3112 new_draw_info_format (NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name (op));
3108 return 1; 3113 return 1;
… …
3110 else if (i & CAN_APPLY_RESTRICTION) 3115 else if (i & CAN_APPLY_RESTRICTION)
3111 { 3116 {
3112 new_draw_info_format (NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name (op)); 3117 new_draw_info_format (NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name (op));
3113 return 1; 3118 return 1;
3114 } 3119 }
3120
3115 if (who->type != PLAYER) 3121 if (who->type != PLAYER)
3116 { 3122 {
3117 /* Some error, so don't try to equip something more */ 3123 /* Some error, so don't try to equip something more */
3118 if (unapply_for_ob (who, op, aflags)) 3124 if (unapply_for_ob (who, op, aflags))
3119 return 1; 3125 return 1;
… …
3125 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some of the following item(s) or change your applymode:"); 3131 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some of the following item(s) or change your applymode:");
3126 unapply_for_ob (who, op, AP_PRINT); 3132 unapply_for_ob (who, op, AP_PRINT);
3127 return 1; 3133 return 1;
3128 } 3134 }
3129 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE)) 3135 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE))
3130 {
3131 i = unapply_for_ob (who, op, aflags); 3136 if (unapply_for_ob (who, op, aflags))
3132 if (i)
3133 return 1; 3137 return 1;
3134 }
3135 } 3138 }
3136 } 3139 }
3137 3140
3138 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL) 3141 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL)
3139 { 3142 {
3140 skop = find_skill_by_name (who, op->skill); 3143 skop = find_skill_by_name (who, op->skill);
3144
3141 if (!skop) 3145 if (!skop)
3142 { 3146 {
3143 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill); 3147 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill);
3144 return 1; 3148 return 1;
3145 } 3149 }
3146 else 3150 else
3147 {
3148 /* While experience will be credited properly, we want to change the 3151 /* While experience will be credited properly, we want to change the
3149 * skill so that the dam and wc get updated 3152 * skill so that the dam and wc get updated
3150 */ 3153 */
3151 change_skill (who, skop, 0); 3154 change_skill (who, skop, 0);
3152 }
3153 }
3154
3155 if (who->type == PLAYER && op->item_power && (op->item_power + who->contr->item_power) > (settings.item_power_factor * who->level))
3156 { 3155 }
3157 new_draw_info (NDI_UNIQUE, 0, who, "Equipping that combined with other items would consume your soul!"); 3156
3157 if (who->type == PLAYER
3158 && op->item_power
3159 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level)
3160 {
3161 new_draw_info (NDI_UNIQUE, 0, who,
3162 "Equipping that combined with other items would consume your soul! "
3163 "[use the skills command to check your available item power]");
3158 return 1; 3164 return 1;
3159 } 3165 }
3160
3161 3166
3162 /* Ok. We are now at the state where we can apply the new object. 3167 /* Ok. We are now at the state where we can apply the new object.
3163 * Note that we don't have the checks for can_use_... 3168 * Note that we don't have the checks for can_use_...
3164 * below - that is already taken care of by can_apply_object. 3169 * below - that is already taken care of by can_apply_object.
3165 */ 3170 */
3166
3167
3168 if (op->nrof > 1) 3171 if (op->nrof > 1)
3169 tmp = get_split_ob (op, op->nrof - 1); 3172 tmp = get_split_ob (op, op->nrof - 1);
3170 else 3173 else
3171 tmp = NULL; 3174 tmp = 0;
3172 3175
3173 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op))) 3176 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
3174 return RESULT_INT (0); 3177 return RESULT_INT (0);
3175 3178
3176 switch (op->type) 3179 switch (op->type)
3177 { 3180 {
3178 case WEAPON: 3181 case WEAPON:
3179 if (!check_weapon_power (who, op->last_eat)) 3182 if (!check_weapon_power (who, op->last_eat))
3180 { 3183 {
3181 new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use."); 3184 new_draw_info (NDI_UNIQUE, 0, who, "This weapon is too powerful for you to use.\n"
3182 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3185 "It would consume your soul!.");
3186
3183 if (tmp != NULL) 3187 if (tmp)
3184 (void) insert_ob_in_ob (tmp, who); 3188 insert_ob_in_ob (tmp, who);
3189
3185 return 1; 3190 return 1;
3186 } 3191 }
3187 3192
3188 //TODO: this obviously fails for players using a shiorter prefix 3193 //TODO: this obviously fails for players using a shorter prefix
3189 // i.e. "R" can use Ragnarok's swors. 3194 // i.e. "R" can use Ragnarok's sword.
3190 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3195 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3191 { 3196 {
3192 /* if the weapon does not have the name as the character, can't use it. */ 3197 /* if the weapon does not have the name as the character, can't use it. */
3193 /* (Ragnarok's sword attempted to be used by Foo: won't work) */ 3198 /* (Ragnarok's sword attempted to be used by Foo: won't work) */
3194 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3199 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner.");
… …
3197 insert_ob_in_ob (tmp, who); 3202 insert_ob_in_ob (tmp, who);
3198 3203
3199 return 1; 3204 return 1;
3200 } 3205 }
3201 3206
3207 if (!skop)
3208 {
3209 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO
3210 return 1;
3211 }
3212
3202 SET_FLAG (op, FLAG_APPLIED); 3213 SET_FLAG (op, FLAG_APPLIED);
3203
3204 if (skop)
3205 change_skill (who, skop, 1); 3214 change_skill (who, skop, 1);
3215
3216 if (who->contr)
3217 who->change_weapon (who->contr->combat_ob = op);
3218
3206 if (!QUERY_FLAG (who, FLAG_READY_WEAPON)) 3219 if (!QUERY_FLAG (who, FLAG_READY_WEAPON))
3207 SET_FLAG (who, FLAG_READY_WEAPON); 3220 SET_FLAG (who, FLAG_READY_WEAPON);
3208 3221
3209 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op)); 3222 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op));
3210 3223
3211 (void) change_abil (who, op); 3224 change_abil (who, op);
3212 break; 3225 break;
3213 3226
3214 case ARMOUR: 3227 case ARMOUR:
3215 case HELMET: 3228 case HELMET:
3216 case SHIELD: 3229 case SHIELD:
… …
3221 case CLOAK: 3234 case CLOAK:
3222 case RING: 3235 case RING:
3223 case AMULET: 3236 case AMULET:
3224 SET_FLAG (op, FLAG_APPLIED); 3237 SET_FLAG (op, FLAG_APPLIED);
3225 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op)); 3238 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op));
3226 (void) change_abil (who, op); 3239 change_abil (who, op);
3227 break; 3240 break;
3241
3228 case LAMP: 3242 case LAMP:
3229 if (op->stats.food < 1) 3243 if (op->stats.food < 1)
3230 { 3244 {
3231 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of" " fuel!", &op->name); 3245 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of fuel!", &op->name);
3232 return 1; 3246 return 1;
3233 } 3247 }
3248
3234 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name); 3249 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name);
3235 tmp2 = arch_to_object (op->other_arch); 3250 tmp2 = arch_to_object (op->other_arch);
3236 tmp2->stats.food = op->stats.food; 3251 tmp2->stats.food = op->stats.food;
3237 SET_FLAG (tmp2, FLAG_APPLIED); 3252 SET_FLAG (tmp2, FLAG_APPLIED);
3253
3238 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 3254 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3239 SET_FLAG (tmp2, FLAG_INV_LOCKED); 3255 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3256
3240 insert_ob_in_ob (tmp2, who); 3257 insert_ob_in_ob (tmp2, who);
3241 3258
3242 /* Remove the old lantern */ 3259 /* Remove the old lantern */
3243 if (who->type == PLAYER) 3260 if (who->type == PLAYER)
3244 esrv_del_item (who->contr, op->count); 3261 esrv_del_item (who->contr, op->count);
3245 3262
3246 op->destroy (); 3263 op->destroy ();
3247 3264
3248 /* insert the portion that was split off */ 3265 /* insert the portion that was split off */
3249 if (tmp != NULL) 3266 if (tmp)
3250 { 3267 {
3251 (void) insert_ob_in_ob (tmp, who); 3268 insert_ob_in_ob (tmp, who);
3252 if (who->type == PLAYER) 3269 if (who->type == PLAYER)
3253 esrv_send_item (who, tmp); 3270 esrv_send_item (who, tmp);
3254 } 3271 }
3272
3255 who->update_stats (); 3273 who->update_stats ();
3274
3256 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3275 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3257 {
3258 if (who->type == PLAYER) 3276 if (who->type == PLAYER)
3259 { 3277 {
3260 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3278 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
3261 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 3279 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3262 } 3280 }
3263 } 3281
3264 if (who->type == PLAYER) 3282 if (who->type == PLAYER)
3265 esrv_send_item (who, tmp2); 3283 esrv_send_item (who, tmp2);
3284
3266 return 0; 3285 return 0;
3267 break;
3268 3286
3269 /* this part is needed for skill-tools */ 3287 /* this part is needed for skill-tools */
3270 case SKILL: 3288 case SKILL:
3271 case SKILL_TOOL: 3289 case SKILL_TOOL:
3272 if (who->chosen_skill) 3290 if (who->chosen_skill)
3273 { 3291 {
3274 LOG (llevError, "BUG: apply_special(): can't apply two skills\n"); 3292 LOG (llevError, "BUG: apply_special(): can't apply two skills\n");
3275 return 1; 3293 return 1;
3276 } 3294 }
3277 if (who->type == PLAYER) 3295
3296 if (player *pl = who->contr)
3297 {
3298 if (IS_COMBAT_SKILL (op->subtype))
3278 { 3299 {
3279 who->contr->shoottype = range_skill; 3300 if (skill_flags [op->subtype] & SF_NEED_WEAPON)
3280 who->contr->ranges[range_skill] = op; 3301 {
3302 for (object *item = who->inv; item; item = item->below)
3303 if (item->type == WEAPON && item->flag [FLAG_APPLIED])
3304 {
3305 who->change_weapon (pl->combat_ob = item);
3306 goto found_weapon;
3307 }
3308
3309 new_draw_info (NDI_UNIQUE, 0, who, "You need to apply a melee weapon before readying this skill");
3310 return 1;
3311
3312 found_weapon:;
3313 }
3314 else
3315 who->change_weapon (pl->combat_ob = op);
3316 }
3317 else if (IS_RANGED_SKILL (op->subtype))
3318 {
3319 if (skill_flags [op->subtype] & SF_NEED_BOW)
3320 {
3321 for (object *item = who->inv; item; item = item->below)
3322 if (item->type == BOW && item->flag [FLAG_APPLIED])
3323 {
3324 who->change_weapon (pl->ranged_ob = item);
3325 goto found_bow;
3326 }
3327
3328 new_draw_info (NDI_UNIQUE, 0, who, "You need to apply a missile weapon before readying this skill");
3329 return 1;
3330
3331 found_bow:;
3332 }
3333 else if (skill_flags [op->subtype] & SF_NEED_ITEM)
3334 {
3335 for (object *item = who->inv; item; item = item->below)
3336 if (item->flag [FLAG_APPLIED]
3337 && (item->type == WAND || item->type == ROD || item->type == HORN))
3338 {
3339 who->change_weapon (pl->ranged_ob = item);
3340 goto found_item;
3341 }
3342
3343 new_draw_info (NDI_UNIQUE, 0, who, "You need to apply a magic item before readying this skill");
3344 return 1;
3345
3346 found_item:;
3347 }
3348 else
3349 who->change_weapon (pl->ranged_ob = op);
3350 }
3351
3281 if (!op->invisible) 3352 if (!op->invisible)
3282 { 3353 {
3283 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3354 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3284 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill); 3355 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill);
3285 } 3356 }
3286 else 3357 else
3287 {
3288 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name); 3358 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name);
3289 } 3359 }
3290 } 3360
3291 SET_FLAG (op, FLAG_APPLIED); 3361 SET_FLAG (op, FLAG_APPLIED);
3292 (void) change_abil (who, op); 3362 change_abil (who, op);
3293 who->chosen_skill = op; 3363 who->chosen_skill = op;
3294 SET_FLAG (who, FLAG_READY_SKILL); 3364 SET_FLAG (who, FLAG_READY_SKILL);
3295 break; 3365 break;
3296 3366
3297 case BOW: 3367 case BOW:
3298 if (!check_weapon_power (who, op->last_eat)) 3368 if (!check_weapon_power (who, op->last_eat))
3299 { 3369 {
3300 new_draw_info (NDI_UNIQUE, 0, who, "That item is too powerful for you to use."); 3370 new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use.");
3301 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3371 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!.");
3372
3302 if (tmp != NULL) 3373 if (tmp)
3303 (void) insert_ob_in_ob (tmp, who); 3374 insert_ob_in_ob (tmp, who);
3375
3304 return 1; 3376 return 1;
3305 } 3377 }
3378
3306 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3379 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3307 { 3380 {
3308 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3381 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner.");
3309 if (tmp != NULL) 3382 if (tmp)
3310 (void) insert_ob_in_ob (tmp, who); 3383 insert_ob_in_ob (tmp, who);
3384
3311 return 1; 3385 return 1;
3312 } 3386 }
3387
3313 /*FALLTHROUGH*/ case WAND: 3388 /*FALLTHROUGH*/
3389 case WAND:
3314 case ROD: 3390 case ROD:
3315 case HORN: 3391 case HORN:
3316 /* check for skill, alter player status */ 3392 /* check for skill, alter player status */
3393
3394 if (!skop)
3395 {
3396 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO
3397 return 1;
3398 }
3399
3317 SET_FLAG (op, FLAG_APPLIED); 3400 SET_FLAG (op, FLAG_APPLIED);
3318 if (skop)
3319 change_skill (who, skop, 0); 3401 change_skill (who, skop, 0);
3402
3403 if (who->contr)
3404 {
3405 who->contr->ranged_ob = op;
3406
3320 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3407 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3321 3408
3322 if (who->type == PLAYER)
3323 {
3324 if (op->type == BOW) 3409 if (op->type == BOW)
3325 { 3410 {
3411 who->current_weapon = op;
3326 (void) change_abil (who, op); 3412 change_abil (who, op);
3327 new_draw_info_format (NDI_UNIQUE, 0, who, 3413 new_draw_info_format (NDI_UNIQUE, 0, who,
3328 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)); 3414 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op));
3329 who->contr->shoottype = range_bow;
3330 }
3331 else
3332 {
3333 who->contr->shoottype = range_misc;
3334 } 3415 }
3335 } 3416 }
3336 else 3417 else
3337 { 3418 {
3338 if (op->type == BOW) 3419 if (op->type == BOW)
3339 SET_FLAG (who, FLAG_READY_BOW); 3420 SET_FLAG (who, FLAG_READY_BOW);
3340 else 3421 else
3341 SET_FLAG (who, FLAG_READY_RANGE); 3422 SET_FLAG (who, FLAG_READY_RANGE);
3342 } 3423 }
3424
3343 break; 3425 break;
3344 3426
3345 case BUILDER: 3427 case BUILDER:
3346 if (who->contr->ranges[range_builder]) 3428 if (who->type == PLAYER)
3429 {
3430 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER)
3347 unapply_special (who, who->contr->ranges[range_builder], 0); 3431 unapply_special (who, who->contr->ranged_ob, 0);
3348 who->contr->shoottype = range_builder; 3432
3349 who->contr->ranges[range_builder] = op;
3350 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op)); 3433 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op));
3434
3435 who->contr->ranged_ob = op;
3436 }
3351 break; 3437 break;
3352 3438
3353 default: 3439 default:
3354 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op)); 3440 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op));
3355 } /* end of switch op->type */ 3441 } /* end of switch op->type */
3356 3442
3357 SET_FLAG (op, FLAG_APPLIED); 3443 SET_FLAG (op, FLAG_APPLIED);
3358 3444
3359 if (tmp != NULL) 3445 if (tmp)
3360 tmp = insert_ob_in_ob (tmp, who); 3446 tmp = insert_ob_in_ob (tmp, who);
3361 3447
3362 who->update_stats (); 3448 who->update_stats ();
3363 3449
3364 /* We exclude spell casting objects. The fire code will set the 3450 /* We exclude spell casting objects. The fire code will set the
… …
3374 { 3460 {
3375 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3461 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
3376 SET_FLAG (op, FLAG_KNOWN_CURSED); 3462 SET_FLAG (op, FLAG_KNOWN_CURSED);
3377 } 3463 }
3378 } 3464 }
3465
3379 if (who->type == PLAYER) 3466 if (who->type == PLAYER)
3380 { 3467 {
3381 /* if multiple objects were applied, update both slots */ 3468 /* if multiple objects were applied, update both slots */
3382 if (tmp) 3469 if (tmp)
3383 esrv_send_item (who, tmp); 3470 esrv_send_item (who, tmp);
3471
3384 esrv_send_item (who, op); 3472 esrv_send_item (who, op);
3385 } 3473 }
3474
3386 return 0; 3475 return 0;
3387} 3476}
3388
3389 3477
3390int 3478int
3391monster_apply_special (object *who, object *op, int aflags) 3479monster_apply_special (object *who, object *op, int aflags)
3392{ 3480{
3393 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED)) 3481 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
… …
3552 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && tmp->has_random_items ()) 3640 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && tmp->has_random_items ())
3553 { 3641 {
3554 create_treasure (tmp->randomitems, tmp, GT_APPLY, difficulty, 0); 3642 create_treasure (tmp->randomitems, tmp, GT_APPLY, difficulty, 0);
3555 tmp->randomitems = NULL; 3643 tmp->randomitems = NULL;
3556 } 3644 }
3645
3557 // close all containers 3646 // close all containers
3558 else if (tmp->type == CONTAINER) 3647 else if (tmp->type == CONTAINER)
3559 tmp->flag [FLAG_APPLIED] = 0; 3648 tmp->flag [FLAG_APPLIED] = 0;
3560 3649
3561 tmp = above; 3650 tmp = above;
… …
3571 * Handles player eating food that temporarily changes status (resistances, stats). 3660 * Handles player eating food that temporarily changes status (resistances, stats).
3572 * This used to call cast_change_attr(), but 3661 * This used to call cast_change_attr(), but
3573 * that doesn't work with the new spell code. Since we know what 3662 * that doesn't work with the new spell code. Since we know what
3574 * the food changes, just grab a force and use that instead. 3663 * the food changes, just grab a force and use that instead.
3575 */ 3664 */
3576
3577void 3665void
3578eat_special_food (object *who, object *food) 3666eat_special_food (object *who, object *food)
3579{ 3667{
3580 object *force; 3668 object *force;
3581 int i, did_one = 0; 3669 int i, did_one = 0;
3582 sint8 k;
3583 3670
3584 force = get_archetype (FORCE_NAME); 3671 force = get_archetype (FORCE_NAME);
3585 3672
3586 for (i = 0; i < NUM_STATS; i++) 3673 for (i = 0; i < NUM_STATS; i++)
3587 { 3674 if (sint8 k = food->stats.stat (i))
3588 k = get_attr_value (&food->stats, i);
3589 if (k)
3590 { 3675 {
3591 set_attr_value (&force->stats, i, k); 3676 force->stats.stat (i) = k;
3592 did_one = 1; 3677 did_one = 1;
3593 } 3678 }
3594 }
3595 3679
3596 /* check if we can protect the eater */ 3680 /* check if we can protect the eater */
3597 for (i = 0; i < NROFATTACKS; i++) 3681 for (i = 0; i < NROFATTACKS; i++)
3598 { 3682 {
3599 if (food->resist[i] > 0) 3683 if (food->resist[i] > 0)
… …
3760 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!"); 3844 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!");
3761 blind_player (op, op, power); 3845 blind_player (op, op, power);
3762 } 3846 }
3763 else if (failure <= -80) 3847 else if (failure <= -80)
3764 { /* blast the immediate area */ 3848 { /* blast the immediate area */
3765 object *tmp;
3766
3767 tmp = get_archetype (LOOSE_MANA); 3849 object *tmp = get_archetype (LOOSE_MANA);
3768 cast_magic_storm (op, tmp, power); 3850 cast_magic_storm (op, tmp, power);
3769 new_draw_info (NDI_UNIQUE, 0, op, "You unlease uncontrolled mana!"); 3851 new_draw_info (NDI_UNIQUE, 0, op, "You unleash uncontrolled mana!");
3770 tmp->destroy (); 3852 tmp->destroy ();
3771 } 3853 }
3772 } 3854 }
3773} 3855}
3774 3856
… …
3794 */ 3876 */
3795 int i, j; 3877 int i, j;
3796 3878
3797 for (i = 0; i < NUM_STATS; i++) 3879 for (i = 0; i < NUM_STATS; i++)
3798 { 3880 {
3799 sint8 stat = get_attr_value (stats, i);
3800 int race_bonus = get_attr_value (&(pl->arch->clone.stats), i); 3881 int race_bonus = pl->arch->clone.stats.stat (i);
3882 sint8 stat = stats->stat (i) + ns->stat (i);
3801 3883
3802 stat += get_attr_value (ns, i);
3803 if (stat > 20 + race_bonus) 3884 if (stat > 20 + race_bonus)
3804 { 3885 {
3805 excess_stat++; 3886 excess_stat++;
3806 stat = 20 + race_bonus; 3887 stat = 20 + race_bonus;
3807 } 3888 }
3808 set_attr_value (stats, i, stat); 3889
3890 stats->stat (i) = stat;
3809 } 3891 }
3810 3892
3811 for (j = 0; excess_stat > 0 && j < 100; j++) 3893 for (j = 0; excess_stat > 0 && j < 100; j++)
3812 { /* try 100 times to assign excess stats */ 3894 { /* try 100 times to assign excess stats */
3813 int i = rndm (0, 6); 3895 int i = rndm (0, 6);
3814 int stat = get_attr_value (stats, i);
3815 int race_bonus = get_attr_value (&(pl->arch->clone.stats), i);
3816 3896
3817 if (i == CHA) 3897 if (i == CHA)
3818 continue; /* exclude cha from this */ 3898 continue; /* exclude cha from this */
3899
3900 int stat = stats->stat (i);
3901 int race_bonus = pl->arch->clone.stats.stat (i);
3819 if (stat < 20 + race_bonus) 3902 if (stat < 20 + race_bonus)
3820 { 3903 {
3821 change_attr_value (stats, i, 1); 3904 change_attr_value (stats, i, 1);
3822 excess_stat--; 3905 excess_stat--;
3823 } 3906 }
… …
3826 /* insert the randomitems from the change's treasurelist into 3909 /* insert the randomitems from the change's treasurelist into
3827 * the player ref: player.c 3910 * the player ref: player.c
3828 */ 3911 */
3829 if (change->randomitems != NULL) 3912 if (change->randomitems != NULL)
3830 give_initial_items (pl, change->randomitems); 3913 give_initial_items (pl, change->randomitems);
3831
3832 3914
3833 /* set up the face, for some races. */ 3915 /* set up the face, for some races. */
3834 3916
3835 /* first, look for the force object banning 3917 /* first, look for the force object banning
3836 * changing the face. Certain races never change face with class. 3918 * changing the face. Certain races never change face with class.

Diff Legend

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