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.59 by pippijn, Sat Jan 6 14:42:30 2007 UTC vs.
Revision 1.119 by elmex, Tue Jul 31 09:59:19 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 (at your option) any later version. 11 * (at your option) any later version.
12 12 *
13 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 *
18 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
21
22 The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23*/ 22 */
23
24#include <cmath>
24 25
25#include <global.h> 26#include <global.h>
26#include <living.h> 27#include <living.h>
27#include <spells.h> 28#include <spells.h>
28#include <skills.h> 29#include <skills.h>
… …
30 31
31#include <sproto.h> 32#include <sproto.h>
32 33
33/* Want this regardless of rplay. */ 34/* Want this regardless of rplay. */
34#include <sounds.h> 35#include <sounds.h>
35
36/* need math lib for double-precision and pow() in dragon_eat_flesh() */
37#include <math.h>
38 36
39/** 37/**
40 * Check if op should abort moving victim because of it's race or slaying. 38 * Check if op should abort moving victim because of it's race or slaying.
41 * Returns 1 if it should abort, returns 0 if it should continue. 39 * Returns 1 if it should abort, returns 0 if it should continue.
42 */ 40 */
… …
65 { 63 {
66 arch_flag = 1; 64 arch_flag = 1;
67 name_flag = 1; 65 name_flag = 1;
68 race_flag = 1; 66 race_flag = 1;
69 } 67 }
68
70 /* If the director has race set, only affect objects with a arch, 69 /* If the director has race set, only affect objects with a arch,
71 * name or race that matches. 70 * name or race that matches.
72 */ 71 */
73 if ((op->race) && 72 if ((op->race) &&
74 ((!(victim->arch && arch_flag && victim->arch->name) || strcmp (op->race, victim->arch->name))) && 73 ((!(victim->arch && arch_flag && victim->arch->archname) || op->race != victim->arch->archname)) &&
75 ((!(victim->name && name_flag) || strcmp (op->race, victim->name))) && 74 ((!(victim->name && name_flag) || op->race != victim->name)) &&
76 ((!(victim->race && race_flag) || strcmp (op->race, victim->race)))) 75 ((!(victim->race && race_flag) || op->race != victim->race)))
77 {
78 return 1; 76 return 1;
79 } 77
80 /* If the director has slaying set, only affect objects where none 78 /* If the director has slaying set, only affect objects where none
81 * of arch, name, or race match. 79 * of arch, name, or race match.
82 */ 80 */
83 if ((op->slaying) && (((victim->arch && arch_flag && victim->arch->name && !strcmp (op->slaying, victim->arch->name))) || 81 if ((op->slaying) && (((victim->arch && arch_flag && victim->arch->archname && op->slaying == victim->arch->archname))) ||
84 ((victim->name && name_flag && !strcmp (op->slaying, victim->name))) || 82 ((victim->name && name_flag && op->slaying == victim->name)) ||
85 ((victim->race && race_flag && !strcmp (op->slaying, victim->race))))) 83 ((victim->race && race_flag && op->slaying == victim->race)))
86 {
87 return 1; 84 return 1;
88 } 85
89 return 0; 86 return 0;
90} 87}
91 88
92/** 89/**
93 * This handles a player dropping money on an altar to identify stuff. 90 * This handles a player dropping money on an altar to identify stuff.
… …
160 157
161/** 158/**
162 * This checks whether the object has a "on_use_yield" field, and if so generated and drops 159 * This checks whether the object has a "on_use_yield" field, and if so generated and drops
163 * matching item. 160 * matching item.
164 **/ 161 **/
165static void 162void
166handle_apply_yield (object *tmp) 163handle_apply_yield (object *tmp)
167{ 164{
168 const char *yield; 165 const char *yield;
169 166
170 yield = get_ob_key_value (tmp, "on_use_yield"); 167 yield = get_ob_key_value (tmp, "on_use_yield");
… …
234 depl = present_arch_in_ob (at, op); 231 depl = present_arch_in_ob (at, op);
235 232
236 if (depl) 233 if (depl)
237 { 234 {
238 for (i = 0; i < NUM_STATS; i++) 235 for (i = 0; i < NUM_STATS; i++)
239 if (get_attr_value (&depl->stats, i)) 236 if (depl->stats.stat (i))
240 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]); 237 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]);
241 238
242 depl->destroy (); 239 depl->destroy ();
243 op->update_stats (); 240 op->update_stats ();
244 } 241 }
… …
376 force->stats.food *= 10; 373 force->stats.food *= 10;
377 for (i = 0; i < NROFATTACKS; i++) 374 for (i = 0; i < NROFATTACKS; i++)
378 if (force->resist[i] > 0) 375 if (force->resist[i] > 0)
379 force->resist[i] = -force->resist[i]; /* prot => vuln */ 376 force->resist[i] = -force->resist[i]; /* prot => vuln */
380 } 377 }
378
381 force->speed_left = -1; 379 force->speed_left = -1;
382 force = insert_ob_in_ob (force, op); 380 force = insert_ob_in_ob (force, op);
383 CLEAR_FLAG (tmp, FLAG_APPLIED); 381 CLEAR_FLAG (tmp, FLAG_APPLIED);
384 SET_FLAG (force, FLAG_APPLIED); 382 SET_FLAG (force, FLAG_APPLIED);
385 change_abil (op, force); 383 change_abil (op, force);
… …
422 int count = 0; 420 int count = 0;
423 421
424 422
425 if (item == NULL) 423 if (item == NULL)
426 return 0; 424 return 0;
425
427 op = op->below; 426 op = op->below;
428 while (op != NULL) 427 while (op != NULL)
429 { 428 {
430 if (strcmp (op->arch->name, item) == 0) 429 if (strcmp (op->arch->archname, item) == 0)
431 { 430 {
432 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED) 431 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED)
433 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID)) 432 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID))
434 { 433 {
435 if (op->nrof == 0) /* this is necessary for artifact sacrifices --FD-- */ 434 if (op->nrof == 0) /* this is necessary for artifact sacrifices --FD-- */
436 count++; 435 count++;
437 else 436 else
438 count += op->nrof; 437 count += op->nrof;
439 } 438 }
440 } 439 }
440
441 op = op->below; 441 op = op->below;
442 } 442 }
443
443 return count; 444 return count;
444} 445}
445 446
446/** 447/**
447 * This removes 'nrof' of what item->slaying says to remove. 448 * This removes 'nrof' of what item->slaying says to remove.
… …
457 prev = op; 458 prev = op;
458 op = op->below; 459 op = op->below;
459 460
460 while (op != NULL) 461 while (op != NULL)
461 { 462 {
462 if (strcmp (op->arch->name, item) == 0) 463 if (strcmp (op->arch->archname, item) == 0)
463 { 464 {
464 if (op->nrof >= nrof) 465 if (op->nrof >= nrof)
465 { 466 {
466 decrease_ob_nr (op, nrof); 467 decrease_ob_nr (op, nrof);
467 return; 468 return;
… …
574 op->update_stats (); 575 op->update_stats ();
575 return 1; 576 return 1;
576} 577}
577 578
578/* Types of improvements, hidden in the sp field. */ 579/* Types of improvements, hidden in the sp field. */
579#define IMPROVE_PREPARE 1 580#define IMPROVE_PREPARE 1
580#define IMPROVE_DAMAGE 2 581#define IMPROVE_DAMAGE 2
581#define IMPROVE_WEIGHT 3 582#define IMPROVE_WEIGHT 3
582#define IMPROVE_ENCHANT 4 583#define IMPROVE_ENCHANT 4
583#define IMPROVE_STR 5 584#define IMPROVE_STR 5
584#define IMPROVE_DEX 6 585#define IMPROVE_DEX 6
585#define IMPROVE_CON 7 586#define IMPROVE_CON 7
586#define IMPROVE_WIS 8 587#define IMPROVE_WIS 8
587#define IMPROVE_CHA 9 588#define IMPROVE_CHA 9
588#define IMPROVE_INT 10 589#define IMPROVE_INT 10
589#define IMPROVE_POW 11 590#define IMPROVE_POW 11
590
591 591
592/** 592/**
593 * This does the prepare weapon scroll. 593 * This does the prepare weapon scroll.
594 * Checks for sacrifice, and so on. 594 * Checks for sacrifice, and so on.
595 */ 595 */
596
597int 596int
598prepare_weapon (object *op, object *improver, object *weapon) 597prepare_weapon (object *op, object *improver, object *weapon)
599{ 598{
600 int sacrifice_count, i; 599 int sacrifice_count, i;
601 char buf[MAX_BUF]; 600 char buf[MAX_BUF];
… …
603 if (weapon->level != 0) 602 if (weapon->level != 0)
604 { 603 {
605 new_draw_info (NDI_UNIQUE, 0, op, "Weapon already prepared."); 604 new_draw_info (NDI_UNIQUE, 0, op, "Weapon already prepared.");
606 return 0; 605 return 0;
607 } 606 }
607
608 for (i = 0; i < NROFATTACKS; i++) 608 for (i = 0; i < NROFATTACKS; i++)
609 if (weapon->resist[i]) 609 if (weapon->resist[i])
610 break; 610 break;
611 611
612 /* If we break out, i will be less than nrofattacks, preventing 612 /* If we break out, i will be less than nrofattacks, preventing
… …
618 weapon->stats.ac) /* AC - only taifu's I think */ 618 weapon->stats.ac) /* AC - only taifu's I think */
619 { 619 {
620 new_draw_info (NDI_UNIQUE, 0, op, "Cannot prepare magic weapons."); 620 new_draw_info (NDI_UNIQUE, 0, op, "Cannot prepare magic weapons.");
621 return 0; 621 return 0;
622 } 622 }
623
623 sacrifice_count = check_sacrifice (op, improver); 624 sacrifice_count = check_sacrifice (op, improver);
624 if (sacrifice_count <= 0) 625 if (sacrifice_count <= 0)
625 return 0; 626 return 0;
627
626 weapon->level = isqrt (sacrifice_count); 628 weapon->level = isqrt (sacrifice_count);
627 new_draw_info (NDI_UNIQUE, 0, op, "Your sacrifice was accepted."); 629 new_draw_info (NDI_UNIQUE, 0, op, "Your sacrifice was accepted.");
628 eat_item (op, improver->slaying, sacrifice_count); 630 eat_item (op, improver->slaying, sacrifice_count);
629 631
630 new_draw_info_format (NDI_UNIQUE, 0, op, "Your *%s may be improved %d times.", &weapon->name, weapon->level); 632 new_draw_info_format (NDI_UNIQUE, 0, op, "Your *%s may be improved %d times.", &weapon->name, weapon->level);
… …
763{ 765{
764 object *otmp; 766 object *otmp;
765 767
766 if (op->type != PLAYER) 768 if (op->type != PLAYER)
767 return 0; 769 return 0;
770
768 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) 771 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC))
769 { 772 {
770 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll."); 773 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll.");
771 return 0; 774 return 0;
772 } 775 }
776
773 otmp = find_marked_object (op); 777 otmp = find_marked_object (op);
774 if (!otmp) 778 if (!otmp)
775 { 779 {
776 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark a weapon object."); 780 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark a weapon object.");
777 return 0; 781 return 0;
778 } 782 }
783
779 if (otmp->type != WEAPON && otmp->type != BOW) 784 if (otmp->type != WEAPON && otmp->type != BOW)
780 { 785 {
781 new_draw_info (NDI_UNIQUE, 0, op, "Marked item is not a weapon or bow"); 786 new_draw_info (NDI_UNIQUE, 0, op, "Marked item is not a weapon or bow");
782 return 0; 787 return 0;
783 } 788 }
789
784 new_draw_info (NDI_UNIQUE, 0, op, "Applied weapon builder."); 790 new_draw_info (NDI_UNIQUE, 0, op, "Applied weapon builder.");
785 improve_weapon (op, tmp, otmp); 791 improve_weapon (op, tmp, otmp);
786 esrv_send_item (op, otmp); 792 esrv_send_item (op, otmp);
787 return 1; 793 return 1;
788} 794}
… …
849 { 855 {
850 base = base - (base * settings.armor_speed_improvement) / 100; 856 base = base - (base * settings.armor_speed_improvement) / 100;
851 pow++; 857 pow++;
852 } 858 }
853 859
854 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (&armour->arch->clone) * base) / 100; 860 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (armour->arch) * base) / 100;
855 } 861 }
856 else 862 else
857 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (&armour->arch->clone) * (100 + armour->magic * settings.armor_speed_improvement)) / 100; 863 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (armour->arch) * (100 + armour->magic * settings.armor_speed_improvement)) / 100;
858 864
859 if (!settings.armor_weight_linear) 865 if (!settings.armor_weight_linear)
860 { 866 {
861 int base = 100; 867 int base = 100;
862 int pow = 0; 868 int pow = 0;
… …
865 { 871 {
866 base = base - (base * settings.armor_weight_reduction) / 100; 872 base = base - (base * settings.armor_weight_reduction) / 100;
867 pow++; 873 pow++;
868 } 874 }
869 875
870 armour->weight = (armour->arch->clone.weight * base) / 100; 876 armour->weight = (armour->arch->weight * base) / 100;
871 } 877 }
872 else 878 else
873 armour->weight = (armour->arch->clone.weight * (100 - armour->magic * settings.armor_weight_reduction)) / 100; 879 armour->weight = (armour->arch->weight * (100 - armour->magic * settings.armor_weight_reduction)) / 100;
874 880
875 if (armour->weight <= 0) 881 if (armour->weight <= 0)
876 { 882 {
877 LOG (llevInfo, "Warning: enchanted armours can have negative weight\n."); 883 LOG (llevInfo, "Warning: enchanted armours can have negative weight\n.");
878 armour->weight = 1; 884 armour->weight = 1;
879 } 885 }
880 886
881 armour->item_power = get_power_from_ench (armour->arch->clone.item_power + armour->magic); 887 armour->item_power = get_power_from_ench (armour->arch->item_power + armour->magic);
882 888
883 if (op->type == PLAYER) 889 if (op->type == PLAYER)
884 { 890 {
885 esrv_send_item (op, armour); 891 esrv_send_item (op, armour);
886 if (QUERY_FLAG (armour, FLAG_APPLIED)) 892 if (QUERY_FLAG (armour, FLAG_APPLIED))
… …
938 944
939 price_in = cost * item->value; 945 price_in = cost * item->value;
940 } 946 }
941 else 947 else
942 { 948 {
943 if (item->type == PLAYER || CONV_FROM (converter) != item->arch->name || 949 if (item->type == PLAYER || CONV_FROM (converter) != item->arch->archname ||
944 (CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof)) 950 (CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof))
945 return 0; 951 return 0;
946 952
947 if (CONV_NEED (converter)) 953 if (CONV_NEED (converter))
948 { 954 {
… …
1000 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n", 1006 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n",
1001 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name); 1007 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
1002 1008
1003 /** 1009 /**
1004 * elmex: we are going to let the game continue, as the mapcreator 1010 * elmex: we are going to let the game continue, as the mapcreator
1005 * propably had something in mind when doing this 1011 * probably had something in mind when doing this
1006 */ 1012 */
1007 } 1013 }
1014 SET_FLAG (item, FLAG_IDENTIFIED);
1008 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y); 1015 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y);
1009 return 1; 1016 return 1;
1010} 1017}
1011 1018
1012/** 1019/**
1013 * Handle apply on containers. 1020 * Handle apply on containers.
1014 * By Eneq(@csd.uu.se). 1021 * By Eneq(@csd.uu.se).
1015 * Moved to own function and added many features [Tero.Haatanen@lut.fi] 1022 * Moved to own function and added many features [Tero.Haatanen@lut.fi]
1016 * added the alchemical cauldron to the code -b.t. 1023 * added the alchemical cauldron to the code -b.t.
1017 */ 1024 */
1018
1019int 1025int
1020apply_container (object *op, object *sack) 1026apply_container (object *op, object *sack)
1021{ 1027{
1022 char buf[MAX_BUF]; 1028 if (op->type != PLAYER || !op->contr->ns)
1023 object *tmp;
1024
1025 if (op->type != PLAYER)
1026 return 0; /* This might change */ 1029 return 0; /* This might change */
1027 1030
1028 if (sack == NULL || sack->type != CONTAINER) 1031 if (!sack || sack->type != CONTAINER)
1029 { 1032 {
1030 LOG (llevError, "apply_container: %s is not container!\n", sack ? &sack->name : "[nullobject]"); 1033 LOG (llevError, "apply_container: %s is not container!\n", sack ? &sack->name : "[nullobject]");
1031 return 0; 1034 return 0;
1032 } 1035 }
1033 1036
1034 op->contr->last_used = 0; 1037 op->contr->last_used = 0;
1035 1038
1036 if (sack->env != op) 1039 if (sack->env && sack->env != op)
1040 {
1041 new_draw_info (NDI_UNIQUE, 0, op, "You must put it onto the floor or into your inventory first.");
1042 return 1;
1037 { 1043 }
1038 if (sack->other_arch == NULL || sack->env != NULL) 1044
1045 // already applied == open on ground, or open in inv, or active in inv
1046 if (sack->flag [FLAG_APPLIED])
1047 {
1048 if (op->container == sack)
1039 { 1049 {
1040 new_draw_info (NDI_UNIQUE, 0, op, "You must get it first."); 1050 // open on ground or inv, so close
1051 op->close_container ();
1041 return 1; 1052 return 1;
1042 } 1053 }
1043 1054 else if (!sack->env)
1044 /* It's on the ground, the problems begin */
1045 if (op->container != sack)
1046 {
1047 /* it's closed OR some player has opened it */
1048 if (QUERY_FLAG (sack, FLAG_APPLIED))
1049 { 1055 {
1050 for (tmp = GET_MAP_OB (sack->map, sack->x, sack->y); tmp && tmp->container != sack; tmp = tmp->above); 1056 // active, but not ours: some other player has opened it
1051 if (tmp)
1052 {
1053 /* some other player have opened it */
1054 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already occupied.", query_name (sack)); 1057 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already occupied.", query_name (sack));
1055 return 1; 1058 return 1;
1056 }
1057 }
1058 }
1059 if (QUERY_FLAG (sack, FLAG_APPLIED))
1060 { 1059 }
1061 if (op->container == NULL)
1062 {
1063 tmp = arch_to_object (sack->other_arch);
1064 /* not good, but insert_ob_in_ob() is too smart */
1065 CLEAR_FLAG (tmp, FLAG_REMOVED);
1066 tmp->x = tmp->y = 0;
1067 tmp->map = NULL;
1068 tmp->env = sack;
1069 if (sack->inv)
1070 sack->inv->above = tmp;
1071 tmp->below = sack->inv;
1072 tmp->above = NULL;
1073 sack->inv = tmp;
1074 sack->move_off = MOVE_ALL; /* trying force closing it */
1075 }
1076 else
1077 {
1078 sack->move_off = 0;
1079 tmp = sack->inv;
1080 1060
1081 if (tmp && tmp->type == CLOSE_CON) 1061 // fall through to opening it (active in inv)
1082 tmp->destroy ();
1083 }
1084 }
1085 }
1086
1087 if (QUERY_FLAG (sack, FLAG_APPLIED))
1088 { 1062 }
1063 else if (sack->env)
1064 {
1065 // it is in our env, so activate it, do not open yet
1089 if (op->container) 1066 op->close_container ();
1090 { 1067 sack->flag [FLAG_APPLIED] = 1;
1091 if (op->container != sack) 1068 esrv_update_item (UPD_FLAGS, op, sack);
1092 { 1069 new_draw_info_format (NDI_UNIQUE, 0, op, "You ready %s.", query_name (sack));
1093 tmp = op->container; 1070 return 1;
1094 apply_container (op, tmp); 1071 }
1095 sprintf (buf, "You close %s and open ", query_name (tmp)); 1072
1096 op->container = sack; 1073 // it's locked?
1097 strcat (buf, query_name (sack)); 1074 if (sack->slaying)
1098 strcat (buf, "."); 1075 {
1099 } 1076 if (object *tmp = find_key (op, op, sack))
1100 else 1077 new_draw_info_format (NDI_UNIQUE, 0, op, "You unlock %s with %s.", query_name (sack), query_name (tmp));
1101 {
1102 CLEAR_FLAG (sack, FLAG_APPLIED);
1103 op->container = NULL;
1104 sprintf (buf, "You close %s.", query_name (sack));
1105 }
1106 }
1107 else 1078 else
1108 { 1079 {
1109 CLEAR_FLAG (sack, FLAG_APPLIED);
1110 sprintf (buf, "You open %s.", query_name (sack));
1111 SET_FLAG (sack, FLAG_APPLIED);
1112 op->container = sack;
1113 }
1114 }
1115 else
1116 { /* not applied */
1117 if (sack->slaying)
1118 { /* it's locked */
1119 tmp = find_key (op, op, sack);
1120 if (tmp)
1121 {
1122 sprintf (buf, "You unlock %s with %s.", query_name (sack), query_name (tmp));
1123 SET_FLAG (sack, FLAG_APPLIED);
1124
1125 if (sack->env == NULL)
1126 { /* if it's on ground,open it also */
1127 new_draw_info (NDI_UNIQUE, 0, op, buf);
1128 apply_container (op, sack);
1129 return 1;
1130 }
1131 }
1132 else
1133 sprintf (buf, "You don't have the key to unlock %s.", query_name (sack)); 1080 new_draw_info_format (NDI_UNIQUE, 0, op, "You don't have the key to unlock %s.", query_name (sack));
1134 }
1135 else
1136 {
1137 sprintf (buf, "You readied %s.", query_name (sack));
1138 SET_FLAG (sack, FLAG_APPLIED);
1139
1140 if (sack->env == NULL)
1141 { /* if it's on ground,open it also */
1142 new_draw_info (NDI_UNIQUE, 0, op, buf);
1143 apply_container (op, sack);
1144 return 1; 1081 return 1;
1145 } 1082 }
1146 }
1147 } 1083 }
1148 1084
1149 new_draw_info (NDI_UNIQUE, 0, op, buf); 1085 op->open_container (sack);
1150
1151 if (op->contr)
1152 op->contr->ns->floorbox_update ();
1153 1086
1154 return 1; 1087 return 1;
1155} 1088}
1156
1157/**
1158 * Eneq(@csd.uu.se): Handle apply on containers. This is for containers
1159 * the player has in their inventory, eg, sacks, luggages, etc.
1160 *
1161 * Moved to own function and added many features [Tero.Haatanen@lut.fi]
1162 * This version is for client/server mode.
1163 * op is the player, sack is the container the player is opening or closing.
1164 * return 1 if an object is apllied somehow or another, 0 if error/no apply
1165 *
1166 * Reminder - there are three states for any container - closed (non applied),
1167 * applied (not open, but objects that match get tossed into it), and open
1168 * (applied flag set, and op->container points to the open container)
1169 */
1170
1171int
1172esrv_apply_container (object *op, object *sack)
1173{
1174 object *tmp = op->container;
1175
1176 if (op->type != PLAYER)
1177 return 0; /* This might change */
1178
1179 if (sack == NULL || sack->type != CONTAINER)
1180 {
1181 LOG (llevError, "esrv_apply_container: %s is not container!\n", sack ? &sack->name : "[nullobject]");
1182 return 0;
1183 }
1184
1185 /* If we have a currently open container, then it needs to be closed in all cases
1186 * if we are opening this one up. We then fall through if appropriate for
1187 * openening the new container.
1188 */
1189
1190 if (op->container && QUERY_FLAG (sack, FLAG_APPLIED))
1191 {
1192 if (op->container->env != op)
1193 { /* if container is on the ground */
1194 op->container->move_off = 0;
1195 }
1196
1197 if (INVOKE_OBJECT (CLOSE, tmp, ARG_OBJECT (op)))
1198 return 1;
1199
1200 new_draw_info_format (NDI_UNIQUE, 0, op, "You close %s.", query_name (op->container));
1201 CLEAR_FLAG (op->container, FLAG_APPLIED);
1202 op->container = NULL;
1203 esrv_update_item (UPD_FLAGS, op, tmp);
1204 if (tmp == sack)
1205 return 1;
1206 }
1207
1208
1209 /* If the player is trying to open it (which he must be doing if we got here),
1210 * and it is locked, check to see if player has the equipment to open it.
1211 */
1212
1213 if (sack->slaying)
1214 { /* it's locked */
1215 tmp = find_key (op, op, sack);
1216 if (tmp)
1217 {
1218 new_draw_info_format (NDI_UNIQUE, 0, op, "You unlock %s with %s.", query_name (sack), query_name (tmp));
1219 }
1220 else
1221 {
1222 new_draw_info_format (NDI_UNIQUE, 0, op, "You don't have the key to unlock %s.", query_name (sack));
1223 return 0;
1224 }
1225 }
1226
1227 /* By the time we get here, we have made sure any other container has been closed and
1228 * if this is a locked container, the player they key to open it.
1229 */
1230
1231 /* There are really two cases - the sack is either on the ground, or the sack is
1232 * part of the players inventory. If on the ground, we assume that the player is
1233 * opening it, since if it was being closed, that would have been taken care of above.
1234 */
1235
1236
1237 if (sack->env != op)
1238 {
1239 /* Hypothetical case - the player is trying to open a sack that belong to someone
1240 * else. This normally should not happen, but a misbehaving client/player could
1241 * try to do it, so lets handle it gracefully.
1242 */
1243 if (sack->env)
1244 {
1245 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't open %s", query_name (sack));
1246 return 0;
1247 }
1248 /* set these so when the player walks off, we can unapply the sack */
1249 sack->move_off = MOVE_ALL; /* trying force closing it */
1250
1251 CLEAR_FLAG (sack, FLAG_APPLIED);
1252 new_draw_info_format (NDI_UNIQUE, 0, op, "You open %s.", query_name (sack));
1253 SET_FLAG (sack, FLAG_APPLIED);
1254 op->container = sack;
1255 esrv_update_item (UPD_FLAGS, op, sack);
1256 esrv_send_inventory (op, sack);
1257
1258 }
1259 else
1260 { /* sack is in players inventory */
1261 if (QUERY_FLAG (sack, FLAG_APPLIED))
1262 { /* readied sack becoming open */
1263 CLEAR_FLAG (sack, FLAG_APPLIED);
1264 new_draw_info_format (NDI_UNIQUE, 0, op, "You open %s.", query_name (sack));
1265 SET_FLAG (sack, FLAG_APPLIED);
1266 op->container = sack;
1267 esrv_update_item (UPD_FLAGS, op, sack);
1268 esrv_send_inventory (op, sack);
1269 }
1270 else
1271 {
1272 CLEAR_FLAG (sack, FLAG_APPLIED);
1273 new_draw_info_format (NDI_UNIQUE, 0, op, "You readied %s.", query_name (sack));
1274 SET_FLAG (sack, FLAG_APPLIED);
1275 esrv_update_item (UPD_FLAGS, op, sack);
1276 }
1277 }
1278 return 1;
1279}
1280
1281 1089
1282/** 1090/**
1283 * Handles dropping things on altar. 1091 * Handles dropping things on altar.
1284 * Returns true if sacrifice was accepted. 1092 * Returns true if sacrifice was accepted.
1285 */ 1093 */
… …
1438 */ 1246 */
1439static void 1247static void
1440apply_sign (object *op, object *sign, int autoapply) 1248apply_sign (object *op, object *sign, int autoapply)
1441{ 1249{
1442 readable_message_type *msgType; 1250 readable_message_type *msgType;
1443 char newbuf[HUGE_BUF];
1444 1251
1445 if (sign->msg == NULL) 1252 if (sign->msg == NULL)
1446 { 1253 {
1447 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is written on it."); 1254 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is written on it.");
1448 return; 1255 return;
… …
1469 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ) && !sign->move_on) 1276 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ) && !sign->move_on)
1470 { 1277 {
1471 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1278 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind.");
1472 return; 1279 return;
1473 } 1280 }
1281
1282 if (op->contr)
1283 if (client *ns = op->contr->ns)
1284 {
1474 msgType = get_readable_message_type (sign); 1285 msgType = get_readable_message_type (sign);
1286
1287 if (ns->can_msg)
1288 ns->send_msg (NDI_NAVY, msgType->msgtype, &sign->msg);
1289 else
1290 {
1291 char newbuf[HUGE_BUF];
1475 snprintf (newbuf, sizeof (newbuf), "%hhu %s", autoapply ? 1 : 0, &sign->msg); 1292 snprintf (newbuf, sizeof (newbuf), "%u %s", autoapply ? 1 : 0, &sign->msg);
1476 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, newbuf, &sign->msg); 1293 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, newbuf, &sign->msg);
1294 }
1295 }
1477} 1296}
1478 1297
1479/** 1298/**
1480 * 'victim' moves onto 'trap' 1299 * 'victim' moves onto 'trap'
1481 * 'victim' leaves 'trap' 1300 * 'victim' leaves 'trap'
… …
1504 * proper. This code was causing needless crashes. 1323 * proper. This code was causing needless crashes.
1505 */ 1324 */
1506 if (recursion_depth >= 500) 1325 if (recursion_depth >= 500)
1507 { 1326 {
1508 LOG (llevDebug, "WARNING: move_apply(): aborting recursion " 1327 LOG (llevDebug, "WARNING: move_apply(): aborting recursion "
1509 "[trap arch %s, name %s; victim arch %s, name %s]\n", &trap->arch->name, &trap->name, &victim->arch->name, &victim->name); 1328 "[trap arch %s, name %s; victim arch %s, name %s]\n", &trap->arch->archname, &trap->name, &victim->arch->archname, &victim->name);
1510 return; 1329 return;
1511 } 1330 }
1331
1512 recursion_depth++; 1332 recursion_depth++;
1513 if (trap->head) 1333 if (trap->head)
1514 trap = trap->head; 1334 trap = trap->head;
1515 1335
1516 if (INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator))) 1336 if (INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator)))
… …
1531 1351
1532 /* Just put in some sanity check. I think there is a bug in the 1352 /* Just put in some sanity check. I think there is a bug in the
1533 * above with some objects have zero speed, and thus the player 1353 * above with some objects have zero speed, and thus the player
1534 * getting permanently paralyzed. 1354 * getting permanently paralyzed.
1535 */ 1355 */
1536 if (victim->speed_left < -50.0) 1356 if (victim->speed_left < -50.f)
1537 victim->speed_left = -50.0; 1357 victim->speed_left = -50.f;
1538 /* LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left); */ 1358 /* LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left); */
1539 } 1359 }
1540 goto leave; 1360 goto leave;
1541 1361
1542 case SPINNER: 1362 case SPINNER:
… …
1614 1434
1615 if ((ab->move_type && trap->move_on) || ab->move_type == 0) 1435 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1616 { 1436 {
1617 if (!sound_was_played) 1437 if (!sound_was_played)
1618 { 1438 {
1619 play_sound_map (trap->map, trap->x, trap->y, SOUND_FALL_HOLE); 1439 trap->play_sound (sound_find ("fall_hole"));
1620 sound_was_played = 1; 1440 sound_was_played = 1;
1621 } 1441 }
1442
1622 new_draw_info (NDI_UNIQUE, 0, ab, "You fall into a trapdoor!"); 1443 new_draw_info (NDI_UNIQUE, 0, ab, "You fall into a trapdoor!");
1623 transfer_ob (ab, (int) EXIT_X (trap), (int) EXIT_Y (trap), 0, ab); 1444 transfer_ob (ab, (int) EXIT_X (trap), (int) EXIT_Y (trap), 0, ab);
1624 } 1445 }
1625 } 1446 }
1626 goto leave; 1447 goto leave;
… …
1628 1449
1629 1450
1630 case CONVERTER: 1451 case CONVERTER:
1631 if (convert_item (victim, trap) < 0) 1452 if (convert_item (victim, trap) < 0)
1632 { 1453 {
1633 object *op;
1634
1635 new_draw_info_format (NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name (trap)); 1454 new_draw_info_format (NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name (trap));
1636 1455 get_archetype ("burnout")->insert_at (trap, trap);
1637 op = get_archetype ("burnout");
1638 if (op != NULL)
1639 {
1640 op->x = trap->x;
1641 op->y = trap->y;
1642 insert_ob_in_map (op, trap->map, trap, 0);
1643 } 1456 }
1644 } 1457
1645 goto leave; 1458 goto leave;
1646 1459
1647 case TRIGGER_BUTTON: 1460 case TRIGGER_BUTTON:
1648 case TRIGGER_PEDESTAL: 1461 case TRIGGER_PEDESTAL:
1649 case TRIGGER_ALTAR: 1462 case TRIGGER_ALTAR:
… …
1667 * Processing will happen if the head runs into the pit 1480 * Processing will happen if the head runs into the pit
1668 */ 1481 */
1669 if (victim->head) 1482 if (victim->head)
1670 goto leave; 1483 goto leave;
1671 1484
1672 play_sound_map (victim->map, victim->x, victim->y, SOUND_FALL_HOLE); 1485 victim->play_sound (sound_find ("fall_hole"));
1673 new_draw_info (NDI_UNIQUE, 0, victim, "You fall through the hole!\n"); 1486 new_draw_info (NDI_UNIQUE, 0, victim, "You fall through the hole!\n");
1674 transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim); 1487 transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim);
1675 goto leave; 1488 goto leave;
1676 1489
1677 case EXIT: 1490 case EXIT:
… …
1706 1519
1707 apply_sign (victim, trap, 1); 1520 apply_sign (victim, trap, 1);
1708 goto leave; 1521 goto leave;
1709 1522
1710 case CONTAINER: 1523 case CONTAINER:
1711 if (victim->type == PLAYER)
1712 (void) esrv_apply_container (victim, trap);
1713 else
1714 (void) apply_container (victim, trap); 1524 apply_container (victim, trap);
1715 goto leave; 1525 goto leave;
1716 1526
1717 case RUNE: 1527 case RUNE:
1718 case TRAP: 1528 case TRAP:
1719 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE)) 1529 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE))
… …
1722 } 1532 }
1723 goto leave; 1533 goto leave;
1724 1534
1725 default: 1535 default:
1726 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not " 1536 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not "
1727 "handled in move_apply()\n", &trap->name, &trap->arch->name, trap->type); 1537 "handled in move_apply()\n", &trap->name, &trap->arch->archname, trap->type);
1728 goto leave; 1538 goto leave;
1729 } 1539 }
1730 1540
1731leave: 1541leave:
1732 recursion_depth--; 1542 recursion_depth--;
… …
1744 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ)) 1554 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
1745 { 1555 {
1746 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1556 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind.");
1747 return; 1557 return;
1748 } 1558 }
1559
1749 if (tmp->msg == NULL) 1560 if (!tmp->msg)
1750 { 1561 {
1751 new_draw_info_format (NDI_UNIQUE, 0, op, "You open the %s and find it empty.", &tmp->name); 1562 new_draw_info_format (NDI_UNIQUE, 0, op, "You open the %s and find it empty.", &tmp->name);
1752 return; 1563 return;
1753 } 1564 }
1754 1565
1755 /* need a literacy skill to read stuff! */ 1566 /* need a literacy skill to read stuff! */
1756 skill_ob = find_skill_by_name (op, tmp->skill); 1567 skill_ob = find_skill_by_name (op, tmp->skill);
1757 if (!skill_ob) 1568 if (!skill_ob)
1758 { 1569 {
1759 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols."); 1570 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. H<You lack the skill to read this>");
1760 return; 1571 return;
1761 } 1572 }
1573
1762 lev_diff = tmp->level - (skill_ob->level + 5); 1574 lev_diff = tmp->level - (skill_ob->level + 5);
1763 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0) 1575 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0)
1764 { 1576 {
1765 if (lev_diff < 2) 1577 if (lev_diff < 2)
1766 new_draw_info (NDI_UNIQUE, 0, op, "This book is just barely beyond your comprehension."); 1578 new_draw_info (NDI_UNIQUE, 0, op, "This book is just barely beyond your comprehension.");
… …
1777 return; 1589 return;
1778 } 1590 }
1779 1591
1780 readable_message_type *msgType = get_readable_message_type (tmp); 1592 readable_message_type *msgType = get_readable_message_type (tmp);
1781 1593
1594 if (player *pl = op->contr)
1595 if (client *ns = pl->ns)
1596 if (ns->can_msg)
1597 {
1598 dynbuf_text buf;
1599 buf << long_desc (tmp, op)
1600 << "\n\n"
1601 << tmp->msg
1602 << '\0';
1603 ns->send_msg (NDI_NAVY, msgType->msgtype, buf.linearise ());
1604 }
1605 else
1782 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, 1606 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1783 msgType->message_type, msgType->message_subtype, 1607 msgType->message_type, msgType->message_subtype,
1784 "You open the %s and start reading.\n%s", "%s\n%s", long_desc (tmp, op), &tmp->msg); 1608 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1609 long_desc (tmp, op), &tmp->msg);
1785 1610
1786 /* gain xp from reading */ 1611 /* gain xp from reading */
1787 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1612 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1788 { /* only if not read before */ 1613 { /* only if not read before */
1789 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1614 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
… …
1855 return; 1680 return;
1856 } 1681 }
1857 return; 1682 return;
1858 } 1683 }
1859 1684
1860 play_sound_player_only (op->contr, SOUND_LEARN_SPELL, 0, 0); 1685 op->contr->play_sound (sound_find ("learn_spell"));
1686
1861 tmp = spell->clone (); 1687 tmp = spell->clone ();
1862 insert_ob_in_ob (tmp, op); 1688 insert_ob_in_ob (tmp, op);
1863 1689
1864 if (special_prayer) 1690 if (special_prayer)
1865 SET_FLAG (tmp, FLAG_STARTEQUIP); 1691 SET_FLAG (tmp, FLAG_STARTEQUIP);
… …
1910 1736
1911 /* artifact_spellbooks have 'slaying' field point to a spell name, 1737 /* artifact_spellbooks have 'slaying' field point to a spell name,
1912 * instead of having their spell stored in stats.sp. These are 1738 * instead of having their spell stored in stats.sp. These are
1913 * legacy spellbooks 1739 * legacy spellbooks
1914 */ 1740 */
1915
1916 if (tmp->slaying != NULL) 1741 if (tmp->slaying)
1917 { 1742 {
1918 spell = arch_to_object (find_archetype_by_object_name (tmp->slaying)); 1743 spell = arch_to_object (find_archetype_by_object_name (tmp->slaying));
1919 if (!spell) 1744 if (!spell)
1920 { 1745 {
1921 new_draw_info_format (NDI_UNIQUE, 0, op, "The book's formula for %s is incomplete", &tmp->slaying); 1746 new_draw_info_format (NDI_UNIQUE, 0, op, "The book's formula for %s is incomplete", &tmp->slaying);
1922 return; 1747 return;
1923 } 1748 }
1924 else 1749 else
1925 insert_ob_in_ob (spell, tmp); 1750 insert_ob_in_ob (spell, tmp);
1751
1926 tmp->slaying = NULL; 1752 tmp->slaying = 0;
1927 } 1753 }
1928 1754
1929 skop = find_skill_by_name (op, tmp->skill); 1755 skop = find_skill_by_name (op, tmp->skill);
1930 1756
1931 /* need a literacy skill to learn spells. Also, having a literacy level 1757 /* need a literacy skill to learn spells. Also, having a literacy level
1932 * lower than the spell will make learning the spell more difficult */ 1758 * lower than the spell will make learning the spell more difficult */
1933 if (!skop) 1759 if (!skop)
1934 { 1760 {
1935 new_draw_info (NDI_UNIQUE, 0, op, "You can't read! Your attempt fails."); 1761 new_draw_info (NDI_UNIQUE, 0, op, "You can't read! Your attempt fails. H<You lack the literacy skill.>");
1936 return; 1762 return;
1937 } 1763 }
1938 1764
1939 spell = tmp->inv; 1765 spell = tmp->inv;
1940 1766
1941 if (!spell) 1767 if (!spell)
1942 { 1768 {
1943 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name); 1769 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name);
1944 new_draw_info (NDI_UNIQUE, 0, op, "The spellbook symbols make no sense."); 1770 new_draw_info (NDI_UNIQUE, 0, op, "The spellbook symbols make no sense. This is a bug, please report!");
1945 return; 1771 return;
1946 } 1772 }
1947 1773
1948 if (skop->level < int (sqrtf (spell->level) * 1.5f)) 1774 if (skop->level < int (sqrtf (spell->level) * 1.5f))
1949 { 1775 {
1950 new_draw_info (NDI_UNIQUE, 0, op, "It is too hard to read at your level: You are unable to decipher the strange symbols."); 1776 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. H<Your literacy level is too low.>");
1951 return; 1777 return;
1952 } 1778 }
1953 1779
1954 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name); 1780 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name);
1955 1781
… …
1968 * if the player doesn't know the spell, doesn't make a lot of sense that 1794 * if the player doesn't know the spell, doesn't make a lot of sense that
1969 * they would have a special prayer mark. 1795 * they would have a special prayer mark.
1970 */ 1796 */
1971 if (check_spell_known (op, spell->name)) 1797 if (check_spell_known (op, spell->name))
1972 { 1798 {
1973 new_draw_info (NDI_UNIQUE, 0, op, "You already know that spell.\n"); 1799 new_draw_info (NDI_UNIQUE, 0, op, "You already know that spell. H<It makes no sense to learn spells twice, and would only waste the spellbook.>\n");
1974 return; 1800 return;
1975 } 1801 }
1976 1802
1977 if (spell->skill) 1803 if (spell->skill)
1978 { 1804 {
1979 spell_skill = find_skill_by_name (op, spell->skill); 1805 spell_skill = find_skill_by_name (op, spell->skill);
1980 1806
1981 if (!spell_skill) 1807 if (!spell_skill)
1982 { 1808 {
1983 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use this spell", &spell->skill); 1809 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use this spell.", &spell->skill);
1984 return; 1810 return;
1985 } 1811 }
1986 1812
1987 if (spell_skill->level < spell->level) 1813 if (spell_skill->level < spell->level)
1988 { 1814 {
… …
2019 if (!QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 1845 if (!QUERY_FLAG (tmp, FLAG_STARTEQUIP))
2020 change_exp (op, calc_skill_exp (op, tmp, skop), skop->skill, 0); 1846 change_exp (op, calc_skill_exp (op, tmp, skop), skop->skill, 0);
2021 } 1847 }
2022 else 1848 else
2023 { 1849 {
2024 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1850 op->contr->play_sound (sound_find ("fumble_spell"));
2025 new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell.\n"); 1851 new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell. H<Wis (priests) or Int (wizards) governs the chance of learning a prayer or spell.>\n");
2026 } 1852 }
1853
2027 decrease_ob (tmp); 1854 decrease_ob (tmp);
2028} 1855}
2029 1856
2030/** 1857/**
2031 * Handles applying a spell scroll. 1858 * Handles applying a spell scroll.
… …
2041 return; 1868 return;
2042 } 1869 }
2043 1870
2044 if (!tmp->inv || tmp->inv->type != SPELL) 1871 if (!tmp->inv || tmp->inv->type != SPELL)
2045 { 1872 {
2046 new_draw_info (NDI_UNIQUE, 0, op, "The scroll just doesn't make sense!"); 1873 new_draw_info (NDI_UNIQUE, 0, op, "The scroll just doesn't make sense! H<...and never will make sense.>");
2047 return; 1874 return;
2048 } 1875 }
2049 1876
2050 if (op->type == PLAYER) 1877 if (op->type == PLAYER)
2051 { 1878 {
… …
2057 */ 1884 */
2058 skop = find_skill_by_name (op, skill_names[SK_LITERACY]); 1885 skop = find_skill_by_name (op, skill_names[SK_LITERACY]);
2059 1886
2060 if (!skop) 1887 if (!skop)
2061 { 1888 {
2062 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols."); 1889 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. H<You lack the literacy skill.>");
2063 return; 1890 return;
2064 } 1891 }
2065 1892
2066 if ((exp_gain = calc_skill_exp (op, tmp, skop))) 1893 if ((exp_gain = calc_skill_exp (op, tmp, skop)))
2067 change_exp (op, exp_gain, skop->skill, 0); 1894 change_exp (op, exp_gain, skop->skill, 0);
… …
2069 1896
2070 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1897 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
2071 identify (tmp); 1898 identify (tmp);
2072 1899
2073 new_draw_info_format (NDI_BLACK, 0, op, "The scroll of %s turns to dust.", &tmp->inv->name); 1900 new_draw_info_format (NDI_BLACK, 0, op, "The scroll of %s turns to dust.", &tmp->inv->name);
2074
2075 1901
2076 cast_spell (op, tmp, dir, tmp->inv, NULL); 1902 cast_spell (op, tmp, dir, tmp->inv, NULL);
2077 decrease_ob (tmp); 1903 decrease_ob (tmp);
2078} 1904}
2079 1905
… …
2083 * chest. 1909 * chest.
2084 */ 1910 */
2085static void 1911static void
2086apply_treasure (object *op, object *tmp) 1912apply_treasure (object *op, object *tmp)
2087{ 1913{
2088 object *treas;
2089
2090
2091 /* Nice side effect of new treasure creation method is that the treasure 1914 /* Nice side effect of new treasure creation method is that the treasure
2092 * for the chest is done when the chest is created, and put into the chest 1915 * for the chest is done when the chest is created, and put into the chest
2093 * inventory. So that when the chest burns up, the items still exist. Also 1916 * inventory. So that when the chest burns up, the items still exist. Also
2094 * prevents people fromt moving chests to more difficult maps to get better 1917 * prevents people fromt moving chests to more difficult maps to get better
2095 * treasure 1918 * treasure
2096 */ 1919 */
2097
2098 treas = tmp->inv; 1920 object *treas = tmp->inv;
2099 if (treas == NULL) 1921
1922 if (!treas)
2100 { 1923 {
2101 new_draw_info (NDI_UNIQUE, 0, op, "The chest was empty."); 1924 new_draw_info (NDI_UNIQUE, 0, op, "The chest was empty.");
2102 decrease_ob (tmp); 1925 decrease_ob (tmp);
2103 return; 1926 return;
2104 } 1927 }
1928
2105 while (tmp->inv) 1929 while (tmp->inv)
2106 { 1930 {
2107 treas = tmp->inv; 1931 treas = tmp->inv;
2108 1932
2109 treas->remove (); 1933 treas->remove ();
… …
2191 /* special food hack -b.t. */ 2015 /* special food hack -b.t. */
2192 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED)) 2016 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED))
2193 eat_special_food (op, tmp); 2017 eat_special_food (op, tmp);
2194 } 2018 }
2195 } 2019 }
2020
2196 handle_apply_yield (tmp); 2021 handle_apply_yield (tmp);
2197 decrease_ob (tmp); 2022 decrease_ob (tmp);
2198} 2023}
2199 2024
2200/** 2025/**
… …
2227 if (meal->type != FLESH || !is_dragon_pl (op)) 2052 if (meal->type != FLESH || !is_dragon_pl (op))
2228 return 0; 2053 return 0;
2229 2054
2230 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces 2055 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces
2231 from the player's inventory */ 2056 from the player's inventory */
2232 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2057 for (tmp = op->inv; tmp; tmp = tmp->below)
2233 {
2234 if (tmp->type == FORCE) 2058 if (tmp->type == FORCE)
2235 { 2059 if (tmp->arch->archname == shstr_dragon_skin_force)
2236 if (strcmp (tmp->arch->name, "dragon_skin_force") == 0)
2237 skin = tmp; 2060 skin = tmp;
2238 else if (strcmp (tmp->arch->name, "dragon_ability_force") == 0) 2061 else if (tmp->arch->archname == shstr_dragon_ability_force)
2239 abil = tmp; 2062 abil = tmp;
2240 }
2241 }
2242 2063
2243 /* if either skin or ability are missing, this is an old player 2064 /* if either skin or ability are missing, this is an old player
2244 which is not to be considered a dragon -> bail out */ 2065 which is not to be considered a dragon -> bail out */
2245 if (skin == NULL || abil == NULL) 2066 if (skin == NULL || abil == NULL)
2246 return 0; 2067 return 0;
… …
2287 /* doubled chance for resistance of ability-focus */ 2108 /* doubled chance for resistance of ability-focus */
2288 if (i == abil->stats.exp) 2109 if (i == abil->stats.exp)
2289 chance = MIN (100., chance * 2.); 2110 chance = MIN (100., chance * 2.);
2290 2111
2291 /* now make the throw and save all winners (Don't insert luck bonus here!) */ 2112 /* now make the throw and save all winners (Don't insert luck bonus here!) */
2292 if (RANDOM () % 10000 < (int) (chance * 100)) 2113 if (rndm (10000) < (unsigned int) (chance * 100))
2293 { 2114 {
2294 atnr_winner[winners] = i; 2115 atnr_winner[winners] = i;
2295 winners++; 2116 winners++;
2296 } 2117 }
2297 2118
… …
2366static void 2187static void
2367apply_armour_improver (object *op, object *tmp) 2188apply_armour_improver (object *op, object *tmp)
2368{ 2189{
2369 object *armor; 2190 object *armor;
2370 2191
2371 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) 2192 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_NO_MAGIC))
2372 { 2193 {
2373 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll."); 2194 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll. H<The area prevents magic effects.>");
2374 return; 2195 return;
2375 } 2196 }
2376 2197
2377 armor = find_marked_object (op); 2198 armor = find_marked_object (op);
2378 2199
2379 if (!armor) 2200 if (!armor)
2380 { 2201 {
2381 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark an armor object."); 2202 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark an armor object. Use the right mouse button popup or the mark command to do this.");
2382 return; 2203 return;
2383 } 2204 }
2384 2205
2385 if (armor->type != ARMOUR 2206 if (armor->type != ARMOUR
2386 && armor->type != CLOAK 2207 && armor->type != CLOAK
… …
2397extern void 2218extern void
2398apply_poison (object *op, object *tmp) 2219apply_poison (object *op, object *tmp)
2399{ 2220{
2400 if (op->type == PLAYER) 2221 if (op->type == PLAYER)
2401 { 2222 {
2402 play_sound_player_only (op->contr, SOUND_DRINK_POISON, 0, 0); 2223 op->contr->play_sound (sound_find ("drink_poison"));
2403 new_draw_info (NDI_UNIQUE, 0, op, "Yech! That tasted poisonous!"); 2224 new_draw_info (NDI_UNIQUE, 0, op, "Yech! That tasted poisonous!");
2404 strcpy (op->contr->killer, "poisonous booze"); 2225 strcpy (op->contr->killer, "poisonous booze");
2405 } 2226 }
2227
2406 if (tmp->stats.hp > 0) 2228 if (tmp->stats.hp > 0)
2407 { 2229 {
2408 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp); 2230 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp);
2409 hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1); 2231 hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1);
2410 } 2232 }
2233
2411 op->stats.food -= op->stats.food / 4; 2234 op->stats.food -= op->stats.food / 4;
2412 handle_apply_yield (tmp); 2235 handle_apply_yield (tmp);
2413 decrease_ob (tmp); 2236 decrease_ob (tmp);
2414} 2237}
2415 2238
… …
2456 continue; /*Not a valid exit */ 2279 continue; /*Not a valid exit */
2457 2280
2458 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y)) 2281 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y))
2459 continue; /*Not in the same place */ 2282 continue; /*Not in the same place */
2460 2283
2461 if (strcmp (exit->map->path, EXIT_PATH (tmp)) != 0) 2284 if (exit->map->path != EXIT_PATH (tmp))
2462 continue; /*Not in the same map */ 2285 continue; /*Not in the same map */
2463 2286
2464 /* From here we have found the exit is valid. However we do 2287 /* From here we have found the exit is valid. However we do
2465 * here the check of the exit owner. It is important for the 2288 * here the check of the exit owner. It is important for the
2466 * town portals to prevent strangers from visiting your appartments 2289 * town portals to prevent strangers from visiting your appartments
… …
2498 } 2321 }
2499 } 2322 }
2500 2323
2501 return 0; 2324 return 0;
2502} 2325}
2503
2504 2326
2505/** 2327/**
2506 * Main apply handler. 2328 * Main apply handler.
2507 * 2329 *
2508 * Checks for unpaid items before applying. 2330 * Checks for unpaid items before applying.
… …
2516 * being applied. 2338 * being applied.
2517 * 2339 *
2518 * aflag is special (always apply/unapply) flags. Nothing is done with 2340 * aflag is special (always apply/unapply) flags. Nothing is done with
2519 * them in this function - they are passed to apply_special 2341 * them in this function - they are passed to apply_special
2520 */ 2342 */
2521
2522int 2343int
2523manual_apply (object *op, object *tmp, int aflag) 2344manual_apply (object *op, object *tmp, int aflag)
2524{ 2345{
2525 if (tmp->head) 2346 if (tmp->head)
2526 tmp = tmp->head; 2347 tmp = tmp->head;
2527 2348
2528 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED)) 2349 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED))
2529 { 2350 {
2530 if (op->type == PLAYER) 2351 if (op->type == PLAYER)
2531 { 2352 {
2532 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first."); 2353 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first. H<You cannot use items marked as unpaid.>");
2533 return 1; 2354 return 1;
2534 } 2355 }
2535 else 2356 else
2536 return 0; /* monsters just skip unpaid items */ 2357 return 0; /* monsters just skip unpaid items */
2537 } 2358 }
… …
2541 2362
2542 switch (tmp->type) 2363 switch (tmp->type)
2543 { 2364 {
2544 case CF_HANDLE: 2365 case CF_HANDLE:
2545 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2366 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle.");
2546 play_sound_map (op->map, op->x, op->y, SOUND_TURN_HANDLE); 2367 op->play_sound (sound_find ("turn_handle"));
2547 tmp->value = tmp->value ? 0 : 1; 2368 tmp->value = tmp->value ? 0 : 1;
2548 SET_ANIMATION (tmp, tmp->value); 2369 SET_ANIMATION (tmp, tmp->value);
2549 update_object (tmp, UP_OBJ_FACE); 2370 update_object (tmp, UP_OBJ_FACE);
2550 push_button (tmp); 2371 push_button (tmp);
2551 return 1; 2372 return 1;
2552 2373
2553 case TRIGGER: 2374 case TRIGGER:
2554 if (check_trigger (tmp, op)) 2375 if (check_trigger (tmp, op))
2555 { 2376 {
2556 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2377 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle.");
2557 play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE); 2378 op->play_sound (sound_find ("turn_handle"));
2558 } 2379 }
2559 else 2380 else
2560 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move."); 2381 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move.");
2561 2382
2562 return 1; 2383 return 1;
… …
2564 case EXIT: 2385 case EXIT:
2565 if (op->type != PLAYER) 2386 if (op->type != PLAYER)
2566 return 0; 2387 return 0;
2567 2388
2568 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2389 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp))
2569 {
2570 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp)); 2390 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp));
2571 }
2572 else 2391 else
2573 { 2392 {
2574 /* Don't display messages for random maps. */ 2393 /* Don't display messages for random maps. */
2575 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2)) 2394 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2))
2576 new_draw_info (NDI_NAVY, 0, op, tmp->msg); 2395 new_draw_info (NDI_NAVY, 0, op, tmp->msg);
2577 2396
2578 op->enter_exit (tmp); 2397 op->enter_exit (tmp);
2579 } 2398 }
2399
2580 return 1; 2400 return 1;
2581 2401
2582 case SIGN: 2402 case SIGN:
2583 apply_sign (op, tmp, 0); 2403 apply_sign (op, tmp, 0);
2584 return 1; 2404 return 1;
… …
2588 { 2408 {
2589 apply_book (op, tmp); 2409 apply_book (op, tmp);
2590 return 1; 2410 return 1;
2591 } 2411 }
2592 else 2412 else
2593 {
2594 return 0; 2413 return 0;
2595 }
2596 2414
2597 case SKILLSCROLL: 2415 case SKILLSCROLL:
2598 if (op->type == PLAYER) 2416 if (op->type == PLAYER)
2599 { 2417 {
2600 apply_skillscroll (op, tmp); 2418 apply_skillscroll (op, tmp);
2601 return 1; 2419 return 1;
2602 } 2420 }
2421 else
2603 return 0; 2422 return 0;
2604 2423
2605 case SPELLBOOK: 2424 case SPELLBOOK:
2606 if (op->type == PLAYER) 2425 if (op->type == PLAYER)
2607 { 2426 {
2608 apply_spellbook (op, tmp); 2427 apply_spellbook (op, tmp);
2609 return 1; 2428 return 1;
2610 } 2429 }
2430 else
2611 return 0; 2431 return 0;
2612 2432
2613 case SCROLL: 2433 case SCROLL:
2614 apply_scroll (op, tmp, 0); 2434 apply_scroll (op, tmp, 0);
2615 return 1; 2435 return 1;
2616 2436
2617 case POTION: 2437 case POTION:
2618 (void) apply_potion (op, tmp); 2438 apply_potion (op, tmp);
2619 return 1; 2439 return 1;
2620 2440
2621 /* Eneq(@csd.uu.se): Handle apply on containers. */ 2441 /* Eneq(@csd.uu.se): Handle apply on containers. */
2442 //TODO: remove, as it is unsed?
2622 case CLOSE_CON: 2443 case CLOSE_CON:
2623 if (op->type == PLAYER)
2624 (void) esrv_apply_container (op, tmp->env);
2625 else
2626 (void) apply_container (op, tmp->env); 2444 apply_container (op, tmp->env);
2627 return 1; 2445 return 1;
2628 2446
2629 case CONTAINER: 2447 case CONTAINER:
2630 if (op->type == PLAYER)
2631 (void) esrv_apply_container (op, tmp);
2632 else
2633 (void) apply_container (op, tmp); 2448 apply_container (op, tmp);
2634 return 1; 2449 return 1;
2635 2450
2636 case TREASURE: 2451 case TREASURE:
2637 if (op->type == PLAYER) 2452 if (op->type == PLAYER)
2638 { 2453 {
2639 apply_treasure (op, tmp); 2454 apply_treasure (op, tmp);
2640 return 1; 2455 return 1;
2641 } 2456 }
2642 else 2457 else
2643 {
2644 return 0; 2458 return 0;
2645 }
2646 2459
2647 case WEAPON: 2460 case WEAPON:
2648 case ARMOUR: 2461 case ARMOUR:
2649 case BOOTS: 2462 case BOOTS:
2650 case GLOVES: 2463 case GLOVES:
… …
2663 case LAMP: 2476 case LAMP:
2664 case BUILDER: 2477 case BUILDER:
2665 case SKILL_TOOL: 2478 case SKILL_TOOL:
2666 if (tmp->env != op) 2479 if (tmp->env != op)
2667 return 2; /* not in inventory */ 2480 return 2; /* not in inventory */
2481
2668 (void) apply_special (op, tmp, aflag); 2482 apply_special (op, tmp, aflag);
2669 return 1; 2483 return 1;
2670 2484
2671 case DRINK: 2485 case DRINK:
2672 case FOOD: 2486 case FOOD:
2673 case FLESH: 2487 case FLESH:
… …
2689 } 2503 }
2690 else 2504 else
2691 return 0; 2505 return 0;
2692 2506
2693 case WEAPON_IMPROVER: 2507 case WEAPON_IMPROVER:
2694 (void) check_improve_weapon (op, tmp); 2508 check_improve_weapon (op, tmp);
2695 return 1; 2509 return 1;
2696 2510
2697 case CLOCK: 2511 case CLOCK:
2698 if (op->type == PLAYER) 2512 if (op->type == PLAYER)
2699 { 2513 {
… …
2702 2516
2703 get_tod (&tod); 2517 get_tod (&tod);
2704 sprintf (buf, "It is %d minute%s past %d o'clock %s", 2518 sprintf (buf, "It is %d minute%s past %d o'clock %s",
2705 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"), 2519 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"),
2706 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am")); 2520 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am"));
2707 play_sound_player_only (op->contr, SOUND_CLOCK, 0, 0); 2521 op->play_sound (sound_find ("sound_clock"));
2708 new_draw_info (NDI_UNIQUE, 0, op, buf); 2522 new_draw_info (NDI_UNIQUE, 0, op, buf);
2709 return 1; 2523 return 1;
2710 } 2524 }
2711 else 2525 else
2712 {
2713 return 0; 2526 return 0;
2714 }
2715 2527
2716 case MENU: 2528 case MENU:
2717 if (op->type == PLAYER) 2529 if (op->type == PLAYER)
2718 { 2530 {
2719 shop_listing (op); 2531 shop_listing (tmp, op);
2720 return 1; 2532 return 1;
2721 } 2533 }
2722 else 2534 else
2723 {
2724 return 0; 2535 return 0;
2725 }
2726 2536
2727 case POWER_CRYSTAL: 2537 case POWER_CRYSTAL:
2728 apply_power_crystal (op, tmp); /* see egoitem.c */ 2538 apply_power_crystal (op, tmp); /* see egoitem.c */
2729 return 1; 2539 return 1;
2730 2540
… …
2733 { 2543 {
2734 apply_lighter (op, tmp); 2544 apply_lighter (op, tmp);
2735 return 1; 2545 return 1;
2736 } 2546 }
2737 else 2547 else
2738 {
2739 return 0; 2548 return 0;
2740 }
2741 2549
2742 case ITEM_TRANSFORMER: 2550 case ITEM_TRANSFORMER:
2743 apply_item_transformer (op, tmp); 2551 apply_item_transformer (op, tmp);
2744 return 1; 2552 return 1;
2745 2553
… …
2758int 2566int
2759player_apply (object *pl, object *op, int aflag, int quiet) 2567player_apply (object *pl, object *op, int aflag, int quiet)
2760{ 2568{
2761 int tmp; 2569 int tmp;
2762 2570
2763 if (op->env == NULL && (pl->move_type & MOVE_FLYING)) 2571 if (op->env && (pl->move_type & MOVE_FLYING))
2764 { 2572 {
2765 /* player is flying and applying object not in inventory */ 2573 /* player is flying and applying object not in inventory */
2766 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING)) 2574 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
2767 { 2575 {
2768 new_draw_info (NDI_UNIQUE, 0, pl, "But you are floating high " "above the ground!"); 2576 new_draw_info (NDI_UNIQUE, 0, pl, "But you are floating high above the ground! H<You have to stop levitating first, if you can.>");
2769 return 0; 2577 return 0;
2770 } 2578 }
2771 }
2772
2773 /* Check for PLAYER to avoid a DM to disappear in a puff of smoke if
2774 * applied.
2775 */
2776 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_WAS_WIZ) && !QUERY_FLAG (pl, FLAG_WAS_WIZ))
2777 {
2778 play_sound_map (pl->map, pl->x, pl->y, SOUND_OB_EVAPORATE);
2779 new_draw_info (NDI_UNIQUE, 0, pl, "The object disappears in a puff " "of smoke!");
2780 new_draw_info (NDI_UNIQUE, 0, pl, "It must have been an illusion.");
2781 op->destroy ();
2782 return 1;
2783 } 2579 }
2784 2580
2785 pl->contr->last_used = op; 2581 pl->contr->last_used = op;
2786 2582
2787 tmp = manual_apply (pl, op, aflag); 2583 tmp = manual_apply (pl, op, aflag);
… …
2790 if (tmp == 0) 2586 if (tmp == 0)
2791 new_draw_info_format (NDI_UNIQUE, 0, pl, "I don't know how to apply the %s.", query_name (op)); 2587 new_draw_info_format (NDI_UNIQUE, 0, pl, "I don't know how to apply the %s.", query_name (op));
2792 else if (tmp == 2) 2588 else if (tmp == 2)
2793 new_draw_info_format (NDI_UNIQUE, 0, pl, "You must get it first!\n"); 2589 new_draw_info_format (NDI_UNIQUE, 0, pl, "You must get it first!\n");
2794 } 2590 }
2591
2795 return tmp; 2592 return tmp;
2796} 2593}
2797 2594
2798/** 2595/**
2799 * player_apply_below attempts to apply the object 'below' the player. 2596 * player_apply_below attempts to apply the object 'below' the player.
2800 * If the player has an open container, we use that for below, otherwise 2597 * If the player has an open container, we use that for below, otherwise
2801 * we use the ground. 2598 * we use the ground.
2802 */ 2599 */
2803
2804void 2600void
2805player_apply_below (object *pl) 2601player_apply_below (object *pl)
2806{ 2602{
2807 object *tmp, *next;
2808 int floors; 2603 int floors = 0;
2809 2604
2810 /* If using a container, set the starting item to be the top 2605 /* If using a container, set the starting item to be the top
2811 * item in the container. Otherwise, use the map. 2606 * item in the container. Otherwise, use the map.
2812 */
2813 tmp = (pl->container != NULL) ? pl->container->inv : pl->below;
2814
2815 /* This is perhaps more complicated. However, I want to make sure that 2607 * This is perhaps more complicated. However, I want to make sure that
2816 * we don't use a corrupt pointer for the next object, so we get the 2608 * we don't use a corrupt pointer for the next object, so we get the
2817 * next object in the stack before applying. This is can only be a 2609 * next object in the stack before applying. This is can only be a
2818 * problem if player_apply() has a bug in that it uses the object but does 2610 * problem if player_apply() has a bug in that it uses the object but does
2819 * not return a proper value. 2611 * not return a proper value.
2820 */ 2612 */
2821 for (floors = 0; tmp != NULL; tmp = next) 2613 for (object *next, *tmp = pl->container ? pl->container->inv : pl->below; tmp; tmp = next)
2822 { 2614 {
2823 next = tmp->below; 2615 next = tmp->below;
2616
2824 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 2617 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
2825 floors++; 2618 floors++;
2826 else if (floors > 0) 2619 else if (floors > 0)
2827 return; /* process only floor objects after first floor object */ 2620 return; /* process only floor objects after first floor object */
2828 2621
… …
2848 * to keep the size of apply_special to a more managable size. 2641 * to keep the size of apply_special to a more managable size.
2849 */ 2642 */
2850static int 2643static int
2851unapply_special (object *who, object *op, int aflags) 2644unapply_special (object *who, object *op, int aflags)
2852{ 2645{
2853 if (INVOKE_OBJECT (BE_UNREADY, op, ARG_OBJECT (who), ARG_INT (aflags)) || INVOKE_OBJECT (UNREADY, who, ARG_OBJECT (op), ARG_INT (aflags))) 2646 if (INVOKE_OBJECT (BE_UNREADY, op, ARG_OBJECT (who), ARG_INT (aflags))
2647 || INVOKE_OBJECT (UNREADY, who, ARG_OBJECT (op), ARG_INT (aflags)))
2854 return RESULT_INT (0); 2648 return RESULT_INT (0);
2855 2649
2856 object *tmp2;
2857
2858 CLEAR_FLAG (op, FLAG_APPLIED); 2650 CLEAR_FLAG (op, FLAG_APPLIED);
2651
2859 switch (op->type) 2652 switch (op->type)
2860 { 2653 {
2654 case SKILL_TOOL:
2655 // unapplying a skill tool should also unapply the skill it governs
2656 // but this is hard, as it shouldn't do so when the skill can
2657 // be used for other reasons
2658 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2659 if (tmp->skill == op->skill
2660 && tmp->type == SKILL
2661 && tmp->flag [FLAG_APPLIED]
2662 && !tmp->flag [FLAG_CAN_USE_SKILL])
2663 unapply_special (who, tmp, 0);
2664
2665 change_abil (who, op);
2666 break;
2667
2861 case WEAPON: 2668 case WEAPON:
2669 if (player *pl = who->contr)
2670 if (op == pl->combat_ob)
2671 {
2672 pl->combat_ob = 0;
2673 who->change_weapon (pl->ranged_ob);
2674 }
2675
2862 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op)); 2676 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op));
2863 2677
2864 (void) change_abil (who, op); 2678 change_abil (who, op);
2865 if (QUERY_FLAG (who, FLAG_READY_WEAPON))
2866 CLEAR_FLAG (who, FLAG_READY_WEAPON); 2679 CLEAR_FLAG (who, FLAG_READY_WEAPON);
2867 clear_skill (who);
2868 break; 2680 break;
2869 2681
2870 case SKILL: /* allows objects to impart skills */
2871 case SKILL_TOOL: 2682 case SKILL:
2872 if (op != who->chosen_skill) 2683 if (who->contr)
2873 {
2874 LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n");
2875 } 2684 {
2876 if (who->type == PLAYER)
2877 {
2878 if (who->contr->shoottype == range_skill)
2879 who->contr->shoottype = range_none;
2880 if (!op->invisible) 2685 if (!op->invisible)
2881 {
2882 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op)); 2686 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op));
2883 }
2884 else 2687 else
2885 {
2886 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill); 2688 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill);
2887 } 2689 }
2888 } 2690
2889 (void) change_abil (who, op); 2691 change_abil (who, op);
2890 who->chosen_skill = NULL;
2891 CLEAR_FLAG (who, FLAG_READY_SKILL); 2692 CLEAR_FLAG (who, FLAG_READY_SKILL);
2892 break; 2693 break;
2893 2694
2894 case ARMOUR: 2695 case ARMOUR:
2895 case HELMET: 2696 case HELMET:
… …
2900 case AMULET: 2701 case AMULET:
2901 case GIRDLE: 2702 case GIRDLE:
2902 case BRACERS: 2703 case BRACERS:
2903 case CLOAK: 2704 case CLOAK:
2904 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op)); 2705 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op));
2905 (void) change_abil (who, op); 2706 change_abil (who, op);
2906 break; 2707 break;
2708
2907 case LAMP: 2709 case LAMP:
2710 {
2908 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name); 2711 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name);
2712
2909 tmp2 = arch_to_object (op->other_arch); 2713 object *tmp2 = arch_to_object (op->other_arch);
2910 tmp2->x = op->x; 2714 tmp2->x = op->x;
2911 tmp2->y = op->y; 2715 tmp2->y = op->y;
2912 tmp2->map = op->map; 2716 tmp2->map = op->map;
2913 tmp2->below = op->below; 2717 tmp2->below = op->below;
2914 tmp2->above = op->above; 2718 tmp2->above = op->above;
2915 tmp2->stats.food = op->stats.food; 2719 tmp2->stats.food = op->stats.food;
2916 CLEAR_FLAG (tmp2, FLAG_APPLIED); 2720 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2917 2721
2918 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 2722 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2919 SET_FLAG (tmp2, FLAG_INV_LOCKED); 2723 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2920 2724
2921 if (who->type == PLAYER) 2725 if (who->contr)
2922 esrv_del_item (who->contr, op->count); 2726 esrv_del_item (who->contr, op->count);
2923 2727
2924 op->destroy (); 2728 op->destroy ();
2925 insert_ob_in_ob (tmp2, who); 2729 insert_ob_in_ob (tmp2, who);
2926 who->update_stats (); 2730 who->update_stats ();
2731
2927 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 2732 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2928 { 2733 {
2929 if (who->type == PLAYER) 2734 if (who->contr)
2930 { 2735 {
2931 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 2736 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
2932 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 2737 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2933 } 2738 }
2934 } 2739 }
2935 if (who->type == PLAYER) 2740
2741 if (who->contr)
2936 esrv_send_item (who, tmp2); 2742 esrv_send_item (who, tmp2);
2743 }
2744
2937 return 1; /* otherwise, an attempt to drop causes problems */ 2745 return 1; /* otherwise, an attempt to drop causes problems */
2938 break; 2746
2939 case BOW: 2747 case BOW:
2940 case WAND: 2748 case WAND:
2941 case ROD: 2749 case ROD:
2942 case HORN: 2750 case HORN:
2943 clear_skill (who); 2751 if (player *pl = who->contr)
2752 {
2753 if (op == pl->ranged_ob)
2754 {
2755 pl->ranged_ob = 0;
2756 who->change_weapon (pl->combat_ob);
2757 }
2758
2944 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2759 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2945 if (who->type == PLAYER)
2946 {
2947 who->contr->shoottype = range_none;
2948 } 2760 }
2949 else 2761 else
2950 { 2762 {
2763 who->change_skill (0);
2764
2951 if (op->type == BOW) 2765 if (op->type == BOW)
2952 CLEAR_FLAG (who, FLAG_READY_BOW); 2766 CLEAR_FLAG (who, FLAG_READY_BOW);
2953 else 2767 else
2954 CLEAR_FLAG (who, FLAG_READY_RANGE); 2768 CLEAR_FLAG (who, FLAG_READY_RANGE);
2955 } 2769 }
2770
2956 break; 2771 break;
2957 2772
2958 case BUILDER: 2773 case BUILDER:
2774 if (who->contr)
2959 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2775 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2960 who->contr->shoottype = range_none;
2961 who->contr->ranges[range_builder] = NULL;
2962 break; 2776 break;
2963 2777
2964 default: 2778 default:
2965 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op)); 2779 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op));
2966 break; 2780 break;
… …
2968 2782
2969 who->update_stats (); 2783 who->update_stats ();
2970 2784
2971 if (!(aflags & AP_NO_MERGE)) 2785 if (!(aflags & AP_NO_MERGE))
2972 { 2786 {
2973 object *tmp;
2974
2975 tmp = merge_ob (op, NULL); 2787 object *tmp = merge_ob (op, 0);
2976 if (who->type == PLAYER) 2788
2789 if (who->contr)
2977 { 2790 {
2978 if (tmp) 2791 if (tmp)
2979 { /* it was merged */ 2792 { /* it was merged */
2980 esrv_del_item (who->contr, op->count); 2793 esrv_del_item (who->contr, op->count);
2981 op = tmp; 2794 op = tmp;
2982 } 2795 }
2983 2796
2984 esrv_send_item (who, op); 2797 esrv_send_item (who, op);
2985 } 2798 }
2986 } 2799 }
2800
2987 return 0; 2801 return 0;
2988} 2802}
2989 2803
2990/** 2804/**
2991 * Returns the object that is using location 'loc'. 2805 * Returns the object that is using location 'loc'.
2992 * Note that 'start' is the first object to start examing - we 2806 * Note that 'start' is the first object to start examing - we
2993 * then go through the below of this. In this way, you can do 2807 * then go through the below of this. In this way, you can do
2994 * something like: 2808 * something like:
2995 * tmp = get_item_from_body_location(who->inv, 1); 2809 * tmp = get_next_item_from_body_location(who->inv, 1);
2996 * if (tmp) tmp1 = get_item_from_body_location(tmp->below, 1); 2810 * if (tmp) tmp1 = get_next_item_from_body_location(tmp->below, 1);
2997 * to find the second object that may use this location, etc. 2811 * to find the second object that may use this location, etc.
2998 * Returns NULL if no match is found. 2812 * Returns NULL if no match is found.
2999 * loc is the index into the array we are looking for a match. 2813 * loc is the index into the array we are looking for a match.
3000 * don't return invisible objects unless they are skill objects 2814 * don't return invisible objects unless they are skill objects
3001 * invisible other objects that use 2815 * invisible other objects that use
3002 * up body locations can be used as restrictions. 2816 * up body locations can be used as restrictions.
3003 */ 2817 */
3004object * 2818static object *
3005get_item_from_body_location (object *start, int loc) 2819get_next_item_from_body_location (int loc, object *start)
3006{ 2820{
3007 object *tmp;
3008
3009 if (!start)
3010 return NULL;
3011
3012 for (tmp = start; tmp; tmp = tmp->below) 2821 for (object *tmp = start; tmp; tmp = tmp->below)
3013 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->body_info[loc] && (!tmp->invisible || tmp->type == SKILL)) 2822 if (tmp->flag [FLAG_APPLIED]
2823 && tmp->slot[loc].info
2824 && (!tmp->invisible || tmp->type == SKILL))
3014 return tmp; 2825 return tmp;
3015 2826
3016 return NULL; 2827 return 0;
3017} 2828}
3018
3019
3020 2829
3021/** 2830/**
3022 * 'op' wants to apply an object, but can't because of other equipment. 2831 * 'op' wants to apply an object, but can't because of other equipment.
3023 * This should only be called when it is known 2832 * This should only be called when it is known
3024 * that there are objects to unapply. This makes pretty heavy 2833 * that there are objects to unapply. This makes pretty heavy
… …
3027 * Returns 0 on success, returns 1 if there is some problem. 2836 * Returns 0 on success, returns 1 if there is some problem.
3028 * if aflags is AP_PRINT, we instead print out waht to unapply 2837 * if aflags is AP_PRINT, we instead print out waht to unapply
3029 * instead of doing it. This is a lot less code than having 2838 * instead of doing it. This is a lot less code than having
3030 * another function that does just that. 2839 * another function that does just that.
3031 */ 2840 */
2841
2842#define CANNOT_REMOVE_CURSED \
2843 "H<You cannot remove cursed or damned items, you first have to remove the curse. " \
2844 "Praying over an altar, scrolls of remove curse/damnation, " \
2845 "priests or even other players might help.>"
2846
3032int 2847int
3033unapply_for_ob (object *who, object *op, int aflags) 2848unapply_for_ob (object *who, object *op, int aflags)
3034{ 2849{
3035 int i; 2850 if (op->is_range ())
3036 object *tmp = NULL, *last;
3037
3038 /* If we are applying a shield or weapon, unapply any equipped shield
3039 * or weapons first - only allowed to use one weapon/shield at a time.
3040 */
3041 if (op->type == WEAPON || op->type == SHIELD)
3042 {
3043 for (tmp = who->inv; tmp; tmp = tmp->below) 2851 for (object *tmp = who->inv; tmp; tmp = tmp->below)
3044 {
3045 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type) 2852 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ())
3046 {
3047 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))) 2853 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)))
3048 { 2854 {
3049 if (aflags & AP_PRINT) 2855 if (aflags & AP_PRINT)
3050 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2856 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp));
3051 else 2857 else
3052 unapply_special (who, tmp, aflags); 2858 unapply_special (who, tmp, aflags);
3053 } 2859 }
3054 else 2860 else
3055 { 2861 {
3056 /* In this case, we want to try and remove a cursed item. 2862 /* In this case, we want to try and remove a cursed item.
3057 * While we know it won't work, we want unapply_special to 2863 * While we know it won't work, we want unapply_special to
3058 * at least generate the message. 2864 * at least generate the message.
3059 */ 2865 */
3060 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (tmp)); 2866 new_draw_info_format (NDI_UNIQUE, 0, who,
2867 "No matter how hard you try, you just can't remove the %s." CANNOT_REMOVE_CURSED,
2868 query_name (tmp));
3061 return 1; 2869 return 1;
3062 }
3063
3064 } 2870 }
3065 }
3066 }
3067 2871
3068 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 2872 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
3069 { 2873 {
3070 /* this used up a slot that we need to free */ 2874 /* this used up a slot that we need to free */
3071 if (op->body_info[i]) 2875 if (op->slot[i].info)
3072 { 2876 {
3073 last = who->inv; 2877 object *last = who->inv;
3074 2878
3075 /* We do a while loop - may need to remove several items in order 2879 /* We do a while loop - may need to remove several items in order
3076 * to free up enough slots. 2880 * to free up enough slots.
3077 */ 2881 */
3078 while ((who->body_used[i] + op->body_info[i]) < 0) 2882 while ((who->slot[i].used + op->slot[i].info) < 0)
3079 { 2883 {
3080 tmp = get_item_from_body_location (last, i); 2884 object *tmp = get_next_item_from_body_location (i, last);
2885
3081 if (!tmp) 2886 if (!tmp)
3082 { 2887 {
3083#if 0 2888#if 0
3084 /* Not a bug - we'll get this if the player has cursed items 2889 /* Not a bug - we'll get this if the player has cursed items
3085 * equipped. 2890 * equipped.
3086 */ 2891 */
3087 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name); 2892 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name);
3088#endif 2893#endif
3089 return 1; 2894 return 1;
3090 } 2895 }
2896
3091 /* If we are just printing, we don't care about cursed status */ 2897 /* If we are just printing, we don't care about cursed status */
3092 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))) 2898 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))))
3093 { 2899 {
3094 if (aflags & AP_PRINT) 2900 if (aflags & AP_PRINT)
3095 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2901 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp));
… …
3101 /* Cursed item that we can't unequip - tell the player. 2907 /* Cursed item that we can't unequip - tell the player.
3102 * Note this could be annoying if this is just one of a few, 2908 * Note this could be annoying if this is just one of a few,
3103 * so it may not be critical (eg, putting on a ring and you have 2909 * so it may not be critical (eg, putting on a ring and you have
3104 * one cursed ring.) 2910 * one cursed ring.)
3105 */ 2911 */
3106 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp)); 2912 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off." CANNOT_REMOVE_CURSED, query_name (tmp));
3107 } 2913 }
2914
3108 last = tmp->below; 2915 last = tmp->below;
3109 } 2916 }
3110 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the 2917 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the
3111 * return in the !tmp would have kicked in. 2918 * return in the !tmp would have kicked in.
3112 */ 2919 */
3113 } /* if op is using this body location */ 2920 } /* if op is using this body location */
3114 } /* for body lcoations */ 2921 } /* for body lcoations */
2922
3115 return 0; 2923 return 0;
3116} 2924}
3117 2925
3118/** 2926/**
3119 * Checks to see if 'who' can apply object 'op'. 2927 * Checks to see if 'who' can apply object 'op'.
3120 * Returns 0 if apply can be done without anything special. 2928 * Returns 0 if apply can be done without anything special.
3121 * Otherwise returns a bitmask - potentially several of these may be 2929 * Otherwise returns a bitmask - potentially several of these may be
3122 * set, but largely depends on circumstance - in the future, processing 2930 * set, but largely depends on circumstance - in the future, processing
3123 * may be pruned once we know some status (eg, once CAN_APPLY_NEVER 2931 * may be pruned once we know some status (eg, once CAN_APPLY_NEVER
3124 * is set, do we really are what the other flags may be?) 2932 * is set, do we really care what the other flags may be?)
3125 * 2933 *
3126 * See include/define.h for detailed description of the meaning of 2934 * See include/define.h for detailed description of the meaning of
3127 * these return values. 2935 * these return values.
3128 */ 2936 */
3129int 2937int
3130can_apply_object (object *who, object *op) 2938can_apply_object (object *who, object *op)
3131{ 2939{
3132 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op))) 2940 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op)))
3133 return RESULT_INT (0); 2941 return RESULT_INT (0);
3134 2942
3135 int i, retval = 0; 2943 int retval = 0;
3136 object *tmp = NULL, *ws = NULL; 2944 object *tmp = 0, *ws = 0;
3137 2945
3138 /* Players have 2 'arm's, so they could in theory equip 2 shields or 2946 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
3139 * 2 weapons, but we don't want to let them do that. So if they are
3140 * trying to equip a weapon or shield, see if they already have one
3141 * in place and store that way.
3142 */
3143 if (op->type == WEAPON || op->type == SHIELD)
3144 { 2947 {
3145 for (tmp = who->inv; tmp && !ws; tmp = tmp->below) 2948 if (op->slot[i].info)
3146 { 2949 {
3147 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type) 2950 /* Item uses more slots than we have */
2951 if (who->slot[i].info + op->slot [i].info < 0)
3148 { 2952 {
3149 retval = CAN_APPLY_UNAPPLY;
3150 ws = tmp;
3151 }
3152 }
3153 }
3154
3155
3156 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
3157 {
3158 if (op->body_info[i])
3159 {
3160 /* Item uses more slots than we have */
3161 if (FABS (op->body_info[i]) > who->body_info[i])
3162 {
3163 /* Could return now for efficiently - rest of info below isn' 2953 /* Could return now for efficiency - rest of info below isn't
3164 * really needed. 2954 * really needed.
3165 */ 2955 */
3166 retval |= CAN_APPLY_NEVER; 2956 retval |= CAN_APPLY_NEVER;
3167 } 2957 }
3168 else if ((who->body_used[i] + op->body_info[i]) < 0) 2958 else if (who->slot[i].used + op->slot[i].info < 0)
3169 { 2959 {
3170 /* in this case, equipping this would use more free spots than 2960 /* in this case, equipping this would use more free spots than
3171 * we have. 2961 * we have.
3172 */ 2962 */
3173 object *tmp1;
3174
3175 2963
3176 /* if we have an applied weapon/shield, and unapply it would free 2964 /* if we have an applied weapon/shield, and unapply it would free
3177 * enough slots to equip the new item, then just set this can 2965 * enough slots to equip the new item, then just set "can
3178 * continue. We don't care about the logic below - if you have 2966 * apply unapply". We don't care about the logic below - if you have a
3179 * shield equipped and try to equip another shield, there is only 2967 * shield equipped and try to equip another shield, there is only
3180 * one choice. However, the check for the number of body locations 2968 * one choice. However, the check for the number of body locations
3181 * does take into the account cases where what is being applied 2969 * does take into the account cases where what is being applied
3182 * may be two handed for example. 2970 * may be two handed for example.
3183 */ 2971 */
3184 if (ws) 2972 if (ws)
3185 { 2973 if ((who->slot[i].used - ws->slot[i].info + op->slot[i].info) >= 0)
3186 if ((who->body_used[i] - ws->body_info[i] + op->body_info[i]) >= 0)
3187 { 2974 {
3188 retval |= CAN_APPLY_UNAPPLY; 2975 retval |= CAN_APPLY_UNAPPLY;
3189 continue; 2976 continue;
3190 } 2977 }
3191 }
3192 2978
3193 tmp1 = get_item_from_body_location (who->inv, i); 2979 object *tmp1 = get_next_item_from_body_location (i, who->inv);
3194 if (!tmp1) 2980 if (!tmp1)
3195 { 2981 {
3196#if 0 2982#if 0
3197 /* This is sort of an error, but happens a lot when old players 2983 /* This is sort of an error, but happens a lot when old players
3198 * join in with more stuff equipped than they are now allowed. 2984 * join in with more stuff equipped than they are now allowed.
… …
3206 /* need to unapply something. However, if this something 2992 /* need to unapply something. However, if this something
3207 * is different than we had found before, it means they need 2993 * is different than we had found before, it means they need
3208 * to apply multiple objects 2994 * to apply multiple objects
3209 */ 2995 */
3210 retval |= CAN_APPLY_UNAPPLY; 2996 retval |= CAN_APPLY_UNAPPLY;
2997
3211 if (!tmp) 2998 if (!tmp)
3212 tmp = tmp1; 2999 tmp = tmp1;
3213 else if (tmp != tmp1) 3000 else if (tmp != tmp1)
3214 {
3215 retval |= CAN_APPLY_UNAPPLY_MULT; 3001 retval |= CAN_APPLY_UNAPPLY_MULT;
3216 } 3002
3217 /* This object isn't using up all the slots, so there must 3003 /* This object isn't using up all the slots, so there must
3218 * be another. If so, and it the new item doesn't need all 3004 * be another. If so, and it the new item doesn't need all
3219 * the slots, the player then has a choice. 3005 * the slots, the player then has a choice.
3220 */ 3006 */
3221 if (((who->body_used[i] - tmp1->body_info[i]) != who->body_info[i]) && (FABS (op->body_info[i]) < who->body_info[i])) 3007 if ((who->slot[i].used - tmp1->slot[i].info != who->slot[i].info)
3008 && abs (op->slot[i].info) < who->slot[i].info)
3222 retval |= CAN_APPLY_UNAPPLY_CHOICE; 3009 retval |= CAN_APPLY_UNAPPLY_CHOICE;
3223 3010
3224 /* Does unequippint 'tmp1' free up enough slots for this to be 3011 /* Does unequippint 'tmp1' free up enough slots for this to be
3225 * equipped? If not, there must be something else to unapply. 3012 * equipped? If not, there must be something else to unapply.
3226 */ 3013 */
3227 if ((who->body_used[i] + op->body_info[i] - tmp1->body_info[i]) < 0) 3014 if (who->slot[i].used + op->slot[i].info < tmp1->slot[i].info)
3228 retval |= CAN_APPLY_UNAPPLY_MULT; 3015 retval |= CAN_APPLY_UNAPPLY_MULT;
3229
3230 } 3016 }
3231 } /* if not enough free slots */ 3017 } /* if not enough free slots */
3232 } /* if this object uses location i */ 3018 } /* if this object uses location i */
3233 } /* for i -> num_body_locations loop */ 3019 } /* for i -> num_body_locations loop */
3234 3020
… …
3239 * and weapons all use the same slot. Similar for horn/rod/wand - they 3025 * and weapons all use the same slot. Similar for horn/rod/wand - they
3240 * all use the same location. 3026 * all use the same location.
3241 */ 3027 */
3242 if (op->type == WEAPON && !QUERY_FLAG (who, FLAG_USE_WEAPON)) 3028 if (op->type == WEAPON && !QUERY_FLAG (who, FLAG_USE_WEAPON))
3243 retval |= CAN_APPLY_RESTRICTION; 3029 retval |= CAN_APPLY_RESTRICTION;
3030
3244 if (op->type == SHIELD && !QUERY_FLAG (who, FLAG_USE_SHIELD)) 3031 if (op->type == SHIELD && !QUERY_FLAG (who, FLAG_USE_SHIELD))
3245 retval |= CAN_APPLY_RESTRICTION; 3032 retval |= CAN_APPLY_RESTRICTION;
3246 3033
3247
3248 if (who->type != PLAYER) 3034 if (who->type != PLAYER)
3249 { 3035 {
3250 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE)) 3036 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE))
3251 retval |= CAN_APPLY_RESTRICTION; 3037 retval |= CAN_APPLY_RESTRICTION;
3038
3252 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3039 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3253 retval |= CAN_APPLY_RESTRICTION; 3040 retval |= CAN_APPLY_RESTRICTION;
3041
3254 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING)) 3042 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING))
3255 retval |= CAN_APPLY_RESTRICTION; 3043 retval |= CAN_APPLY_RESTRICTION;
3044
3256 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3045 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3257 retval |= CAN_APPLY_RESTRICTION; 3046 retval |= CAN_APPLY_RESTRICTION;
3258 } 3047 }
3048
3259 return retval; 3049 return retval;
3260} 3050}
3261
3262
3263 3051
3264/** 3052/**
3265 * who is the object using the object. It can be a monster. 3053 * who is the object using the object. It can be a monster.
3266 * op is the object they are using. op is an equipment type item, 3054 * op is the object they are using. op is an equipment type item,
3267 * eg, one which you put on and keep on for a while, and not something 3055 * eg, one which you put on and keep on for a while, and not something
… …
3276 * AP_UNAPPLY=always unapply). 3064 * AP_UNAPPLY=always unapply).
3277 * 3065 *
3278 * Optional flags: 3066 * Optional flags:
3279 * AP_NO_MERGE: don't merge an unapplied object with other objects 3067 * AP_NO_MERGE: don't merge an unapplied object with other objects
3280 * AP_IGNORE_CURSE: unapply cursed items 3068 * AP_IGNORE_CURSE: unapply cursed items
3069 * AP_NO_READY: do not ready skills when applying skill tools
3281 * 3070 *
3282 * Usage example: apply_special (who, op, AP_UNAPPLY | AP_IGNORE_CURSE) 3071 * Usage example: apply_special (who, op, AP_UNAPPLY | AP_IGNORE_CURSE)
3283 * 3072 *
3284 * apply_special() doesn't check for unpaid items. 3073 * apply_special() doesn't check for unpaid items.
3285 */ 3074 */
3075
3076#define LACK_ITEM_POWER \
3077 " H<You lack enough unused item power to use this weapon, see the skills command.>"
3078
3286int 3079int
3287apply_special (object *who, object *op, int aflags) 3080apply_special (object *who, object *op, int aflags)
3288{ 3081{
3289 int basic_flag = aflags & AP_BASIC_FLAGS; 3082 int basic_flag = aflags & AP_BASIC_FLAGS;
3290 object *tmp, *tmp2, *skop = NULL; 3083 object *tmp, *tmp2, *skop = NULL;
3291 int i;
3292 3084
3293 if (who == NULL) 3085 if (who == NULL)
3294 { 3086 {
3295 LOG (llevError, "apply_special() from object without environment.\n"); 3087 LOG (llevError, "apply_special() from object without environment.\n");
3296 return 1; 3088 return 1;
… …
3306 if (basic_flag == AP_APPLY) 3098 if (basic_flag == AP_APPLY)
3307 return 0; 3099 return 0;
3308 3100
3309 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 3101 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
3310 { 3102 {
3311 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (op)); 3103 new_draw_info_format (NDI_UNIQUE, 0, who,
3104 "No matter how hard you try, you just can't remove %s." CANNOT_REMOVE_CURSED,
3105 query_name (op));
3312 return 1; 3106 return 1;
3313 } 3107 }
3108
3314 return unapply_special (who, op, aflags); 3109 return unapply_special (who, op, aflags);
3315 } 3110 }
3316 3111
3317 if (basic_flag == AP_UNAPPLY) 3112 if (basic_flag == AP_UNAPPLY)
3318 return 0; 3113 return 0;
3319 3114
3320 i = can_apply_object (who, op); 3115 // if the item is combat/ranged, wield the relevant slot first
3116 // to resolve conflicts.
3117 if (player *pl = who->contr)
3118 switch (op->slottype ())
3119 {
3120 case slot_combat: who->change_weapon (pl->combat_ob); break;
3121 case slot_ranged: who->change_weapon (pl->ranged_ob); break;
3122 }
3123
3124 splay (op);
3321 3125
3322 /* Can't just apply this object. Lets see what not and what to do */ 3126 /* Can't just apply this object. Lets see what not and what to do */
3323 if (i) 3127 if (int i = can_apply_object (who, op))
3324 { 3128 {
3325 if (i & CAN_APPLY_NEVER) 3129 if (i & CAN_APPLY_NEVER)
3326 { 3130 {
3327 new_draw_info_format (NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name (op)); 3131 new_draw_info_format (NDI_UNIQUE, 0, who,
3132 "You don't have the body to use a %s. H<You can never apply this item.>",
3133 query_name (op));
3328 return 1; 3134 return 1;
3329 } 3135 }
3330 else if (i & CAN_APPLY_RESTRICTION) 3136 else if (i & CAN_APPLY_RESTRICTION)
3331 { 3137 {
3332 new_draw_info_format (NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name (op)); 3138 new_draw_info_format (NDI_UNIQUE, 0, who,
3139 "You have a prohibition against using a %s. "
3140 "H<Your belief, profession or class prevents you from applying this item.>",
3141 query_name (op));
3333 return 1; 3142 return 1;
3334 } 3143 }
3144
3335 if (who->type != PLAYER) 3145 if (who->type != PLAYER)
3336 { 3146 {
3337 /* Some error, so don't try to equip something more */ 3147 /* Some error, so don't try to equip something more */
3338 if (unapply_for_ob (who, op, aflags)) 3148 if (unapply_for_ob (who, op, aflags))
3339 return 1; 3149 return 1;
… …
3345 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some of the following item(s) or change your applymode:"); 3155 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some of the following item(s) or change your applymode:");
3346 unapply_for_ob (who, op, AP_PRINT); 3156 unapply_for_ob (who, op, AP_PRINT);
3347 return 1; 3157 return 1;
3348 } 3158 }
3349 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE)) 3159 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE))
3350 {
3351 i = unapply_for_ob (who, op, aflags); 3160 if (unapply_for_ob (who, op, aflags))
3352 if (i)
3353 return 1; 3161 return 1;
3354 }
3355 } 3162 }
3356 } 3163 }
3357 3164
3358 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL) 3165 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL)
3359 { 3166 {
3360 skop = find_skill_by_name (who, op->skill); 3167 skop = find_skill_by_name (who, op->skill);
3168
3361 if (!skop) 3169 if (!skop)
3362 { 3170 {
3363 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill); 3171 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill);
3364 return 1; 3172 return 1;
3365 } 3173 }
3366 else 3174 else
3367 {
3368 /* While experience will be credited properly, we want to change the 3175 /* While experience will be credited properly, we want to change the
3369 * skill so that the dam and wc get updated 3176 * skill so that the dam and wc get updated
3370 */ 3177 */
3371 change_skill (who, skop, 0); 3178 who->change_skill (skop);
3372 }
3373 }
3374
3375 if (who->type == PLAYER && op->item_power && (op->item_power + who->contr->item_power) > (settings.item_power_factor * who->level))
3376 { 3179 }
3377 new_draw_info (NDI_UNIQUE, 0, who, "Equipping that combined with other items would consume your soul!"); 3180
3181 if (who->type == PLAYER
3182 && op->item_power
3183 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level)
3184 {
3185 new_draw_info (NDI_UNIQUE, 0, who,
3186 "Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER);
3378 return 1; 3187 return 1;
3379 } 3188 }
3380
3381 3189
3382 /* Ok. We are now at the state where we can apply the new object. 3190 /* Ok. We are now at the state where we can apply the new object.
3383 * Note that we don't have the checks for can_use_... 3191 * Note that we don't have the checks for can_use_...
3384 * below - that is already taken care of by can_apply_object. 3192 * below - that is already taken care of by can_apply_object.
3385 */ 3193 */
3386
3387
3388 if (op->nrof > 1) 3194 if (op->nrof > 1)
3389 tmp = get_split_ob (op, op->nrof - 1); 3195 tmp = get_split_ob (op, op->nrof - 1);
3390 else 3196 else
3391 tmp = NULL; 3197 tmp = 0;
3392 3198
3393 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op))) 3199 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
3394 return RESULT_INT (0); 3200 return RESULT_INT (0);
3395 3201
3396 switch (op->type) 3202 switch (op->type)
3397 { 3203 {
3398 case WEAPON: 3204 case WEAPON:
3399 if (!check_weapon_power (who, op->last_eat)) 3205 if (!check_weapon_power (who, op->last_eat))
3400 { 3206 {
3401 new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use."); 3207 new_draw_info (NDI_UNIQUE, 0, who, "This weapon is too powerful for you to use. "
3402 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3208 "It would consume your soul!." LACK_ITEM_POWER);
3209
3403 if (tmp != NULL) 3210 if (tmp)
3404 (void) insert_ob_in_ob (tmp, who); 3211 insert_ob_in_ob (tmp, who);
3212
3405 return 1; 3213 return 1;
3406 } 3214 }
3215
3216 //TODO: this obviously fails for players using a shorter prefix
3217 // i.e. "R" can use Ragnarok's sword.
3407 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3218 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3408 { 3219 {
3409 /* if the weapon does not have the name as the character, can't use it. */ 3220 /* if the weapon does not have the name as the character, can't use it. */
3410 /* (Ragnarok's sword attempted to be used by Foo: won't work) */ 3221 /* (Ragnarok's sword attempted to be used by Foo: won't work) */
3411 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3222 new_draw_info (NDI_UNIQUE, 0, who,
3223 "The weapon does not recognize you as its owner. "
3224 "H<Its name indicates that it belongs to somebody else.>");
3225
3412 if (tmp != NULL) 3226 if (tmp)
3413 (void) insert_ob_in_ob (tmp, who); 3227 insert_ob_in_ob (tmp, who);
3228
3414 return 1; 3229 return 1;
3415 } 3230 }
3231
3232 if (!skop)
3233 {
3234 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO
3235 return 1;
3236 }
3237
3416 SET_FLAG (op, FLAG_APPLIED); 3238 SET_FLAG (op, FLAG_APPLIED);
3417
3418 if (skop)
3419 change_skill (who, skop, 1); 3239 who->change_skill (skop);
3420 if (!QUERY_FLAG (who, FLAG_READY_WEAPON)) 3240
3421 SET_FLAG (who, FLAG_READY_WEAPON); 3241 if (who->contr)
3242 who->change_weapon (who->contr->combat_ob = op);
3422 3243
3423 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op)); 3244 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op));
3424 3245
3246 SET_FLAG (who, FLAG_READY_WEAPON);
3425 (void) change_abil (who, op); 3247 change_abil (who, op);
3426 break; 3248 break;
3427 3249
3428 case ARMOUR: 3250 case ARMOUR:
3429 case HELMET: 3251 case HELMET:
3430 case SHIELD: 3252 case SHIELD:
… …
3435 case CLOAK: 3257 case CLOAK:
3436 case RING: 3258 case RING:
3437 case AMULET: 3259 case AMULET:
3438 SET_FLAG (op, FLAG_APPLIED); 3260 SET_FLAG (op, FLAG_APPLIED);
3439 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op)); 3261 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op));
3440 (void) change_abil (who, op); 3262 change_abil (who, op);
3441 break; 3263 break;
3264
3442 case LAMP: 3265 case LAMP:
3443 if (op->stats.food < 1) 3266 if (op->stats.food < 1)
3444 { 3267 {
3445 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of" " fuel!", &op->name); 3268 new_draw_info_format (NDI_UNIQUE, 0, who,
3269 "Your %s is out of fuel! "
3270 "H<Lamps and similar items need fuel. They cannot be refilled.>", &op->name);
3446 return 1; 3271 return 1;
3447 } 3272 }
3273
3448 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name); 3274 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name);
3449 tmp2 = arch_to_object (op->other_arch); 3275 tmp2 = arch_to_object (op->other_arch);
3450 tmp2->stats.food = op->stats.food; 3276 tmp2->stats.food = op->stats.food;
3451 SET_FLAG (tmp2, FLAG_APPLIED); 3277 SET_FLAG (tmp2, FLAG_APPLIED);
3278
3452 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 3279 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3453 SET_FLAG (tmp2, FLAG_INV_LOCKED); 3280 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3281
3454 insert_ob_in_ob (tmp2, who); 3282 insert_ob_in_ob (tmp2, who);
3455 3283
3456 /* Remove the old lantern */ 3284 /* Remove the old lantern */
3457 if (who->type == PLAYER) 3285 if (who->type == PLAYER)
3458 esrv_del_item (who->contr, op->count); 3286 esrv_del_item (who->contr, op->count);
3459 3287
3460 op->destroy (); 3288 op->destroy ();
3461 3289
3462 /* insert the portion that was split off */ 3290 /* insert the portion that was split off */
3463 if (tmp != NULL) 3291 if (tmp)
3464 { 3292 {
3465 (void) insert_ob_in_ob (tmp, who); 3293 insert_ob_in_ob (tmp, who);
3466 if (who->type == PLAYER) 3294 if (who->type == PLAYER)
3467 esrv_send_item (who, tmp); 3295 esrv_send_item (who, tmp);
3468 } 3296 }
3297
3469 who->update_stats (); 3298 who->update_stats ();
3299
3470 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3300 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3471 {
3472 if (who->type == PLAYER) 3301 if (who->type == PLAYER)
3473 { 3302 {
3474 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3303 new_draw_info (NDI_UNIQUE, 0, who,
3304 "Oops, it feels deadly cold! "
3305 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>");
3475 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 3306 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3476 } 3307 }
3477 } 3308
3478 if (who->type == PLAYER) 3309 if (who->type == PLAYER)
3479 esrv_send_item (who, tmp2); 3310 esrv_send_item (who, tmp2);
3311
3480 return 0; 3312 return 0;
3313
3314 case SKILL_TOOL:
3315 // applying a skill tool also readies the skill
3316 SET_FLAG (op, FLAG_APPLIED);
3317
3318 if (!(aflags & AP_NO_READY))
3319 {
3320 skop = find_skill_by_name (who, op->skill);
3321 if (!skop->flag [FLAG_APPLIED])
3322 apply_special (who, skop, AP_APPLY);
3323 }
3481 break; 3324 break;
3482 3325
3483 /* this part is needed for skill-tools */
3484 case SKILL: 3326 case SKILL:
3485 case SKILL_TOOL: 3327 if (player *pl = who->contr)
3486 if (who->chosen_skill)
3487 {
3488 LOG (llevError, "BUG: apply_special(): can't apply two skills\n");
3489 return 1;
3490 } 3328 {
3491 if (who->type == PLAYER) 3329 if (IS_COMBAT_SKILL (op->subtype))
3492 { 3330 {
3493 who->contr->shoottype = range_skill; 3331 if (skill_flags [op->subtype] & SF_NEED_WEAPON)
3494 who->contr->ranges[range_skill] = op; 3332 {
3333 for (object *item = who->inv; item; item = item->below)
3334 if (item->type == WEAPON && item->flag [FLAG_APPLIED])
3335 {
3336 if (item->skill == op->skill)
3337 {
3338 who->change_weapon (pl->combat_ob = item);
3339 goto found_weapon;
3340 }
3341 }
3342
3343 new_draw_info_format (NDI_UNIQUE, 0, who,
3344 "You need to apply a '%s' melee weapon before readying this skill. "
3345 "H<Some skills need an item, in this case a melee weapon, to function.>",
3346 &op->skill);
3347 return 1;
3348
3349 found_weapon:;
3350 }
3351 else
3352 who->change_weapon (pl->combat_ob = op);
3353 }
3354 else if (IS_RANGED_SKILL (op->subtype))
3355 {
3356 if (skill_flags [op->subtype] & SF_NEED_BOW)
3357 {
3358 for (object *item = who->inv; item; item = item->below)
3359 if (item->type == BOW && item->flag [FLAG_APPLIED])
3360 {
3361 //TODO: bows should/must all have skill missile weapon right now
3362 who->change_weapon (pl->ranged_ob = item);
3363 goto found_bow;
3364 }
3365
3366 new_draw_info (NDI_UNIQUE, 0, who,
3367 "You need to apply a missile weapon before readying this skill. "
3368 "H<Some skills need an item, in this case a missile weapon, to function.>");
3369 return 1;
3370
3371 found_bow:;
3372 }
3373 else
3374 who->change_weapon (pl->ranged_ob = op);
3375 }
3376
3495 if (!op->invisible) 3377 if (!op->invisible)
3496 { 3378 {
3497 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3379 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3498 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill); 3380 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill);
3499 } 3381 }
3500 else 3382 else
3501 {
3502 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name); 3383 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name);
3503 } 3384 }
3385 else
3504 } 3386 {
3505 SET_FLAG (op, FLAG_APPLIED); 3387 SET_FLAG (op, FLAG_APPLIED);
3506 (void) change_abil (who, op); 3388 change_abil (who, op);
3507 who->chosen_skill = op; 3389 who->chosen_skill = op;
3508 SET_FLAG (who, FLAG_READY_SKILL); 3390 SET_FLAG (who, FLAG_READY_SKILL);
3391 }
3392
3509 break; 3393 break;
3510 3394
3511 case BOW: 3395 case BOW:
3512 if (!check_weapon_power (who, op->last_eat)) 3396 if (!check_weapon_power (who, op->last_eat))
3513 { 3397 {
3514 new_draw_info (NDI_UNIQUE, 0, who, "That item is too powerful for you to use."); 3398 new_draw_info (NDI_UNIQUE, 0, who,
3515 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3399 "That weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3400
3516 if (tmp != NULL) 3401 if (tmp)
3517 (void) insert_ob_in_ob (tmp, who); 3402 insert_ob_in_ob (tmp, who);
3403
3518 return 1; 3404 return 1;
3519 } 3405 }
3406
3520 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3407 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3521 { 3408 {
3522 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3409 new_draw_info (NDI_UNIQUE, 0, who,
3410 "The weapon does not recognize you as its owner. "
3411 "H<Its name indicates that it belongs to somebody else.>");
3523 if (tmp != NULL) 3412 if (tmp)
3524 (void) insert_ob_in_ob (tmp, who); 3413 insert_ob_in_ob (tmp, who);
3414
3525 return 1; 3415 return 1;
3526 } 3416 }
3417
3527 /*FALLTHROUGH*/ case WAND: 3418 /*FALLTHROUGH*/
3419 case WAND:
3528 case ROD: 3420 case ROD:
3529 case HORN: 3421 case HORN:
3530 /* check for skill, alter player status */ 3422 /* check for skill, alter player status */
3423
3424 if (!skop)
3425 {
3426 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO
3427 return 1;
3428 }
3429
3531 SET_FLAG (op, FLAG_APPLIED); 3430 SET_FLAG (op, FLAG_APPLIED);
3532 if (skop)
3533 change_skill (who, skop, 0); 3431 who->change_skill (skop);
3432
3433 if (who->contr)
3434 {
3435 who->contr->ranged_ob = op;
3436
3534 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3437 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3535 3438
3536 if (who->type == PLAYER)
3537 {
3538 if (op->type == BOW) 3439 if (op->type == BOW)
3539 { 3440 {
3441 who->current_weapon = op;
3540 (void) change_abil (who, op); 3442 change_abil (who, op);
3541 new_draw_info_format (NDI_UNIQUE, 0, who, 3443 new_draw_info_format (NDI_UNIQUE, 0, who,
3542 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)); 3444 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op));
3543 who->contr->shoottype = range_bow;
3544 }
3545 else
3546 {
3547 who->contr->shoottype = range_misc;
3548 } 3445 }
3549 } 3446 }
3550 else 3447 else
3551 { 3448 {
3552 if (op->type == BOW) 3449 if (op->type == BOW)
3553 SET_FLAG (who, FLAG_READY_BOW); 3450 SET_FLAG (who, FLAG_READY_BOW);
3554 else 3451 else
3555 SET_FLAG (who, FLAG_READY_RANGE); 3452 SET_FLAG (who, FLAG_READY_RANGE);
3556 } 3453 }
3454
3557 break; 3455 break;
3558 3456
3559 case BUILDER: 3457 case BUILDER:
3560 if (who->contr->ranges[range_builder]) 3458 if (who->type == PLAYER)
3459 {
3460 //TODO: wtf does this do? shouldn't this be managed automatically (slots?)
3461 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER)
3561 unapply_special (who, who->contr->ranges[range_builder], 0); 3462 unapply_special (who, who->contr->ranged_ob, 0);
3562 who->contr->shoottype = range_builder; 3463
3563 who->contr->ranges[range_builder] = op;
3564 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op)); 3464 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op));
3465
3466 who->contr->ranged_ob = op;
3467 }
3565 break; 3468 break;
3566 3469
3567 default: 3470 default:
3568 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op)); 3471 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op));
3569 } /* end of switch op->type */ 3472 } /* end of switch op->type */
3570 3473
3571 SET_FLAG (op, FLAG_APPLIED); 3474 SET_FLAG (op, FLAG_APPLIED);
3572 3475
3573 if (tmp != NULL) 3476 if (tmp)
3574 tmp = insert_ob_in_ob (tmp, who); 3477 tmp = insert_ob_in_ob (tmp, who);
3575 3478
3576 who->update_stats (); 3479 who->update_stats ();
3577 3480
3578 /* We exclude spell casting objects. The fire code will set the 3481 /* We exclude spell casting objects. The fire code will set the
… …
3581 */ 3484 */
3582 if (who->type == PLAYER && op->type != WAND && op->type != HORN && op->type != ROD) 3485 if (who->type == PLAYER && op->type != WAND && op->type != HORN && op->type != ROD)
3583 SET_FLAG (op, FLAG_BEEN_APPLIED); 3486 SET_FLAG (op, FLAG_BEEN_APPLIED);
3584 3487
3585 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3488 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3586 {
3587 if (who->type == PLAYER) 3489 if (who->type == PLAYER)
3588 { 3490 {
3589 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3491 new_draw_info (NDI_UNIQUE, 0, who,
3492 "Oops, it feels deadly cold! "
3493 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>");
3590 SET_FLAG (op, FLAG_KNOWN_CURSED); 3494 SET_FLAG (op, FLAG_KNOWN_CURSED);
3591 } 3495 }
3592 } 3496
3593 if (who->type == PLAYER) 3497 if (who->type == PLAYER)
3594 { 3498 {
3595 /* if multiple objects were applied, update both slots */ 3499 /* if multiple objects were applied, update both slots */
3596 if (tmp) 3500 if (tmp)
3597 esrv_send_item (who, tmp); 3501 esrv_send_item (who, tmp);
3502
3598 esrv_send_item (who, op); 3503 esrv_send_item (who, op);
3599 } 3504 }
3505
3600 return 0; 3506 return 0;
3601} 3507}
3602
3603 3508
3604int 3509int
3605monster_apply_special (object *who, object *op, int aflags) 3510monster_apply_special (object *who, object *op, int aflags)
3606{ 3511{
3607 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED)) 3512 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
3608 return 1; 3513 return 1;
3514
3609 return apply_special (who, op, aflags); 3515 return apply_special (who, op, aflags);
3610} 3516}
3611 3517
3612/** 3518/**
3613 * Map was just loaded, handle op's initialisation. 3519 * Map was just loaded, handle op's initialisation.
… …
3651 3557
3652 case TREASURE: 3558 case TREASURE:
3653 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 3559 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
3654 return 0; 3560 return 0;
3655 3561
3656 while ((op->stats.hp--) > 0) 3562 while (op->stats.hp-- > 0)
3657 create_treasure (op->randomitems, op, op->map ? GT_ENVIRONMENT : 0, 3563 create_treasure (op->randomitems, op, op->map ? GT_ENVIRONMENT : 0,
3658 op->stats.exp ? (int) op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0); 3564 op->stats.exp ? (int) op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0);
3659 3565
3660 /* If we generated an object and put it in this object inventory, 3566 /* If we generated an object and put it in this object inventory,
3661 * move it to the parent object as the current object is about 3567 * move it to the parent object as the current object is about
… …
3678 } 3584 }
3679 return tmp ? 1 : 0; 3585 return tmp ? 1 : 0;
3680} 3586}
3681 3587
3682/** 3588/**
3683 * fix_auto_apply goes through the entire map (only the first time 3589 * fix_auto_apply goes through the entire map every time a map
3684 * when an original map is loaded) and performs special actions for 3590 * is loaded or swapped in and performs special actions for
3685 * certain objects (most initialization of chests and creation of 3591 * certain objects (most initialization of chests and creation of
3686 * treasures and stuff). Calls auto_apply if appropriate. 3592 * treasures and stuff). Calls auto_apply if appropriate.
3687 */ 3593 */
3688void 3594void
3689maptile::fix_auto_apply () 3595maptile::fix_auto_apply ()
… …
3767 { 3673 {
3768 create_treasure (tmp->randomitems, tmp, GT_APPLY, difficulty, 0); 3674 create_treasure (tmp->randomitems, tmp, GT_APPLY, difficulty, 0);
3769 tmp->randomitems = NULL; 3675 tmp->randomitems = NULL;
3770 } 3676 }
3771 3677
3678 // close all containers
3679 else if (tmp->type == CONTAINER)
3680 tmp->flag [FLAG_APPLIED] = 0;
3681
3772 tmp = above; 3682 tmp = above;
3773 } 3683 }
3774 3684
3775 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 3685 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3776 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 3686 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
… …
3782 * Handles player eating food that temporarily changes status (resistances, stats). 3692 * Handles player eating food that temporarily changes status (resistances, stats).
3783 * This used to call cast_change_attr(), but 3693 * This used to call cast_change_attr(), but
3784 * that doesn't work with the new spell code. Since we know what 3694 * that doesn't work with the new spell code. Since we know what
3785 * the food changes, just grab a force and use that instead. 3695 * the food changes, just grab a force and use that instead.
3786 */ 3696 */
3787
3788void 3697void
3789eat_special_food (object *who, object *food) 3698eat_special_food (object *who, object *food)
3790{ 3699{
3791 object *force; 3700 object *force;
3792 int i, did_one = 0; 3701 int i, did_one = 0;
3793 sint8 k;
3794 3702
3795 force = get_archetype (FORCE_NAME); 3703 force = get_archetype (FORCE_NAME);
3796 3704
3797 for (i = 0; i < NUM_STATS; i++) 3705 for (i = 0; i < NUM_STATS; i++)
3798 { 3706 if (sint8 k = food->stats.stat (i))
3799 k = get_attr_value (&food->stats, i);
3800 if (k)
3801 { 3707 {
3802 set_attr_value (&force->stats, i, k); 3708 force->stats.stat (i) = k;
3803 did_one = 1; 3709 did_one = 1;
3804 } 3710 }
3805 }
3806 3711
3807 /* check if we can protect the eater */ 3712 /* check if we can protect the eater */
3808 for (i = 0; i < NROFATTACKS; i++) 3713 for (i = 0; i < NROFATTACKS; i++)
3809 { 3714 {
3810 if (food->resist[i] > 0) 3715 if (food->resist[i] > 0)
… …
3829 /* check for hp, sp change */ 3734 /* check for hp, sp change */
3830 if (food->stats.hp != 0) 3735 if (food->stats.hp != 0)
3831 { 3736 {
3832 if (QUERY_FLAG (food, FLAG_CURSED)) 3737 if (QUERY_FLAG (food, FLAG_CURSED))
3833 { 3738 {
3834 strcpy (who->contr->killer, food->name); 3739 assign (who->contr->killer, food->name);
3835 hit_player (who, food->stats.hp, food, AT_POISON, 1); 3740 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3836 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!"); 3741 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!");
3837 } 3742 }
3838 else 3743 else
3839 { 3744 {
… …
3940 3845
3941 if (failure <= -1 && failure > -15) 3846 if (failure <= -1 && failure > -15)
3942 { /* wonder */ 3847 { /* wonder */
3943 object *tmp; 3848 object *tmp;
3944 3849
3945 new_draw_info (NDI_UNIQUE, 0, op, "Your spell warps!."); 3850 new_draw_info (NDI_UNIQUE, 0, op, "Your spell warps!");
3946 tmp = get_archetype (SPELL_WONDER); 3851 tmp = get_archetype (SPELL_WONDER);
3947 cast_wonder (op, op, 0, tmp); 3852 cast_wonder (op, op, 0, tmp);
3948 tmp->destroy (); 3853 tmp->destroy ();
3949 } 3854 }
3950 else if (failure <= -15 && failure > -35) 3855 else if (failure <= -15 && failure > -35)
… …
3971 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!"); 3876 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!");
3972 blind_player (op, op, power); 3877 blind_player (op, op, power);
3973 } 3878 }
3974 else if (failure <= -80) 3879 else if (failure <= -80)
3975 { /* blast the immediate area */ 3880 { /* blast the immediate area */
3976 object *tmp;
3977
3978 tmp = get_archetype (LOOSE_MANA); 3881 object *tmp = get_archetype (LOOSE_MANA);
3979 cast_magic_storm (op, tmp, power); 3882 cast_magic_storm (op, tmp, power);
3980 new_draw_info (NDI_UNIQUE, 0, op, "You unlease uncontrolled mana!"); 3883 new_draw_info (NDI_UNIQUE, 0, op, "You unleash uncontrolled mana!");
3981 tmp->destroy (); 3884 tmp->destroy ();
3982 } 3885 }
3983 } 3886 }
3984} 3887}
3985 3888
… …
4005 */ 3908 */
4006 int i, j; 3909 int i, j;
4007 3910
4008 for (i = 0; i < NUM_STATS; i++) 3911 for (i = 0; i < NUM_STATS; i++)
4009 { 3912 {
4010 sint8 stat = get_attr_value (stats, i); 3913 int race_bonus = pl->arch->stats.stat (i);
4011 int race_bonus = get_attr_value (&(pl->arch->clone.stats), i); 3914 sint8 stat = stats->stat (i) + ns->stat (i);
4012 3915
4013 stat += get_attr_value (ns, i);
4014 if (stat > 20 + race_bonus) 3916 if (stat > 20 + race_bonus)
4015 { 3917 {
4016 excess_stat++; 3918 excess_stat++;
4017 stat = 20 + race_bonus; 3919 stat = 20 + race_bonus;
4018 } 3920 }
4019 set_attr_value (stats, i, stat); 3921
3922 stats->stat (i) = stat;
4020 } 3923 }
4021 3924
4022 for (j = 0; excess_stat > 0 && j < 100; j++) 3925 for (j = 0; excess_stat > 0 && j < 100; j++)
4023 { /* try 100 times to assign excess stats */ 3926 { /* try 100 times to assign excess stats */
4024 int i = rndm (0, 6); 3927 int i = rndm (0, 6);
4025 int stat = get_attr_value (stats, i);
4026 int race_bonus = get_attr_value (&(pl->arch->clone.stats), i);
4027 3928
4028 if (i == CHA) 3929 if (i == CHA)
4029 continue; /* exclude cha from this */ 3930 continue; /* exclude cha from this */
3931
3932 int stat = stats->stat (i);
3933 int race_bonus = pl->arch->stats.stat (i);
4030 if (stat < 20 + race_bonus) 3934 if (stat < 20 + race_bonus)
4031 { 3935 {
4032 change_attr_value (stats, i, 1); 3936 change_attr_value (stats, i, 1);
4033 excess_stat--; 3937 excess_stat--;
4034 } 3938 }
… …
4037 /* insert the randomitems from the change's treasurelist into 3941 /* insert the randomitems from the change's treasurelist into
4038 * the player ref: player.c 3942 * the player ref: player.c
4039 */ 3943 */
4040 if (change->randomitems != NULL) 3944 if (change->randomitems != NULL)
4041 give_initial_items (pl, change->randomitems); 3945 give_initial_items (pl, change->randomitems);
4042
4043 3946
4044 /* set up the face, for some races. */ 3947 /* set up the face, for some races. */
4045 3948
4046 /* first, look for the force object banning 3949 /* first, look for the force object banning
4047 * changing the face. Certain races never change face with class. 3950 * changing the face. Certain races never change face with class.
… …
4092 char got[MAX_BUF]; 3995 char got[MAX_BUF];
4093 int len; 3996 int len;
4094 3997
4095 if (!pl || !transformer) 3998 if (!pl || !transformer)
4096 return; 3999 return;
4000
4097 marked = find_marked_object (pl); 4001 marked = find_marked_object (pl);
4002
4098 if (!marked) 4003 if (!marked)
4099 { 4004 {
4100 new_draw_info_format (NDI_UNIQUE, 0, pl, "Use the %s with what item?", query_name (transformer)); 4005 new_draw_info_format (NDI_UNIQUE, 0, pl, "Use the %s with what item?", query_name (transformer));
4101 return; 4006 return;
4102 } 4007 }
4008
4103 if (!marked->slaying) 4009 if (!marked->slaying)
4104 { 4010 {
4105 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked)); 4011 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked));
4106 return; 4012 return;
4107 } 4013 }
4014
4108 /* check whether they are compatible or not */ 4015 /* check whether they are compatible or not */
4109 find = strstr (marked->slaying, transformer->arch->name); 4016 find = strstr (marked->slaying, transformer->arch->archname);
4110 if (!find || (*(find + strlen (transformer->arch->name)) != ':')) 4017 if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
4111 { 4018 {
4112 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked)); 4019 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked));
4113 return; 4020 return;
4114 } 4021 }
4022
4115 find += strlen (transformer->arch->name) + 1; 4023 find += strlen (transformer->arch->archname) + 1;
4116 /* Item can be used, now find how many and what it yields */ 4024 /* Item can be used, now find how many and what it yields */
4117 if (isdigit (*(find))) 4025 if (isdigit (*(find)))
4118 { 4026 {
4119 yield = atoi (find); 4027 yield = atoi (find);
4120 if (yield < 1) 4028 if (yield < 1)
… …
4128 4036
4129 while (isdigit (*find)) 4037 while (isdigit (*find))
4130 find++; 4038 find++;
4131 while (*find == ' ') 4039 while (*find == ' ')
4132 find++; 4040 find++;
4041
4133 memset (got, 0, MAX_BUF); 4042 memset (got, 0, MAX_BUF);
4043
4134 if ((separator = strchr (find, ';')) != NULL) 4044 if ((separator = strchr (find, ';')) != NULL)
4135 {
4136 len = separator - find; 4045 len = separator - find;
4137 }
4138 else 4046 else
4139 {
4140 len = strlen (find); 4047 len = strlen (find);
4141 } 4048
4142 if (len > MAX_BUF - 1) 4049 if (len > MAX_BUF - 1)
4143 len = MAX_BUF - 1; 4050 len = MAX_BUF - 1;
4051
4144 strcpy (got, find); 4052 strcpy (got, find);
4145 got[len] = '\0'; 4053 got[len] = '\0';
4146 4054
4147 /* Now create new item, remove used ones when required. */ 4055 /* Now create new item, remove used ones when required. */
4148 new_item = get_archetype (got); 4056 new_item = get_archetype (got);
… …
4156 new_draw_info_format (NDI_UNIQUE, 0, pl, "You %s the %s.", &transformer->slaying, query_base_name (marked, 0)); 4064 new_draw_info_format (NDI_UNIQUE, 0, pl, "You %s the %s.", &transformer->slaying, query_base_name (marked, 0));
4157 insert_ob_in_ob (new_item, pl); 4065 insert_ob_in_ob (new_item, pl);
4158 esrv_send_inventory (pl, pl); 4066 esrv_send_inventory (pl, pl);
4159 /* Eat up one item */ 4067 /* Eat up one item */
4160 decrease_ob_nr (marked, 1); 4068 decrease_ob_nr (marked, 1);
4069
4161 /* Eat one transformer if needed */ 4070 /* Eat one transformer if needed */
4162 if (transformer->stats.food) 4071 if (transformer->stats.food)
4163 if (--transformer->stats.food == 0) 4072 if (--transformer->stats.food == 0)
4164 decrease_ob_nr (transformer, 1); 4073 decrease_ob_nr (transformer, 1);
4165} 4074}

Diff Legend

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