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.9 by root, Fri Aug 25 17:11:53 2006 UTC vs.
Revision 1.19 by elmex, Sun Sep 3 14:33:46 2006 UTC

1/* 1/*
2 * static char *rcsid_apply_c = 2 * static char *rcsid_apply_c =
3 * "$Id: apply.C,v 1.9 2006/08/25 17:11:53 root Exp $"; 3 * "$Id: apply.C,v 1.19 2006/09/03 14:33:46 elmex Exp $";
4 */ 4 */
5/* 5/*
6 CrossFire, A Multiplayer game for X-windows 6 CrossFire, A Multiplayer game for X-windows
7 7
8 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 8 Copyright (C) 2001 Mark Wedel & Crossfire Development Team
… …
38/* Want this regardless of rplay. */ 38/* Want this regardless of rplay. */
39#include <sounds.h> 39#include <sounds.h>
40 40
41/* need math lib for double-precision and pow() in dragon_eat_flesh() */ 41/* need math lib for double-precision and pow() in dragon_eat_flesh() */
42#include <math.h> 42#include <math.h>
43
44/* Can transport hold object op?
45 * This is a pretty trivial function,
46 * but in the future, possible transport may have more restrictions
47 * or weight reduction like containers
48 */
49int transport_can_hold(const object *transport, const object *op, int nrof)
50{
51 if ((op->weight *nrof + transport->carrying) > transport->weight_limit)
52 return 0;
53 else
54 return 1;
55}
56
57
58/*
59 * Player is trying to use a transport. This returns same values as
60 * manual_apply() does. This function basically checks to see if
61 * the player can use the transport, and if so, sets up the appropriate
62 * pointers.
63 */
64int apply_transport(object *pl, object *transport, int aflag) {
65
66 /* Only players can use transports right now */
67 if (pl->type != PLAYER) return 0;
68
69 // due to brokenness of transports disable them until a working alternative
70 // has been found... :(
71 // - elmex
72 new_draw_info (NDI_UNIQUE, 0, pl, "This transport is out of order!");
73 return 1;
74
75 /* If player is currently on a transport but not this transport, they need
76 * to exit first. Perhaps transport to transport transfers should be
77 * allowed.
78 */
79 if (pl->contr->transport && pl->contr->transport != transport) {
80 new_draw_info_format(NDI_UNIQUE, 0, pl,
81 "You must exit %s before you can board %s.",
82 query_name(pl->contr->transport),
83 query_name(transport));
84 return 1;
85 }
86
87 /* player is currently on a transport. This must mean he
88 * wants to exit.
89 */
90 if (pl->contr->transport) {
91 object *old_transport = pl->contr->transport, *inv;
92
93 /* Should we print a message if the player only wants to
94 * apply?
95 */
96 if (aflag & AP_APPLY) return 1;
97 new_draw_info_format(NDI_UNIQUE, 0, pl,
98 "You disembark from %s.",
99 query_name(old_transport));
100 remove_ob(pl);
101 pl->map = old_transport->map;
102 pl->x = old_transport->x;
103 pl->y = old_transport->y;
104 if (pl->contr == old_transport->contr)
105 old_transport->contr = NULL;
106
107 pl->contr->transport = NULL;
108 insert_ob_in_map(pl, pl->map, pl, 0);
109 sum_weight(old_transport);
110
111 /* Possible for more than one player to be using a transport.
112 * if that is the case, we don't want to reset the face, as the
113 * transport is still occupied.
114 */
115 for (inv=old_transport->inv; inv; inv=inv->below)
116 if (inv->type == PLAYER) break;
117 if (!inv) {
118 old_transport->face = old_transport->arch->clone.face;
119 old_transport->animation_id = old_transport->arch->clone.animation_id;
120 }
121 return 1;
122 }
123 else {
124 /* player is trying to board a transport */
125 int pc=0, p_limit;
126 object *inv;
127 const char *kv;
128
129 if (aflag & AP_UNAPPLY) return 1;
130
131 /* Can this transport hold the weight of this player? */
132 if (!transport_can_hold(transport, pl, 1)) {
133 new_draw_info_format(NDI_UNIQUE, 0, pl,
134 "The %s is unable to hold your weight!",
135 query_name(transport));
136 return 1;
137 }
138
139 /* Does this transport have space for more players? */
140 for (inv=transport->inv; inv; inv=inv->below) {
141 if (inv->type == PLAYER) pc++;
142 }
143 kv = get_ob_key_value(transport, "passenger_limit");
144 if (!kv) p_limit=1;
145 else p_limit = atoi(kv);
146 if (pc >= p_limit) {
147 new_draw_info_format(NDI_UNIQUE, 0, pl,
148 "The %s does not have space for any more people",
149 query_name(transport));
150 return 1;
151 }
152
153 /* Everything checks out OK - player can get on the transport */
154 pl->contr->transport = transport;
155 if (!transport->contr) transport->contr = pl->contr;
156 remove_ob(pl);
157 insert_ob_in_ob(pl, transport);
158 sum_weight(transport);
159 pl->map = transport->map;
160 pl->x = transport->x;
161 pl->y = transport->y;
162
163 /* Might need to update face, animation info */
164 if (!pc) {
165 const char *str;
166
167 str = get_ob_key_value(transport, "face_full");
168 if (str)
169 transport->face = &new_faces[FindFace(str,
170 transport->face->number)];
171 str = get_ob_key_value(transport, "anim_full");
172 if (str)
173 transport->animation_id = find_animation(str);
174 }
175
176 /* Does speed of this object change based on weight? */
177 kv = get_ob_key_value(transport, "weight_speed_ratio");
178 if (kv) {
179 int wsr = atoi(kv);
180 float base_speed;
181
182 kv = get_ob_key_value(transport, "base_speed");
183 if (kv) base_speed = atof(kv);
184 else base_speed = transport->arch->clone.speed;
185
186 transport->speed = base_speed - (base_speed * transport->carrying *
187 wsr) / (transport->weight_limit * 100);
188
189 /* Put some limits on min/max speeds */
190 if (transport->speed < 0.10) transport->speed = 0.10;
191 if (transport->speed > 1.0) transport->speed = 1.0;
192 }
193 } /* else if player is boarding the transport */
194
195 return 1;
196}
197
198
199 43
200/** 44/**
201 * Check if op should abort moving victim because of it's race or slaying. 45 * Check if op should abort moving victim because of it's race or slaying.
202 * Returns 1 if it should abort, returns 0 if it should continue. 46 * Returns 1 if it should abort, returns 0 if it should continue.
203 */ 47 */
… …
269 * identified. IF it doesn't, then go through the player inventory. 113 * identified. IF it doesn't, then go through the player inventory.
270 */ 114 */
271 if (marked && ! QUERY_FLAG (marked, FLAG_IDENTIFIED) 115 if (marked && ! QUERY_FLAG (marked, FLAG_IDENTIFIED)
272 && need_identify (marked)) 116 && need_identify (marked))
273 { 117 {
274 if (operate_altar (altar, &money)) { 118 if (operate_altar (altar, &money)) {
275 identify (marked); 119 identify (marked);
276 new_draw_info_format(NDI_UNIQUE, 0, pl, 120 new_draw_info_format(NDI_UNIQUE, 0, pl,
277 "You have %s.", long_desc(marked, pl)); 121 "You have %s.", long_desc(marked, pl));
278 if (marked->msg) { 122 if (marked->msg) {
279 new_draw_info(NDI_UNIQUE, 0,pl, "The item has a story:"); 123 new_draw_info(NDI_UNIQUE, 0,pl, "The item has a story:");
280 new_draw_info(NDI_UNIQUE, 0,pl, marked->msg); 124 new_draw_info(NDI_UNIQUE, 0,pl, marked->msg);
281 } 125 }
282 return money == NULL; 126 return money == NULL;
283 } 127 }
284 } 128 }
285 129
286 for (id=pl->inv; id; id=id->below) { 130 for (id=pl->inv; id; id=id->below) {
287 if (!QUERY_FLAG(id, FLAG_IDENTIFIED) && !id->invisible && 131 if (!QUERY_FLAG(id, FLAG_IDENTIFIED) && !id->invisible &&
288 need_identify(id)) { 132 need_identify(id)) {
289 if (operate_altar(altar,&money)) { 133 if (operate_altar(altar,&money)) {
290 identify(id); 134 identify(id);
291 new_draw_info_format(NDI_UNIQUE, 0, pl, 135 new_draw_info_format(NDI_UNIQUE, 0, pl,
292 "You have %s.", long_desc(id, pl)); 136 "You have %s.", long_desc(id, pl));
293 if (id->msg) { 137 if (id->msg) {
294 new_draw_info(NDI_UNIQUE, 0,pl, "The item has a story:"); 138 new_draw_info(NDI_UNIQUE, 0,pl, "The item has a story:");
295 new_draw_info(NDI_UNIQUE, 0,pl, id->msg); 139 new_draw_info(NDI_UNIQUE, 0,pl, id->msg);
296 } 140 }
297 success=1; 141 success=1;
298 /* If no more money, might as well quit now */ 142 /* If no more money, might as well quit now */
299 if (money == NULL || ! check_altar_sacrifice (altar,money)) 143 if (money == NULL || ! check_altar_sacrifice (altar,money))
300 break; 144 break;
301 } 145 }
302 else { 146 else {
303 LOG(llevError,"check_id_altar: Couldn't do sacrifice when we should have been able to\n"); 147 LOG(llevError,"check_id_altar: Couldn't do sacrifice when we should have been able to\n");
304 break; 148 break;
305 } 149 }
306 } 150 }
307 } 151 }
308 if (!success) new_draw_info(NDI_UNIQUE, 0,pl,"You have nothing that needs identifying"); 152 if (!success) new_draw_info(NDI_UNIQUE, 0,pl,"You have nothing that needs identifying");
309 return money == NULL; 153 return money == NULL;
310} 154}
311 155
… …
582 426
583 if (item==NULL) return 0; 427 if (item==NULL) return 0;
584 op=op->below; 428 op=op->below;
585 while(op!=NULL) { 429 while(op!=NULL) {
586 if (strcmp(op->arch->name,item)==0){ 430 if (strcmp(op->arch->name,item)==0){
587 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED) 431 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED)
588 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID) ) 432 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID) )
589 { 433 {
590 if (op->nrof == 0)/* this is necessary for artifact sacrifices --FD-- */ 434 if (op->nrof == 0)/* this is necessary for artifact sacrifices --FD-- */
591 count++; 435 count++;
592 else 436 else
593 count += op->nrof; 437 count += op->nrof;
594 } 438 }
595 } 439 }
596 op=op->below; 440 op=op->below;
597 } 441 }
598 return count; 442 return count;
599} 443}
… …
610 454
611 prev = op; 455 prev = op;
612 op=op->below; 456 op=op->below;
613 457
614 while(op!=NULL) { 458 while(op!=NULL) {
615 if (strcmp(op->arch->name,item)==0) { 459 if (strcmp(op->arch->name,item)==0) {
616 if (op->nrof >= nrof) { 460 if (op->nrof >= nrof) {
617 decrease_ob_nr(op,nrof); 461 decrease_ob_nr(op,nrof);
618 return; 462 return;
619 } else { 463 } else {
620 decrease_ob_nr(op,op->nrof); 464 decrease_ob_nr(op,op->nrof);
621 nrof -= op->nrof; 465 nrof -= op->nrof;
622 } 466 }
623 op=prev; 467 op=prev;
624 } 468 }
625 prev = op; 469 prev = op;
626 op=op->below; 470 op=op->below;
627 } 471 }
628} 472}
629 473
630/** 474/**
631 * This checks to see of the player (who) is sufficient level to use a weapon 475 * This checks to see of the player (who) is sufficient level to use a weapon
… …
653 * I changed this to 1 improvement per "fighter" level/5 -b.t. 497 * I changed this to 1 improvement per "fighter" level/5 -b.t.
654 * Note: Nothing should break by allowing this ratio to be different or 498 * Note: Nothing should break by allowing this ratio to be different or
655 * using normal level - it is just a matter of play balance. 499 * using normal level - it is just a matter of play balance.
656 */ 500 */
657 if(who->type==PLAYER) { 501 if(who->type==PLAYER) {
658 object *wc_obj=NULL; 502 object *wc_obj=NULL;
659 503
660 for(wc_obj=who->inv;wc_obj;wc_obj=wc_obj->below) 504 for(wc_obj=who->inv;wc_obj;wc_obj=wc_obj->below)
661 if (wc_obj->type == SKILL && IS_COMBAT_SKILL(wc_obj->subtype) && wc_obj->level > level) 505 if (wc_obj->type == SKILL && IS_COMBAT_SKILL(wc_obj->subtype) && wc_obj->level > level)
662 level = wc_obj->level; 506 level = wc_obj->level;
663 507
664 if (!level ) { 508 if (!level ) {
665 LOG(llevError,"Error: Player: %s lacks wc experience object\n",who->name); 509 LOG(llevError,"Error: Player: %s lacks wc experience object\n",who->name);
666 level = who->level; 510 level = who->level;
667 } 511 }
668 } 512 }
669 else 513 else
670 level=who->level; 514 level=who->level;
671 515
672 return (improvs <= ((level/5)+5)); 516 return (improvs <= ((level/5)+5));
673#endif 517#endif
674} 518}
675 519
… …
680static int check_sacrifice(object *op, const object *improver) 524static int check_sacrifice(object *op, const object *improver)
681{ 525{
682 int count=0; 526 int count=0;
683 527
684 if (improver->slaying!=NULL) { 528 if (improver->slaying!=NULL) {
685 count = check_item(op,improver->slaying); 529 count = check_item(op,improver->slaying);
686 if (count<1) { 530 if (count<1) {
687 char buf[200]; 531 char buf[200];
688 sprintf(buf,"The gods want more %ss",improver->slaying); 532 sprintf(buf,"The gods want more %ss", &improver->slaying);
689 new_draw_info(NDI_UNIQUE,0,op,buf); 533 new_draw_info(NDI_UNIQUE,0,op,buf);
690 return 0; 534 return 0;
691 } 535 }
692 } 536 }
693 else 537 else
694 count=1; 538 count=1;
695 539
696 return count; 540 return count;
697} 541}
698 542
699/** 543/**
700 * Actually improves the weapon, and tells user. 544 * Actually improves the weapon, and tells user.
701 */ 545 */
702int improve_weapon_stat(object *op,object *improver,object *weapon, 546int improve_weapon_stat(object *op,object *improver,object *weapon,
703 signed char *stat,int sacrifice_count,const char *statname) 547 signed char *stat,int sacrifice_count,const char *statname)
704{ 548{
705 549
706 new_draw_info(NDI_UNIQUE,0,op,"Your sacrifice was accepted."); 550 new_draw_info(NDI_UNIQUE,0,op,"Your sacrifice was accepted.");
707 *stat += sacrifice_count; 551 *stat += sacrifice_count;
708 weapon->last_eat++; 552 weapon->last_eat++;
709 new_draw_info_format(NDI_UNIQUE,0,op, 553 new_draw_info_format(NDI_UNIQUE,0,op,
710 "Weapon's bonus to %s improved by %d",statname,sacrifice_count); 554 "Weapon's bonus to %s improved by %d",statname,sacrifice_count);
711 decrease_ob(improver); 555 decrease_ob(improver);
712 556
713 /* So it updates the players stats and the window */ 557 /* So it updates the players stats and the window */
714 fix_player(op); 558 fix_player(op);
715 return 1; 559 return 1;
… …
742 if (weapon->level!=0) { 586 if (weapon->level!=0) {
743 new_draw_info(NDI_UNIQUE,0,op,"Weapon already prepared."); 587 new_draw_info(NDI_UNIQUE,0,op,"Weapon already prepared.");
744 return 0; 588 return 0;
745 } 589 }
746 for (i=0; i<NROFATTACKS; i++) 590 for (i=0; i<NROFATTACKS; i++)
747 if (weapon->resist[i]) break; 591 if (weapon->resist[i]) break;
748 592
749 /* If we break out, i will be less than nrofattacks, preventing 593 /* If we break out, i will be less than nrofattacks, preventing
750 * improvement of items that already have protections. 594 * improvement of items that already have protections.
751 */ 595 */
752 if (i<NROFATTACKS || 596 if (i<NROFATTACKS ||
753 weapon->stats.hp || /* regeneration */ 597 weapon->stats.hp || /* regeneration */
754 (weapon->stats.sp && weapon->type == WEAPON) || /* sp regeneration */ 598 (weapon->stats.sp && weapon->type == WEAPON) || /* sp regeneration */
755 weapon->stats.exp || /* speed */ 599 weapon->stats.exp || /* speed */
756 weapon->stats.ac) /* AC - only taifu's I think */ 600 weapon->stats.ac) /* AC - only taifu's I think */
757 { 601 {
758 new_draw_info(NDI_UNIQUE,0,op,"Cannot prepare magic weapons."); 602 new_draw_info(NDI_UNIQUE,0,op,"Cannot prepare magic weapons.");
759 return 0; 603 return 0;
760 } 604 }
761 sacrifice_count=check_sacrifice(op,improver); 605 sacrifice_count=check_sacrifice(op,improver);
… …
764 weapon->level=isqrt(sacrifice_count); 608 weapon->level=isqrt(sacrifice_count);
765 new_draw_info(NDI_UNIQUE,0,op,"Your sacrifice was accepted."); 609 new_draw_info(NDI_UNIQUE,0,op,"Your sacrifice was accepted.");
766 eat_item(op, improver->slaying, sacrifice_count); 610 eat_item(op, improver->slaying, sacrifice_count);
767 611
768 new_draw_info_format(NDI_UNIQUE, 0, op,"Your *%s may be improved %d times.", 612 new_draw_info_format(NDI_UNIQUE, 0, op,"Your *%s may be improved %d times.",
769 weapon->name,weapon->level); 613 &weapon->name,weapon->level);
770 614
771 sprintf(buf,"%s's %s",op->name,weapon->name); 615 sprintf(buf,"%s's %s",&op->name,&weapon->name);
772 FREE_AND_COPY(weapon->name, buf); 616 weapon->name = weapon->name_pl = buf;
773 FREE_AND_COPY(weapon->name_pl, buf);
774 weapon->nrof=0; /* prevents preparing n weapons in the same 617 weapon->nrof=0; /* prevents preparing n weapons in the same
775 slot at once! */ 618 slot at once! */
776 decrease_ob(improver); 619 decrease_ob(improver);
777 weapon->last_eat=0; 620 weapon->last_eat=0;
778 return 1; 621 return 1;
779} 622}
780 623
… …
793int improve_weapon(object *op,object *improver,object *weapon) 636int improve_weapon(object *op,object *improver,object *weapon)
794{ 637{
795 int sacrifice_count, sacrifice_needed=0; 638 int sacrifice_count, sacrifice_needed=0;
796 639
797 if(improver->stats.sp==IMPROVE_PREPARE) { 640 if(improver->stats.sp==IMPROVE_PREPARE) {
798 return prepare_weapon(op, improver, weapon); 641 return prepare_weapon(op, improver, weapon);
799 } 642 }
800 if (weapon->level==0) { 643 if (weapon->level==0) {
801 new_draw_info(NDI_UNIQUE, 0,op,"This weapon has not been prepared."); 644 new_draw_info(NDI_UNIQUE, 0,op,"This weapon has not been prepared.");
802 return 0; 645 return 0;
803 } 646 }
… …
805 new_draw_info(NDI_UNIQUE, 0,op,"This weapon cannot be improved any more."); 648 new_draw_info(NDI_UNIQUE, 0,op,"This weapon cannot be improved any more.");
806 return 0; 649 return 0;
807 } 650 }
808 if (QUERY_FLAG(weapon, FLAG_APPLIED) && 651 if (QUERY_FLAG(weapon, FLAG_APPLIED) &&
809 !check_weapon_power(op, weapon->last_eat+1)) { 652 !check_weapon_power(op, weapon->last_eat+1)) {
810 new_draw_info(NDI_UNIQUE, 0,op,"Improving the weapon will make it too"); 653 new_draw_info(NDI_UNIQUE, 0,op,"Improving the weapon will make it too");
811 new_draw_info(NDI_UNIQUE, 0,op,"powerful for you to use. Unready it if you"); 654 new_draw_info(NDI_UNIQUE, 0,op,"powerful for you to use. Unready it if you");
812 new_draw_info(NDI_UNIQUE, 0,op,"really want to improve it."); 655 new_draw_info(NDI_UNIQUE, 0,op,"really want to improve it.");
813 return 0; 656 return 0;
814 } 657 }
815 /* This just increases damage by 5 points, no matter what. No sacrifice 658 /* This just increases damage by 5 points, no matter what. No sacrifice
816 * is needed. Since stats.dam is now a 16 bit value and not 8 bit, 659 * is needed. Since stats.dam is now a 16 bit value and not 8 bit,
817 * don't put any maximum value on damage - the limit is how much the 660 * don't put any maximum value on damage - the limit is how much the
818 * weapon can be improved. 661 * weapon can be improved.
819 */ 662 */
820 if (improver->stats.sp==IMPROVE_DAMAGE) { 663 if (improver->stats.sp==IMPROVE_DAMAGE) {
821 weapon->stats.dam += 5; 664 weapon->stats.dam += 5;
822 weapon->weight += 5000; /* 5 KG's */ 665 weapon->weight += 5000; /* 5 KG's */
823 new_draw_info_format(NDI_UNIQUE, 0, op, 666 new_draw_info_format(NDI_UNIQUE, 0, op,
824 "Damage has been increased by 5 to %d", weapon->stats.dam); 667 "Damage has been increased by 5 to %d", weapon->stats.dam);
825 weapon->last_eat++; 668 weapon->last_eat++;
826 669
827 weapon->item_power++; 670 weapon->item_power++;
828 decrease_ob(improver); 671 decrease_ob(improver);
829 return 1; 672 return 1;
830 } 673 }
831 if (improver->stats.sp == IMPROVE_WEIGHT) { 674 if (improver->stats.sp == IMPROVE_WEIGHT) {
832 /* Reduce weight by 20% */ 675 /* Reduce weight by 20% */
833 weapon->weight = (weapon->weight * 8)/10; 676 weapon->weight = (weapon->weight * 8)/10;
834 if (weapon->weight < 1) weapon->weight = 1; 677 if (weapon->weight < 1) weapon->weight = 1;
835 new_draw_info_format(NDI_UNIQUE, 0, op, 678 new_draw_info_format(NDI_UNIQUE, 0, op,
836 "Weapon weight reduced to %6.1f kg", 679 "Weapon weight reduced to %6.1f kg",
837 (float)weapon->weight/1000.0); 680 (float)weapon->weight/1000.0);
838 weapon->last_eat++; 681 weapon->last_eat++;
839 weapon->item_power++; 682 weapon->item_power++;
840 decrease_ob(improver); 683 decrease_ob(improver);
841 return 1; 684 return 1;
842 } 685 }
843 if (improver->stats.sp == IMPROVE_ENCHANT) { 686 if (improver->stats.sp == IMPROVE_ENCHANT) {
844 weapon->magic++; 687 weapon->magic++;
845 weapon->last_eat++; 688 weapon->last_eat++;
846 new_draw_info_format(NDI_UNIQUE, 0, op 689 new_draw_info_format(NDI_UNIQUE, 0, op
847 ,"Weapon magic increased to %d",weapon->magic); 690 ,"Weapon magic increased to %d",weapon->magic);
848 decrease_ob(improver); 691 decrease_ob(improver);
849 weapon->item_power++; 692 weapon->item_power++;
850 return 1; 693 return 1;
851 } 694 }
852 695
853 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex+ 696 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex+
854 weapon->stats.Pow + weapon->stats.Con + weapon->stats.Cha + 697 weapon->stats.Pow + weapon->stats.Con + weapon->stats.Cha +
855 weapon->stats.Wis; 698 weapon->stats.Wis;
856 699
857 if (sacrifice_needed<1) 700 if (sacrifice_needed<1)
858 sacrifice_needed =1; 701 sacrifice_needed =1;
859 sacrifice_needed *=2; 702 sacrifice_needed *=2;
860 703
861 sacrifice_count = check_sacrifice(op,improver); 704 sacrifice_count = check_sacrifice(op,improver);
862 if (sacrifice_count < sacrifice_needed) { 705 if (sacrifice_count < sacrifice_needed) {
863 new_draw_info_format(NDI_UNIQUE, 0, op, 706 new_draw_info_format(NDI_UNIQUE, 0, op,
864 "You need at least %d %s", sacrifice_needed, improver->slaying); 707 "You need at least %d %s", sacrifice_needed, &improver->slaying);
865 return 0; 708 return 0;
866 } 709 }
867 eat_item(op,improver->slaying, sacrifice_needed); 710 eat_item(op,improver->slaying, sacrifice_needed);
868 weapon->item_power++; 711 weapon->item_power++;
869 712
870 switch (improver->stats.sp) { 713 switch (improver->stats.sp) {
871 case IMPROVE_STR: 714 case IMPROVE_STR:
872 return improve_weapon_stat(op,improver,weapon, 715 return improve_weapon_stat(op,improver,weapon,
873 (signed char *) &(weapon->stats.Str), 716 (signed char *) &(weapon->stats.Str),
874 1, "strength"); 717 1, "strength");
875 case IMPROVE_DEX: 718 case IMPROVE_DEX:
876 return improve_weapon_stat(op,improver,weapon, 719 return improve_weapon_stat(op,improver,weapon,
877 (signed char *) &(weapon->stats.Dex), 720 (signed char *) &(weapon->stats.Dex),
878 1, "dexterity"); 721 1, "dexterity");
879 case IMPROVE_CON: 722 case IMPROVE_CON:
880 return improve_weapon_stat(op,improver,weapon, 723 return improve_weapon_stat(op,improver,weapon,
881 (signed char *) &(weapon->stats.Con), 724 (signed char *) &(weapon->stats.Con),
882 1, "constitution"); 725 1, "constitution");
883 case IMPROVE_WIS: 726 case IMPROVE_WIS:
884 return improve_weapon_stat(op,improver,weapon, 727 return improve_weapon_stat(op,improver,weapon,
885 (signed char *) &(weapon->stats.Wis), 728 (signed char *) &(weapon->stats.Wis),
886 1, "wisdom"); 729 1, "wisdom");
887 case IMPROVE_CHA: 730 case IMPROVE_CHA:
888 return improve_weapon_stat(op,improver,weapon, 731 return improve_weapon_stat(op,improver,weapon,
889 (signed char *) &(weapon->stats.Cha), 732 (signed char *) &(weapon->stats.Cha),
890 1, "charisma"); 733 1, "charisma");
891 case IMPROVE_INT: 734 case IMPROVE_INT:
892 return improve_weapon_stat(op,improver,weapon, 735 return improve_weapon_stat(op,improver,weapon,
893 (signed char *) &(weapon->stats.Int), 736 (signed char *) &(weapon->stats.Int),
894 1, "intelligence"); 737 1, "intelligence");
895 case IMPROVE_POW: 738 case IMPROVE_POW:
896 return improve_weapon_stat(op,improver,weapon, 739 return improve_weapon_stat(op,improver,weapon,
897 (signed char *) &(weapon->stats.Pow), 740 (signed char *) &(weapon->stats.Pow),
898 1, "power"); 741 1, "power");
899 default: 742 default:
… …
913 object *otmp; 756 object *otmp;
914 757
915 if(op->type!=PLAYER) 758 if(op->type!=PLAYER)
916 return 0; 759 return 0;
917 if (!QUERY_FLAG(op, FLAG_WIZCAST) && (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) { 760 if (!QUERY_FLAG(op, FLAG_WIZCAST) && (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) {
918 new_draw_info(NDI_UNIQUE, 0,op,"Something blocks the magic of the scroll."); 761 new_draw_info(NDI_UNIQUE, 0,op,"Something blocks the magic of the scroll.");
919 return 0; 762 return 0;
920 } 763 }
921 otmp=find_marked_object(op); 764 otmp=find_marked_object(op);
922 if(!otmp) { 765 if(!otmp) {
923 new_draw_info(NDI_UNIQUE, 0, op, "You need to mark a weapon object."); 766 new_draw_info(NDI_UNIQUE, 0, op, "You need to mark a weapon object.");
924 return 0; 767 return 0;
… …
959{ 802{
960 object *tmp; 803 object *tmp;
961 804
962 if (armour->magic >= settings.armor_max_enchant) { 805 if (armour->magic >= settings.armor_max_enchant) {
963 new_draw_info(NDI_UNIQUE, 0,op,"This armour can not be enchanted any further."); 806 new_draw_info(NDI_UNIQUE, 0,op,"This armour can not be enchanted any further.");
964 return 0; 807 return 0;
965 } 808 }
966 /* Dealing with random artifact armor is a lot trickier (in terms of value, weight, 809 /* Dealing with random artifact armor is a lot trickier (in terms of value, weight,
967 * etc), so take the easy way out and don't worry about it. 810 * etc), so take the easy way out and don't worry about it.
968 * Note - maybe add scrolls which make the random artifact versions (eg, armour 811 * Note - maybe add scrolls which make the random artifact versions (eg, armour
969 * of gnarg and what not?) 812 * of gnarg and what not?)
970 */ 813 */
971 if (armour->title) { 814 if (armour->title) {
972 new_draw_info(NDI_UNIQUE, 0, op, "This armour will not accept further enchantment."); 815 new_draw_info(NDI_UNIQUE, 0, op, "This armour will not accept further enchantment.");
973 return 0; 816 return 0;
974 } 817 }
975 818
976 /* Split objects if needed. Can't insert tmp until the 819 /* Split objects if needed. Can't insert tmp until the
977 * end of this function - otherwise it will just re-merge. 820 * end of this function - otherwise it will just re-merge.
978 */ 821 */
979 if(armour->nrof > 1) 822 if(armour->nrof > 1)
980 tmp = get_split_ob(armour,armour->nrof - 1); 823 tmp = get_split_ob(armour,armour->nrof - 1);
981 else 824 else
982 tmp = NULL; 825 tmp = NULL;
983 826
984 armour->magic++; 827 armour->magic++;
985 828
986 if ( !settings.armor_speed_linear ) 829 if ( !settings.armor_speed_linear )
987 { 830 {
… …
1026 if(QUERY_FLAG(armour, FLAG_APPLIED)) 869 if(QUERY_FLAG(armour, FLAG_APPLIED))
1027 fix_player(op); 870 fix_player(op);
1028 } 871 }
1029 decrease_ob(improver); 872 decrease_ob(improver);
1030 if (tmp) { 873 if (tmp) {
1031 insert_ob_in_ob(tmp, op); 874 insert_ob_in_ob(tmp, op);
1032 esrv_send_item(op, tmp); 875 esrv_send_item(op, tmp);
1033 } 876 }
1034 return 1; 877 return 1;
1035} 878}
1036 879
1037 880
… …
1050 * what the converter wants, this will not do anything. 893 * what the converter wants, this will not do anything.
1051 */ 894 */
1052int convert_item(object *item, object *converter) { 895int convert_item(object *item, object *converter) {
1053 int nr=0; 896 int nr=0;
1054 object *tmp; 897 object *tmp;
1055 int is_in_shop;
1056 uint32 price_in; 898 uint32 price_in;
1057
1058 for(tmp = get_map_ob(converter->map, converter->x, converter->y);
1059 tmp != NULL;
1060 tmp = tmp->above) {
1061 if(tmp->type == SHOP_FLOOR)
1062 break;
1063 }
1064 is_in_shop = (tmp != NULL);
1065 899
1066 /* We make some assumptions - we assume if it takes money as it type, 900 /* We make some assumptions - we assume if it takes money as it type,
1067 * it wants some amount. We don't make change (ie, if something costs 901 * it wants some amount. We don't make change (ie, if something costs
1068 * 3 gp and player drops a platinum, tough luck) 902 * 3 gp and player drops a platinum, tough luck)
1069 */ 903 */
1070 if (!strcmp(CONV_FROM(converter),"money")) { 904 if (!strcmp(CONV_FROM(converter),"money")) {
1071 int cost; 905 int cost;
1072 906
1073 if(item->type!=MONEY) 907 if(item->type!=MONEY)
1074 return 0; 908 return 0;
1075 909
1076 nr=(item->nrof*item->value)/CONV_NEED(converter); 910 nr=(item->nrof*item->value)/CONV_NEED(converter);
1077 if (!nr) return 0; 911 if (!nr) return 0;
1078 cost=nr*CONV_NEED(converter)/item->value; 912 cost=nr*CONV_NEED(converter)/item->value;
1079 /* take into account rounding errors */ 913 /* take into account rounding errors */
1080 if (nr*CONV_NEED(converter)%item->value) cost++; 914 if (nr*CONV_NEED(converter)%item->value) cost++;
1081 decrease_ob_nr(item, cost); 915 decrease_ob_nr(item, cost);
1082 916
1083 price_in = cost*item->value; 917 price_in = cost*item->value;
1084 } 918 }
1085 else { 919 else {
1086 if(item->type==PLAYER||CONV_FROM(converter)!=item->arch->name|| 920 if(item->type==PLAYER||CONV_FROM(converter)!=item->arch->name||
1087 (CONV_NEED(converter)&&CONV_NEED(converter)>item->nrof)) 921 (CONV_NEED(converter)&&CONV_NEED(converter)>item->nrof))
1088 return 0; 922 return 0;
1089 923
1090 if(CONV_NEED(converter)) { 924 if(CONV_NEED(converter)) {
1091 nr=item->nrof/CONV_NEED(converter); 925 nr=item->nrof/CONV_NEED(converter);
1092 decrease_ob_nr(item,nr*CONV_NEED(converter)); 926 decrease_ob_nr(item,nr*CONV_NEED(converter));
1093 price_in = nr*CONV_NEED(converter)*item->value; 927 price_in = nr*CONV_NEED(converter)*item->value;
1094 } else { 928 } else {
1095 price_in = item->value; 929 price_in = item->value;
1096 remove_ob(item); 930 remove_ob(item);
1097 free_object(item); 931 free_object(item);
1098 } 932 }
1099 } 933 }
1100 934
1101 if (converter->inv != NULL) { 935 if (converter->inv != NULL) {
1102 object *ob; 936 object *ob;
1103 int i; 937 int i;
1104 object *ob_to_copy; 938 object *ob_to_copy;
1105 939
1106 /* select random object from inventory to copy */ 940 /* select random object from inventory to copy */
1107 ob_to_copy = converter->inv; 941 ob_to_copy = converter->inv;
1108 for (ob = converter->inv->below, i = 1; ob != NULL; ob = ob->below, i++) { 942 for (ob = converter->inv->below, i = 1; ob != NULL; ob = ob->below, i++) {
1109 if (rndm(0, i) == 0) { 943 if (rndm(0, i) == 0) {
1110 ob_to_copy = ob; 944 ob_to_copy = ob;
1111 } 945 }
1112 } 946 }
1113 item = object_create_clone(ob_to_copy); 947 item = object_create_clone(ob_to_copy);
1114 CLEAR_FLAG(item, FLAG_IS_A_TEMPLATE); 948 CLEAR_FLAG(item, FLAG_IS_A_TEMPLATE);
1115 unflag_inv(item, FLAG_IS_A_TEMPLATE); 949 unflag_inv(item, FLAG_IS_A_TEMPLATE);
1116 } else { 950 } else {
1117 if (converter->other_arch == NULL) { 951 if (converter->other_arch == NULL) {
1118 LOG(llevError,"move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n", converter->name ? converter->name : "(null)", converter->map->path, converter->x, converter->y); 952 LOG(llevError,"move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n",
953 &converter->name, converter->map->path, converter->x, converter->y);
1119 return -1; 954 return -1;
1120 } 955 }
1121 956
1122 item = object_create_arch(converter->other_arch); 957 item = object_create_arch(converter->other_arch);
1123 fix_generated_item(item, converter, 0, 0, GT_MINIMAL); 958 fix_generated_item(item, converter, 0, 0, GT_MINIMAL);
1124 } 959 }
1125 960
1126 if(CONV_NR(converter)) 961 if(CONV_NR(converter))
1127 item->nrof=CONV_NR(converter); 962 item->nrof=CONV_NR(converter);
1128 if(nr) 963 if(nr)
1129 item->nrof*=nr; 964 item->nrof*=nr;
1130 if(is_in_shop) 965 if(is_in_shop (converter))
1131 SET_FLAG(item,FLAG_UNPAID); 966 SET_FLAG(item,FLAG_UNPAID);
1132 else if(price_in < item->nrof*item->value) { 967 else if(price_in < item->nrof*item->value) {
1133 LOG(llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n", 968 LOG(llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n",
1134 converter->name, converter->map->path, converter->x, converter->y, price_in, 969 &converter->name, converter->map->path, converter->x, converter->y, price_in,
1135 item->nrof*item->value, item->name); 970 item->nrof*item->value, &item->name);
1136 /** 971 /**
1137 * elmex: we are going to let the game continue, as the mapcreator 972 * elmex: we are going to let the game continue, as the mapcreator
1138 * propably had something in mind when doing this 973 * propably had something in mind when doing this
1139 */ 974 */
1140 } 975 }
… …
1153{ 988{
1154 char buf[MAX_BUF]; 989 char buf[MAX_BUF];
1155 object *tmp; 990 object *tmp;
1156 991
1157 if(op->type!=PLAYER) 992 if(op->type!=PLAYER)
1158 return 0; /* This might change */ 993 return 0; /* This might change */
1159 994
1160 if (sack==NULL || sack->type != CONTAINER) { 995 if (sack==NULL || sack->type != CONTAINER) {
1161 LOG (llevError, "apply_container: %s is not container!\n",sack?sack->name:"NULL"); 996 LOG (llevError, "apply_container: %s is not container!\n", &sack->name);
1162 return 0; 997 return 0;
1163 } 998 }
1164 op->contr->last_used = NULL; 999 op->contr->last_used = NULL;
1165 op->contr->last_used_id = 0; 1000 op->contr->last_used_id = 0;
1166 1001
1167 if (sack->env!=op) { 1002 if (sack->env!=op) {
1168 if (sack->other_arch == NULL || sack->env != NULL) { 1003 if (sack->other_arch == NULL || sack->env != NULL) {
1169 new_draw_info(NDI_UNIQUE, 0,op,"You must get it first."); 1004 new_draw_info(NDI_UNIQUE, 0,op,"You must get it first.");
1170 return 1; 1005 return 1;
1171 } 1006 }
1172 /* It's on the ground, the problems begin */ 1007 /* It's on the ground, the problems begin */
1173 if (op->container != sack) { 1008 if (op->container != sack) {
1174 /* it's closed OR some player has opened it */ 1009 /* it's closed OR some player has opened it */
1010 if (QUERY_FLAG(sack, FLAG_APPLIED)) {
1011 for(tmp=get_map_ob(sack->map, sack->x, sack->y);
1012 tmp && tmp->container != sack; tmp=tmp->above);
1013 if (tmp) {
1014 /* some other player have opened it */
1015 new_draw_info_format(NDI_UNIQUE, 0, op,
1016 "%s is already occupied.", query_name(sack));
1017 return 1;
1018 }
1019 }
1020 }
1175 if (QUERY_FLAG(sack, FLAG_APPLIED)) { 1021 if ( QUERY_FLAG(sack, FLAG_APPLIED)) {
1176 for(tmp=get_map_ob(sack->map, sack->x, sack->y);
1177 tmp && tmp->container != sack; tmp=tmp->above);
1178 if (tmp) {
1179 /* some other player have opened it */
1180 new_draw_info_format(NDI_UNIQUE, 0, op,
1181 "%s is already occupied.", query_name(sack));
1182 return 1;
1183 }
1184 }
1185 }
1186 if ( QUERY_FLAG(sack, FLAG_APPLIED)) {
1187 if (op->container == NULL) { 1022 if (op->container == NULL) {
1188 tmp = arch_to_object (sack->other_arch); 1023 tmp = arch_to_object (sack->other_arch);
1189 /* not good, but insert_ob_in_ob() is too smart */ 1024 /* not good, but insert_ob_in_ob() is too smart */
1190 CLEAR_FLAG (tmp, FLAG_REMOVED); 1025 CLEAR_FLAG (tmp, FLAG_REMOVED);
1191 tmp->x= tmp->y = tmp->ox = tmp->oy = 0; 1026 tmp->x= tmp->y = 0;
1192 tmp->map = NULL; 1027 tmp->map = NULL;
1193 tmp->env = sack; 1028 tmp->env = sack;
1194 if (sack->inv) 1029 if (sack->inv)
1195 sack->inv->above = tmp; 1030 sack->inv->above = tmp;
1196 tmp->below = sack->inv; 1031 tmp->below = sack->inv;
1197 tmp->above = NULL; 1032 tmp->above = NULL;
1198 sack->inv = tmp; 1033 sack->inv = tmp;
1199 sack->move_off = MOVE_ALL; /* trying force closing it */ 1034 sack->move_off = MOVE_ALL; /* trying force closing it */
1200 } else { 1035 } else {
1201 sack->move_off = 0; 1036 sack->move_off = 0;
1202 tmp = sack->inv; 1037 tmp = sack->inv;
1203 if (tmp && tmp->type == CLOSE_CON) { 1038 if (tmp && tmp->type == CLOSE_CON) {
1204 remove_ob(tmp); 1039 remove_ob(tmp);
1205 free_object (tmp); 1040 free_object (tmp);
1206 } 1041 }
1207 } 1042 }
1208 } 1043 }
1209 } 1044 }
1210 1045
1211 if (QUERY_FLAG (sack, FLAG_APPLIED)) { 1046 if (QUERY_FLAG (sack, FLAG_APPLIED)) {
1212 if (op->container) { 1047 if (op->container) {
1213 if (op->container != sack) { 1048 if (op->container != sack) {
1214 tmp = op->container; 1049 tmp = op->container;
1215 apply_container (op, tmp); 1050 apply_container (op, tmp);
1216 sprintf (buf, "You close %s and open ", query_name(tmp)); 1051 sprintf (buf, "You close %s and open ", query_name(tmp));
1217 op->container = sack; 1052 op->container = sack;
1218 strcat (buf, query_name(sack)); 1053 strcat (buf, query_name(sack));
1219 strcat (buf, "."); 1054 strcat (buf, ".");
1220 } else { 1055 } else {
1221 CLEAR_FLAG (sack, FLAG_APPLIED); 1056 CLEAR_FLAG (sack, FLAG_APPLIED);
1222 op->container = NULL; 1057 op->container = NULL;
1223 sprintf (buf, "You close %s.", query_name(sack)); 1058 sprintf (buf, "You close %s.", query_name(sack));
1224 } 1059 }
1225 } else { 1060 } else {
1226 CLEAR_FLAG (sack, FLAG_APPLIED); 1061 CLEAR_FLAG (sack, FLAG_APPLIED);
1227 sprintf (buf, "You open %s.", query_name(sack)); 1062 sprintf (buf, "You open %s.", query_name(sack));
1228 SET_FLAG (sack, FLAG_APPLIED); 1063 SET_FLAG (sack, FLAG_APPLIED);
1229 op->container = sack; 1064 op->container = sack;
1230 } 1065 }
1231 } else { /* not applied */ 1066 } else { /* not applied */
1232 if (sack->slaying) { /* it's locked */ 1067 if (sack->slaying) { /* it's locked */
1233 tmp = find_key(op, op, sack); 1068 tmp = find_key(op, op, sack);
1234 if (tmp) { 1069 if (tmp) {
1235 sprintf (buf, "You unlock %s with %s.", query_name(sack), query_name(tmp)); 1070 sprintf (buf, "You unlock %s with %s.", query_name(sack), query_name(tmp));
1236 SET_FLAG (sack, FLAG_APPLIED); 1071 SET_FLAG (sack, FLAG_APPLIED);
1237 if (sack->env == NULL) { /* if it's on ground,open it also */ 1072 if (sack->env == NULL) { /* if it's on ground,open it also */
1238 new_draw_info (NDI_UNIQUE,0,op, buf); 1073 new_draw_info (NDI_UNIQUE,0,op, buf);
1239 apply_container (op, sack); 1074 apply_container (op, sack);
1240 return 1; 1075 return 1;
1241 } 1076 }
1242 } else { 1077 } else {
1243 sprintf (buf, "You don't have the key to unlock %s.", 1078 sprintf (buf, "You don't have the key to unlock %s.",
1244 query_name(sack)); 1079 query_name(sack));
1245 } 1080 }
1246 } else { 1081 } else {
1247 sprintf (buf, "You readied %s.", query_name(sack)); 1082 sprintf (buf, "You readied %s.", query_name(sack));
1248 SET_FLAG (sack, FLAG_APPLIED); 1083 SET_FLAG (sack, FLAG_APPLIED);
1249 if (sack->env == NULL) { /* if it's on ground,open it also */ 1084 if (sack->env == NULL) { /* if it's on ground,open it also */
1250 new_draw_info (NDI_UNIQUE, 0, op, buf); 1085 new_draw_info (NDI_UNIQUE, 0, op, buf);
1251 apply_container (op, sack); 1086 apply_container (op, sack);
1252 return 1; 1087 return 1;
1253 } 1088 }
1254 } 1089 }
1255 } 1090 }
1256 new_draw_info (NDI_UNIQUE, 0, op, buf); 1091 new_draw_info (NDI_UNIQUE, 0, op, buf);
1257 if (op->contr) op->contr->socket.update_look=1; 1092 if (op->contr) op->contr->socket.update_look=1;
1258 return 1; 1093 return 1;
1259} 1094}
… …
1274 1109
1275int esrv_apply_container (object *op, object *sack) 1110int esrv_apply_container (object *op, object *sack)
1276{ 1111{
1277 object *tmp=op->container; 1112 object *tmp=op->container;
1278 if(op->type!=PLAYER) 1113 if(op->type!=PLAYER)
1279 return 0; /* This might change */ 1114 return 0; /* This might change */
1280 1115
1281 if (sack==NULL || sack->type != CONTAINER) { 1116 if (sack==NULL || sack->type != CONTAINER) {
1282 LOG (llevError,
1283 "esrv_apply_container: %s is not container!\n",sack?sack->name:"NULL"); 1117 LOG (llevError, "esrv_apply_container: %s is not container!\n", &sack->name);
1284 return 0; 1118 return 0;
1285 } 1119 }
1286 1120
1287 /* If we have a currently open container, then it needs to be closed in all cases 1121 /* If we have a currently open container, then it needs to be closed in all cases
1288 * if we are opening this one up. We then fall through if appropriate for 1122 * if we are opening this one up. We then fall through if appropriate for
1289 * openening the new container. 1123 * openening the new container.
1290 */ 1124 */
1291 1125
1292 if (op->container && QUERY_FLAG(sack, FLAG_APPLIED)) { 1126 if (op->container && QUERY_FLAG(sack, FLAG_APPLIED)) {
1293 if (op->container->env != op) { /* if container is on the ground */ 1127 if (op->container->env != op) { /* if container is on the ground */
1294 op->container->move_off = 0; 1128 op->container->move_off = 0;
1295 } 1129 }
1296 /* Lauwenmark: Handle for plugin close event */ 1130
1297 if (execute_event(tmp, EVENT_CLOSE,op,NULL,NULL,SCRIPT_FIX_ALL)!=0) 1131 if (INVOKE_OBJECT (CLOSE, tmp, ARG_OBJECT (op)))
1298 return 1; 1132 return 1;
1299 1133
1300 new_draw_info_format(NDI_UNIQUE, 0, op, "You close %s.", 1134 new_draw_info_format(NDI_UNIQUE, 0, op, "You close %s.",
1301 query_name(op->container)); 1135 query_name(op->container));
1302 CLEAR_FLAG(op->container, FLAG_APPLIED); 1136 CLEAR_FLAG(op->container, FLAG_APPLIED);
1303 op->container=NULL; 1137 op->container=NULL;
1304 esrv_update_item (UPD_FLAGS, op, tmp); 1138 esrv_update_item (UPD_FLAGS, op, tmp);
1305 if (tmp == sack) return 1; 1139 if (tmp == sack) return 1;
1306 } 1140 }
1307 1141
1308 1142
1309 /* If the player is trying to open it (which he must be doing if we got here), 1143 /* If the player is trying to open it (which he must be doing if we got here),
1310 * and it is locked, check to see if player has the equipment to open it. 1144 * and it is locked, check to see if player has the equipment to open it.
1311 */ 1145 */
1312 1146
1313 if (sack->slaying) { /* it's locked */ 1147 if (sack->slaying) { /* it's locked */
1314 tmp=find_key(op, op, sack); 1148 tmp=find_key(op, op, sack);
1315 if (tmp) { 1149 if (tmp) {
1316 new_draw_info_format(NDI_UNIQUE, 0, op, "You unlock %s with %s.", query_name(sack), query_name(tmp)); 1150 new_draw_info_format(NDI_UNIQUE, 0, op, "You unlock %s with %s.", query_name(sack), query_name(tmp));
1317 } else { 1151 } else {
1318 new_draw_info_format(NDI_UNIQUE, 0, op, "You don't have the key to unlock %s.", 1152 new_draw_info_format(NDI_UNIQUE, 0, op, "You don't have the key to unlock %s.",
1319 query_name(sack)); 1153 query_name(sack));
1320 return 0; 1154 return 0;
1321 } 1155 }
1322 } 1156 }
1323 1157
1324 /* By the time we get here, we have made sure any other container has been closed and 1158 /* By the time we get here, we have made sure any other container has been closed and
1325 * if this is a locked container, the player they key to open it. 1159 * if this is a locked container, the player they key to open it.
… …
1330 * opening it, since if it was being closed, that would have been taken care of above. 1164 * opening it, since if it was being closed, that would have been taken care of above.
1331 */ 1165 */
1332 1166
1333 1167
1334 if (sack->env != op) { 1168 if (sack->env != op) {
1335 /* Hypothetical case - the player is trying to open a sack that belong to someone 1169 /* Hypothetical case - the player is trying to open a sack that belong to someone
1336 * else. This normally should not happen, but a misbehaving client/player could 1170 * else. This normally should not happen, but a misbehaving client/player could
1337 * try to do it, so lets handle it gracefully. 1171 * try to do it, so lets handle it gracefully.
1338 */ 1172 */
1339 if (sack->env) { 1173 if (sack->env) {
1340 new_draw_info_format(NDI_UNIQUE, 0, op, "You can't open %s", 1174 new_draw_info_format(NDI_UNIQUE, 0, op, "You can't open %s",
1341 query_name(sack)); 1175 query_name(sack));
1342 return 0; 1176 return 0;
1343 } 1177 }
1344 /* set these so when the player walks off, we can unapply the sack */ 1178 /* set these so when the player walks off, we can unapply the sack */
1345 sack->move_off = MOVE_ALL; /* trying force closing it */ 1179 sack->move_off = MOVE_ALL; /* trying force closing it */
1346 1180
1347 CLEAR_FLAG (sack, FLAG_APPLIED); 1181 CLEAR_FLAG (sack, FLAG_APPLIED);
1348 new_draw_info_format(NDI_UNIQUE, 0, op, "You open %s.", query_name(sack)); 1182 new_draw_info_format(NDI_UNIQUE, 0, op, "You open %s.", query_name(sack));
1349 SET_FLAG (sack, FLAG_APPLIED); 1183 SET_FLAG (sack, FLAG_APPLIED);
1350 op->container = sack; 1184 op->container = sack;
1351 esrv_update_item (UPD_FLAGS, op, sack); 1185 esrv_update_item (UPD_FLAGS, op, sack);
1352 esrv_send_inventory (op, sack); 1186 esrv_send_inventory (op, sack);
1353 1187
1354 } else { /* sack is in players inventory */ 1188 } else { /* sack is in players inventory */
1355 if (QUERY_FLAG (sack, FLAG_APPLIED)) { /* readied sack becoming open */ 1189 if (QUERY_FLAG (sack, FLAG_APPLIED)) { /* readied sack becoming open */
1356 CLEAR_FLAG (sack, FLAG_APPLIED); 1190 CLEAR_FLAG (sack, FLAG_APPLIED);
1357 new_draw_info_format(NDI_UNIQUE, 0, op, "You open %s.", query_name(sack)); 1191 new_draw_info_format(NDI_UNIQUE, 0, op, "You open %s.", query_name(sack));
1358 SET_FLAG (sack, FLAG_APPLIED); 1192 SET_FLAG (sack, FLAG_APPLIED);
1359 op->container = sack; 1193 op->container = sack;
1360 esrv_update_item (UPD_FLAGS, op, sack); 1194 esrv_update_item (UPD_FLAGS, op, sack);
1361 esrv_send_inventory (op, sack); 1195 esrv_send_inventory (op, sack);
1362 } 1196 }
1363 else { 1197 else {
1364 CLEAR_FLAG (sack, FLAG_APPLIED); 1198 CLEAR_FLAG (sack, FLAG_APPLIED);
1365 new_draw_info_format(NDI_UNIQUE, 0, op, "You readied %s.", query_name(sack)); 1199 new_draw_info_format(NDI_UNIQUE, 0, op, "You readied %s.", query_name(sack));
1366 SET_FLAG (sack, FLAG_APPLIED); 1200 SET_FLAG (sack, FLAG_APPLIED);
1367 esrv_update_item (UPD_FLAGS, op, sack); 1201 esrv_update_item (UPD_FLAGS, op, sack);
1368 } 1202 }
1369 } 1203 }
1370 return 1; 1204 return 1;
1371} 1205}
1372 1206
1373 1207
… …
1377 */ 1211 */
1378static int apply_altar (object *altar, object *sacrifice, object *originator) 1212static int apply_altar (object *altar, object *sacrifice, object *originator)
1379{ 1213{
1380 /* Only players can make sacrifices on spell casting altars. */ 1214 /* Only players can make sacrifices on spell casting altars. */
1381 if (altar->inv && ( ! originator || originator->type != PLAYER)) 1215 if (altar->inv && ( ! originator || originator->type != PLAYER))
1382 return 0; 1216 return 0;
1383 1217
1384 if (operate_altar (altar, &sacrifice)) { 1218 if (operate_altar (altar, &sacrifice)) {
1385 /* Simple check. Unfortunately, it means you can't cast magic bullet 1219 /* Simple check. Unfortunately, it means you can't cast magic bullet
1386 * with an altar. We call it a Potion - altars are stationary - it 1220 * with an altar. We call it a Potion - altars are stationary - it
1387 * is up to map designers to use them properly. 1221 * is up to map designers to use them properly.
1388 */ 1222 */
1389 if (altar->inv && altar->inv->type==SPELL) { 1223 if (altar->inv && altar->inv->type==SPELL) {
1390 new_draw_info_format (NDI_BLACK, 0, originator, "The altar casts %s.", 1224 new_draw_info_format (NDI_BLACK, 0, originator, "The altar casts %s.", &altar->inv->name);
1391 altar->inv->name);
1392 cast_spell (originator, altar, 0, altar->inv, NULL); 1225 cast_spell (originator, altar, 0, altar->inv, NULL);
1393 /* If it is connected, push the button. Fixes some problems with 1226 /* If it is connected, push the button. Fixes some problems with
1394 * old maps. 1227 * old maps.
1395 */ 1228 */
1396/* push_button (altar);*/ 1229/* push_button (altar);*/
1397 } else { 1230 } else {
1398 altar->value = 1; /* works only once */ 1231 altar->value = 1; /* works only once */
1399 push_button (altar); 1232 push_button (altar);
1400 } 1233 }
1401 return sacrifice == NULL; 1234 return sacrifice == NULL;
1402 } else { 1235 } else {
1403 return 0; 1236 return 0;
1404 } 1237 }
1405} 1238}
1406 1239
1407 1240
1408/** 1241/**
… …
1410 * Returns 1 if 'op' was destroyed, 0 if not. 1243 * Returns 1 if 'op' was destroyed, 0 if not.
1411 * Largely re-written to not use nearly as many gotos, plus 1244 * Largely re-written to not use nearly as many gotos, plus
1412 * some of this code just looked plain out of date. 1245 * some of this code just looked plain out of date.
1413 * MSW 2001-08-29 1246 * MSW 2001-08-29
1414 */ 1247 */
1415int apply_shop_mat (object *shop_mat, object *op) 1248int apply_shop_mat (object * shop_mat, object * op)
1416{ 1249{
1417 int rv = 0; 1250 int rv = 0;
1418 double opinion; 1251 double opinion;
1419 object *tmp, *next; 1252 object *tmp, *next;
1420 1253
1421 SET_FLAG (op,FLAG_NO_APPLY); /* prevent loops */ 1254 SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */
1422 1255
1423 if (op->type != PLAYER) { 1256 if (op->type != PLAYER)
1257 {
1424 /* Remove all the unpaid objects that may be carried here. 1258 /* Remove all the unpaid objects that may be carried here.
1425 * This could be pets or monsters that are somehow in 1259 * This could be pets or monsters that are somehow in
1426 * the shop. 1260 * the shop.
1427 */ 1261 */
1428 for (tmp=op->inv; tmp; tmp=next) { 1262 for (tmp = op->inv; tmp; tmp = next)
1263 {
1429 next = tmp->below; 1264 next = tmp->below;
1430 if (QUERY_FLAG(tmp, FLAG_UNPAID)) { 1265 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1266 {
1431 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9); 1267 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9);
1432 1268
1433 remove_ob(tmp); 1269 remove_ob (tmp);
1434 if (i==-1) i=0; 1270 if (i == -1)
1435 tmp->map = op->map; 1271 i = 0;
1272 tmp->map = op->map;
1436 tmp->x = op->x + freearr_x[i]; 1273 tmp->x = op->x + freearr_x[i];
1437 tmp->y = op->y + freearr_y[i]; 1274 tmp->y = op->y + freearr_y[i];
1438 insert_ob_in_map(tmp, op->map, op, 0); 1275 insert_ob_in_map (tmp, op->map, op, 0);
1439 } 1276 }
1440 } 1277 }
1441 1278
1442 /* Don't teleport things like spell effects */ 1279 /* Don't teleport things like spell effects */
1443 if (QUERY_FLAG(op, FLAG_NO_PICK)) return 0; 1280 if (QUERY_FLAG (op, FLAG_NO_PICK))
1281 return 0;
1444 1282
1445 /* unpaid objects, or non living objects, can't transfer by 1283 /* unpaid objects, or non living objects, can't transfer by
1446 * shop mats. Instead, put it on a nearby space. 1284 * shop mats. Instead, put it on a nearby space.
1447 */ 1285 */
1448 if (QUERY_FLAG(op, FLAG_UNPAID) || !QUERY_FLAG(op, FLAG_ALIVE)) { 1286 if (QUERY_FLAG (op, FLAG_UNPAID) || !QUERY_FLAG (op, FLAG_ALIVE))
1287 {
1449 1288
1450 /* Somebody dropped an unpaid item, just move to an adjacent place. */ 1289 /* Somebody dropped an unpaid item, just move to an adjacent place. */
1451 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9); 1290 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9);
1452 if (i != -1) { 1291 if (i != -1)
1292 {
1293 rv =
1453 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, 1294 transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i],
1454 shop_mat); 1295 0, shop_mat);
1455 } 1296 }
1456 return 0; 1297 return 0;
1457 } 1298 }
1458 /* Removed code that checked for multipart objects - it appears that 1299 /* Removed code that checked for multipart objects - it appears that
1459 * the teleport function should be able to handle this just fine. 1300 * the teleport function should be able to handle this just fine.
1460 */ 1301 */
1461 rv = teleport (shop_mat, SHOP_MAT, op); 1302 rv = teleport (shop_mat, SHOP_MAT, op);
1462 } 1303 }
1463 /* immediate block below is only used for players */ 1304 /* immediate block below is only used for players */
1464 else if (can_pay(op)) { 1305 else if (can_pay (op))
1306 {
1465 get_payment (op, op->inv); 1307 get_payment (op, op->inv);
1466 rv = teleport (shop_mat, SHOP_MAT, op); 1308 rv = teleport (shop_mat, SHOP_MAT, op);
1309
1467 if (shop_mat->msg) { 1310 if (shop_mat->msg)
1311 {
1468 new_draw_info (NDI_UNIQUE, 0, op, shop_mat->msg); 1312 new_draw_info (NDI_UNIQUE, 0, op, shop_mat->msg);
1469 } 1313 }
1470 /* This check below is a bit simplistic - generally it should be correct, 1314 /* This check below is a bit simplistic - generally it should be correct,
1471 * but there is never a guarantee that the bottom space on the map is 1315 * but there is never a guarantee that the bottom space on the map is
1472 * actually the shop floor. 1316 * actually the shop floor.
1473 */ 1317 */
1474 else if ( ! rv && (tmp = get_map_ob (op->map, op->x, op->y)) != NULL 1318 else if (!rv && !is_in_shop (op))
1475 && tmp->type != SHOP_FLOOR) { 1319 {
1476 opinion = shopkeeper_approval(op->map, op); 1320 opinion = shopkeeper_approval (op->map, op);
1477 if ( opinion > 0.9) 1321 if (opinion > 0.9)
1478 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper gives you a friendly wave."); 1322 new_draw_info (NDI_UNIQUE, 0, op,
1323 "The shopkeeper gives you a friendly wave.");
1479 else if ( opinion > 0.75) 1324 else if (opinion > 0.75)
1480 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper waves to you."); 1325 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper waves to you.");
1481 else if ( opinion > 0.5) 1326 else if (opinion > 0.5)
1482 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper ignores you."); 1327 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper ignores you.");
1328 else
1329 new_draw_info (NDI_UNIQUE, 0, op,
1330 "The shopkeeper glares at you with contempt.");
1331 }
1332 }
1483 else 1333 else
1484 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper glares at you with contempt.");
1485 }
1486 } 1334 {
1487 else {
1488 /* if we get here, a player tried to leave a shop but was not able 1335 /* if we get here, a player tried to leave a shop but was not able
1489 * to afford the items he has. We try to move the player so that 1336 * to afford the items he has. We try to move the player so that
1490 * they are not on the mat anymore 1337 * they are not on the mat anymore
1491 */ 1338 */
1492 1339
1493 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9); 1340 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9);
1494 if(i == -1) { 1341 if (i == -1)
1342 {
1495 LOG (llevError, "Internal shop-mat problem.\n"); 1343 LOG (llevError, "Internal shop-mat problem.\n");
1496 } else { 1344 }
1345 else
1346 {
1497 remove_ob (op); 1347 remove_ob (op);
1498 op->x += freearr_x[i]; 1348 op->x += freearr_x[i];
1499 op->y += freearr_y[i]; 1349 op->y += freearr_y[i];
1500 rv = insert_ob_in_map (op, op->map, shop_mat,0) == NULL; 1350 rv = insert_ob_in_map (op, op->map, shop_mat, 0) == NULL;
1501 } 1351 }
1502 } 1352 }
1503 CLEAR_FLAG (op, FLAG_NO_APPLY); 1353 CLEAR_FLAG (op, FLAG_NO_APPLY);
1504 return rv; 1354 return rv;
1505} 1355}
1506 1356
1507/** 1357/**
1508 * Handles applying a sign. 1358 * Handles applying a sign.
1509 */ 1359 */
… …
1515 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is written on it."); 1365 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is written on it.");
1516 return; 1366 return;
1517 } 1367 }
1518 1368
1519 if (sign->stats.food) { 1369 if (sign->stats.food) {
1520 if (sign->last_eat >= sign->stats.food) { 1370 if (sign->last_eat >= sign->stats.food) {
1521 if (!sign->move_on) 1371 if (!sign->move_on)
1522 new_draw_info (NDI_UNIQUE, 0, op, "You cannot read it anymore."); 1372 new_draw_info (NDI_UNIQUE, 0, op, "You cannot read it anymore.");
1523 return; 1373 return;
1524 } 1374 }
1525 1375
1526 if (!QUERY_FLAG(op, FLAG_WIZPASS)) 1376 if (!QUERY_FLAG(op, FLAG_WIZPASS))
1527 sign->last_eat++; 1377 sign->last_eat++;
1528 } 1378 }
1529 1379
1530 /* Sign or magic mouth? Do we need to see it, or does it talk to us? 1380 /* Sign or magic mouth? Do we need to see it, or does it talk to us?
1531 * No way to know for sure. The presumption is basically that if 1381 * No way to know for sure. The presumption is basically that if
1532 * move_on is zero, it needs to be manually applied (doesn't talk 1382 * move_on is zero, it needs to be manually applied (doesn't talk
… …
1536 new_draw_info (NDI_UNIQUE, 0, op, 1386 new_draw_info (NDI_UNIQUE, 0, op,
1537 "You are unable to read while blind."); 1387 "You are unable to read while blind.");
1538 return; 1388 return;
1539 } 1389 }
1540 msgType=get_readable_message_type(sign); 1390 msgType=get_readable_message_type(sign);
1541 snprintf(newbuf,sizeof(newbuf),"%hhu %s", autoapply?1:0,sign->msg); 1391 snprintf(newbuf,sizeof(newbuf),"%hhu %s", autoapply?1:0, &sign->msg);
1542 draw_ext_info(NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, newbuf, sign->msg); 1392 draw_ext_info(NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, newbuf, &sign->msg);
1543} 1393}
1544
1545 1394
1546/** 1395/**
1547 * 'victim' moves onto 'trap' 1396 * 'victim' moves onto 'trap'
1548 * 'victim' leaves 'trap' 1397 * 'victim' leaves 'trap'
1549 * effect is determined by move_on/move_off of trap and move_type of victime. 1398 * effect is determined by move_on/move_off of trap and move_type of victime.
… …
1568 * rune detonates, summoning monster. monster lands on nearby rune. 1417 * rune detonates, summoning monster. monster lands on nearby rune.
1569 * nearby rune detonates. This sort of recursion is expected and 1418 * nearby rune detonates. This sort of recursion is expected and
1570 * proper. This code was causing needless crashes. 1419 * proper. This code was causing needless crashes.
1571 */ 1420 */
1572 if (recursion_depth >= 500) { 1421 if (recursion_depth >= 500) {
1573 LOG (llevDebug, "WARNING: move_apply(): aborting recursion " 1422 LOG (llevDebug, "WARNING: move_apply(): aborting recursion "
1574 "[trap arch %s, name %s; victim arch %s, name %s]\n", 1423 "[trap arch %s, name %s; victim arch %s, name %s]\n",
1575 trap->arch->name, trap->name, victim->arch->name, victim->name); 1424 &trap->arch->name, &trap->name, &victim->arch->name, &victim->name);
1576 return; 1425 return;
1577 } 1426 }
1578 recursion_depth++; 1427 recursion_depth++;
1579 if (trap->head) trap=trap->head; 1428 if (trap->head) trap=trap->head;
1580 1429
1581 /* Lauwenmark: Handle for plugin trigger event */ 1430 if (INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator)))
1582 if (execute_event(trap, EVENT_TRIGGER,originator,victim,NULL,SCRIPT_FIX_ALL)!=0)
1583 goto leave; 1431 goto leave;
1584 1432
1585 switch (trap->type) { 1433 switch (trap->type) {
1586 case PLAYERMOVER: 1434 case PLAYERMOVER:
1587 if (trap->attacktype && (trap->level || victim->type!=PLAYER) && 1435 if (trap->attacktype && (trap->level || victim->type!=PLAYER) &&
1588 !should_director_abort(trap, victim)) { 1436 !should_director_abort(trap, victim)) {
1589 if (!trap->stats.maxsp) trap->stats.maxsp=2; 1437 if (!trap->stats.maxsp) trap->stats.maxsp=2;
1590 1438
1591 /* Is this correct? From the docs, it doesn't look like it 1439 /* Is this correct? From the docs, it doesn't look like it
1592 * should be divided by trap->speed 1440 * should be divided by trap->speed
1593 */ 1441 */
1594 victim->speed_left = -FABS(trap->stats.maxsp*victim->speed/trap->speed); 1442 victim->speed_left = -FABS(trap->stats.maxsp*victim->speed/trap->speed);
1595 1443
1596 /* Just put in some sanity check. I think there is a bug in the 1444 /* Just put in some sanity check. I think there is a bug in the
1597 * above with some objects have zero speed, and thus the player 1445 * above with some objects have zero speed, and thus the player
1598 * getting permanently paralyzed. 1446 * getting permanently paralyzed.
1599 */ 1447 */
1600 if (victim->speed_left<-50.0) victim->speed_left=-50.0; 1448 if (victim->speed_left<-50.0) victim->speed_left=-50.0;
1601 /* LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left);*/ 1449 /* LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left);*/
1602 } 1450 }
1603 goto leave; 1451 goto leave;
1604 1452
1605 case SPINNER: 1453 case SPINNER:
1606 if(victim->direction) { 1454 if(victim->direction) {
1607 victim->direction=absdir(victim->direction-trap->stats.sp); 1455 victim->direction=absdir(victim->direction-trap->stats.sp);
1608 update_turn_face(victim); 1456 update_turn_face(victim);
1609 } 1457 }
1610 goto leave; 1458 goto leave;
1611 1459
1612 case DIRECTOR: 1460 case DIRECTOR:
1613 if(victim->direction && !should_director_abort(trap, victim)) { 1461 if(victim->direction && !should_director_abort(trap, victim)) {
1614 victim->direction=trap->stats.sp; 1462 victim->direction=trap->stats.sp;
1615 update_turn_face(victim); 1463 update_turn_face(victim);
1616 } 1464 }
1617 goto leave; 1465 goto leave;
1618 1466
1619 case BUTTON: 1467 case BUTTON:
1620 case PEDESTAL: 1468 case PEDESTAL:
1621 update_button(trap); 1469 update_button(trap);
1622 goto leave; 1470 goto leave;
1623 1471
1624 case ALTAR: 1472 case ALTAR:
1625 /* sacrifice victim on trap */ 1473 /* sacrifice victim on trap */
1626 apply_altar (trap, victim, originator); 1474 apply_altar (trap, victim, originator);
1627 goto leave; 1475 goto leave;
1628 1476
1629 case THROWN_OBJ: 1477 case THROWN_OBJ:
1630 if (trap->inv == NULL) 1478 if (trap->inv == NULL)
1631 goto leave; 1479 goto leave;
1632 /* fallthrough */ 1480 /* fallthrough */
1633 1481
1634 case ARROW: 1482 case ARROW:
1635 1483
1636 /* bad bug: monster throw a object, make a step forwards, step on object , 1484 /* bad bug: monster throw a object, make a step forwards, step on object ,
1637 * trigger this here and get hit by own missile - and will be own enemy. 1485 * trigger this here and get hit by own missile - and will be own enemy.
1638 * Victim then is his own enemy and will start to kill herself (this is 1486 * Victim then is his own enemy and will start to kill herself (this is
1639 * removed) but we have not synced victim and his missile. To avoid senseless 1487 * removed) but we have not synced victim and his missile. To avoid senseless
1640 * action, we avoid hits here 1488 * action, we avoid hits here
1641 */ 1489 */
1642 if ((QUERY_FLAG (victim, FLAG_ALIVE) && trap->speed) && trap->owner != victim) 1490 if ((QUERY_FLAG (victim, FLAG_ALIVE) && trap->speed) && trap->owner != victim)
1643 hit_with_arrow (trap, victim); 1491 hit_with_arrow (trap, victim);
1644 goto leave; 1492 goto leave;
1645 1493
1646 case SPELL_EFFECT: 1494 case SPELL_EFFECT:
1647 apply_spell_effect(trap, victim); 1495 apply_spell_effect(trap, victim);
1648 goto leave; 1496 goto leave;
1649 1497
1650 case TRAPDOOR: 1498 case TRAPDOOR:
1651 { 1499 {
1652 int max, sound_was_played; 1500 int max, sound_was_played;
1653 object *ab, *ab_next; 1501 object *ab, *ab_next;
1654 if(!trap->value) { 1502 if(!trap->value) {
1655 int tot; 1503 int tot;
1656 for(ab=trap->above,tot=0;ab!=NULL;ab=ab->above) 1504 for(ab=trap->above,tot=0;ab!=NULL;ab=ab->above)
1657 if ((ab->move_type && trap->move_on) || ab->move_type==0) 1505 if ((ab->move_type && trap->move_on) || ab->move_type==0)
1658 tot += (ab->nrof ? ab->nrof : 1) * ab->weight + ab->carrying; 1506 tot += (ab->nrof ? ab->nrof : 1) * ab->weight + ab->carrying;
1659 1507
1660 if(!(trap->value=(tot>trap->weight)?1:0)) 1508 if(!(trap->value=(tot>trap->weight)?1:0))
1661 goto leave; 1509 goto leave;
1662 1510
1663 SET_ANIMATION(trap, trap->value); 1511 SET_ANIMATION(trap, trap->value);
1664 update_object(trap,UP_OBJ_FACE); 1512 update_object(trap,UP_OBJ_FACE);
1665 } 1513 }
1666 1514
1667 for (ab = trap->above, max=100, sound_was_played = 0; --max && ab; ab=ab_next) { 1515 for (ab = trap->above, max=100, sound_was_played = 0; --max && ab; ab=ab_next) {
1668 /* need to set this up, since if we do transfer the object, 1516 /* need to set this up, since if we do transfer the object,
1669 * ab->above would be bogus 1517 * ab->above would be bogus
1670 */ 1518 */
1671 ab_next = ab->above; 1519 ab_next = ab->above;
1672 1520
1673 if ((ab->move_type && trap->move_on) || ab->move_type==0) { 1521 if ((ab->move_type && trap->move_on) || ab->move_type==0) {
1674 if ( ! sound_was_played) { 1522 if ( ! sound_was_played) {
1675 play_sound_map(trap->map, trap->x, trap->y, SOUND_FALL_HOLE); 1523 play_sound_map(trap->map, trap->x, trap->y, SOUND_FALL_HOLE);
1676 sound_was_played = 1; 1524 sound_was_played = 1;
1677 } 1525 }
1678 new_draw_info(NDI_UNIQUE, 0,ab,"You fall into a trapdoor!"); 1526 new_draw_info(NDI_UNIQUE, 0,ab,"You fall into a trapdoor!");
1679 transfer_ob(ab,(int)EXIT_X(trap),(int)EXIT_Y(trap),0,ab); 1527 transfer_ob(ab,(int)EXIT_X(trap),(int)EXIT_Y(trap),0,ab);
1680 } 1528 }
1681 } 1529 }
1682 goto leave; 1530 goto leave;
1683 } 1531 }
1684 1532
1685 1533
1686 case CONVERTER: 1534 case CONVERTER:
1687 if (convert_item (victim, trap) < 0) { 1535 if (convert_item (victim, trap) < 0) {
1688 object *op; 1536 object *op;
1689 1537
1690 new_draw_info_format(NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name(trap)); 1538 new_draw_info_format(NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name(trap));
1691 1539
1692 op = get_archetype("burnout"); 1540 op = get_archetype("burnout");
1693 if (op != NULL) { 1541 if (op != NULL) {
1694 op->x = trap->x; 1542 op->x = trap->x;
1695 op->y = trap->y; 1543 op->y = trap->y;
1696 insert_ob_in_map(op, trap->map, trap, 0); 1544 insert_ob_in_map(op, trap->map, trap, 0);
1697 } 1545 }
1698 } 1546 }
1699 goto leave; 1547 goto leave;
1700 1548
1701 case TRIGGER_BUTTON: 1549 case TRIGGER_BUTTON:
1702 case TRIGGER_PEDESTAL: 1550 case TRIGGER_PEDESTAL:
1703 case TRIGGER_ALTAR: 1551 case TRIGGER_ALTAR:
1704 check_trigger (trap, victim); 1552 check_trigger (trap, victim);
1705 goto leave; 1553 goto leave;
1706 1554
1707 case DEEP_SWAMP: 1555 case DEEP_SWAMP:
1708 walk_on_deep_swamp (trap, victim); 1556 walk_on_deep_swamp (trap, victim);
1709 goto leave; 1557 goto leave;
1710 1558
1711 case CHECK_INV: 1559 case CHECK_INV:
1712 check_inv (victim, trap); 1560 check_inv (victim, trap);
1713 goto leave; 1561 goto leave;
1714 1562
1715 case HOLE: 1563 case HOLE:
1716 /* Hole not open? */ 1564 /* Hole not open? */
1717 if(trap->stats.wc > 0) 1565 if(trap->stats.wc > 0)
1718 goto leave; 1566 goto leave;
1719 1567
1720 /* Is this a multipart monster and not the head? If so, return. 1568 /* Is this a multipart monster and not the head? If so, return.
1721 * Processing will happen if the head runs into the pit 1569 * Processing will happen if the head runs into the pit
1722 */ 1570 */
1723 if (victim->head) 1571 if (victim->head)
1724 goto leave; 1572 goto leave;
1725 1573
1726 play_sound_map (victim->map, victim->x, victim->y, SOUND_FALL_HOLE); 1574 play_sound_map (victim->map, victim->x, victim->y, SOUND_FALL_HOLE);
1727 new_draw_info (NDI_UNIQUE, 0, victim, "You fall through the hole!\n"); 1575 new_draw_info (NDI_UNIQUE, 0, victim, "You fall through the hole!\n");
1728 transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim); 1576 transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim);
1729 goto leave; 1577 goto leave;
1730 1578
1731 case EXIT: 1579 case EXIT:
1732 if (victim->type == PLAYER && EXIT_PATH (trap)) { 1580 if (victim->type == PLAYER && EXIT_PATH (trap)) {
1733 /* Basically, don't show exits leading to random maps the 1581 /* Basically, don't show exits leading to random maps the
1734 * players output. 1582 * players output.
1735 */ 1583 */
1736 if (trap->msg && strncmp(EXIT_PATH(trap),"/!",2) && strncmp(EXIT_PATH(trap), "/random/", 8)) 1584 if (trap->msg && strncmp(EXIT_PATH(trap),"/!",2) && strncmp(EXIT_PATH(trap), "/random/", 8))
1737 new_draw_info (NDI_NAVY, 0, victim, trap->msg); 1585 new_draw_info (NDI_NAVY, 0, victim, trap->msg);
1738 enter_exit (victim, trap); 1586 enter_exit (victim, trap);
1739 } 1587 }
1740 goto leave; 1588 goto leave;
1741 1589
1742 case ENCOUNTER: 1590 case ENCOUNTER:
1743 /* may be some leftovers on this */ 1591 /* may be some leftovers on this */
1744 goto leave; 1592 goto leave;
1745 1593
1746 case SHOP_MAT: 1594 case SHOP_MAT:
1747 apply_shop_mat (trap, victim); 1595 apply_shop_mat (trap, victim);
1748 goto leave; 1596 goto leave;
1749 1597
1750 /* Drop a certain amount of gold, and have one item identified */ 1598 /* Drop a certain amount of gold, and have one item identified */
1751 case IDENTIFY_ALTAR: 1599 case IDENTIFY_ALTAR:
1752 apply_id_altar (victim, trap, originator); 1600 apply_id_altar (victim, trap, originator);
1753 goto leave; 1601 goto leave;
1754 1602
1755 case SIGN: 1603 case SIGN:
1756 if (victim->type != PLAYER && trap->stats.food > 0) 1604 if (victim->type != PLAYER && trap->stats.food > 0)
1757 goto leave; /* monsters musn't apply magic_mouths with counters */ 1605 goto leave; /* monsters musn't apply magic_mouths with counters */
1758 1606
1759 apply_sign (victim, trap, 1); 1607 apply_sign (victim, trap, 1);
1760 goto leave; 1608 goto leave;
1761 1609
1762 case CONTAINER: 1610 case CONTAINER:
1763 if (victim->type==PLAYER) 1611 if (victim->type==PLAYER)
1764 (void) esrv_apply_container (victim, trap); 1612 (void) esrv_apply_container (victim, trap);
1765 else 1613 else
1766 (void) apply_container (victim, trap); 1614 (void) apply_container (victim, trap);
1767 goto leave; 1615 goto leave;
1768 1616
1769 case RUNE: 1617 case RUNE:
1770 case TRAP: 1618 case TRAP:
1771 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE)) { 1619 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE)) {
1772 spring_trap(trap, victim); 1620 spring_trap(trap, victim);
1773 } 1621 }
1774 goto leave; 1622 goto leave;
1775 1623
1776 default: 1624 default:
1777 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not " 1625 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not "
1778 "handled in move_apply()\n", trap->name, trap->arch->name, 1626 "handled in move_apply()\n", &trap->name, &trap->arch->name,
1779 trap->type); 1627 trap->type);
1780 goto leave; 1628 goto leave;
1781 } 1629 }
1782 1630
1783 leave: 1631 leave:
1784 recursion_depth--; 1632 recursion_depth--;
1785} 1633}
1786 1634
1787/** 1635/**
1788 * Handles reading a regular (ie not containing a spell) book. 1636 * Handles reading a regular (ie not containing a spell) book.
1789 */ 1637 */
… …
1796 new_draw_info(NDI_UNIQUE, 0,op,"You are unable to read while blind."); 1644 new_draw_info(NDI_UNIQUE, 0,op,"You are unable to read while blind.");
1797 return; 1645 return;
1798 } 1646 }
1799 if(tmp->msg==NULL) { 1647 if(tmp->msg==NULL) {
1800 new_draw_info_format(NDI_UNIQUE, 0, op, 1648 new_draw_info_format(NDI_UNIQUE, 0, op,
1801 "You open the %s and find it empty.", tmp->name); 1649 "You open the %s and find it empty.", &tmp->name);
1802 return; 1650 return;
1803 } 1651 }
1804 1652
1805 /* need a literacy skill to read stuff! */ 1653 /* need a literacy skill to read stuff! */
1806 skill_ob = find_skill_by_name(op, tmp->skill); 1654 skill_ob = find_skill_by_name(op, tmp->skill);
1807 if ( ! skill_ob) { 1655 if ( ! skill_ob) {
1808 new_draw_info(NDI_UNIQUE, 0,op, 1656 new_draw_info(NDI_UNIQUE, 0,op,
1809 "You are unable to decipher the strange symbols."); 1657 "You are unable to decipher the strange symbols.");
1810 return; 1658 return;
1811 } 1659 }
1812 lev_diff = tmp->level - (skill_ob->level + 5); 1660 lev_diff = tmp->level - (skill_ob->level + 5);
1813 if ( ! QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0) { 1661 if ( ! QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0) {
1814 if (lev_diff < 2) 1662 if (lev_diff < 2)
1815 new_draw_info(NDI_UNIQUE, 0,op,"This book is just barely beyond your comprehension."); 1663 new_draw_info(NDI_UNIQUE, 0,op,"This book is just barely beyond your comprehension.");
1816 else if (lev_diff < 3) 1664 else if (lev_diff < 3)
1817 new_draw_info(NDI_UNIQUE, 0,op,"This book is slightly beyond your comprehension."); 1665 new_draw_info(NDI_UNIQUE, 0,op,"This book is slightly beyond your comprehension.");
1818 else if (lev_diff < 5) 1666 else if (lev_diff < 5)
1819 new_draw_info(NDI_UNIQUE, 0,op,"This book is beyond your comprehension."); 1667 new_draw_info(NDI_UNIQUE, 0,op,"This book is beyond your comprehension.");
1820 else if (lev_diff < 8) 1668 else if (lev_diff < 8)
1821 new_draw_info(NDI_UNIQUE, 0,op,"This book is quite a bit beyond your comprehension."); 1669 new_draw_info(NDI_UNIQUE, 0,op,"This book is quite a bit beyond your comprehension.");
1822 else if (lev_diff < 15) 1670 else if (lev_diff < 15)
1823 new_draw_info(NDI_UNIQUE, 0,op,"This book is way beyond your comprehension."); 1671 new_draw_info(NDI_UNIQUE, 0,op,"This book is way beyond your comprehension.");
1824 else 1672 else
1825 new_draw_info(NDI_UNIQUE, 0,op,"This book is totally beyond your comprehension."); 1673 new_draw_info(NDI_UNIQUE, 0,op,"This book is totally beyond your comprehension.");
1826 return; 1674 return;
1827 } 1675 }
1828 1676
1829 readable_message_type* msgType = get_readable_message_type(tmp); 1677 readable_message_type* msgType = get_readable_message_type(tmp);
1830 draw_ext_info_format(NDI_UNIQUE | NDI_NAVY, 0, op, 1678 draw_ext_info_format(NDI_UNIQUE | NDI_NAVY, 0, op,
1831 msgType->message_type, msgType->message_subtype, 1679 msgType->message_type, msgType->message_subtype,
1832 "You open the %s and start reading.\n%s", 1680 "You open the %s and start reading.\n%s",
1833 "%s\n%s", 1681 "%s\n%s",
1834 long_desc(tmp,op), tmp->msg); 1682 long_desc(tmp,op), &tmp->msg);
1835 1683
1836 /* gain xp from reading */ 1684 /* gain xp from reading */
1837 if(!QUERY_FLAG(tmp,FLAG_NO_SKILL_IDENT)) { /* only if not read before */ 1685 if(!QUERY_FLAG(tmp,FLAG_NO_SKILL_IDENT)) { /* only if not read before */
1838 int exp_gain=calc_skill_exp(op,tmp, skill_ob); 1686 int exp_gain=calc_skill_exp(op,tmp, skill_ob);
1839 if(!QUERY_FLAG(tmp,FLAG_IDENTIFIED)) { 1687 if(!QUERY_FLAG(tmp,FLAG_IDENTIFIED)) {
1840 /*exp_gain *= 2; because they just identified it too */ 1688 /*exp_gain *= 2; because they just identified it too */
1841 SET_FLAG(tmp,FLAG_IDENTIFIED); 1689 SET_FLAG(tmp,FLAG_IDENTIFIED);
1842 /* If in a container, update how it looks */ 1690 /* If in a container, update how it looks */
1843 if(tmp->env) esrv_update_item(UPD_FLAGS|UPD_NAME, op,tmp); 1691 if(tmp->env) esrv_update_item(UPD_FLAGS|UPD_NAME, op,tmp);
… …
1853 * op is the person learning the skill, tmp is the skill scroll object 1701 * op is the person learning the skill, tmp is the skill scroll object
1854 */ 1702 */
1855static void apply_skillscroll (object *op, object *tmp) 1703static void apply_skillscroll (object *op, object *tmp)
1856{ 1704{
1857 switch ((int) learn_skill (op, tmp)) { 1705 switch ((int) learn_skill (op, tmp)) {
1858 case 0: 1706 case 0:
1859 new_draw_info(NDI_UNIQUE, 0,op,"You already possess the knowledge "); 1707 new_draw_info(NDI_UNIQUE, 0,op,"You already possess the knowledge ");
1860 new_draw_info_format(NDI_UNIQUE, 0,op,"held within the %s.\n",query_name(tmp)); 1708 new_draw_info_format(NDI_UNIQUE, 0,op,"held within the %s.\n",query_name(tmp));
1861 return; 1709 return;
1862 1710
1863 case 1: 1711 case 1:
1864 new_draw_info_format(NDI_UNIQUE, 0,op,"You succeed in learning %s", 1712 new_draw_info_format(NDI_UNIQUE, 0,op,"You succeed in learning %s", &tmp->skill);
1865 tmp->skill);
1866 new_draw_info_format(NDI_UNIQUE, 0, op,
1867 "Type 'bind ready_skill %s",tmp->skill);
1868 new_draw_info(NDI_UNIQUE, 0,op,"to store the skill in a key.");
1869 decrease_ob(tmp); 1713 decrease_ob(tmp);
1870 return; 1714 return;
1871 1715
1872 default: 1716 default:
1873 new_draw_info_format(NDI_UNIQUE,0,op, 1717 new_draw_info_format(NDI_UNIQUE,0,op,
1874 "You fail to learn the knowledge of the %s.\n",query_name(tmp)); 1718 "You fail to learn the knowledge of the %s.\n",query_name(tmp));
1875 decrease_ob(tmp); 1719 decrease_ob(tmp);
1876 return; 1720 return;
1877 } 1721 }
1878} 1722}
1879 1723
1880/** 1724/**
1881 * Actually makes op learn spell. 1725 * Actually makes op learn spell.
… …
1903 tmp = get_object(); 1747 tmp = get_object();
1904 copy_object(spell, tmp); 1748 copy_object(spell, tmp);
1905 insert_ob_in_ob(tmp, op); 1749 insert_ob_in_ob(tmp, op);
1906 1750
1907 if (special_prayer) { 1751 if (special_prayer) {
1908 SET_FLAG(tmp, FLAG_STARTEQUIP); 1752 SET_FLAG(tmp, FLAG_STARTEQUIP);
1909 } 1753 }
1910 1754
1911 new_draw_info_format (NDI_UNIQUE, 0, op,
1912 "Type 'bind cast %s", spell->name);
1913 new_draw_info (NDI_UNIQUE, 0, op, "to store the spell in a key.");
1914 esrv_add_spells(op->contr, tmp); 1755 esrv_add_spells(op->contr, tmp);
1915} 1756}
1916 1757
1917/** 1758/**
1918 * Erases spell from player's inventory. 1759 * Erases spell from player's inventory.
… …
1929 LOG (llevError, "BUG: do_forget_spell(): spell not known\n"); 1770 LOG (llevError, "BUG: do_forget_spell(): spell not known\n");
1930 return; 1771 return;
1931 } 1772 }
1932 1773
1933 new_draw_info_format (NDI_UNIQUE|NDI_NAVY, 0, op, 1774 new_draw_info_format (NDI_UNIQUE|NDI_NAVY, 0, op,
1934 "You lose knowledge of %s.", spell); 1775 "You lose knowledge of %s.", spell);
1935 player_unready_range_ob(op->contr, spob); 1776 player_unready_range_ob(op->contr, spob);
1936 esrv_remove_spell(op->contr, spob); 1777 esrv_remove_spell(op->contr, spob);
1937 remove_ob(spob); 1778 remove_ob(spob);
1938 free_object(spob); 1779 free_object(spob);
1939} 1780}
… …
1946static void apply_spellbook (object *op, object *tmp) 1787static void apply_spellbook (object *op, object *tmp)
1947{ 1788{
1948 object *skop, *spell, *spell_skill; 1789 object *skop, *spell, *spell_skill;
1949 1790
1950 if(QUERY_FLAG(op, FLAG_BLIND)&&!QUERY_FLAG(op,FLAG_WIZ)) { 1791 if(QUERY_FLAG(op, FLAG_BLIND)&&!QUERY_FLAG(op,FLAG_WIZ)) {
1951 new_draw_info(NDI_UNIQUE, 0,op,"You are unable to read while blind."); 1792 new_draw_info(NDI_UNIQUE, 0,op,"You are unable to read while blind.");
1952 return; 1793 return;
1953 } 1794 }
1954 1795
1955 /* artifact_spellbooks have 'slaying' field point to a spell name, 1796 /* artifact_spellbooks have 'slaying' field point to a spell name,
1956 * instead of having their spell stored in stats.sp. These are 1797 * instead of having their spell stored in stats.sp. These are
1957 * legacy spellbooks 1798 * legacy spellbooks
1958 */ 1799 */
1959 1800
1960 if(tmp->slaying != NULL) { 1801 if(tmp->slaying != NULL) {
1961 spell=arch_to_object(find_archetype_by_object_name(tmp->slaying)); 1802 spell=arch_to_object(find_archetype_by_object_name(tmp->slaying));
1962 if (!spell) { 1803 if (!spell) {
1963 new_draw_info_format(NDI_UNIQUE, 0, op, 1804 new_draw_info_format(NDI_UNIQUE, 0, op,
1964 "The book's formula for %s is incomplete", tmp->slaying); 1805 "The book's formula for %s is incomplete", &tmp->slaying);
1965 return; 1806 return;
1966 } 1807 }
1967 else 1808 else
1968 insert_ob_in_ob(spell, tmp); 1809 insert_ob_in_ob(spell, tmp);
1969 free_string(tmp->slaying);
1970 tmp->slaying=NULL; 1810 tmp->slaying=NULL;
1971 } 1811 }
1972 1812
1973 skop = find_skill_by_name(op, tmp->skill); 1813 skop = find_skill_by_name(op, tmp->skill);
1974 1814
1975 /* need a literacy skill to learn spells. Also, having a literacy level 1815 /* need a literacy skill to learn spells. Also, having a literacy level
1976 * lower than the spell will make learning the spell more difficult */ 1816 * lower than the spell will make learning the spell more difficult */
1977 if ( !skop) { 1817 if ( !skop) {
1978 new_draw_info(NDI_UNIQUE, 0,op,"You can't read! Your attempt fails."); 1818 new_draw_info(NDI_UNIQUE, 0,op,"You can't read! Your attempt fails.");
1979 return; 1819 return;
1980 } 1820 }
1981 1821
1982 spell = tmp->inv; 1822 spell = tmp->inv;
1983 if (!spell) { 1823 if (!spell) {
1984 LOG(llevError,"apply_spellbook: Book %s has no spell in it!\n", tmp->name); 1824 LOG(llevError,"apply_spellbook: Book %s has no spell in it!\n", &tmp->name);
1985 new_draw_info(NDI_UNIQUE, 0,op,"The spellbook symbols make no sense."); 1825 new_draw_info(NDI_UNIQUE, 0,op,"The spellbook symbols make no sense.");
1986 return; 1826 return;
1987 } 1827 }
1988 if (spell->level > (skop->level+10)) { 1828 if (spell->level > (skop->level+10)) {
1989 new_draw_info(NDI_UNIQUE, 0,op,"You are unable to decipher the strange symbols."); 1829 new_draw_info(NDI_UNIQUE, 0,op,"You are unable to decipher the strange symbols.");
1990 return; 1830 return;
1991 } 1831 }
1992 1832
1993 new_draw_info_format(NDI_UNIQUE, 0, op, 1833 new_draw_info_format(NDI_UNIQUE, 0, op,
1994 "The spellbook contains the %s level spell %s.", 1834 "The spellbook contains the %s level spell %s.",
1995 get_levelnumber(spell->level), spell->name); 1835 get_levelnumber(spell->level), &spell->name);
1996 1836
1997 if (!QUERY_FLAG(tmp, FLAG_IDENTIFIED)) { 1837 if (!QUERY_FLAG(tmp, FLAG_IDENTIFIED)) {
1998 identify(tmp); 1838 identify(tmp);
1999 if (tmp->env) 1839 if (tmp->env)
2000 esrv_update_item(UPD_FLAGS|UPD_NAME,op,tmp); 1840 esrv_update_item(UPD_FLAGS|UPD_NAME,op,tmp);
2001 else 1841 else
2002 op->contr->socket.update_look=1; 1842 op->contr->socket.update_look=1;
2003 } 1843 }
2004 1844
2005 /* I removed the check for special_prayer_mark here - it didn't make 1845 /* I removed the check for special_prayer_mark here - it didn't make
2006 * a lot of sense - special prayers are not found in spellbooks, and 1846 * a lot of sense - special prayers are not found in spellbooks, and
2007 * if the player doesn't know the spell, doesn't make a lot of sense that 1847 * if the player doesn't know the spell, doesn't make a lot of sense that
2008 * they would have a special prayer mark. 1848 * they would have a special prayer mark.
2009 */ 1849 */
2010 if (check_spell_known (op, spell->name)) { 1850 if (check_spell_known (op, spell->name)) {
2011 new_draw_info(NDI_UNIQUE, 0,op,"You already know that spell.\n"); 1851 new_draw_info(NDI_UNIQUE, 0,op,"You already know that spell.\n");
2012 return; 1852 return;
2013 } 1853 }
2014 1854
2015 if (spell->skill) { 1855 if (spell->skill) {
2016 spell_skill = find_skill_by_name(op, spell->skill); 1856 spell_skill = find_skill_by_name(op, spell->skill);
2017 if (!spell_skill) { 1857 if (!spell_skill) {
2018 new_draw_info_format(NDI_UNIQUE, 0, op, 1858 new_draw_info_format(NDI_UNIQUE, 0, op,
2019 "You lack the skill %s to use this spell", 1859 "You lack the skill %s to use this spell",
2020 spell->skill); 1860 &spell->skill);
2021 return; 1861 return;
2022 } 1862 }
2023 if (spell_skill->level < spell->level) { 1863 if (spell_skill->level < spell->level) {
2024 new_draw_info_format(NDI_UNIQUE, 0, op, 1864 new_draw_info_format(NDI_UNIQUE, 0, op,
2025 "You need to be level %d in %s to learn this spell.", 1865 "You need to be level %d in %s to learn this spell.",
2026 spell->level, spell->skill); 1866 spell->level, &spell->skill);
2027 return; 1867 return;
2028 } 1868 }
2029 } 1869 }
2030 1870
2031 /* Logic as follows 1871 /* Logic as follows
2032 * 1872 *
2033 * 1- MU spells use Int to learn, Cleric spells use Wisdom 1873 * 1- MU spells use Int to learn, Cleric spells use Wisdom
… …
2039 * 1879 *
2040 * Overall, chances are the same but a player will find having a high 1880 * Overall, chances are the same but a player will find having a high
2041 * literacy rate very useful! -b.t. 1881 * literacy rate very useful! -b.t.
2042 */ 1882 */
2043 if(QUERY_FLAG(op,FLAG_CONFUSED)) { 1883 if(QUERY_FLAG(op,FLAG_CONFUSED)) {
2044 new_draw_info(NDI_UNIQUE,0,op,"In your confused state you flub the wording of the text!"); 1884 new_draw_info(NDI_UNIQUE,0,op,"In your confused state you flub the wording of the text!");
2045 scroll_failure(op, 0 - random_roll(0, spell->level, op, PREFER_LOW), MAX(spell->stats.sp, spell->stats.grace)); 1885 scroll_failure(op, 0 - random_roll(0, spell->level, op, PREFER_LOW), MAX(spell->stats.sp, spell->stats.grace));
2046 } else if(QUERY_FLAG(tmp,FLAG_STARTEQUIP) || 1886 } else if(QUERY_FLAG(tmp,FLAG_STARTEQUIP) ||
2047 (random_roll(0, 100, op, PREFER_LOW)-(5*skop->level)) < 1887 (random_roll(0, 100, op, PREFER_LOW)-(5*skop->level)) <
2048 learn_spell[spell->stats.grace ? op->stats.Wis : op->stats.Int]) { 1888 learn_spell[spell->stats.grace ? op->stats.Wis : op->stats.Int]) {
2049 1889
2050 new_draw_info(NDI_UNIQUE, 0,op,"You succeed in learning the spell!"); 1890 new_draw_info(NDI_UNIQUE, 0,op,"You succeed in learning the spell!");
2051 do_learn_spell (op, spell, 0); 1891 do_learn_spell (op, spell, 0);
2052 1892
2053 /* xp gain to literacy for spell learning */ 1893 /* xp gain to literacy for spell learning */
2054 if ( ! QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 1894 if ( ! QUERY_FLAG (tmp, FLAG_STARTEQUIP))
2055 change_exp(op,calc_skill_exp(op,tmp,skop), skop->skill, 0); 1895 change_exp(op,calc_skill_exp(op,tmp,skop), skop->skill, 0);
2056 } else { 1896 } else {
2057 play_sound_player_only(op->contr, SOUND_FUMBLE_SPELL,0,0); 1897 play_sound_player_only(op->contr, SOUND_FUMBLE_SPELL,0,0);
2058 new_draw_info(NDI_UNIQUE, 0,op,"You fail to learn the spell.\n"); 1898 new_draw_info(NDI_UNIQUE, 0,op,"You fail to learn the spell.\n");
2059 } 1899 }
2060 decrease_ob(tmp); 1900 decrease_ob(tmp);
2061} 1901}
2062 1902
2063/** 1903/**
… …
2066void apply_scroll (object *op, object *tmp, int dir) 1906void apply_scroll (object *op, object *tmp, int dir)
2067{ 1907{
2068 object *skop; 1908 object *skop;
2069 1909
2070 if(QUERY_FLAG(op, FLAG_BLIND)&&!QUERY_FLAG(op,FLAG_WIZ)) { 1910 if(QUERY_FLAG(op, FLAG_BLIND)&&!QUERY_FLAG(op,FLAG_WIZ)) {
2071 new_draw_info(NDI_UNIQUE, 0,op, "You are unable to read while blind."); 1911 new_draw_info(NDI_UNIQUE, 0,op, "You are unable to read while blind.");
2072 return; 1912 return;
2073 } 1913 }
2074 1914
2075 if (!tmp->inv || tmp->inv->type != SPELL) { 1915 if (!tmp->inv || tmp->inv->type != SPELL) {
2076 new_draw_info (NDI_UNIQUE, 0, op, 1916 new_draw_info (NDI_UNIQUE, 0, op,
2077 "The scroll just doesn't make sense!"); 1917 "The scroll just doesn't make sense!");
2078 return; 1918 return;
2079 } 1919 }
2080 1920
2081 if(op->type==PLAYER) { 1921 if(op->type==PLAYER) {
2082 /* players need a literacy skill to read stuff! */ 1922 /* players need a literacy skill to read stuff! */
2083 int exp_gain=0; 1923 int exp_gain=0;
2084 1924
2085 /* hard code literacy - tmp->skill points to where the exp 1925 /* hard code literacy - tmp->skill points to where the exp
2086 * should go for anything killed by the spell. 1926 * should go for anything killed by the spell.
2087 */ 1927 */
2088 skop = find_skill_by_name(op, skill_names[SK_LITERACY]); 1928 skop = find_skill_by_name(op, skill_names[SK_LITERACY]);
2089 1929
2090 if ( ! skop) { 1930 if ( ! skop) {
2091 new_draw_info(NDI_UNIQUE, 0,op, 1931 new_draw_info(NDI_UNIQUE, 0,op,
2092 "You are unable to decipher the strange symbols."); 1932 "You are unable to decipher the strange symbols.");
2093 return; 1933 return;
2094 } 1934 }
2095 1935
2096 if((exp_gain = calc_skill_exp(op,tmp, skop))) 1936 if((exp_gain = calc_skill_exp(op,tmp, skop)))
2097 change_exp(op,exp_gain, skop->skill, 0); 1937 change_exp(op,exp_gain, skop->skill, 0);
2098 } 1938 }
2099 1939
2100 if (!QUERY_FLAG(tmp, FLAG_IDENTIFIED)) 1940 if (!QUERY_FLAG(tmp, FLAG_IDENTIFIED))
2101 identify(tmp); 1941 identify(tmp);
2102 1942
2103 new_draw_info_format(NDI_BLACK, 0, op, 1943 new_draw_info_format(NDI_BLACK, 0, op,
2104 "The scroll of %s turns to dust.", tmp->inv->name); 1944 "The scroll of %s turns to dust.", &tmp->inv->name);
2105 1945
2106 1946
2107 cast_spell(op,tmp,dir,tmp->inv, NULL); 1947 cast_spell(op,tmp,dir,tmp->inv, NULL);
2108 decrease_ob(tmp); 1948 decrease_ob(tmp);
2109} 1949}
… …
2126 * treasure 1966 * treasure
2127 */ 1967 */
2128 1968
2129 treas = tmp->inv; 1969 treas = tmp->inv;
2130 if(treas==NULL) { 1970 if(treas==NULL) {
2131 new_draw_info(NDI_UNIQUE, 0,op,"The chest was empty."); 1971 new_draw_info(NDI_UNIQUE, 0,op,"The chest was empty.");
2132 decrease_ob(tmp); 1972 decrease_ob(tmp);
2133 return; 1973 return;
2134 } 1974 }
2135 while (tmp->inv) { 1975 while (tmp->inv) {
2136 treas = tmp->inv; 1976 treas = tmp->inv;
2137 1977
2138 remove_ob(treas); 1978 remove_ob(treas);
2139 new_draw_info_format(NDI_UNIQUE, 0, op, "You find %s in the chest.", 1979 new_draw_info_format(NDI_UNIQUE, 0, op, "You find %s in the chest.",
2140 query_name(treas)); 1980 query_name(treas));
2141 1981
2142 treas->x=op->x; 1982 treas->x=op->x;
2143 treas->y=op->y; 1983 treas->y=op->y;
2144 treas = insert_ob_in_map (treas, op->map, op,INS_BELOW_ORIGINATOR); 1984 treas = insert_ob_in_map (treas, op->map, op,INS_BELOW_ORIGINATOR);
2145 1985
2146 if (treas && (treas->type == RUNE || treas->type == TRAP) && treas->level 1986 if (treas && (treas->type == RUNE || treas->type == TRAP) && treas->level
2147 && QUERY_FLAG (op, FLAG_ALIVE)) 1987 && QUERY_FLAG (op, FLAG_ALIVE))
2148 spring_trap (treas, op); 1988 spring_trap (treas, op);
2149 /* If either player or container was destroyed, no need to do 1989 /* If either player or container was destroyed, no need to do
2150 * further processing. I think this should be enclused with 1990 * further processing. I think this should be enclused with
2151 * spring trap above, as I don't think there is otherwise 1991 * spring trap above, as I don't think there is otherwise
2152 * any way for the treasure chest or player to get killed 1992 * any way for the treasure chest or player to get killed
2153 */ 1993 */
2154 if (was_destroyed (op, op_tag) || was_destroyed (tmp, tmp_tag)) 1994 if (was_destroyed (op, op_tag) || was_destroyed (tmp, tmp_tag))
2155 break; 1995 break;
2156 } 1996 }
2157 1997
2158 if ( ! was_destroyed (tmp, tmp_tag) && tmp->inv == NULL) 1998 if ( ! was_destroyed (tmp, tmp_tag) && tmp->inv == NULL)
2159 decrease_ob (tmp); 1999 decrease_ob (tmp);
2160 2000
… …
2171 if(op->type!=PLAYER) 2011 if(op->type!=PLAYER)
2172 op->stats.hp=op->stats.maxhp; 2012 op->stats.hp=op->stats.maxhp;
2173 else { 2013 else {
2174 /* check if this is a dragon (player), eating some flesh */ 2014 /* check if this is a dragon (player), eating some flesh */
2175 if (tmp->type==FLESH && is_dragon_pl(op) && dragon_eat_flesh(op, tmp)) 2015 if (tmp->type==FLESH && is_dragon_pl(op) && dragon_eat_flesh(op, tmp))
2176 ; 2016 ;
2177 else { 2017 else {
2178 /* usual case - no dragon meal: */ 2018 /* usual case - no dragon meal: */
2179 if(op->stats.food+tmp->stats.food>999) { 2019 if(op->stats.food+tmp->stats.food>999) {
2180 if(tmp->type==FOOD || tmp->type==FLESH) 2020 if(tmp->type==FOOD || tmp->type==FLESH)
2181 new_draw_info(NDI_UNIQUE, 0,op,"You feel full, but what a waste of food!"); 2021 new_draw_info(NDI_UNIQUE, 0,op,"You feel full, but what a waste of food!");
2182 else 2022 else
2183 new_draw_info(NDI_UNIQUE, 0,op,"Most of the drink goes down your face not your throat!"); 2023 new_draw_info(NDI_UNIQUE, 0,op,"Most of the drink goes down your face not your throat!");
2184 } 2024 }
2185 2025
2186 if(!QUERY_FLAG(tmp, FLAG_CURSED)) { 2026 if(!QUERY_FLAG(tmp, FLAG_CURSED)) {
2187 char buf[MAX_BUF]; 2027 char buf[MAX_BUF];
2188 2028
2189 if (!is_dragon_pl(op)) { 2029 if (!is_dragon_pl(op)) {
2190 /* eating message for normal players*/ 2030 /* eating message for normal players*/
2191 if(tmp->type==DRINK) 2031 if(tmp->type==DRINK)
2192 sprintf(buf,"Ahhh...that %s tasted good.",tmp->name); 2032 sprintf(buf,"Ahhh...that %s tasted good.",&tmp->name);
2193 else 2033 else
2194 sprintf(buf,"The %s tasted %s",tmp->name, 2034 sprintf(buf,"The %s tasted %s",&tmp->name,
2195 tmp->type==FLESH?"terrible!":"good."); 2035 tmp->type==FLESH?"terrible!":"good.");
2196 } 2036 }
2197 else { 2037 else {
2198 /* eating message for dragon players*/ 2038 /* eating message for dragon players*/
2199 sprintf(buf,"The %s tasted terrible!",tmp->name); 2039 sprintf(buf,"The %s tasted terrible!",&tmp->name);
2200 } 2040 }
2201 2041
2202 new_draw_info(NDI_UNIQUE, 0,op,buf); 2042 new_draw_info(NDI_UNIQUE, 0,op,buf);
2203 capacity_remaining = 999 - op->stats.food; 2043 capacity_remaining = 999 - op->stats.food;
2204 op->stats.food+=tmp->stats.food; 2044 op->stats.food+=tmp->stats.food;
2205 if(capacity_remaining < tmp->stats.food) 2045 if(capacity_remaining < tmp->stats.food)
2206 op->stats.hp += capacity_remaining / 50; 2046 op->stats.hp += capacity_remaining / 50;
2207 else 2047 else
2208 op->stats.hp+=tmp->stats.food/50; 2048 op->stats.hp+=tmp->stats.food/50;
2209 if(op->stats.hp>op->stats.maxhp) 2049 if(op->stats.hp>op->stats.maxhp)
2210 op->stats.hp=op->stats.maxhp; 2050 op->stats.hp=op->stats.maxhp;
2211 if (op->stats.food > 999) 2051 if (op->stats.food > 999)
2212 op->stats.food = 999; 2052 op->stats.food = 999;
2213 } 2053 }
2214 2054
2215 /* special food hack -b.t. */ 2055 /* special food hack -b.t. */
2216 if(tmp->title || QUERY_FLAG(tmp,FLAG_CURSED)) 2056 if(tmp->title || QUERY_FLAG(tmp,FLAG_CURSED))
2217 eat_special_food(op,tmp); 2057 eat_special_food(op,tmp);
2218 } 2058 }
2219 } 2059 }
2220 handle_apply_yield(tmp); 2060 handle_apply_yield(tmp);
2221 decrease_ob(tmp); 2061 decrease_ob(tmp);
2222} 2062}
… …
2252 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces 2092 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces
2253 from the player's inventory */ 2093 from the player's inventory */
2254 for (tmp=op->inv; tmp!=NULL; tmp=tmp->below) { 2094 for (tmp=op->inv; tmp!=NULL; tmp=tmp->below) {
2255 if (tmp->type == FORCE) { 2095 if (tmp->type == FORCE) {
2256 if (strcmp(tmp->arch->name, "dragon_skin_force")==0) 2096 if (strcmp(tmp->arch->name, "dragon_skin_force")==0)
2257 skin = tmp; 2097 skin = tmp;
2258 else if (strcmp(tmp->arch->name, "dragon_ability_force")==0) 2098 else if (strcmp(tmp->arch->name, "dragon_ability_force")==0)
2259 abil = tmp; 2099 abil = tmp;
2260 } 2100 }
2261 } 2101 }
2262 2102
2263 /* if either skin or ability are missing, this is an old player 2103 /* if either skin or ability are missing, this is an old player
2264 which is not to be considered a dragon -> bail out */ 2104 which is not to be considered a dragon -> bail out */
… …
2282 /* got positive resistance, now calculate improvement chance (0-100) */ 2122 /* got positive resistance, now calculate improvement chance (0-100) */
2283 2123
2284 /* this bonus makes resistance increase easier at lower levels */ 2124 /* this bonus makes resistance increase easier at lower levels */
2285 bonus = (settings.max_level - op->level) * 30. / ((double)settings.max_level); 2125 bonus = (settings.max_level - op->level) * 30. / ((double)settings.max_level);
2286 if (i == abil->stats.exp) 2126 if (i == abil->stats.exp)
2287 bonus += 5; /* additional bonus for resistance of ability-focus */ 2127 bonus += 5; /* additional bonus for resistance of ability-focus */
2288 2128
2289 /* monster bonus increases with level, because high-level 2129 /* monster bonus increases with level, because high-level
2290 flesh is too rare */ 2130 flesh is too rare */
2291 mbonus = op->level * 20. / ((double)settings.max_level); 2131 mbonus = op->level * 20. / ((double)settings.max_level);
2292 2132
2293 chance = (((double)MIN(op->level+bonus, meal->level+bonus+mbonus))*100. / 2133 chance = (((double)MIN(op->level+bonus, meal->level+bonus+mbonus))*100. /
2294 ((double)settings.max_level)) - skin->resist[i]; 2134 ((double)settings.max_level)) - skin->resist[i];
2295 2135
2296 if (chance >= 0.) 2136 if (chance >= 0.)
2297 chance += 1.; 2137 chance += 1.;
2298 else 2138 else
2299 chance = (chance < -12) ? 0. : 1./pow(2., -chance); 2139 chance = (chance < -12) ? 0. : 1./pow(2., -chance);
2300 2140
2301 /* chance is proportional to amount of resistance (max. 50) */ 2141 /* chance is proportional to amount of resistance (max. 50) */
2302 chance *= ((double)(MIN(meal->resist[i], 50)))/50.; 2142 chance *= ((double)(MIN(meal->resist[i], 50)))/50.;
2303 2143
2304 /* doubled chance for resistance of ability-focus */ 2144 /* doubled chance for resistance of ability-focus */
2305 if (i == abil->stats.exp) 2145 if (i == abil->stats.exp)
2306 chance = MIN(100., chance*2.); 2146 chance = MIN(100., chance*2.);
2307 2147
2308 /* now make the throw and save all winners (Don't insert luck bonus here!) */ 2148 /* now make the throw and save all winners (Don't insert luck bonus here!) */
2309 if (RANDOM()%10000 < (int)(chance*100)) { 2149 if (RANDOM()%10000 < (int)(chance*100)) {
2310 atnr_winner[winners] = i; 2150 atnr_winner[winners] = i;
2311 winners++; 2151 winners++;
2312 } 2152 }
2313 2153
2314 if (chance >= 0.01 ) totalchance *= 1 - chance/100; 2154 if (chance >= 0.01 ) totalchance *= 1 - chance/100;
2315 2155
2316 /*LOG(llevDebug, " %s: bonus %.1f, chance %.1f\n", attacks[i], bonus, chance);*/ 2156 /*LOG(llevDebug, " %s: bonus %.1f, chance %.1f\n", attacks[i], bonus, chance);*/
… …
2319 2159
2320 /* inverse totalchance as until now we have the failure-chance */ 2160 /* inverse totalchance as until now we have the failure-chance */
2321 totalchance = 100 - totalchance*100; 2161 totalchance = 100 - totalchance*100;
2322 /* print message according to totalchance */ 2162 /* print message according to totalchance */
2323 if (totalchance > 50.) 2163 if (totalchance > 50.)
2324 sprintf(buf, "Hmm! The %s tasted delicious!", meal->name); 2164 sprintf(buf, "Hmm! The %s tasted delicious!", &meal->name);
2325 else if (totalchance > 10.) 2165 else if (totalchance > 10.)
2326 sprintf(buf, "The %s tasted very good.", meal->name); 2166 sprintf(buf, "The %s tasted very good.", &meal->name);
2327 else if (totalchance > 1.) 2167 else if (totalchance > 1.)
2328 sprintf(buf, "The %s tasted good.", meal->name); 2168 sprintf(buf, "The %s tasted good.", &meal->name);
2329 else if (totalchance > 0.1) 2169 else if (totalchance > 0.1)
2330 sprintf(buf, "The %s tasted bland.", meal->name); 2170 sprintf(buf, "The %s tasted bland.", &meal->name);
2331 else if (totalchance >= 0.01) 2171 else if (totalchance >= 0.01)
2332 sprintf(buf, "The %s had a boring taste.", meal->name); 2172 sprintf(buf, "The %s had a boring taste.", &meal->name);
2333 else if (meal->last_eat > 0 && atnr_is_dragon_enabled(meal->last_eat)) 2173 else if (meal->last_eat > 0 && atnr_is_dragon_enabled(meal->last_eat))
2334 sprintf(buf, "The %s tasted strange.", meal->name); 2174 sprintf(buf, "The %s tasted strange.", &meal->name);
2335 else 2175 else
2336 sprintf(buf, "The %s had no taste.", meal->name); 2176 sprintf(buf, "The %s had no taste.", &meal->name);
2337 new_draw_info(NDI_UNIQUE, 0, op, buf); 2177 new_draw_info(NDI_UNIQUE, 0, op, buf);
2338 2178
2339 /* now choose a winner if we have any */ 2179 /* now choose a winner if we have any */
2340 i = -1; 2180 i = -1;
2341 if (winners>0) 2181 if (winners>0)
… …
2356 && meal->last_eat != abil->last_eat) { 2196 && meal->last_eat != abil->last_eat) {
2357 abil->last_eat = meal->last_eat; /* write: last_eat <new attnr focus> */ 2197 abil->last_eat = meal->last_eat; /* write: last_eat <new attnr focus> */
2358 2198
2359 if (meal->last_eat != abil->stats.exp) { 2199 if (meal->last_eat != abil->stats.exp) {
2360 sprintf(buf, "Your metabolism prepares to focus on %s!", 2200 sprintf(buf, "Your metabolism prepares to focus on %s!",
2361 change_resist_msg[meal->last_eat]); 2201 change_resist_msg[meal->last_eat]);
2362 new_draw_info(NDI_UNIQUE, 0, op, buf); 2202 new_draw_info(NDI_UNIQUE, 0, op, buf);
2363 sprintf(buf, "The change will happen at level %d", abil->level + 1); 2203 sprintf(buf, "The change will happen at level %d", abil->level + 1);
2364 new_draw_info(NDI_UNIQUE, 0, op, buf); 2204 new_draw_info(NDI_UNIQUE, 0, op, buf);
2365 } 2205 }
2366 else { 2206 else {
2367 sprintf(buf, "Your metabolism will continue to focus on %s.", 2207 sprintf(buf, "Your metabolism will continue to focus on %s.",
2368 change_resist_msg[meal->last_eat]); 2208 change_resist_msg[meal->last_eat]);
2369 new_draw_info(NDI_UNIQUE, 0, op, buf); 2209 new_draw_info(NDI_UNIQUE, 0, op, buf);
2370 abil->last_eat = 0; 2210 abil->last_eat = 0;
2371 } 2211 }
2372 } 2212 }
2373 return 1; 2213 return 1;
… …
2379 if(!pl->contr->name_changed||!pl->stats.exp) { 2219 if(!pl->contr->name_changed||!pl->stats.exp) {
2380 new_draw_info(NDI_UNIQUE, 0,pl,"You don't deserve to save your character yet."); 2220 new_draw_info(NDI_UNIQUE, 0,pl,"You don't deserve to save your character yet.");
2381 return; 2221 return;
2382 } 2222 }
2383#endif 2223#endif
2224 INVOKE_PLAYER (LOGOUT, pl->contr);
2384 /* Need to call terminate_all_pets() before we remove the player ob */ 2225 /* Need to call terminate_all_pets() before we remove the player ob */
2385 terminate_all_pets(pl); 2226 terminate_all_pets(pl);
2386 remove_ob(pl); 2227 remove_ob(pl);
2387 pl->direction=0; 2228 pl->direction=0;
2388 new_draw_info_format(NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, pl, 2229 new_draw_info_format(NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, pl,
2389 "%s leaves the game.",pl->name); 2230 "%s leaves the game.", &pl->name);
2390 2231
2391 /* update respawn position */ 2232 /* update respawn position */
2392 strcpy(pl->contr->savebed_map, pl->map->path); 2233 strcpy(pl->contr->savebed_map, pl->map->path);
2393 pl->contr->bed_x = pl->x; 2234 pl->contr->bed_x = pl->x;
2394 pl->contr->bed_y = pl->y; 2235 pl->contr->bed_y = pl->y;
… …
2421 if ( ! armor) { 2262 if ( ! armor) {
2422 new_draw_info(NDI_UNIQUE, 0, op, "You need to mark an armor object."); 2263 new_draw_info(NDI_UNIQUE, 0, op, "You need to mark an armor object.");
2423 return; 2264 return;
2424 } 2265 }
2425 if (armor->type != ARMOUR 2266 if (armor->type != ARMOUR
2426 && armor->type != CLOAK 2267 && armor->type != CLOAK
2427 && armor->type != BOOTS && armor->type != GLOVES 2268 && armor->type != BOOTS && armor->type != GLOVES
2428 && armor->type != BRACERS && armor->type != SHIELD 2269 && armor->type != BRACERS && armor->type != SHIELD
2429 && armor->type != HELMET) 2270 && armor->type != HELMET)
2430 { 2271 {
2431 new_draw_info(NDI_UNIQUE, 0,op,"Your marked item is not armour!\n"); 2272 new_draw_info(NDI_UNIQUE, 0,op,"Your marked item is not armour!\n");
2432 return; 2273 return;
2433 } 2274 }
2434 2275
… …
2538int manual_apply (object *op, object *tmp, int aflag) 2379int manual_apply (object *op, object *tmp, int aflag)
2539{ 2380{
2540 if (tmp->head) tmp=tmp->head; 2381 if (tmp->head) tmp=tmp->head;
2541 2382
2542 if (QUERY_FLAG (tmp, FLAG_UNPAID) && ! QUERY_FLAG (tmp, FLAG_APPLIED)) { 2383 if (QUERY_FLAG (tmp, FLAG_UNPAID) && ! QUERY_FLAG (tmp, FLAG_APPLIED)) {
2543 if (op->type == PLAYER) { 2384 if (op->type == PLAYER) {
2544 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first."); 2385 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first.");
2545 return 1; 2386 return 1;
2546 } else { 2387 } else {
2547 return 0; /* monsters just skip unpaid items */ 2388 return 0; /* monsters just skip unpaid items */
2548 } 2389 }
2549 } 2390 }
2550
2551
2552 /* Lauwenmark: Handle for plugin apply event */
2553 //TODO: remove
2554 if (execute_event(tmp, EVENT_APPLY,op,NULL,NULL,SCRIPT_FIX_ALL)!=0)
2555 return 1;
2556 2391
2557 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op))) 2392 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op)))
2558 return 1; 2393 return RESULT_INT (0);
2559 2394
2560 switch (tmp->type) { 2395 switch (tmp->type) {
2561 2396
2562 case TRANSPORT:
2563 return apply_transport(op, tmp, aflag);
2564
2565 case CF_HANDLE: 2397 case CF_HANDLE:
2566 new_draw_info(NDI_UNIQUE, 0,op,"You turn the handle."); 2398 new_draw_info(NDI_UNIQUE, 0,op,"You turn the handle.");
2567 play_sound_map(op->map, op->x, op->y, SOUND_TURN_HANDLE); 2399 play_sound_map(op->map, op->x, op->y, SOUND_TURN_HANDLE);
2568 tmp->value=tmp->value?0:1; 2400 tmp->value=tmp->value?0:1;
2569 SET_ANIMATION(tmp, tmp->value); 2401 SET_ANIMATION(tmp, tmp->value);
2570 update_object(tmp,UP_OBJ_FACE); 2402 update_object(tmp,UP_OBJ_FACE);
2571 push_button(tmp); 2403 push_button(tmp);
2572 return 1; 2404 return 1;
2573 2405
2574 case TRIGGER: 2406 case TRIGGER:
2575 if (check_trigger (tmp, op)) { 2407 if (check_trigger (tmp, op)) {
2576 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2408 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle.");
2577 play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE); 2409 play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE);
2578 } else { 2410 } else {
2579 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move."); 2411 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move.");
2580 } 2412 }
2581 return 1; 2413 return 1;
2582 2414
2583 case EXIT: 2415 case EXIT:
2584 if (op->type != PLAYER) 2416 if (op->type != PLAYER)
2585 return 0; 2417 return 0;
2586 if( ! EXIT_PATH (tmp) || !is_legal_2ways_exit(op,tmp)) { 2418 if( ! EXIT_PATH (tmp) || !is_legal_2ways_exit(op,tmp)) {
2587 new_draw_info_format(NDI_UNIQUE, 0, op, "The %s is closed.", 2419 new_draw_info_format(NDI_UNIQUE, 0, op, "The %s is closed.",
2588 query_name(tmp)); 2420 query_name(tmp));
2589 } else { 2421 } else {
2590 /* Don't display messages for random maps. */ 2422 /* Don't display messages for random maps. */
2591 if (tmp->msg && strncmp(EXIT_PATH(tmp),"/!",2) && 2423 if (tmp->msg && strncmp(EXIT_PATH(tmp),"/!",2) &&
2592 strncmp(EXIT_PATH(tmp), "/random/", 8)) 2424 strncmp(EXIT_PATH(tmp), "/random/", 8))
2593 new_draw_info (NDI_NAVY, 0, op, tmp->msg); 2425 new_draw_info (NDI_NAVY, 0, op, tmp->msg);
2594 enter_exit(op,tmp); 2426 enter_exit(op,tmp);
2595 } 2427 }
2596 return 1; 2428 return 1;
2597 2429
2598 case SIGN: 2430 case SIGN:
2599 apply_sign (op, tmp, 0); 2431 apply_sign (op, tmp, 0);
2600 return 1; 2432 return 1;
2601 2433
2602 case BOOK: 2434 case BOOK:
2603 if (op->type == PLAYER) { 2435 if (op->type == PLAYER) {
2604 apply_book (op, tmp); 2436 apply_book (op, tmp);
2605 return 1; 2437 return 1;
2606 } else { 2438 } else {
2607 return 0; 2439 return 0;
2608 } 2440 }
2609 2441
2610 case SKILLSCROLL: 2442 case SKILLSCROLL:
2611 if (op->type == PLAYER) { 2443 if (op->type == PLAYER) {
2612 apply_skillscroll (op, tmp); 2444 apply_skillscroll (op, tmp);
2613 return 1; 2445 return 1;
2614 } 2446 }
2615 return 0; 2447 return 0;
2616 2448
2617 case SPELLBOOK: 2449 case SPELLBOOK:
2618 if (op->type == PLAYER) { 2450 if (op->type == PLAYER) {
2619 apply_spellbook (op, tmp); 2451 apply_spellbook (op, tmp);
2620 return 1; 2452 return 1;
2621 } 2453 }
2622 return 0; 2454 return 0;
2623 2455
2624 case SCROLL: 2456 case SCROLL:
2625 apply_scroll (op, tmp, 0); 2457 apply_scroll (op, tmp, 0);
2626 return 1; 2458 return 1;
2627 2459
2628 case POTION: 2460 case POTION:
2629 (void) apply_potion(op, tmp); 2461 (void) apply_potion(op, tmp);
2630 return 1; 2462 return 1;
2631 2463
2632 /* Eneq(@csd.uu.se): Handle apply on containers. */ 2464 /* Eneq(@csd.uu.se): Handle apply on containers. */
2633 case CLOSE_CON: 2465 case CLOSE_CON:
2634 if (op->type==PLAYER) 2466 if (op->type==PLAYER)
2635 (void) esrv_apply_container (op, tmp->env); 2467 (void) esrv_apply_container (op, tmp->env);
2636 else 2468 else
2637 (void) apply_container (op, tmp->env); 2469 (void) apply_container (op, tmp->env);
2638 return 1; 2470 return 1;
2639 2471
2640 case CONTAINER: 2472 case CONTAINER:
2641 if (op->type==PLAYER) 2473 if (op->type==PLAYER)
2642 (void) esrv_apply_container (op, tmp); 2474 (void) esrv_apply_container (op, tmp);
2643 else 2475 else
2644 (void) apply_container (op, tmp); 2476 (void) apply_container (op, tmp);
2645 return 1; 2477 return 1;
2646 2478
2647 case TREASURE: 2479 case TREASURE:
2648 if (op->type == PLAYER) { 2480 if (op->type == PLAYER) {
2649 apply_treasure (op, tmp); 2481 apply_treasure (op, tmp);
2650 return 1; 2482 return 1;
2651 } else { 2483 } else {
2652 return 0; 2484 return 0;
2653 } 2485 }
2654 2486
2655 case WEAPON: 2487 case WEAPON:
2656 case ARMOUR: 2488 case ARMOUR:
2657 case BOOTS: 2489 case BOOTS:
2658 case GLOVES: 2490 case GLOVES:
2659 case AMULET: 2491 case AMULET:
2660 case GIRDLE: 2492 case GIRDLE:
2661 case BRACERS: 2493 case BRACERS:
2662 case SHIELD: 2494 case SHIELD:
2663 case HELMET: 2495 case HELMET:
2664 case RING: 2496 case RING:
2665 case CLOAK: 2497 case CLOAK:
2666 case WAND: 2498 case WAND:
2667 case ROD: 2499 case ROD:
2668 case HORN: 2500 case HORN:
2669 case SKILL: 2501 case SKILL:
2670 case BOW: 2502 case BOW:
2671 case LAMP: 2503 case LAMP:
2672 case BUILDER: 2504 case BUILDER:
2673 case SKILL_TOOL: 2505 case SKILL_TOOL:
2674 if (tmp->env != op) 2506 if (tmp->env != op)
2675 return 2; /* not in inventory */ 2507 return 2; /* not in inventory */
2676 (void) apply_special (op, tmp, aflag); 2508 (void) apply_special (op, tmp, aflag);
2677 return 1; 2509 return 1;
2678 2510
2679 case DRINK: 2511 case DRINK:
2680 case FOOD: 2512 case FOOD:
2681 case FLESH: 2513 case FLESH:
2682 apply_food (op, tmp); 2514 apply_food (op, tmp);
2683 return 1; 2515 return 1;
2684 2516
2685 case POISON: 2517 case POISON:
2686 apply_poison (op, tmp); 2518 apply_poison (op, tmp);
2687 return 1; 2519 return 1;
2688 2520
2689 case SAVEBED: 2521 case SAVEBED:
2690 if (op->type == PLAYER) { 2522 if (op->type == PLAYER) {
2691 apply_savebed (op); 2523 apply_savebed (op);
2692 return 1; 2524 return 1;
2693 } else { 2525 } else {
2694 return 0; 2526 return 0;
2695 } 2527 }
2696 2528
2697 case ARMOUR_IMPROVER: 2529 case ARMOUR_IMPROVER:
2698 if (op->type == PLAYER) { 2530 if (op->type == PLAYER) {
2699 apply_armour_improver (op, tmp); 2531 apply_armour_improver (op, tmp);
2700 return 1; 2532 return 1;
2701 } else { 2533 } else {
2702 return 0; 2534 return 0;
2703 } 2535 }
2704 2536
2705 case WEAPON_IMPROVER: 2537 case WEAPON_IMPROVER:
2706 (void) check_improve_weapon(op, tmp); 2538 (void) check_improve_weapon(op, tmp);
2707 return 1; 2539 return 1;
2708 2540
2709 case CLOCK: 2541 case CLOCK:
2710 if (op->type == PLAYER) { 2542 if (op->type == PLAYER) {
2711 char buf[MAX_BUF]; 2543 char buf[MAX_BUF];
2712 timeofday_t tod; 2544 timeofday_t tod;
2713 2545
2714 get_tod(&tod); 2546 get_tod(&tod);
2715 sprintf(buf, "It is %d minute%s past %d o'clock %s", 2547 sprintf(buf, "It is %d minute%s past %d o'clock %s",
2716 tod.minute+1, ((tod.minute+1 < 2) ? "" : "s"), 2548 tod.minute+1, ((tod.minute+1 < 2) ? "" : "s"),
2717 ((tod.hour % 14 == 0) ? 14 : ((tod.hour)%14)), 2549 ((tod.hour % 14 == 0) ? 14 : ((tod.hour)%14)),
2718 ((tod.hour >= 14) ? "pm" : "am")); 2550 ((tod.hour >= 14) ? "pm" : "am"));
2719 play_sound_player_only(op->contr, SOUND_CLOCK,0,0); 2551 play_sound_player_only(op->contr, SOUND_CLOCK,0,0);
2720 new_draw_info(NDI_UNIQUE, 0,op, buf); 2552 new_draw_info(NDI_UNIQUE, 0,op, buf);
2721 return 1; 2553 return 1;
2722 } else { 2554 } else {
2723 return 0; 2555 return 0;
2724 } 2556 }
2725 2557
2726 case MENU: 2558 case MENU:
2727 if (op->type == PLAYER) { 2559 if (op->type == PLAYER) {
2728 shop_listing (op); 2560 shop_listing (op);
2729 return 1; 2561 return 1;
2730 } else { 2562 } else {
2731 return 0; 2563 return 0;
2732 } 2564 }
2733 2565
2734 case POWER_CRYSTAL: 2566 case POWER_CRYSTAL:
2735 apply_power_crystal(op,tmp); /* see egoitem.c */ 2567 apply_power_crystal(op,tmp); /* see egoitem.c */
2736 return 1; 2568 return 1;
2737 2569
2738 case LIGHTER: /* for lighting torches/lanterns/etc */ 2570 case LIGHTER: /* for lighting torches/lanterns/etc */
2739 if (op->type == PLAYER) { 2571 if (op->type == PLAYER) {
2740 apply_lighter(op,tmp); 2572 apply_lighter(op,tmp);
2741 return 1; 2573 return 1;
2742 } else { 2574 } else {
2743 return 0; 2575 return 0;
2744 } 2576 }
2745 2577
2746 case ITEM_TRANSFORMER: 2578 case ITEM_TRANSFORMER:
2747 apply_item_transformer( op, tmp ); 2579 apply_item_transformer( op, tmp );
2748 return 1; 2580 return 1;
2749 2581
2750 default: 2582 default:
2751 return 0; 2583 return 0;
2752 } 2584 }
2753} 2585}
2754 2586
2755 2587
2756/* quiet suppresses the "don't know how to apply" and "you must get it first" 2588/* quiet suppresses the "don't know how to apply" and "you must get it first"
… …
2767 /* player is flying and applying object not in inventory */ 2599 /* player is flying and applying object not in inventory */
2768 if ( ! QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING)) { 2600 if ( ! QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING)) {
2769 new_draw_info (NDI_UNIQUE, 0, pl, "But you are floating high " 2601 new_draw_info (NDI_UNIQUE, 0, pl, "But you are floating high "
2770 "above the ground!"); 2602 "above the ground!");
2771 return 0; 2603 return 0;
2772 } 2604 }
2773 } 2605 }
2774 2606
2775 /* Check for PLAYER to avoid a DM to disappear in a puff of smoke if 2607 /* Check for PLAYER to avoid a DM to disappear in a puff of smoke if
2776 * applied. 2608 * applied.
2777 */ 2609 */
… …
2811void player_apply_below (object *pl) 2643void player_apply_below (object *pl)
2812{ 2644{
2813 object *tmp, *next; 2645 object *tmp, *next;
2814 int floors; 2646 int floors;
2815 2647
2816 if (pl->contr->transport && pl->contr->transport->type == TRANSPORT) {
2817 apply_transport(pl, pl->contr->transport, 0);
2818 return;
2819 }
2820
2821 /* If using a container, set the starting item to be the top 2648 /* If using a container, set the starting item to be the top
2822 * item in the container. Otherwise, use the map. 2649 * item in the container. Otherwise, use the map.
2823 */ 2650 */
2824 tmp = (pl->container != NULL) ? pl->container->inv : pl->below; 2651 tmp = (pl->container != NULL) ? pl->container->inv : pl->below;
2825 2652
… …
2828 * next object in the stack before applying. This is can only be a 2655 * next object in the stack before applying. This is can only be a
2829 * problem if player_apply() has a bug in that it uses the object but does 2656 * problem if player_apply() has a bug in that it uses the object but does
2830 * not return a proper value. 2657 * not return a proper value.
2831 */ 2658 */
2832 for (floors = 0; tmp!=NULL; tmp=next) { 2659 for (floors = 0; tmp!=NULL; tmp=next) {
2833 next = tmp->below; 2660 next = tmp->below;
2834 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 2661 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
2835 floors++; 2662 floors++;
2836 else if (floors > 0) 2663 else if (floors > 0)
2837 return; /* process only floor objects after first floor object */ 2664 return; /* process only floor objects after first floor object */
2838 2665
2839 /* If it is visible, player can apply it. If it is applied by 2666 /* If it is visible, player can apply it. If it is applied by
2840 * person moving on it, also activate. Added code to make it 2667 * person moving on it, also activate. Added code to make it
2841 * so that at least one of players movement types be that which 2668 * so that at least one of players movement types be that which
2842 * the item needs. 2669 * the item needs.
2843 */ 2670 */
2844 if ( ! tmp->invisible || (tmp->move_on & pl->move_type)) { 2671 if ( ! tmp->invisible || (tmp->move_on & pl->move_type)) {
2845 if (player_apply (pl, tmp, 0, 1) == 1) 2672 if (player_apply (pl, tmp, 0, 1) == 1)
2846 return; 2673 return;
2847 } 2674 }
2848 if (floors >= 2) 2675 if (floors >= 2)
2849 return; /* process at most two floor objects */ 2676 return; /* process at most two floor objects */
… …
2856 * Break this out of apply_special - this is just done 2683 * Break this out of apply_special - this is just done
2857 * to keep the size of apply_special to a more managable size. 2684 * to keep the size of apply_special to a more managable size.
2858 */ 2685 */
2859static int unapply_special (object *who, object *op, int aflags) 2686static int unapply_special (object *who, object *op, int aflags)
2860{ 2687{
2688 if (INVOKE_OBJECT (BE_UNREADY, op, ARG_OBJECT (who), ARG_INT (aflags))
2689 || INVOKE_OBJECT (UNREADY, who, ARG_OBJECT (op), ARG_INT (aflags)))
2690 return RESULT_INT (0);
2691
2861 object *tmp2; 2692 object *tmp2;
2862 2693
2863 CLEAR_FLAG(op, FLAG_APPLIED); 2694 CLEAR_FLAG(op, FLAG_APPLIED);
2864 switch(op->type) { 2695 switch(op->type) {
2865 case WEAPON: 2696 case WEAPON:
2866 new_draw_info_format(NDI_UNIQUE, 0, who, "You unwield %s.",query_name(op)); 2697 new_draw_info_format(NDI_UNIQUE, 0, who, "You unwield %s.",query_name(op));
2867 2698
2868 (void) change_abil (who,op); 2699 (void) change_abil (who,op);
2869 if(QUERY_FLAG(who,FLAG_READY_WEAPON)) 2700 if(QUERY_FLAG(who,FLAG_READY_WEAPON))
2870 CLEAR_FLAG(who,FLAG_READY_WEAPON); 2701 CLEAR_FLAG(who,FLAG_READY_WEAPON);
2871 /* GROS: update the current_weapon_script field (used with script_attack for weapons) */
2872 who->current_weapon_script = NULL;
2873 who->current_weapon = NULL;
2874 clear_skill(who); 2702 clear_skill(who);
2875 break; 2703 break;
2876 2704
2877 case SKILL: /* allows objects to impart skills */ 2705 case SKILL: /* allows objects to impart skills */
2878 case SKILL_TOOL: 2706 case SKILL_TOOL:
2879 if (op != who->chosen_skill) { 2707 if (op != who->chosen_skill) {
2880 LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n"); 2708 LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n");
2881 } 2709 }
2882 if (who->type==PLAYER) { 2710 if (who->type==PLAYER) {
2883 if (who->contr->shoottype == range_skill) 2711 if (who->contr->shoottype == range_skill)
2884 who->contr->shoottype = range_none; 2712 who->contr->shoottype = range_none;
2885 if ( ! op->invisible) { 2713 if ( ! op->invisible) {
2886 new_draw_info_format (NDI_UNIQUE, 0, who, 2714 new_draw_info_format (NDI_UNIQUE, 0, who,
2887 "You stop using the %s.", query_name(op)); 2715 "You stop using the %s.", query_name(op));
2888 } else { 2716 } else {
2889 new_draw_info_format (NDI_UNIQUE, 0, who, 2717 new_draw_info_format (NDI_UNIQUE, 0, who,
2890 "You can no longer use the skill: %s.", 2718 "You can no longer use the skill: %s.",
2891 op->skill); 2719 &op->skill);
2892 } 2720 }
2893 } 2721 }
2894 (void) change_abil (who, op); 2722 (void) change_abil (who, op);
2895 who->chosen_skill = NULL; 2723 who->chosen_skill = NULL;
2896 CLEAR_FLAG (who, FLAG_READY_SKILL); 2724 CLEAR_FLAG (who, FLAG_READY_SKILL);
2897 break; 2725 break;
2898 2726
2899 case ARMOUR: 2727 case ARMOUR:
2900 case HELMET: 2728 case HELMET:
2901 case SHIELD: 2729 case SHIELD:
2902 case RING: 2730 case RING:
2903 case BOOTS: 2731 case BOOTS:
2904 case GLOVES: 2732 case GLOVES:
2905 case AMULET: 2733 case AMULET:
2906 case GIRDLE: 2734 case GIRDLE:
2907 case BRACERS: 2735 case BRACERS:
2908 case CLOAK: 2736 case CLOAK:
2909 new_draw_info_format(NDI_UNIQUE, 0, who, "You unwear %s.",query_name(op)); 2737 new_draw_info_format(NDI_UNIQUE, 0, who, "You unwear %s.",query_name(op));
2910 (void) change_abil (who,op); 2738 (void) change_abil (who,op);
2911 break; 2739 break;
2912 case LAMP: 2740 case LAMP:
2913 new_draw_info_format(NDI_UNIQUE, 0, who, "You turn off your %s.", 2741 new_draw_info_format(NDI_UNIQUE, 0, who, "You turn off your %s.",
2914 op->name); 2742 &op->name);
2915 tmp2 = arch_to_object(op->other_arch); 2743 tmp2 = arch_to_object(op->other_arch);
2916 tmp2->x = op->x; 2744 tmp2->x = op->x;
2917 tmp2->y = op->y; 2745 tmp2->y = op->y;
2918 tmp2->map = op->map; 2746 tmp2->map = op->map;
2919 tmp2->below = op->below; 2747 tmp2->below = op->below;
2920 tmp2->above = op->above; 2748 tmp2->above = op->above;
2921 tmp2->stats.food = op->stats.food; 2749 tmp2->stats.food = op->stats.food;
2922 CLEAR_FLAG(tmp2, FLAG_APPLIED); 2750 CLEAR_FLAG(tmp2, FLAG_APPLIED);
2923 if (QUERY_FLAG(op, FLAG_INV_LOCKED)) 2751 if (QUERY_FLAG(op, FLAG_INV_LOCKED))
2924 SET_FLAG(tmp2, FLAG_INV_LOCKED); 2752 SET_FLAG(tmp2, FLAG_INV_LOCKED);
2925 if (who->type == PLAYER) 2753 if (who->type == PLAYER)
2926 esrv_del_item(who->contr, (tag_t)op->count); 2754 esrv_del_item(who->contr, (tag_t)op->count);
2927 remove_ob(op); 2755 remove_ob(op);
2928 free_object(op); 2756 free_object(op);
2929 insert_ob_in_ob(tmp2, who); 2757 insert_ob_in_ob(tmp2, who);
2930 fix_player(who); 2758 fix_player(who);
2931 if (QUERY_FLAG(op, FLAG_CURSED) || QUERY_FLAG(op, FLAG_DAMNED)) { 2759 if (QUERY_FLAG(op, FLAG_CURSED) || QUERY_FLAG(op, FLAG_DAMNED)) {
2932 if (who->type == PLAYER) { 2760 if (who->type == PLAYER) {
2933 new_draw_info(NDI_UNIQUE, 0,who, "Oops, it feels deadly cold!"); 2761 new_draw_info(NDI_UNIQUE, 0,who, "Oops, it feels deadly cold!");
2934 SET_FLAG(tmp2, FLAG_KNOWN_CURSED); 2762 SET_FLAG(tmp2, FLAG_KNOWN_CURSED);
2935 } 2763 }
2936 } 2764 }
2937 if(who->type==PLAYER) 2765 if(who->type==PLAYER)
2938 esrv_send_item(who, tmp2); 2766 esrv_send_item(who, tmp2);
2939 return 1; /* otherwise, an attempt to drop causes problems */ 2767 return 1; /* otherwise, an attempt to drop causes problems */
2940 break; 2768 break;
2941 case BOW: 2769 case BOW:
2942 case WAND: 2770 case WAND:
2943 case ROD: 2771 case ROD:
2944 case HORN: 2772 case HORN:
2945 clear_skill(who); 2773 clear_skill(who);
2946 new_draw_info_format(NDI_UNIQUE, 0, who, "You unready %s.",query_name(op)); 2774 new_draw_info_format(NDI_UNIQUE, 0, who, "You unready %s.",query_name(op));
2947 if(who->type==PLAYER) { 2775 if(who->type==PLAYER) {
2948 who->contr->shoottype = range_none; 2776 who->contr->shoottype = range_none;
2949 } else { 2777 } else {
2950 if (op->type == BOW) 2778 if (op->type == BOW)
2951 CLEAR_FLAG (who, FLAG_READY_BOW); 2779 CLEAR_FLAG (who, FLAG_READY_BOW);
2952 else 2780 else
2953 CLEAR_FLAG(who, FLAG_READY_RANGE); 2781 CLEAR_FLAG(who, FLAG_READY_RANGE);
2954 } 2782 }
2955 break; 2783 break;
2956 2784
2957 case BUILDER: 2785 case BUILDER:
2958 new_draw_info_format(NDI_UNIQUE, 0, who, "You unready %s.",query_name(op)); 2786 new_draw_info_format(NDI_UNIQUE, 0, who, "You unready %s.",query_name(op));
2959 who->contr->shoottype = range_none; 2787 who->contr->shoottype = range_none;
2960 who->contr->ranges[ range_builder ] = NULL; 2788 who->contr->ranges[ range_builder ] = NULL;
2961 break; 2789 break;
2962 2790
2963 default: 2791 default:
2964 new_draw_info_format(NDI_UNIQUE, 0, who, "You unapply %s.",query_name(op)); 2792 new_draw_info_format(NDI_UNIQUE, 0, who, "You unapply %s.",query_name(op));
2965 break; 2793 break;
2966 } 2794 }
2967 2795
2968 fix_player(who); 2796 fix_player(who);
2969 2797
2970 if ( ! (aflags & AP_NO_MERGE)) { 2798 if ( ! (aflags & AP_NO_MERGE)) {
2971 object *tmp; 2799 object *tmp;
2972 2800
2973 tag_t del_tag = op->count; 2801 tag_t del_tag = op->count;
2974 tmp = merge_ob (op, NULL); 2802 tmp = merge_ob (op, NULL);
2975 if (who->type == PLAYER) { 2803 if (who->type == PLAYER) {
2976 if (tmp) { /* it was merged */ 2804 if (tmp) { /* it was merged */
2977 esrv_del_item (who->contr, del_tag); 2805 esrv_del_item (who->contr, del_tag);
2978 op = tmp; 2806 op = tmp;
2979 } 2807 }
2980 esrv_send_item (who, op); 2808 esrv_send_item (who, op);
2981 } 2809 }
2982 } 2810 }
2983 return 0; 2811 return 0;
2984} 2812}
2985 2813
2986/** 2814/**
… …
3002 object *tmp; 2830 object *tmp;
3003 2831
3004 if (!start) return NULL; 2832 if (!start) return NULL;
3005 2833
3006 for (tmp=start; tmp; tmp=tmp->below) 2834 for (tmp=start; tmp; tmp=tmp->below)
3007 if (QUERY_FLAG(tmp, FLAG_APPLIED) && tmp->body_info[loc] && 2835 if (QUERY_FLAG(tmp, FLAG_APPLIED) && tmp->body_info[loc] &&
3008 (!tmp->invisible || tmp->type==SKILL)) return tmp; 2836 (!tmp->invisible || tmp->type==SKILL)) return tmp;
3009 2837
3010 return NULL; 2838 return NULL;
3011} 2839}
3012 2840
3013 2841
… …
3031 /* If we are applying a shield or weapon, unapply any equipped shield 2859 /* If we are applying a shield or weapon, unapply any equipped shield
3032 * or weapons first - only allowed to use one weapon/shield at a time. 2860 * or weapons first - only allowed to use one weapon/shield at a time.
3033 */ 2861 */
3034 if (op->type == WEAPON || op->type == SHIELD) { 2862 if (op->type == WEAPON || op->type == SHIELD) {
3035 for (tmp=who->inv; tmp; tmp=tmp->below) { 2863 for (tmp=who->inv; tmp; tmp=tmp->below) {
3036 if (QUERY_FLAG(tmp, FLAG_APPLIED) && tmp->type == op->type) { 2864 if (QUERY_FLAG(tmp, FLAG_APPLIED) && tmp->type == op->type) {
3037 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || 2865 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) ||
3038 (!QUERY_FLAG(tmp, FLAG_CURSED) && !QUERY_FLAG(tmp, FLAG_DAMNED))) { 2866 (!QUERY_FLAG(tmp, FLAG_CURSED) && !QUERY_FLAG(tmp, FLAG_DAMNED))) {
3039 if (aflags & AP_PRINT) 2867 if (aflags & AP_PRINT)
3040 new_draw_info(NDI_UNIQUE, 0, who, query_name(tmp)); 2868 new_draw_info(NDI_UNIQUE, 0, who, query_name(tmp));
3041 else 2869 else
3042 unapply_special(who, tmp, aflags); 2870 unapply_special(who, tmp, aflags);
3043 } 2871 }
3044 else { 2872 else {
3045 /* In this case, we want to try and remove a cursed item. 2873 /* In this case, we want to try and remove a cursed item.
3046 * While we know it won't work, we want unapply_special to 2874 * While we know it won't work, we want unapply_special to
3047 * at least generate the message. 2875 * at least generate the message.
3048 */ 2876 */
3049 new_draw_info_format(NDI_UNIQUE, 0, who, 2877 new_draw_info_format(NDI_UNIQUE, 0, who,
3050 "No matter how hard you try, you just can't\nremove %s.", 2878 "No matter how hard you try, you just can't\nremove %s.",
3051 query_name(tmp)); 2879 query_name(tmp));
3052 return 1; 2880 return 1;
3053 } 2881 }
3054 2882
3055 } 2883 }
3056 } 2884 }
3057 } 2885 }
3058 2886
3059 for (i=0; i<NUM_BODY_LOCATIONS; i++) { 2887 for (i=0; i<NUM_BODY_LOCATIONS; i++) {
3060 /* this used up a slot that we need to free */ 2888 /* this used up a slot that we need to free */
3061 if (op->body_info[i]) { 2889 if (op->body_info[i]) {
3062 last = who->inv; 2890 last = who->inv;
3063 2891
3064 /* We do a while loop - may need to remove several items in order 2892 /* We do a while loop - may need to remove several items in order
3065 * to free up enough slots. 2893 * to free up enough slots.
3066 */ 2894 */
3067 while ((who->body_used[i] + op->body_info[i]) < 0) { 2895 while ((who->body_used[i] + op->body_info[i]) < 0) {
3068 tmp = get_item_from_body_location(last, i); 2896 tmp = get_item_from_body_location(last, i);
3069 if (!tmp) { 2897 if (!tmp) {
3070#if 0 2898#if 0
3071 /* Not a bug - we'll get this if the player has cursed items 2899 /* Not a bug - we'll get this if the player has cursed items
3072 * equipped. 2900 * equipped.
3073 */ 2901 */
3074 LOG(llevError,"Can't find object using location %d (%s) on %s\n", 2902 LOG(llevError,"Can't find object using location %d (%s) on %s\n",
3075 i, body_locations[i].save_name, who->name); 2903 i, body_locations[i].save_name, who->name);
3076#endif 2904#endif
3077 return 1; 2905 return 1;
3078 } 2906 }
3079 /* If we are just printing, we don't care about cursed status */ 2907 /* If we are just printing, we don't care about cursed status */
3080 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || 2908 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) ||
3081 (!(QUERY_FLAG(tmp, FLAG_CURSED) || QUERY_FLAG(tmp, FLAG_DAMNED)))) { 2909 (!(QUERY_FLAG(tmp, FLAG_CURSED) || QUERY_FLAG(tmp, FLAG_DAMNED)))) {
3082 if (aflags & AP_PRINT) 2910 if (aflags & AP_PRINT)
3083 new_draw_info(NDI_UNIQUE, 0, who, query_name(tmp)); 2911 new_draw_info(NDI_UNIQUE, 0, who, query_name(tmp));
3084 else 2912 else
3085 unapply_special(who, tmp, aflags); 2913 unapply_special(who, tmp, aflags);
3086 } 2914 }
3087 else { 2915 else {
3088 /* Cursed item that we can't unequip - tell the player. 2916 /* Cursed item that we can't unequip - tell the player.
3089 * Note this could be annoying if this is just one of a few, 2917 * Note this could be annoying if this is just one of a few,
3090 * so it may not be critical (eg, putting on a ring and you have 2918 * so it may not be critical (eg, putting on a ring and you have
3091 * one cursed ring.) 2919 * one cursed ring.)
3092 */ 2920 */
3093 new_draw_info_format(NDI_UNIQUE, 0, who, "The %s just won't come off", query_name(tmp)); 2921 new_draw_info_format(NDI_UNIQUE, 0, who, "The %s just won't come off", query_name(tmp));
3094 } 2922 }
3095 last = tmp->below; 2923 last = tmp->below;
3096 } 2924 }
3097 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the 2925 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the
3098 * return in the !tmp would have kicked in. 2926 * return in the !tmp would have kicked in.
3099 */ 2927 */
3100 } /* if op is using this body location */ 2928 } /* if op is using this body location */
3101 } /* for body lcoations */ 2929 } /* for body lcoations */
3102 return 0; 2930 return 0;
3103} 2931}
3104 2932
3105/** 2933/**
… …
3113 * See include/define.h for detailed description of the meaning of 2941 * See include/define.h for detailed description of the meaning of
3114 * these return values. 2942 * these return values.
3115 */ 2943 */
3116int can_apply_object(object *who, object *op) 2944int can_apply_object(object *who, object *op)
3117{ 2945{
2946 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who))
2947 || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op)))
2948 return RESULT_INT (0);
2949
3118 int i, retval=0; 2950 int i, retval=0;
3119 object *tmp=NULL, *ws=NULL; 2951 object *tmp=NULL, *ws=NULL;
3120 2952
3121 /* Players have 2 'arm's, so they could in theory equip 2 shields or 2953 /* Players have 2 'arm's, so they could in theory equip 2 shields or
3122 * 2 weapons, but we don't want to let them do that. So if they are 2954 * 2 weapons, but we don't want to let them do that. So if they are
3123 * trying to equip a weapon or shield, see if they already have one 2955 * trying to equip a weapon or shield, see if they already have one
3124 * in place and store that way. 2956 * in place and store that way.
3125 */ 2957 */
3126 if (op->type == WEAPON || op->type == SHIELD) { 2958 if (op->type == WEAPON || op->type == SHIELD) {
3127 for (tmp=who->inv; tmp && !ws; tmp=tmp->below) { 2959 for (tmp=who->inv; tmp && !ws; tmp=tmp->below) {
3128 if (QUERY_FLAG(tmp, FLAG_APPLIED) && tmp->type == op->type) { 2960 if (QUERY_FLAG(tmp, FLAG_APPLIED) && tmp->type == op->type) {
3129 retval = CAN_APPLY_UNAPPLY; 2961 retval = CAN_APPLY_UNAPPLY;
3130 ws = tmp; 2962 ws = tmp;
2963 }
2964 }
3131 } 2965 }
3132 } 2966
3133 }
3134
3135 2967
3136 for (i=0; i<NUM_BODY_LOCATIONS; i++) { 2968 for (i=0; i<NUM_BODY_LOCATIONS; i++) {
3137 if (op->body_info[i]) { 2969 if (op->body_info[i]) {
3138 /* Item uses more slots than we have */ 2970 /* Item uses more slots than we have */
3139 if (FABS(op->body_info[i]) > who->body_info[i]) { 2971 if (FABS(op->body_info[i]) > who->body_info[i]) {
3140 /* Could return now for efficiently - rest of info below isn' 2972 /* Could return now for efficiently - rest of info below isn'
3141 * really needed. 2973 * really needed.
3142 */ 2974 */
3143 retval |= CAN_APPLY_NEVER; 2975 retval |= CAN_APPLY_NEVER;
3144 } else if ((who->body_used[i] + op->body_info[i]) < 0) { 2976 } else if ((who->body_used[i] + op->body_info[i]) < 0) {
3145 /* in this case, equipping this would use more free spots than 2977 /* in this case, equipping this would use more free spots than
3146 * we have. 2978 * we have.
3147 */ 2979 */
3148 object *tmp1; 2980 object *tmp1;
3149 2981
3150 2982
3151 /* if we have an applied weapon/shield, and unapply it would free 2983 /* if we have an applied weapon/shield, and unapply it would free
3152 * enough slots to equip the new item, then just set this can 2984 * enough slots to equip the new item, then just set this can
3153 * continue. We don't care about the logic below - if you have 2985 * continue. We don't care about the logic below - if you have
3154 * shield equipped and try to equip another shield, there is only 2986 * shield equipped and try to equip another shield, there is only
3155 * one choice. However, the check for the number of body locations 2987 * one choice. However, the check for the number of body locations
3156 * does take into the account cases where what is being applied 2988 * does take into the account cases where what is being applied
3157 * may be two handed for example. 2989 * may be two handed for example.
3158 */ 2990 */
3159 if (ws) { 2991 if (ws) {
3160 if ((who->body_used[i] - ws->body_info[i] + op->body_info[i]) >=0) { 2992 if ((who->body_used[i] - ws->body_info[i] + op->body_info[i]) >=0) {
3161 retval |= CAN_APPLY_UNAPPLY; 2993 retval |= CAN_APPLY_UNAPPLY;
3162 continue; 2994 continue;
3163 } 2995 }
3164 } 2996 }
3165 2997
3166 tmp1 = get_item_from_body_location(who->inv, i); 2998 tmp1 = get_item_from_body_location(who->inv, i);
3167 if (!tmp1) { 2999 if (!tmp1) {
3168#if 0 3000#if 0
3169 /* This is sort of an error, but happens a lot when old players 3001 /* This is sort of an error, but happens a lot when old players
3170 * join in with more stuff equipped than they are now allowed. 3002 * join in with more stuff equipped than they are now allowed.
3171 */ 3003 */
3172 LOG(llevError,"Can't find object using location %d on %s\n", 3004 LOG(llevError,"Can't find object using location %d on %s\n",
3173 i, who->name); 3005 i, who->name);
3174#endif 3006#endif
3175 retval |= CAN_APPLY_NEVER; 3007 retval |= CAN_APPLY_NEVER;
3176 } else { 3008 } else {
3177 /* need to unapply something. However, if this something 3009 /* need to unapply something. However, if this something
3178 * is different than we had found before, it means they need 3010 * is different than we had found before, it means they need
3179 * to apply multiple objects 3011 * to apply multiple objects
3180 */ 3012 */
3181 retval |= CAN_APPLY_UNAPPLY; 3013 retval |= CAN_APPLY_UNAPPLY;
3182 if (!tmp) tmp = tmp1; 3014 if (!tmp) tmp = tmp1;
3183 else if (tmp != tmp1) { 3015 else if (tmp != tmp1) {
3184 retval |= CAN_APPLY_UNAPPLY_MULT; 3016 retval |= CAN_APPLY_UNAPPLY_MULT;
3185 } 3017 }
3186 /* This object isn't using up all the slots, so there must 3018 /* This object isn't using up all the slots, so there must
3187 * be another. If so, and it the new item doesn't need all 3019 * be another. If so, and it the new item doesn't need all
3188 * the slots, the player then has a choice. 3020 * the slots, the player then has a choice.
3189 */ 3021 */
3190 if (((who->body_used[i] - tmp1->body_info[i]) != who->body_info[i]) && 3022 if (((who->body_used[i] - tmp1->body_info[i]) != who->body_info[i]) &&
3191 (FABS(op->body_info[i]) < who->body_info[i])) 3023 (FABS(op->body_info[i]) < who->body_info[i]))
3192 retval |= CAN_APPLY_UNAPPLY_CHOICE; 3024 retval |= CAN_APPLY_UNAPPLY_CHOICE;
3193 3025
3194 /* Does unequippint 'tmp1' free up enough slots for this to be 3026 /* Does unequippint 'tmp1' free up enough slots for this to be
3195 * equipped? If not, there must be something else to unapply. 3027 * equipped? If not, there must be something else to unapply.
3196 */ 3028 */
3197 if ((who->body_used[i] + op->body_info[i] - tmp1->body_info[i]) < 0) 3029 if ((who->body_used[i] + op->body_info[i] - tmp1->body_info[i]) < 0)
3198 retval |= CAN_APPLY_UNAPPLY_MULT; 3030 retval |= CAN_APPLY_UNAPPLY_MULT;
3199 3031
3200 } 3032 }
3201 } /* if not enough free slots */ 3033 } /* if not enough free slots */
3202 } /* if this object uses location i */ 3034 } /* if this object uses location i */
3203 } /* for i -> num_body_locations loop */ 3035 } /* for i -> num_body_locations loop */
3204 3036
3205 /* Note that we don't check for FLAG_USE_ARMOUR - that should 3037 /* Note that we don't check for FLAG_USE_ARMOUR - that should
3206 * really be controlled by use of body locations. We do have 3038 * really be controlled by use of body locations. We do have
3207 * the weapon/shield checks, and the range checks for monsters, 3039 * the weapon/shield checks, and the range checks for monsters,
3208 * because you can't control those just by body location - bows, shields, 3040 * because you can't control those just by body location - bows, shields,
3209 * and weapons all use the same slot. Similar for horn/rod/wand - they 3041 * and weapons all use the same slot. Similar for horn/rod/wand - they
3210 * all use the same location. 3042 * all use the same location.
3211 */ 3043 */
3212 if (op->type == WEAPON && !QUERY_FLAG(who,FLAG_USE_WEAPON)) 3044 if (op->type == WEAPON && !QUERY_FLAG(who,FLAG_USE_WEAPON))
3213 retval |= CAN_APPLY_RESTRICTION; 3045 retval |= CAN_APPLY_RESTRICTION;
3214 if (op->type == SHIELD && !QUERY_FLAG(who,FLAG_USE_SHIELD)) 3046 if (op->type == SHIELD && !QUERY_FLAG(who,FLAG_USE_SHIELD))
3215 retval |= CAN_APPLY_RESTRICTION; 3047 retval |= CAN_APPLY_RESTRICTION;
3216 3048
3217 3049
3218 if (who->type != PLAYER) { 3050 if (who->type != PLAYER) {
3219 if ((op->type == WAND || op->type == HORN || op->type==ROD) 3051 if ((op->type == WAND || op->type == HORN || op->type==ROD)
3220 && !QUERY_FLAG(who, FLAG_USE_RANGE)) 3052 && !QUERY_FLAG(who, FLAG_USE_RANGE))
3221 retval |= CAN_APPLY_RESTRICTION; 3053 retval |= CAN_APPLY_RESTRICTION;
3222 if (op->type == BOW && !QUERY_FLAG(who, FLAG_USE_BOW)) 3054 if (op->type == BOW && !QUERY_FLAG(who, FLAG_USE_BOW))
3223 retval |= CAN_APPLY_RESTRICTION; 3055 retval |= CAN_APPLY_RESTRICTION;
3224 if (op->type == RING && !QUERY_FLAG(who, FLAG_USE_RING)) 3056 if (op->type == RING && !QUERY_FLAG(who, FLAG_USE_RING))
3225 retval |= CAN_APPLY_RESTRICTION; 3057 retval |= CAN_APPLY_RESTRICTION;
3226 if (op->type == BOW && !QUERY_FLAG(who, FLAG_USE_BOW)) 3058 if (op->type == BOW && !QUERY_FLAG(who, FLAG_USE_BOW))
3227 retval |= CAN_APPLY_RESTRICTION; 3059 retval |= CAN_APPLY_RESTRICTION;
3228 } 3060 }
3229 return retval; 3061 return retval;
3230} 3062}
3231 3063
3232 3064
3233 3065
3234/** 3066/**
3235 * who is the object using the object. It can be a monster. 3067 * who is the object using the object. It can be a monster.
3236 * op is the object they are using. op is an equipment type item, 3068 * op is the object they are using. op is an equipment type item,
3237 * eg, one which you put on and keep on for a while, and not something 3069 * eg, one which you put on and keep on for a while, and not something
… …
3258 int basic_flag = aflags & AP_BASIC_FLAGS; 3090 int basic_flag = aflags & AP_BASIC_FLAGS;
3259 object *tmp, *tmp2, *skop=NULL; 3091 object *tmp, *tmp2, *skop=NULL;
3260 int i; 3092 int i;
3261 3093
3262 if(who==NULL) { 3094 if(who==NULL) {
3263 LOG(llevError,"apply_special() from object without environment.\n"); 3095 LOG(llevError,"apply_special() from object without environment.\n");
3264 return 1; 3096 return 1;
3265 } 3097 }
3266 3098
3267 if(op->env!=who) 3099 if(op->env!=who)
3268 return 1; /* op is not in inventory */ 3100 return 1; /* op is not in inventory */
3269 3101
3270 /* trying to unequip op */ 3102 /* trying to unequip op */
3271 if (QUERY_FLAG(op,FLAG_APPLIED)) { 3103 if (QUERY_FLAG(op,FLAG_APPLIED)) {
3272 /* always apply, so no reason to unapply */ 3104 /* always apply, so no reason to unapply */
3273 if (basic_flag == AP_APPLY) return 0; 3105 if (basic_flag == AP_APPLY) return 0;
3274 3106
3275 if ( ! (aflags & AP_IGNORE_CURSE) 3107 if ( ! (aflags & AP_IGNORE_CURSE)
3276 && (QUERY_FLAG(op, FLAG_CURSED) || QUERY_FLAG(op, FLAG_DAMNED))) { 3108 && (QUERY_FLAG(op, FLAG_CURSED) || QUERY_FLAG(op, FLAG_DAMNED))) {
3277 new_draw_info_format(NDI_UNIQUE, 0, who, 3109 new_draw_info_format(NDI_UNIQUE, 0, who,
3278 "No matter how hard you try, you just can't\nremove %s.", 3110 "No matter how hard you try, you just can't\nremove %s.",
3279 query_name(op)); 3111 query_name(op));
3280 return 1; 3112 return 1;
3281 } 3113 }
3282 return unapply_special(who, op, aflags); 3114 return unapply_special(who, op, aflags);
3283 } 3115 }
3284 3116
3285 if (basic_flag == AP_UNAPPLY) return 0; 3117 if (basic_flag == AP_UNAPPLY) return 0;
3286 3118
3287 i = can_apply_object(who, op); 3119 i = can_apply_object(who, op);
3288 3120
3289 /* Can't just apply this object. Lets see what not and what to do */ 3121 /* Can't just apply this object. Lets see what not and what to do */
3290 if (i) { 3122 if (i) {
3291 if (i & CAN_APPLY_NEVER) { 3123 if (i & CAN_APPLY_NEVER) {
3292 new_draw_info_format(NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name(op)); 3124 new_draw_info_format(NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name(op));
3293 return 1; 3125 return 1;
3294 } else if (i & CAN_APPLY_RESTRICTION) { 3126 } else if (i & CAN_APPLY_RESTRICTION) {
3295 new_draw_info_format(NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name(op)); 3127 new_draw_info_format(NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name(op));
3296 return 1; 3128 return 1;
3297 } 3129 }
3298 if (who->type != PLAYER) { 3130 if (who->type != PLAYER) {
3299 /* Some error, so don't try to equip something more */ 3131 /* Some error, so don't try to equip something more */
3300 if (unapply_for_ob(who, op, aflags)) return 1; 3132 if (unapply_for_ob(who, op, aflags)) return 1;
3301 } else { 3133 } else {
3302 if (who->contr->unapply == unapply_never || 3134 if (who->contr->unapply == unapply_never ||
3303 (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice)) { 3135 (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice)) {
3304 new_draw_info(NDI_UNIQUE, 0, who, "You need to unapply some item(s):"); 3136 new_draw_info(NDI_UNIQUE, 0, who, "You need to unapply some item(s):");
3305 unapply_for_ob(who, op, AP_PRINT); 3137 unapply_for_ob(who, op, AP_PRINT);
3306 return 1; 3138 return 1;
3307 } 3139 }
3308 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE)) { 3140 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE)) {
3309 i = unapply_for_ob(who, op, aflags); 3141 i = unapply_for_ob(who, op, aflags);
3310 if (i) return 1; 3142 if (i) return 1;
3311 } 3143 }
3312 } 3144 }
3313 } 3145 }
3314 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL) { 3146 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL) {
3315 skop=find_skill_by_name(who, op->skill); 3147 skop=find_skill_by_name(who, op->skill);
3316 if (!skop) { 3148 if (!skop) {
3317 new_draw_info_format(NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", op->skill); 3149 new_draw_info_format(NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill);
3318 return 1; 3150 return 1;
3319 } else { 3151 } else {
3320 /* While experience will be credited properly, we want to change the 3152 /* While experience will be credited properly, we want to change the
3321 * skill so that the dam and wc get updated 3153 * skill so that the dam and wc get updated
3322 */ 3154 */
3323 change_skill(who, skop, 0); 3155 change_skill(who, skop, 0);
3324 } 3156 }
3325 } 3157 }
3326 3158
3327 if (who->type == PLAYER && op->item_power && 3159 if (who->type == PLAYER && op->item_power &&
3328 (op->item_power + who->contr->item_power) > (settings.item_power_factor * who->level)) { 3160 (op->item_power + who->contr->item_power) > (settings.item_power_factor * who->level)) {
3329 new_draw_info(NDI_UNIQUE, 0, who, "Equipping that combined with other items would consume your soul!"); 3161 new_draw_info(NDI_UNIQUE, 0, who, "Equipping that combined with other items would consume your soul!");
3330 return 1; 3162 return 1;
3331 } 3163 }
3332 3164
3333 3165
3334 /* Ok. We are now at the state where we can apply the new object. 3166 /* Ok. We are now at the state where we can apply the new object.
3335 * Note that we don't have the checks for can_use_... 3167 * Note that we don't have the checks for can_use_...
3336 * below - that is already taken care of by can_apply_object. 3168 * below - that is already taken care of by can_apply_object.
3337 */ 3169 */
3338 3170
3339 3171
3340 if(op->nrof > 1) 3172 if(op->nrof > 1)
3341 tmp = get_split_ob(op,op->nrof - 1); 3173 tmp = get_split_ob(op,op->nrof - 1);
3342 else 3174 else
3343 tmp = NULL; 3175 tmp = NULL;
3176
3177 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who))
3178 || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
3179 return RESULT_INT (0);
3344 3180
3345 switch(op->type) { 3181 switch(op->type) {
3346 case WEAPON: 3182 case WEAPON:
3347 if (!check_weapon_power(who, op->last_eat)) { 3183 if (!check_weapon_power(who, op->last_eat)) {
3348 new_draw_info(NDI_UNIQUE, 0,who, 3184 new_draw_info(NDI_UNIQUE, 0,who,
3349 "That weapon is too powerful for you to use."); 3185 "That weapon is too powerful for you to use.");
3350 new_draw_info(NDI_UNIQUE, 0, who, "It would consume your soul!."); 3186 new_draw_info(NDI_UNIQUE, 0, who, "It would consume your soul!.");
3351 if(tmp!=NULL) 3187 if(tmp!=NULL)
3352 (void) insert_ob_in_ob(tmp,who); 3188 (void) insert_ob_in_ob(tmp,who);
3353 return 1; 3189 return 1;
3354 } 3190 }
3355 if( op->level && (strncmp(op->name,who->name,strlen(who->name)))) { 3191 if( op->level && (strncmp(op->name,who->name,strlen(who->name)))) {
3356 /* if the weapon does not have the name as the character, can't use it. */ 3192 /* if the weapon does not have the name as the character, can't use it. */
3357 /* (Ragnarok's sword attempted to be used by Foo: won't work) */ 3193 /* (Ragnarok's sword attempted to be used by Foo: won't work) */
3358 new_draw_info(NDI_UNIQUE, 0,who,"The weapon does not recognize you as its owner."); 3194 new_draw_info(NDI_UNIQUE, 0,who,"The weapon does not recognize you as its owner.");
3359 if(tmp!=NULL) 3195 if(tmp!=NULL)
3360 (void) insert_ob_in_ob(tmp,who); 3196 (void) insert_ob_in_ob(tmp,who);
3361 return 1; 3197 return 1;
3362 } 3198 }
3363 SET_FLAG(op, FLAG_APPLIED); 3199 SET_FLAG(op, FLAG_APPLIED);
3364 3200
3365 if (skop) change_skill(who, skop, 1); 3201 if (skop) change_skill(who, skop, 1);
3366 if(!QUERY_FLAG(who,FLAG_READY_WEAPON)) 3202 if(!QUERY_FLAG(who,FLAG_READY_WEAPON))
3367 SET_FLAG(who, FLAG_READY_WEAPON); 3203 SET_FLAG(who, FLAG_READY_WEAPON);
3368 3204
3369 new_draw_info_format(NDI_UNIQUE, 0, who, "You wield %s.",query_name(op)); 3205 new_draw_info_format(NDI_UNIQUE, 0, who, "You wield %s.",query_name(op));
3370 3206
3371 (void) change_abil (who,op); 3207 (void) change_abil (who,op);
3372 /* GROS: update the current_weapon_script field (used with EVENT_ATTACK for weapons) */ 3208 break;
3373 /*if ((evt = find_event(op, EVENT_ATTACK)) != NULL) {
3374 LOG(llevDebug, "Scripting Weapon wielded\n");
3375 if (who->current_weapon_script) free_string(who->current_weapon_script);
3376 who->current_weapon_script=add_string(query_name(op));
3377 }
3378 who->current_weapon = op;*/
3379 break;
3380 3209
3381 case ARMOUR: 3210 case ARMOUR:
3382 case HELMET: 3211 case HELMET:
3383 case SHIELD: 3212 case SHIELD:
3384 case BOOTS: 3213 case BOOTS:
3385 case GLOVES: 3214 case GLOVES:
3386 case GIRDLE: 3215 case GIRDLE:
3387 case BRACERS: 3216 case BRACERS:
3388 case CLOAK: 3217 case CLOAK:
3389 case RING: 3218 case RING:
3390 case AMULET: 3219 case AMULET:
3391 SET_FLAG(op, FLAG_APPLIED); 3220 SET_FLAG(op, FLAG_APPLIED);
3392 new_draw_info_format(NDI_UNIQUE, 0, who, "You wear %s.",query_name(op)); 3221 new_draw_info_format(NDI_UNIQUE, 0, who, "You wear %s.",query_name(op));
3393 (void) change_abil (who,op); 3222 (void) change_abil (who,op);
3394 break; 3223 break;
3395 case LAMP: 3224 case LAMP:
3396 if (op->stats.food < 1) { 3225 if (op->stats.food < 1) {
3397 new_draw_info_format(NDI_UNIQUE, 0, who, "Your %s is out of" 3226 new_draw_info_format(NDI_UNIQUE, 0, who, "Your %s is out of"
3398 " fuel!", op->name); 3227 " fuel!", &op->name);
3399 return 1; 3228 return 1;
3400 } 3229 }
3401 new_draw_info_format(NDI_UNIQUE, 0, who, "You turn on your %s.", 3230 new_draw_info_format(NDI_UNIQUE, 0, who, "You turn on your %s.",
3402 op->name); 3231 &op->name);
3403 tmp2 = arch_to_object(op->other_arch); 3232 tmp2 = arch_to_object(op->other_arch);
3404 tmp2->stats.food = op->stats.food; 3233 tmp2->stats.food = op->stats.food;
3405 SET_FLAG(tmp2, FLAG_APPLIED); 3234 SET_FLAG(tmp2, FLAG_APPLIED);
3406 if (QUERY_FLAG(op, FLAG_INV_LOCKED)) 3235 if (QUERY_FLAG(op, FLAG_INV_LOCKED))
3407 SET_FLAG(tmp2, FLAG_INV_LOCKED); 3236 SET_FLAG(tmp2, FLAG_INV_LOCKED);
3408 insert_ob_in_ob(tmp2, who); 3237 insert_ob_in_ob(tmp2, who);
3409 3238
3410 /* Remove the old lantern */ 3239 /* Remove the old lantern */
3411 if (who->type == PLAYER) 3240 if (who->type == PLAYER)
3412 esrv_del_item(who->contr, (tag_t)op->count); 3241 esrv_del_item(who->contr, (tag_t)op->count);
3413 remove_ob(op); 3242 remove_ob(op);
3414 free_object(op); 3243 free_object(op);
3415 3244
3416 /* insert the portion that was split off */ 3245 /* insert the portion that was split off */
3417 if(tmp!=NULL) { 3246 if(tmp!=NULL) {
3418 (void) insert_ob_in_ob(tmp,who); 3247 (void) insert_ob_in_ob(tmp,who);
3419 if(who->type==PLAYER) 3248 if(who->type==PLAYER)
3420 esrv_send_item(who, tmp); 3249 esrv_send_item(who, tmp);
3421 } 3250 }
3422 fix_player(who); 3251 fix_player(who);
3423 if (QUERY_FLAG(op, FLAG_CURSED) || QUERY_FLAG(op, FLAG_DAMNED)) { 3252 if (QUERY_FLAG(op, FLAG_CURSED) || QUERY_FLAG(op, FLAG_DAMNED)) {
3424 if (who->type == PLAYER) { 3253 if (who->type == PLAYER) {
3425 new_draw_info(NDI_UNIQUE, 0,who, "Oops, it feels deadly cold!"); 3254 new_draw_info(NDI_UNIQUE, 0,who, "Oops, it feels deadly cold!");
3426 SET_FLAG(tmp2, FLAG_KNOWN_CURSED); 3255 SET_FLAG(tmp2, FLAG_KNOWN_CURSED);
3427 } 3256 }
3428 } 3257 }
3429 if(who->type==PLAYER) 3258 if(who->type==PLAYER)
3430 esrv_send_item(who, tmp2); 3259 esrv_send_item(who, tmp2);
3431 return 0; 3260 return 0;
3432 break; 3261 break;
3433 3262
3434 /* this part is needed for skill-tools */ 3263 /* this part is needed for skill-tools */
3435 case SKILL: 3264 case SKILL:
3436 case SKILL_TOOL: 3265 case SKILL_TOOL:
3437 if (who->chosen_skill) { 3266 if (who->chosen_skill) {
3438 LOG (llevError, "BUG: apply_special(): can't apply two skills\n"); 3267 LOG (llevError, "BUG: apply_special(): can't apply two skills\n");
3439 return 1; 3268 return 1;
3440 } 3269 }
3441 if (who->type == PLAYER) { 3270 if (who->type == PLAYER) {
3442 who->contr->shoottype = range_skill; 3271 who->contr->shoottype = range_skill;
3443 who->contr->ranges[range_skill] = op; 3272 who->contr->ranges[range_skill] = op;
3444 if ( ! op->invisible) { 3273 if ( ! op->invisible) {
3445 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", 3274 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.",
3446 query_name (op)); 3275 query_name (op));
3447 new_draw_info_format (NDI_UNIQUE, 0, who, 3276 new_draw_info_format (NDI_UNIQUE, 0, who,
3448 "You can now use the skill: %s.", 3277 "You can now use the skill: %s.",
3449 op->skill); 3278 &op->skill);
3450 } else { 3279 } else {
3451 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", 3280 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.",
3452 op->skill? op->skill:op->name); 3281 op->skill ? &op->skill : &op->name);
3453 } 3282 }
3454 } 3283 }
3455 SET_FLAG (op, FLAG_APPLIED); 3284 SET_FLAG (op, FLAG_APPLIED);
3456 (void) change_abil (who, op); 3285 (void) change_abil (who, op);
3457 who->chosen_skill = op; 3286 who->chosen_skill = op;
3458 SET_FLAG (who, FLAG_READY_SKILL); 3287 SET_FLAG (who, FLAG_READY_SKILL);
3459 break; 3288 break;
3460 3289
3461 case BOW: 3290 case BOW:
3462 if (!check_weapon_power(who, op->last_eat)) { 3291 if (!check_weapon_power(who, op->last_eat)) {
3463 new_draw_info(NDI_UNIQUE, 0, who, 3292 new_draw_info(NDI_UNIQUE, 0, who,
3464 "That item is too powerful for you to use."); 3293 "That item is too powerful for you to use.");
3465 new_draw_info(NDI_UNIQUE, 0, who, "It would consume your soul!."); 3294 new_draw_info(NDI_UNIQUE, 0, who, "It would consume your soul!.");
3466 if(tmp != NULL) 3295 if(tmp != NULL)
3467 (void)insert_ob_in_ob(tmp,who); 3296 (void)insert_ob_in_ob(tmp,who);
3468 return 1; 3297 return 1;
3469 } 3298 }
3470 if( op->level && (strncmp(op->name,who->name,strlen(who->name)))) { 3299 if( op->level && (strncmp(op->name,who->name,strlen(who->name)))) {
3471 new_draw_info(NDI_UNIQUE, 0, who, 3300 new_draw_info(NDI_UNIQUE, 0, who,
3472 "The weapon does not recognize you as its owner."); 3301 "The weapon does not recognize you as its owner.");
3473 if(tmp != NULL) 3302 if(tmp != NULL)
3474 (void)insert_ob_in_ob(tmp,who); 3303 (void)insert_ob_in_ob(tmp,who);
3475 return 1; 3304 return 1;
3476 } 3305 }
3477 /*FALLTHROUGH*/ 3306 /*FALLTHROUGH*/
3478 case WAND: 3307 case WAND:
3479 case ROD: 3308 case ROD:
3480 case HORN: 3309 case HORN:
3481 /* check for skill, alter player status */ 3310 /* check for skill, alter player status */
3482 SET_FLAG(op, FLAG_APPLIED); 3311 SET_FLAG(op, FLAG_APPLIED);
3483 if (skop) change_skill(who, skop, 0); 3312 if (skop) change_skill(who, skop, 0);
3484 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name(op)); 3313 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name(op));
3485 3314
3486 if(who->type==PLAYER) { 3315 if(who->type==PLAYER) {
3487 if (op->type == BOW) { 3316 if (op->type == BOW) {
3488 (void)change_abil(who, op); 3317 (void)change_abil(who, op);
3489 new_draw_info_format (NDI_UNIQUE, 0, who, 3318 new_draw_info_format (NDI_UNIQUE, 0, who,
3490 "You will now fire %s with %s.", 3319 "You will now fire %s with %s.",
3491 op->race ? op->race : "nothing", query_name(op)); 3320 op->race ? &op->race : "nothing", query_name(op));
3492 who->contr->shoottype = range_bow; 3321 who->contr->shoottype = range_bow;
3493 } else { 3322 } else {
3494 who->contr->shoottype = range_misc; 3323 who->contr->shoottype = range_misc;
3495 } 3324 }
3496 } else { 3325 } else {
3497 if (op->type == BOW) 3326 if (op->type == BOW)
3498 SET_FLAG (who, FLAG_READY_BOW); 3327 SET_FLAG (who, FLAG_READY_BOW);
3499 else 3328 else
3500 SET_FLAG (who, FLAG_READY_RANGE); 3329 SET_FLAG (who, FLAG_READY_RANGE);
3501 } 3330 }
3502 break; 3331 break;
3503 3332
3504 case BUILDER: 3333 case BUILDER:
3505 if ( who->contr->ranges[ range_builder ] ) 3334 if ( who->contr->ranges[ range_builder ] )
3506 unapply_special( who, who->contr->ranges[ range_builder ], 0 ); 3335 unapply_special( who, who->contr->ranges[ range_builder ], 0 );
3507 who->contr->shoottype = range_builder; 3336 who->contr->shoottype = range_builder;
3508 who->contr->ranges[ range_builder ] = op; 3337 who->contr->ranges[ range_builder ] = op;
3509 new_draw_info_format( NDI_UNIQUE, 0, who, "You ready your %s.", query_name( op ) ); 3338 new_draw_info_format( NDI_UNIQUE, 0, who, "You ready your %s.", query_name( op ) );
3510 break; 3339 break;
3511 3340
3512 default: 3341 default:
3513 new_draw_info_format(NDI_UNIQUE, 0, who, "You apply %s.",query_name(op)); 3342 new_draw_info_format(NDI_UNIQUE, 0, who, "You apply %s.",query_name(op));
3514 } /* end of switch op->type */ 3343 } /* end of switch op->type */
3515 3344
3516 SET_FLAG(op, FLAG_APPLIED); 3345 SET_FLAG(op, FLAG_APPLIED);
3517 3346
3518 if(tmp!=NULL) 3347 if(tmp!=NULL)
3519 tmp = insert_ob_in_ob(tmp,who); 3348 tmp = insert_ob_in_ob(tmp,who);
3520 3349
3521 fix_player(who); 3350 fix_player(who);
3522 3351
3523 /* We exclude spell casting objects. The fire code will set the 3352 /* We exclude spell casting objects. The fire code will set the
3524 * been applied flag when they are used - until that point, 3353 * been applied flag when they are used - until that point,
3525 * you don't know anything about them. 3354 * you don't know anything about them.
3526 */ 3355 */
3527 if (who->type == PLAYER && op->type!=WAND && op->type!=HORN && 3356 if (who->type == PLAYER && op->type!=WAND && op->type!=HORN &&
3528 op->type!=ROD) 3357 op->type!=ROD)
3529 SET_FLAG(op,FLAG_BEEN_APPLIED); 3358 SET_FLAG(op,FLAG_BEEN_APPLIED);
3530 3359
3531 if (QUERY_FLAG(op, FLAG_CURSED) || QUERY_FLAG(op, FLAG_DAMNED)) { 3360 if (QUERY_FLAG(op, FLAG_CURSED) || QUERY_FLAG(op, FLAG_DAMNED)) {
3532 if (who->type == PLAYER) { 3361 if (who->type == PLAYER) {
3533 new_draw_info(NDI_UNIQUE, 0,who, "Oops, it feels deadly cold!"); 3362 new_draw_info(NDI_UNIQUE, 0,who, "Oops, it feels deadly cold!");
3534 SET_FLAG(op,FLAG_KNOWN_CURSED); 3363 SET_FLAG(op,FLAG_KNOWN_CURSED);
3535 } 3364 }
3536 } 3365 }
3537 if(who->type==PLAYER) { 3366 if(who->type==PLAYER) {
3538 /* if multiple objects were applied, update both slots */ 3367 /* if multiple objects were applied, update both slots */
3539 if (tmp) 3368 if (tmp)
3369 esrv_send_item(who, tmp);
3540 esrv_send_item(who, tmp); 3370 esrv_send_item(who, op);
3541 esrv_send_item(who, op);
3542 } 3371 }
3543 return 0; 3372 return 0;
3544} 3373}
3545 3374
3546 3375
… …
3559int auto_apply (object *op) { 3388int auto_apply (object *op) {
3560 object *tmp = NULL, *tmp2; 3389 object *tmp = NULL, *tmp2;
3561 int i; 3390 int i;
3562 3391
3563 switch(op->type) { 3392 switch(op->type) {
3564 case SHOP_FLOOR: 3393 case SHOP_FLOOR:
3565 if (!HAS_RANDOM_ITEMS(op)) return 0; 3394 if (!HAS_RANDOM_ITEMS(op)) return 0;
3566 do { 3395 do {
3567 i=10; /* let's give it 10 tries */ 3396 i=10; /* let's give it 10 tries */
3568 while((tmp=generate_treasure(op->randomitems, 3397 while((tmp=generate_treasure(op->randomitems,
3569 op->stats.exp?(int)op->stats.exp:MAX(op->map->difficulty, 5)))==NULL&&--i); 3398 op->stats.exp?(int)op->stats.exp:MAX(op->map->difficulty, 5)))==NULL&&--i);
3570 if(tmp==NULL) 3399 if(tmp==NULL)
3571 return 0; 3400 return 0;
3572 if(QUERY_FLAG(tmp, FLAG_CURSED) || QUERY_FLAG(tmp, FLAG_DAMNED)) { 3401 if(QUERY_FLAG(tmp, FLAG_CURSED) || QUERY_FLAG(tmp, FLAG_DAMNED)) {
3573 free_object(tmp); 3402 free_object(tmp);
3574 tmp = NULL; 3403 tmp = NULL;
3575 } 3404 }
3576 } while(!tmp); 3405 } while(!tmp);
3577 tmp->x=op->x; 3406 tmp->x=op->x;
3578 tmp->y=op->y; 3407 tmp->y=op->y;
3579 SET_FLAG(tmp,FLAG_UNPAID); 3408 SET_FLAG(tmp,FLAG_UNPAID);
3580 insert_ob_in_map(tmp,op->map,NULL,0); 3409 insert_ob_in_map(tmp,op->map,NULL,0);
3581 CLEAR_FLAG(op,FLAG_AUTO_APPLY); 3410 CLEAR_FLAG(op,FLAG_AUTO_APPLY);
3582 identify(tmp); 3411 identify(tmp);
3583 break; 3412 break;
3584 3413
3585 case TREASURE: 3414 case TREASURE:
3586 if (QUERY_FLAG(op,FLAG_IS_A_TEMPLATE)) 3415 if (QUERY_FLAG(op,FLAG_IS_A_TEMPLATE))
3587 return 0; 3416 return 0;
3588 while ((op->stats.hp--)>0) 3417 while ((op->stats.hp--)>0)
3589 create_treasure(op->randomitems, op, op->map?GT_ENVIRONMENT:0, 3418 create_treasure(op->randomitems, op, op->map?GT_ENVIRONMENT:0,
3590 op->stats.exp ? (int)op->stats.exp : 3419 op->stats.exp ? (int)op->stats.exp :
3591 op->map == NULL ? 14: op->map->difficulty,0); 3420 op->map == NULL ? 14: op->map->difficulty,0);
3592 3421
3593 /* If we generated an object and put it in this object inventory, 3422 /* If we generated an object and put it in this object inventory,
3594 * move it to the parent object as the current object is about 3423 * move it to the parent object as the current object is about
3595 * to disappear. An example of this item is the random_* stuff 3424 * to disappear. An example of this item is the random_* stuff
3596 * that is put inside other objects. 3425 * that is put inside other objects.
3597 */ 3426 */
3598 for (tmp=op->inv; tmp; tmp=tmp2) { 3427 for (tmp=op->inv; tmp; tmp=tmp2) {
3599 tmp2 = tmp->below; 3428 tmp2 = tmp->below;
3600 remove_ob(tmp); 3429 remove_ob(tmp);
3601 if (op->env) insert_ob_in_ob(tmp, op->env); 3430 if (op->env) insert_ob_in_ob(tmp, op->env);
3602 else free_object(tmp); 3431 else free_object(tmp);
3603 } 3432 }
3604 remove_ob(op); 3433 remove_ob(op);
3605 free_object(op); 3434 free_object(op);
3606 break; 3435 break;
3607 } 3436 }
3608 return tmp ? 1 : 0; 3437 return tmp ? 1 : 0;
3609} 3438}
3610 3439
3611/** 3440/**
… …
3620 int x,y; 3449 int x,y;
3621 3450
3622 if(m==NULL) return; 3451 if(m==NULL) return;
3623 3452
3624 for(x=0;x<MAP_WIDTH(m);x++) 3453 for(x=0;x<MAP_WIDTH(m);x++)
3625 for(y=0;y<MAP_HEIGHT(m);y++) 3454 for(y=0;y<MAP_HEIGHT(m);y++)
3626 for(tmp=get_map_ob(m,x,y);tmp!=NULL;tmp=above) { 3455 for(tmp=get_map_ob(m,x,y);tmp!=NULL;tmp=above) {
3627 above=tmp->above; 3456 above=tmp->above;
3628 3457
3629 if (tmp->inv) { 3458 if (tmp->inv) {
3630 object *invtmp, *invnext; 3459 object *invtmp, *invnext;
3631 3460
3632 for (invtmp=tmp->inv; invtmp != NULL; invtmp = invnext) { 3461 for (invtmp=tmp->inv; invtmp != NULL; invtmp = invnext) {
3633 invnext = invtmp->below; 3462 invnext = invtmp->below;
3634 3463
3635 if(QUERY_FLAG(invtmp,FLAG_AUTO_APPLY)) 3464 if(QUERY_FLAG(invtmp,FLAG_AUTO_APPLY))
3636 auto_apply(invtmp); 3465 auto_apply(invtmp);
3637 else if(invtmp->type==TREASURE && HAS_RANDOM_ITEMS(invtmp)) { 3466 else if(invtmp->type==TREASURE && HAS_RANDOM_ITEMS(invtmp)) {
3638 while ((invtmp->stats.hp--)>0) 3467 while ((invtmp->stats.hp--)>0)
3639 create_treasure(invtmp->randomitems, invtmp, 0,
3640 m->difficulty,0);
3641 invtmp->randomitems = NULL;
3642 }
3643 else if (invtmp && invtmp->arch &&
3644 invtmp->type!=TREASURE &&
3645 invtmp->type != SPELL &&
3646 invtmp->type != CLASS &&
3647 HAS_RANDOM_ITEMS(invtmp)) {
3648 create_treasure(invtmp->randomitems, invtmp, 0, 3468 create_treasure(invtmp->randomitems, invtmp, 0,
3649 m->difficulty,0); 3469 m->difficulty,0);
3650 /* Need to clear this so that we never try to create 3470 invtmp->randomitems = NULL;
3651 * treasure again for this object 3471 }
3652 */ 3472 else if (invtmp && invtmp->arch &&
3653 invtmp->randomitems = NULL; 3473 invtmp->type!=TREASURE &&
3654 } 3474 invtmp->type != SPELL &&
3655 } 3475 invtmp->type != CLASS &&
3476 HAS_RANDOM_ITEMS(invtmp)) {
3477 create_treasure(invtmp->randomitems, invtmp, 0,
3478 m->difficulty,0);
3479 /* Need to clear this so that we never try to create
3480 * treasure again for this object
3481 */
3482 invtmp->randomitems = NULL;
3483 }
3484 }
3656 /* This is really temporary - the code at the bottom will 3485 /* This is really temporary - the code at the bottom will
3657 * also set randomitems to null. The problem is there are bunches 3486 * also set randomitems to null. The problem is there are bunches
3658 * of maps/players already out there with items that have spells 3487 * of maps/players already out there with items that have spells
3659 * which haven't had the randomitems set to null yet. 3488 * which haven't had the randomitems set to null yet.
3660 * MSW 2004-05-13 3489 * MSW 2004-05-13
3661 * 3490 *
3662 * And if it's a spellbook, it's better to set randomitems to NULL too, 3491 * And if it's a spellbook, it's better to set randomitems to NULL too,
3663 * else you get two spells in the book ^_- 3492 * else you get two spells in the book ^_-
3664 * Ryo 2004-08-16 3493 * Ryo 2004-08-16
3665 */ 3494 */
3666 if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL || 3495 if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL ||
3667 tmp->type == HORN || tmp->type == FIREWALL || tmp->type == POTION || 3496 tmp->type == HORN || tmp->type == FIREWALL || tmp->type == POTION ||
3668 tmp->type == ALTAR || tmp->type == SPELLBOOK) 3497 tmp->type == ALTAR || tmp->type == SPELLBOOK)
3669 tmp->randomitems = NULL; 3498 tmp->randomitems = NULL;
3670 3499
3671 } 3500 }
3672 3501
3673 if(QUERY_FLAG(tmp,FLAG_AUTO_APPLY)) 3502 if(QUERY_FLAG(tmp,FLAG_AUTO_APPLY))
3674 auto_apply(tmp); 3503 auto_apply(tmp);
3675 else if((tmp->type==TREASURE || (tmp->type==CONTAINER))&& HAS_RANDOM_ITEMS(tmp)) { 3504 else if((tmp->type==TREASURE || (tmp->type==CONTAINER))&& HAS_RANDOM_ITEMS(tmp)) {
3676 while ((tmp->stats.hp--)>0) 3505 while ((tmp->stats.hp--)>0)
3677 create_treasure(tmp->randomitems, tmp, 0, 3506 create_treasure(tmp->randomitems, tmp, 0,
3678 m->difficulty,0); 3507 m->difficulty,0);
3679 tmp->randomitems = NULL; 3508 tmp->randomitems = NULL;
3680 } 3509 }
3681 else if(tmp->type==TIMED_GATE) { 3510 else if(tmp->type==TIMED_GATE) {
3682 object *head = tmp->head != NULL ? tmp->head : tmp; 3511 object *head = tmp->head != NULL ? tmp->head : tmp;
3683 if (QUERY_FLAG(head, FLAG_IS_LINKED)) { 3512 if (QUERY_FLAG(head, FLAG_IS_LINKED)) {
3684 tmp->speed = 0; 3513 tmp->speed = 0;
3685 update_ob_speed(tmp); 3514 update_ob_speed(tmp);
3686 } 3515 }
3687 } 3516 }
3688 /* This function can be called everytime a map is loaded, even when 3517 /* This function can be called everytime a map is loaded, even when
3689 * swapping back in. As such, we don't want to create the treasure 3518 * swapping back in. As such, we don't want to create the treasure
3690 * over and ove again, so after we generate the treasure, blank out 3519 * over and ove again, so after we generate the treasure, blank out
3691 * randomitems so if it is swapped in again, it won't make anything. 3520 * randomitems so if it is swapped in again, it won't make anything.
3692 * This is a problem for the above objects, because they have counters 3521 * This is a problem for the above objects, because they have counters
3693 * which say how many times to make the treasure. 3522 * which say how many times to make the treasure.
3694 */ 3523 */
3695 else if(tmp && tmp->arch && tmp->type!=PLAYER && tmp->type!=TREASURE && 3524 else if(tmp && tmp->arch && tmp->type!=PLAYER && tmp->type!=TREASURE &&
3696 tmp->type != SPELL && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && 3525 tmp->type != SPELL && tmp->type != PLAYER_CHANGER && tmp->type != CLASS &&
3697 HAS_RANDOM_ITEMS(tmp)) { 3526 HAS_RANDOM_ITEMS(tmp)) {
3698 create_treasure(tmp->randomitems, tmp, GT_APPLY, 3527 create_treasure(tmp->randomitems, tmp, GT_APPLY,
3699 m->difficulty,0); 3528 m->difficulty,0);
3700 tmp->randomitems = NULL; 3529 tmp->randomitems = NULL;
3701 } 3530 }
3702 } 3531 }
3703 3532
3704 for(x=0;x<MAP_WIDTH(m);x++) 3533 for(x=0;x<MAP_WIDTH(m);x++)
3705 for(y=0;y<MAP_HEIGHT(m);y++) 3534 for(y=0;y<MAP_HEIGHT(m);y++)
3706 for(tmp=get_map_ob(m,x,y);tmp!=NULL;tmp=tmp->above) 3535 for(tmp=get_map_ob(m,x,y);tmp!=NULL;tmp=tmp->above)
3707 if (tmp->above && 3536 if (tmp->above &&
3708 (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL)) 3537 (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL))
3709 check_trigger (tmp, tmp->above); 3538 check_trigger (tmp, tmp->above);
3710} 3539}
3711 3540
3712/** 3541/**
3713 * Handles player eating food that temporarily changes status (resistances, stats). 3542 * Handles player eating food that temporarily changes status (resistances, stats).
3714 * This used to call cast_change_attr(), but 3543 * This used to call cast_change_attr(), but
… …
3722 sint8 k; 3551 sint8 k;
3723 3552
3724 force = get_archetype(FORCE_NAME); 3553 force = get_archetype(FORCE_NAME);
3725 3554
3726 for (i=0; i < NUM_STATS; i++) { 3555 for (i=0; i < NUM_STATS; i++) {
3727 k = get_attr_value(&food->stats, i); 3556 k = get_attr_value(&food->stats, i);
3728 if (k) { 3557 if (k) {
3729 set_attr_value(&force->stats, i, k); 3558 set_attr_value(&force->stats, i, k);
3730 did_one = 1; 3559 did_one = 1;
3731 } 3560 }
3732 } 3561 }
3733 3562
3734 /* check if we can protect the eater */ 3563 /* check if we can protect the eater */
3735 for (i=0; i<NROFATTACKS; i++) { 3564 for (i=0; i<NROFATTACKS; i++) {
3736 if (food->resist[i]>0) { 3565 if (food->resist[i]>0) {
3737 force->resist[i] = food->resist[i] / 2; 3566 force->resist[i] = food->resist[i] / 2;
3738 did_one = 1; 3567 did_one = 1;
3739 } 3568 }
3740 } 3569 }
3741 if (did_one) { 3570 if (did_one) {
3742 force->speed = 0.1; 3571 force->speed = 0.1;
3743 update_ob_speed(force); 3572 update_ob_speed(force);
3744 /* bigger morsel of food = longer effect time */ 3573 /* bigger morsel of food = longer effect time */
3745 force->stats.food = food->stats.food / 5; 3574 force->stats.food = food->stats.food / 5;
3746 SET_FLAG(force, FLAG_IS_USED_UP); 3575 SET_FLAG(force, FLAG_IS_USED_UP);
3747 SET_FLAG(force, FLAG_APPLIED); 3576 SET_FLAG(force, FLAG_APPLIED);
3748 change_abil(who, force); 3577 change_abil(who, force);
3749 insert_ob_in_ob(force, who); 3578 insert_ob_in_ob(force, who);
3750 } else { 3579 } else {
3751 free_object(force); 3580 free_object(force);
3752 } 3581 }
3753 3582
3754 /* check for hp, sp change */ 3583 /* check for hp, sp change */
3755 if(food->stats.hp!=0) { 3584 if(food->stats.hp!=0) {
3756 if(QUERY_FLAG(food, FLAG_CURSED)) { 3585 if(QUERY_FLAG(food, FLAG_CURSED)) {
3757 strcpy(who->contr->killer,food->name); 3586 strcpy(who->contr->killer,food->name);
3758 hit_player(who, food->stats.hp, food, AT_POISON, 1); 3587 hit_player(who, food->stats.hp, food, AT_POISON, 1);
3759 new_draw_info(NDI_UNIQUE, 0,who,"Eck!...that was poisonous!"); 3588 new_draw_info(NDI_UNIQUE, 0,who,"Eck!...that was poisonous!");
3760 } else { 3589 } else {
3761 if(food->stats.hp>0) 3590 if(food->stats.hp>0)
3762 new_draw_info(NDI_UNIQUE, 0,who,"You begin to feel better."); 3591 new_draw_info(NDI_UNIQUE, 0,who,"You begin to feel better.");
3763 else 3592 else
3764 new_draw_info(NDI_UNIQUE, 0,who,"Eck!...that was poisonous!"); 3593 new_draw_info(NDI_UNIQUE, 0,who,"Eck!...that was poisonous!");
3765 who->stats.hp += food->stats.hp; 3594 who->stats.hp += food->stats.hp;
3766 } 3595 }
3767 } 3596 }
3768 if(food->stats.sp!=0) { 3597 if(food->stats.sp!=0) {
3769 if(QUERY_FLAG(food, FLAG_CURSED)) { 3598 if(QUERY_FLAG(food, FLAG_CURSED)) {
3770 new_draw_info(NDI_UNIQUE, 0,who,"You are drained of mana!"); 3599 new_draw_info(NDI_UNIQUE, 0,who,"You are drained of mana!");
3771 who->stats.sp -= food->stats.sp; 3600 who->stats.sp -= food->stats.sp;
3772 if(who->stats.sp<0) who->stats.sp=0; 3601 if(who->stats.sp<0) who->stats.sp=0;
3773 } else { 3602 } else {
3774 new_draw_info(NDI_UNIQUE, 0,who,"You feel a rush of magical energy!"); 3603 new_draw_info(NDI_UNIQUE, 0,who,"You feel a rush of magical energy!");
3775 who->stats.sp += food->stats.sp; 3604 who->stats.sp += food->stats.sp;
3776 /* place limit on max sp from food? */ 3605 /* place limit on max sp from food? */
3777 } 3606 }
3778 } 3607 }
3779 fix_player(who); 3608 fix_player(who);
3780} 3609}
3781 3610
3782 3611
… …
3795 3624
3796 item=find_marked_object(who); 3625 item=find_marked_object(who);
3797 if(item) { 3626 if(item) {
3798 if(lighter->last_eat && lighter->stats.food) { /* lighter gets used up */ 3627 if(lighter->last_eat && lighter->stats.food) { /* lighter gets used up */
3799 /* Split multiple lighters if they're being used up. Otherwise * 3628 /* Split multiple lighters if they're being used up. Otherwise *
3800 * one charge from each would be used up. --DAMN */ 3629 * one charge from each would be used up. --DAMN */
3801 if(lighter->nrof > 1) { 3630 if(lighter->nrof > 1) {
3802 object *oneLighter = get_object(); 3631 object *oneLighter = get_object();
3803 copy_object(lighter, oneLighter); 3632 copy_object(lighter, oneLighter);
3804 lighter->nrof -= 1; 3633 lighter->nrof -= 1;
3805 oneLighter->nrof = 1; 3634 oneLighter->nrof = 1;
3806 oneLighter->stats.food--; 3635 oneLighter->stats.food--;
3807 esrv_send_item(who, lighter); 3636 esrv_send_item(who, lighter);
3808 oneLighter=insert_ob_in_ob(oneLighter, who); 3637 oneLighter=insert_ob_in_ob(oneLighter, who);
3809 esrv_send_item(who, oneLighter); 3638 esrv_send_item(who, oneLighter);
3810 } else { 3639 } else {
3811 lighter->stats.food--; 3640 lighter->stats.food--;
3812 } 3641 }
3813 3642
3814 } else if(lighter->last_eat) { /* no charges left in lighter */ 3643 } else if(lighter->last_eat) { /* no charges left in lighter */
3815 new_draw_info_format(NDI_UNIQUE, 0,who, 3644 new_draw_info_format(NDI_UNIQUE, 0,who,
3816 "You attempt to light the %s with a used up %s.", 3645 "You attempt to light the %s with a used up %s.",
3817 item->name, lighter->name); 3646 &item->name, &lighter->name);
3818 return; 3647 return;
3819 } 3648 }
3820 /* Perhaps we should split what we are trying to light on fire? 3649 /* Perhaps we should split what we are trying to light on fire?
3821 * I can't see many times when you would want to light multiple 3650 * I can't see many times when you would want to light multiple
3822 * objects at once. 3651 * objects at once.
3823 */ 3652 */
3824 nrof=item->nrof; 3653 nrof=item->nrof;
3825 count=item->count; 3654 count=item->count;
3826 /* If the item is destroyed, we don't have a valid pointer to the 3655 /* If the item is destroyed, we don't have a valid pointer to the
3827 * name object, so make a copy so the message we print out makes 3656 * name object, so make a copy so the message we print out makes
3828 * some sense. 3657 * some sense.
3829 */ 3658 */
3830 strcpy(item_name, item->name); 3659 strcpy(item_name, item->name);
3831 if (who == is_player_inv(item)) is_player_env=1; 3660 if (who == is_player_inv(item)) is_player_env=1;
3832 3661
3833 save_throw_object(item,AT_FIRE,who); 3662 save_throw_object(item,AT_FIRE,who);
3834 /* Change to check count and not freed, since the object pointer 3663 /* Change to check count and not freed, since the object pointer
3835 * may have gotten recycled 3664 * may have gotten recycled
3836 */ 3665 */
3837 if ((nrof != item->nrof ) || (count != item->count)) { 3666 if ((nrof != item->nrof ) || (count != item->count)) {
3838 new_draw_info_format(NDI_UNIQUE, 0,who, 3667 new_draw_info_format(NDI_UNIQUE, 0,who,
3839 "You light the %s with the %s.",item_name,lighter->name); 3668 "You light the %s with the %s.", &item_name, &lighter->name);
3840 /* Need to update the player so that the players glow radius 3669 /* Need to update the player so that the players glow radius
3841 * gets changed. 3670 * gets changed.
3842 */ 3671 */
3843 if (is_player_env) fix_player(who); 3672 if (is_player_env) fix_player(who);
3844 } else { 3673 } else {
3845 new_draw_info_format(NDI_UNIQUE, 0,who, 3674 new_draw_info_format(NDI_UNIQUE, 0,who,
3846 "You attempt to light the %s with the %s and fail.",item->name,lighter->name); 3675 "You attempt to light the %s with the %s and fail.", &item->name, &lighter->name);
3847 } 3676 }
3848 3677
3849 } else /* nothing to light */ 3678 } else /* nothing to light */
3850 new_draw_info(NDI_UNIQUE, 0,who,"You need to mark a lightable object."); 3679 new_draw_info(NDI_UNIQUE, 0,who,"You need to mark a lightable object.");
3851 3680
3852} 3681}
3853 3682
3854/** 3683/**
3855 * op made some mistake with a scroll, this takes care of punishment. 3684 * op made some mistake with a scroll, this takes care of punishment.
… …
3858void scroll_failure(object *op, int failure, int power) 3687void scroll_failure(object *op, int failure, int power)
3859{ 3688{
3860 if(abs(failure/4)>power) power=abs(failure/4); /* set minimum effect */ 3689 if(abs(failure/4)>power) power=abs(failure/4); /* set minimum effect */
3861 3690
3862 if(failure<= -1&&failure > -15) {/* wonder */ 3691 if(failure<= -1&&failure > -15) {/* wonder */
3863 object *tmp; 3692 object *tmp;
3864 3693
3865 new_draw_info(NDI_UNIQUE, 0,op,"Your spell warps!."); 3694 new_draw_info(NDI_UNIQUE, 0,op,"Your spell warps!.");
3866 tmp=get_archetype(SPELL_WONDER); 3695 tmp=get_archetype(SPELL_WONDER);
3867 cast_wonder(op, op, 0, tmp); 3696 cast_wonder(op, op, 0, tmp);
3868 free_object(tmp); 3697 free_object(tmp);
3869 } else if (failure <= -15&&failure > -35) {/* drain mana */ 3698 } else if (failure <= -15&&failure > -35) {/* drain mana */
3870 new_draw_info(NDI_UNIQUE, 0,op,"Your mana is drained!."); 3699 new_draw_info(NDI_UNIQUE, 0,op,"Your mana is drained!.");
3871 op->stats.sp -= random_roll(0, power-1, op, PREFER_LOW); 3700 op->stats.sp -= random_roll(0, power-1, op, PREFER_LOW);
3872 if(op->stats.sp<0) op->stats.sp = 0; 3701 if(op->stats.sp<0) op->stats.sp = 0;
3873 } else if (settings.spell_failure_effects == TRUE) { 3702 } else if (settings.spell_failure_effects == TRUE) {
3874 if (failure <= -35&&failure > -60) { /* confusion */ 3703 if (failure <= -35&&failure > -60) { /* confusion */
3875 new_draw_info(NDI_UNIQUE, 0,op,"The magic recoils on you!"); 3704 new_draw_info(NDI_UNIQUE, 0,op,"The magic recoils on you!");
3876 confuse_player(op,op,power); 3705 confuse_player(op,op,power);
3877 } else if (failure <= -60&&failure> -70) {/* paralysis */ 3706 } else if (failure <= -60&&failure> -70) {/* paralysis */
3878 new_draw_info(NDI_UNIQUE, 0,op,"The magic recoils and paralyzes " 3707 new_draw_info(NDI_UNIQUE, 0,op,"The magic recoils and paralyzes "
3879 "you!"); 3708 "you!");
3880 paralyze_player(op,op,power); 3709 paralyze_player(op,op,power);
3881 } else if (failure <= -70&&failure> -80) {/* blind */ 3710 } else if (failure <= -70&&failure> -80) {/* blind */
3882 new_draw_info(NDI_UNIQUE, 0,op,"The magic recoils on you!"); 3711 new_draw_info(NDI_UNIQUE, 0,op,"The magic recoils on you!");
3883 blind_player(op,op,power); 3712 blind_player(op,op,power);
3884 } else if (failure <= -80) {/* blast the immediate area */ 3713 } else if (failure <= -80) {/* blast the immediate area */
3885 object *tmp; 3714 object *tmp;
3886 tmp=get_archetype(LOOSE_MANA); 3715 tmp=get_archetype(LOOSE_MANA);
3887 cast_magic_storm(op,tmp, power); 3716 cast_magic_storm(op,tmp, power);
3888 new_draw_info(NDI_UNIQUE, 0,op,"You unlease uncontrolled mana!"); 3717 new_draw_info(NDI_UNIQUE, 0,op,"You unlease uncontrolled mana!");
3889 free_object(tmp); 3718 free_object(tmp);
3890 } 3719 }
3891 } 3720 }
3892} 3721}
3893 3722
3894void apply_changes_to_player(object *pl, object *change) { 3723void apply_changes_to_player(object *pl, object *change) {
3895 int excess_stat=0; /* if the stat goes over the maximum 3724 int excess_stat=0; /* if the stat goes over the maximum
3896 for the race, put the excess stat some 3725 for the race, put the excess stat some
3897 where else. */ 3726 where else. */
3898 3727
3899 switch (change->type) { 3728 switch (change->type) {
3900 case CLASS: { 3729 case CLASS: {
3901 living *stats = &(pl->contr->orig_stats); 3730 living *stats = &(pl->contr->orig_stats);
3902 living *ns = &(change->stats); 3731 living *ns = &(change->stats);
3903 object *walk; 3732 object *walk;
3904 int flag_change_face=1; 3733 int flag_change_face=1;
3905 3734
3906 /* the following code assigns stats up to the stat max 3735 /* the following code assigns stats up to the stat max
3907 * for the race, and if the stat max is exceeded, 3736 * for the race, and if the stat max is exceeded,
3908 * tries to randomly reassign the excess stat 3737 * tries to randomly reassign the excess stat
3909 */ 3738 */
3910 int i,j; 3739 int i,j;
3911 for(i=0;i<NUM_STATS;i++) { 3740 for(i=0;i<NUM_STATS;i++) {
3912 sint8 stat=get_attr_value(stats,i); 3741 sint8 stat=get_attr_value(stats,i);
3913 int race_bonus = get_attr_value(&(pl->arch->clone.stats),i); 3742 int race_bonus = get_attr_value(&(pl->arch->clone.stats),i);
3914 stat += get_attr_value(ns,i); 3743 stat += get_attr_value(ns,i);
3915 if(stat > 20 + race_bonus) { 3744 if(stat > 20 + race_bonus) {
3916 excess_stat++; 3745 excess_stat++;
3917 stat = 20+race_bonus; 3746 stat = 20+race_bonus;
3918 } 3747 }
3919 set_attr_value(stats,i,stat); 3748 set_attr_value(stats,i,stat);
3920 } 3749 }
3921 3750
3922 for(j=0;excess_stat >0 && j<100;j++) {/* try 100 times to assign excess stats */ 3751 for(j=0;excess_stat >0 && j<100;j++) {/* try 100 times to assign excess stats */
3923 int i = rndm(0, 6); 3752 int i = rndm(0, 6);
3924 int stat=get_attr_value(stats,i); 3753 int stat=get_attr_value(stats,i);
3925 int race_bonus = get_attr_value(&(pl->arch->clone.stats),i); 3754 int race_bonus = get_attr_value(&(pl->arch->clone.stats),i);
3926 if(i==CHA) continue; /* exclude cha from this */ 3755 if(i==CHA) continue; /* exclude cha from this */
3927 if( stat < 20 + race_bonus) { 3756 if( stat < 20 + race_bonus) {
3928 change_attr_value(stats,i,1); 3757 change_attr_value(stats,i,1);
3929 excess_stat--; 3758 excess_stat--;
3930 } 3759 }
3931 } 3760 }
3932 3761
3933 /* insert the randomitems from the change's treasurelist into 3762 /* insert the randomitems from the change's treasurelist into
3934 * the player ref: player.c 3763 * the player ref: player.c
3935 */ 3764 */
3936 if(change->randomitems!=NULL) 3765 if(change->randomitems!=NULL)
3937 give_initial_items(pl,change->randomitems); 3766 give_initial_items(pl,change->randomitems);
3938 3767
3939 3768
3940 /* set up the face, for some races. */ 3769 /* set up the face, for some races. */
3941 3770
3942 /* first, look for the force object banning 3771 /* first, look for the force object banning
3943 * changing the face. Certain races never change face with class. 3772 * changing the face. Certain races never change face with class.
3944 */ 3773 */
3945 for(walk=pl->inv;walk!=NULL;walk=walk->below) 3774 for(walk=pl->inv;walk!=NULL;walk=walk->below)
3946 if (!strcmp(walk->name,"NOCLASSFACECHANGE")) flag_change_face=0; 3775 if (!strcmp(walk->name,"NOCLASSFACECHANGE")) flag_change_face=0;
3947 3776
3948 if(flag_change_face) { 3777 if(flag_change_face) {
3949 pl->animation_id = GET_ANIM_ID(change); 3778 pl->animation_id = GET_ANIM_ID(change);
3950 pl->face = change->face; 3779 pl->face = change->face;
3951 3780
3952 if(QUERY_FLAG(change,FLAG_ANIMATE)) 3781 if(QUERY_FLAG(change,FLAG_ANIMATE))
3953 SET_FLAG(pl,FLAG_ANIMATE); 3782 SET_FLAG(pl,FLAG_ANIMATE);
3954 else 3783 else
3955 CLEAR_FLAG(pl,FLAG_ANIMATE); 3784 CLEAR_FLAG(pl,FLAG_ANIMATE);
3956 } 3785 }
3957 3786
3958 /* check the special case of can't use weapons */ 3787 /* check the special case of can't use weapons */
3959 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON);*/ 3788 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON);*/
3960 if(!strcmp(change->name,"monk")) CLEAR_FLAG(pl,FLAG_USE_WEAPON); 3789 if(!strcmp(change->name,"monk")) CLEAR_FLAG(pl,FLAG_USE_WEAPON);
3961 3790
3962 break; 3791 break;
3963 } 3792 }
3964 } 3793 }
3965} 3794}
3966 3795
3967/** 3796/**
3968 * This handles items of type 'transformer'. 3797 * This handles items of type 'transformer'.
… …
4023 while ( *find == ' ' ) 3852 while ( *find == ' ' )
4024 find++; 3853 find++;
4025 memset( got, 0, MAX_BUF ); 3854 memset( got, 0, MAX_BUF );
4026 if ( (separator = strchr( find, ';' ))!=NULL) 3855 if ( (separator = strchr( find, ';' ))!=NULL)
4027 { 3856 {
4028 len = separator - find; 3857 len = separator - find;
4029 } 3858 }
4030 else 3859 else
4031 { 3860 {
4032 len = strlen(find); 3861 len = strlen(find);
4033 } 3862 }
4034 if ( len > MAX_BUF-1) 3863 if ( len > MAX_BUF-1)
4035 len = MAX_BUF-1; 3864 len = MAX_BUF-1;
4036 strcpy( got, find ); 3865 strcpy( got, find );
4037 got[len] = '\0'; 3866 got[len] = '\0';
4038 3867
4039 /* Now create new item, remove used ones when required. */ 3868 /* Now create new item, remove used ones when required. */
4040 new_item = get_archetype( got ); 3869 new_item = get_archetype( got );
… …
4042 { 3871 {
4043 new_draw_info_format( NDI_UNIQUE, 0, pl, "This %s is strange, better to not use it.", query_base_name( marked, 0 ) ); 3872 new_draw_info_format( NDI_UNIQUE, 0, pl, "This %s is strange, better to not use it.", query_base_name( marked, 0 ) );
4044 return; 3873 return;
4045 } 3874 }
4046 new_item->nrof = yield; 3875 new_item->nrof = yield;
4047 new_draw_info_format( NDI_UNIQUE, 0, pl, "You %s the %s.", transformer->slaying, query_base_name( marked, 0 ) ); 3876 new_draw_info_format( NDI_UNIQUE, 0, pl, "You %s the %s.", &transformer->slaying, query_base_name( marked, 0 ) );
4048 insert_ob_in_ob( new_item, pl ); 3877 insert_ob_in_ob( new_item, pl );
4049 esrv_send_inventory( pl, pl ); 3878 esrv_send_inventory( pl, pl );
4050 /* Eat up one item */ 3879 /* Eat up one item */
4051 decrease_ob_nr( marked, 1 ); 3880 decrease_ob_nr( marked, 1 );
4052 /* Eat one transformer if needed */ 3881 /* Eat one transformer if needed */

Diff Legend

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