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.107 by root, Mon May 28 21:28:35 2007 UTC vs.
Revision 1.122 by root, Sun Aug 12 05:59:25 2007 UTC

… …
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * 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, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
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 */
24 23
25#include <cmath> 24#include <cmath>
… …
69 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) || op->race != victim->arch->name)) && 73 ((!(victim->arch && arch_flag && victim->arch->archname) || op->race != victim->arch->archname)) &&
75 ((!(victim->name && name_flag) || op->race != victim->name)) && 74 ((!(victim->name && name_flag) || op->race != victim->name)) &&
76 ((!(victim->race && race_flag) || op->race != victim->race))) 75 ((!(victim->race && race_flag) || op->race != victim->race)))
77 return 1; 76 return 1;
78 77
79 /* If the director has slaying set, only affect objects where none 78 /* If the director has slaying set, only affect objects where none
80 * of arch, name, or race match. 79 * of arch, name, or race match.
81 */ 80 */
82 if ((op->slaying) && (((victim->arch && arch_flag && victim->arch->name && op->slaying == victim->arch->name))) || 81 if ((op->slaying) && (((victim->arch && arch_flag && victim->arch->archname && op->slaying == victim->arch->archname))) ||
83 ((victim->name && name_flag && op->slaying == victim->name)) || 82 ((victim->name && name_flag && op->slaying == victim->name)) ||
84 ((victim->race && race_flag && op->slaying == victim->race))) 83 ((victim->race && race_flag && op->slaying == victim->race)))
85 return 1; 84 return 1;
86 85
87 return 0; 86 return 0;
… …
158 157
159/** 158/**
160 * 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
161 * matching item. 160 * matching item.
162 **/ 161 **/
163static void 162void
164handle_apply_yield (object *tmp) 163handle_apply_yield (object *tmp)
165{ 164{
166 const char *yield; 165 const char *yield;
167 166
168 yield = get_ob_key_value (tmp, "on_use_yield"); 167 yield = get_ob_key_value (tmp, "on_use_yield");
… …
425 return 0; 424 return 0;
426 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-- */
… …
459 prev = op; 458 prev = op;
460 op = op->below; 459 op = op->below;
461 460
462 while (op != NULL) 461 while (op != NULL)
463 { 462 {
464 if (strcmp (op->arch->name, item) == 0) 463 if (strcmp (op->arch->archname, item) == 0)
465 { 464 {
466 if (op->nrof >= nrof) 465 if (op->nrof >= nrof)
467 { 466 {
468 decrease_ob_nr (op, nrof); 467 decrease_ob_nr (op, nrof);
469 return; 468 return;
… …
576 op->update_stats (); 575 op->update_stats ();
577 return 1; 576 return 1;
578} 577}
579 578
580/* Types of improvements, hidden in the sp field. */ 579/* Types of improvements, hidden in the sp field. */
581#define IMPROVE_PREPARE 1 580#define IMPROVE_PREPARE 1
582#define IMPROVE_DAMAGE 2 581#define IMPROVE_DAMAGE 2
583#define IMPROVE_WEIGHT 3 582#define IMPROVE_WEIGHT 3
584#define IMPROVE_ENCHANT 4 583#define IMPROVE_ENCHANT 4
585#define IMPROVE_STR 5 584#define IMPROVE_STR 5
586#define IMPROVE_DEX 6 585#define IMPROVE_DEX 6
587#define IMPROVE_CON 7 586#define IMPROVE_CON 7
588#define IMPROVE_WIS 8 587#define IMPROVE_WIS 8
589#define IMPROVE_CHA 9 588#define IMPROVE_CHA 9
590#define IMPROVE_INT 10 589#define IMPROVE_INT 10
591#define IMPROVE_POW 11 590#define IMPROVE_POW 11
592
593 591
594/** 592/**
595 * This does the prepare weapon scroll. 593 * This does the prepare weapon scroll.
596 * Checks for sacrifice, and so on. 594 * Checks for sacrifice, and so on.
597 */ 595 */
598
599int 596int
600prepare_weapon (object *op, object *improver, object *weapon) 597prepare_weapon (object *op, object *improver, object *weapon)
601{ 598{
602 int sacrifice_count, i; 599 int sacrifice_count, i;
603 char buf[MAX_BUF]; 600 char buf[MAX_BUF];
… …
605 if (weapon->level != 0) 602 if (weapon->level != 0)
606 { 603 {
607 new_draw_info (NDI_UNIQUE, 0, op, "Weapon already prepared."); 604 new_draw_info (NDI_UNIQUE, 0, op, "Weapon already prepared.");
608 return 0; 605 return 0;
609 } 606 }
607
610 for (i = 0; i < NROFATTACKS; i++) 608 for (i = 0; i < NROFATTACKS; i++)
611 if (weapon->resist[i]) 609 if (weapon->resist[i])
612 break; 610 break;
613 611
614 /* If we break out, i will be less than nrofattacks, preventing 612 /* If we break out, i will be less than nrofattacks, preventing
… …
620 weapon->stats.ac) /* AC - only taifu's I think */ 618 weapon->stats.ac) /* AC - only taifu's I think */
621 { 619 {
622 new_draw_info (NDI_UNIQUE, 0, op, "Cannot prepare magic weapons."); 620 new_draw_info (NDI_UNIQUE, 0, op, "Cannot prepare magic weapons.");
623 return 0; 621 return 0;
624 } 622 }
623
625 sacrifice_count = check_sacrifice (op, improver); 624 sacrifice_count = check_sacrifice (op, improver);
626 if (sacrifice_count <= 0) 625 if (sacrifice_count <= 0)
627 return 0; 626 return 0;
627
628 weapon->level = isqrt (sacrifice_count); 628 weapon->level = isqrt (sacrifice_count);
629 new_draw_info (NDI_UNIQUE, 0, op, "Your sacrifice was accepted."); 629 new_draw_info (NDI_UNIQUE, 0, op, "Your sacrifice was accepted.");
630 eat_item (op, improver->slaying, sacrifice_count); 630 eat_item (op, improver->slaying, sacrifice_count);
631 631
632 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);
… …
855 { 855 {
856 base = base - (base * settings.armor_speed_improvement) / 100; 856 base = base - (base * settings.armor_speed_improvement) / 100;
857 pow++; 857 pow++;
858 } 858 }
859 859
860 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (&armour->arch->clone) * base) / 100; 860 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (armour->arch) * base) / 100;
861 } 861 }
862 else 862 else
863 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;
864 864
865 if (!settings.armor_weight_linear) 865 if (!settings.armor_weight_linear)
866 { 866 {
867 int base = 100; 867 int base = 100;
868 int pow = 0; 868 int pow = 0;
… …
871 { 871 {
872 base = base - (base * settings.armor_weight_reduction) / 100; 872 base = base - (base * settings.armor_weight_reduction) / 100;
873 pow++; 873 pow++;
874 } 874 }
875 875
876 armour->weight = (armour->arch->clone.weight * base) / 100; 876 armour->weight = (armour->arch->weight * base) / 100;
877 } 877 }
878 else 878 else
879 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;
880 880
881 if (armour->weight <= 0) 881 if (armour->weight <= 0)
882 { 882 {
883 LOG (llevInfo, "Warning: enchanted armours can have negative weight\n."); 883 LOG (llevInfo, "Warning: enchanted armours can have negative weight\n.");
884 armour->weight = 1; 884 armour->weight = 1;
885 } 885 }
886 886
887 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);
888 888
889 if (op->type == PLAYER) 889 if (op->type == PLAYER)
890 { 890 {
891 esrv_send_item (op, armour); 891 esrv_send_item (op, armour);
892 if (QUERY_FLAG (armour, FLAG_APPLIED)) 892 if (QUERY_FLAG (armour, FLAG_APPLIED))
… …
898 insert_ob_in_ob (tmp, op); 898 insert_ob_in_ob (tmp, op);
899 esrv_send_item (op, tmp); 899 esrv_send_item (op, tmp);
900 } 900 }
901 return 1; 901 return 1;
902} 902}
903
904 903
905/* 904/*
906 * convert_item() returns 1 if anything was converted, 0 if the item was not 905 * convert_item() returns 1 if anything was converted, 0 if the item was not
907 * what the converter wants, -1 if the converter is broken. 906 * what the converter wants, -1 if the converter is broken.
908 */ 907 */
… …
924 923
925 /* We make some assumptions - we assume if it takes money as it type, 924 /* We make some assumptions - we assume if it takes money as it type,
926 * it wants some amount. We don't make change (ie, if something costs 925 * it wants some amount. We don't make change (ie, if something costs
927 * 3 gp and player drops a platinum, tough luck) 926 * 3 gp and player drops a platinum, tough luck)
928 */ 927 */
929 if (!strcmp (CONV_FROM (converter), "money")) 928 if (CONV_FROM (converter) == shstr_money)
930 { 929 {
931 int cost;
932
933 if (item->type != MONEY) 930 if (item->type != MONEY)
934 return 0; 931 return 0;
935 932
936 nr = (item->nrof * item->value) / CONV_NEED (converter); 933 nr = (item->nrof * item->value) / CONV_NEED (converter);
937 if (!nr) 934 if (!nr)
938 return 0; 935 return 0;
936
937 converter->play_sound (sound_find ("shop_buy"));
938
939 cost = nr * CONV_NEED (converter) / item->value; 939 int cost = nr * CONV_NEED (converter) / item->value;
940 /* take into account rounding errors */ 940 /* take into account rounding errors */
941 if (nr * CONV_NEED (converter) % item->value) 941 if (nr * CONV_NEED (converter) % item->value)
942 cost++; 942 cost++;
943
943 decrease_ob_nr (item, cost); 944 decrease_ob_nr (item, cost);
944 945
945 price_in = cost * item->value; 946 price_in = cost * item->value;
946 } 947 }
947 else 948 else
948 { 949 {
949 if (item->type == PLAYER || CONV_FROM (converter) != item->arch->name || 950 if (item->type == PLAYER || CONV_FROM (converter) != item->arch->archname ||
950 (CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof)) 951 (CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof))
951 return 0; 952 return 0;
953
954 converter->play_sound (sound_find ("convert_item"));
952 955
953 if (CONV_NEED (converter)) 956 if (CONV_NEED (converter))
954 { 957 {
955 nr = item->nrof / CONV_NEED (converter); 958 nr = item->nrof / CONV_NEED (converter);
956 decrease_ob_nr (item, nr * CONV_NEED (converter)); 959 decrease_ob_nr (item, nr * CONV_NEED (converter));
… …
961 price_in = item->value; 964 price_in = item->value;
962 item->destroy (); 965 item->destroy ();
963 } 966 }
964 } 967 }
965 968
966 if (converter->inv != NULL) 969 if (converter->inv)
967 { 970 {
968 object *ob; 971 object *ob;
969 int i; 972 int i;
970 object *ob_to_copy; 973 object *ob_to_copy;
971 974
972 /* select random object from inventory to copy */ 975 /* select random object from inventory to copy */
973 ob_to_copy = converter->inv; 976 ob_to_copy = converter->inv;
974 for (ob = converter->inv->below, i = 1; ob != NULL; ob = ob->below, i++) 977 for (ob = converter->inv->below, i = 1; ob; ob = ob->below, i++)
975 {
976 if (rndm (0, i) == 0) 978 if (rndm (0, i) == 0)
977 {
978 ob_to_copy = ob; 979 ob_to_copy = ob;
979 } 980
980 }
981 item = object_create_clone (ob_to_copy); 981 item = object_create_clone (ob_to_copy);
982 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE); 982 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE);
983 unflag_inv (item, FLAG_IS_A_TEMPLATE); 983 unflag_inv (item, FLAG_IS_A_TEMPLATE);
984 } 984 }
985 else 985 else
… …
995 fix_generated_item (item, converter, 0, 0, GT_MINIMAL); 995 fix_generated_item (item, converter, 0, 0, GT_MINIMAL);
996 } 996 }
997 997
998 if (CONV_NR (converter)) 998 if (CONV_NR (converter))
999 item->nrof = CONV_NR (converter); 999 item->nrof = CONV_NR (converter);
1000
1000 if (nr) 1001 if (nr)
1001 item->nrof *= nr; 1002 item->nrof *= nr;
1003
1002 if (is_in_shop (converter)) 1004 if (is_in_shop (converter))
1003 SET_FLAG (item, FLAG_UNPAID); 1005 SET_FLAG (item, FLAG_UNPAID);
1004 else if (price_in < item->nrof * item->value) 1006 else if (price_in < item->nrof * item->value)
1005 { 1007 {
1006 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n", 1008 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n",
1007 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name); 1009 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
1008
1009 /** 1010 /**
1010 * elmex: we are going to let the game continue, as the mapcreator 1011 * elmex: we are going to let the game continue, as the mapcreator
1011 * probably had something in mind when doing this 1012 * hopefully had something in mind when doing this.
1012 */ 1013 */
1013 } 1014 }
1015
1016 SET_FLAG (item, FLAG_IDENTIFIED);
1014 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y); 1017 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y);
1015 return 1; 1018 return 1;
1016} 1019}
1017 1020
1018/** 1021/**
… …
1139 double opinion; 1142 double opinion;
1140 object *tmp, *next; 1143 object *tmp, *next;
1141 1144
1142 SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */ 1145 SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */
1143 1146
1147 bool has_unpaid = false;
1148
1149 // quite inefficient to do this here twice, but the api doesn'T lend itself to
1150 // a quick and small change :(
1151 for (object::depth_iterator item = op->begin (); item != op->end (); ++item)
1152 if (item->flag [FLAG_UNPAID])
1153 {
1154 has_unpaid = true;
1155 break;
1156 }
1157
1144 if (op->type != PLAYER) 1158 if (op->type != PLAYER)
1145 { 1159 {
1146 /* Remove all the unpaid objects that may be carried here. 1160 /* Remove all the unpaid objects that may be carried here.
1147 * This could be pets or monsters that are somehow in 1161 * This could be pets or monsters that are somehow in
1148 * the shop. 1162 * the shop.
… …
1174 /* unpaid objects, or non living objects, can't transfer by 1188 /* unpaid objects, or non living objects, can't transfer by
1175 * shop mats. Instead, put it on a nearby space. 1189 * shop mats. Instead, put it on a nearby space.
1176 */ 1190 */
1177 if (QUERY_FLAG (op, FLAG_UNPAID) || !QUERY_FLAG (op, FLAG_ALIVE)) 1191 if (QUERY_FLAG (op, FLAG_UNPAID) || !QUERY_FLAG (op, FLAG_ALIVE))
1178 { 1192 {
1179
1180 /* Somebody dropped an unpaid item, just move to an adjacent place. */ 1193 /* Somebody dropped an unpaid item, just move to an adjacent place. */
1181 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9); 1194 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9);
1182 1195
1183 if (i != -1) 1196 if (i != -1)
1184 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat); 1197 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat);
… …
1192 } 1205 }
1193 else if (can_pay (op) && get_payment (op)) 1206 else if (can_pay (op) && get_payment (op))
1194 { 1207 {
1195 /* this is only used for players */ 1208 /* this is only used for players */
1196 rv = teleport (shop_mat, SHOP_MAT, op); 1209 rv = teleport (shop_mat, SHOP_MAT, op);
1210
1211 if (has_unpaid)
1212 op->contr->play_sound (sound_find ("shop_buy"));
1213 else if (is_in_shop (op))
1214 op->contr->play_sound (sound_find ("shop_enter"));
1215 else
1216 op->contr->play_sound (sound_find ("shop_leave"));
1197 1217
1198 if (shop_mat->msg) 1218 if (shop_mat->msg)
1199 new_draw_info (NDI_UNIQUE, 0, op, shop_mat->msg); 1219 new_draw_info (NDI_UNIQUE, 0, op, shop_mat->msg);
1200 /* This check below is a bit simplistic - generally it should be correct, 1220 /* This check below is a bit simplistic - generally it should be correct,
1201 * but there is never a guarantee that the bottom space on the map is 1221 * but there is never a guarantee that the bottom space on the map is
… …
1216 } 1236 }
1217 } 1237 }
1218 else 1238 else
1219 { 1239 {
1220 /* if we get here, a player tried to leave a shop but was not able 1240 /* if we get here, a player tried to leave a shop but was not able
1221 * to afford the items he has. We try to move the player so that 1241 * to afford the items he has. We try to move the player so that
1222 * they are not on the mat anymore 1242 * they are not on the mat anymore
1223 */ 1243 */
1224 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9); 1244 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9);
1225 1245
1226 if (i == -1) 1246 if (i == -1)
1227 {
1228 LOG (llevError, "Internal shop-mat problem.\n"); 1247 LOG (llevError, "Internal shop-mat problem.\n");
1229 }
1230 else 1248 else
1231 { 1249 {
1232 op->remove (); 1250 op->remove ();
1233 op->x += freearr_x[i]; 1251 op->x += freearr_x[i];
1234 op->y += freearr_y[i]; 1252 op->y += freearr_y[i];
… …
1245 */ 1263 */
1246static void 1264static void
1247apply_sign (object *op, object *sign, int autoapply) 1265apply_sign (object *op, object *sign, int autoapply)
1248{ 1266{
1249 readable_message_type *msgType; 1267 readable_message_type *msgType;
1250 char newbuf[HUGE_BUF];
1251 1268
1252 if (sign->msg == NULL) 1269 if (sign->msg == NULL)
1253 { 1270 {
1254 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is written on it."); 1271 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is written on it.");
1255 return; 1272 return;
… …
1259 { 1276 {
1260 if (sign->last_eat >= sign->stats.food) 1277 if (sign->last_eat >= sign->stats.food)
1261 { 1278 {
1262 if (!sign->move_on) 1279 if (!sign->move_on)
1263 new_draw_info (NDI_UNIQUE, 0, op, "You cannot read it anymore."); 1280 new_draw_info (NDI_UNIQUE, 0, op, "You cannot read it anymore.");
1281
1264 return; 1282 return;
1265 } 1283 }
1266 1284
1267 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1285 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1268 sign->last_eat++; 1286 sign->last_eat++;
… …
1276 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ) && !sign->move_on) 1294 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ) && !sign->move_on)
1277 { 1295 {
1278 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1296 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind.");
1279 return; 1297 return;
1280 } 1298 }
1299
1300 if (op->contr)
1301 if (client *ns = op->contr->ns)
1302 {
1303 ns->play_sound (sign->sound);
1281 msgType = get_readable_message_type (sign); 1304 msgType = get_readable_message_type (sign);
1305
1306 if (ns->can_msg)
1307 ns->send_msg (NDI_NAVY, msgType->msgtype, &sign->msg);
1308 else
1309 {
1310 char newbuf[HUGE_BUF];
1282 snprintf (newbuf, sizeof (newbuf), "%hhu %s", autoapply ? 1 : 0, &sign->msg); 1311 snprintf (newbuf, sizeof (newbuf), "%u %s", autoapply ? 1 : 0, &sign->msg);
1283 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, newbuf, &sign->msg); 1312 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, newbuf, &sign->msg);
1313 }
1314 }
1284} 1315}
1285 1316
1286/** 1317/**
1287 * 'victim' moves onto 'trap' 1318 * 'victim' moves onto 'trap'
1288 * 'victim' leaves 'trap' 1319 * 'victim' leaves 'trap'
… …
1311 * proper. This code was causing needless crashes. 1342 * proper. This code was causing needless crashes.
1312 */ 1343 */
1313 if (recursion_depth >= 500) 1344 if (recursion_depth >= 500)
1314 { 1345 {
1315 LOG (llevDebug, "WARNING: move_apply(): aborting recursion " 1346 LOG (llevDebug, "WARNING: move_apply(): aborting recursion "
1316 "[trap arch %s, name %s; victim arch %s, name %s]\n", &trap->arch->name, &trap->name, &victim->arch->name, &victim->name); 1347 "[trap arch %s, name %s; victim arch %s, name %s]\n", &trap->arch->archname, &trap->name, &victim->arch->archname, &victim->name);
1317 return; 1348 return;
1318 } 1349 }
1350
1319 recursion_depth++; 1351 recursion_depth++;
1320 if (trap->head) 1352 if (trap->head)
1321 trap = trap->head; 1353 trap = trap->head;
1322 1354
1323 if (INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator))) 1355 if (INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator)))
… …
1421 1453
1422 if ((ab->move_type && trap->move_on) || ab->move_type == 0) 1454 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1423 { 1455 {
1424 if (!sound_was_played) 1456 if (!sound_was_played)
1425 { 1457 {
1426 play_sound_map (trap->map, trap->x, trap->y, SOUND_FALL_HOLE); 1458 trap->play_sound (sound_find ("fall_hole"));
1427 sound_was_played = 1; 1459 sound_was_played = 1;
1428 } 1460 }
1461
1429 new_draw_info (NDI_UNIQUE, 0, ab, "You fall into a trapdoor!"); 1462 new_draw_info (NDI_UNIQUE, 0, ab, "You fall into a trapdoor!");
1430 transfer_ob (ab, (int) EXIT_X (trap), (int) EXIT_Y (trap), 0, ab); 1463 transfer_ob (ab, (int) EXIT_X (trap), (int) EXIT_Y (trap), 0, ab);
1431 } 1464 }
1432 } 1465 }
1433 goto leave; 1466 goto leave;
1434 } 1467 }
1435 1468
1436
1437 case CONVERTER: 1469 case CONVERTER:
1438 if (convert_item (victim, trap) < 0) 1470 if (convert_item (victim, trap) < 0)
1439 { 1471 {
1440 new_draw_info_format (NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name (trap)); 1472 new_draw_info_format (NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name (trap));
1441 get_archetype ("burnout")->insert_at (trap, trap); 1473 get_archetype ("burnout")->insert_at (trap, trap);
… …
1466 * Processing will happen if the head runs into the pit 1498 * Processing will happen if the head runs into the pit
1467 */ 1499 */
1468 if (victim->head) 1500 if (victim->head)
1469 goto leave; 1501 goto leave;
1470 1502
1471 play_sound_map (victim->map, victim->x, victim->y, SOUND_FALL_HOLE); 1503 victim->play_sound (sound_find ("fall_hole"));
1472 new_draw_info (NDI_UNIQUE, 0, victim, "You fall through the hole!\n"); 1504 new_draw_info (NDI_UNIQUE, 0, victim, "You fall through the hole!\n");
1473 transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim); 1505 transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim);
1474 goto leave; 1506 goto leave;
1475 1507
1476 case EXIT: 1508 case EXIT:
… …
1518 } 1550 }
1519 goto leave; 1551 goto leave;
1520 1552
1521 default: 1553 default:
1522 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not " 1554 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not "
1523 "handled in move_apply()\n", &trap->name, &trap->arch->name, trap->type); 1555 "handled in move_apply()\n", &trap->name, &trap->arch->archname, trap->type);
1524 goto leave; 1556 goto leave;
1525 } 1557 }
1526 1558
1527leave: 1559leave:
1528 recursion_depth--; 1560 recursion_depth--;
… …
1540 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ)) 1572 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
1541 { 1573 {
1542 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1574 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind.");
1543 return; 1575 return;
1544 } 1576 }
1577
1545 if (tmp->msg == NULL) 1578 if (!tmp->msg)
1546 { 1579 {
1547 new_draw_info_format (NDI_UNIQUE, 0, op, "You open the %s and find it empty.", &tmp->name); 1580 new_draw_info_format (NDI_UNIQUE, 0, op, "You open the %s and find it empty.", &tmp->name);
1548 return; 1581 return;
1549 } 1582 }
1550 1583
1551 /* need a literacy skill to read stuff! */ 1584 /* need a literacy skill to read stuff! */
1552 skill_ob = find_skill_by_name (op, tmp->skill); 1585 skill_ob = find_skill_by_name (op, tmp->skill);
1553 if (!skill_ob) 1586 if (!skill_ob)
1554 { 1587 {
1555 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols."); 1588 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. H<You lack the skill to read this>");
1556 return; 1589 return;
1557 } 1590 }
1591
1558 lev_diff = tmp->level - (skill_ob->level + 5); 1592 lev_diff = tmp->level - (skill_ob->level + 5);
1559 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0) 1593 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0)
1560 { 1594 {
1561 if (lev_diff < 2) 1595 if (lev_diff < 2)
1562 new_draw_info (NDI_UNIQUE, 0, op, "This book is just barely beyond your comprehension."); 1596 new_draw_info (NDI_UNIQUE, 0, op, "This book is just barely beyond your comprehension.");
… …
1573 return; 1607 return;
1574 } 1608 }
1575 1609
1576 readable_message_type *msgType = get_readable_message_type (tmp); 1610 readable_message_type *msgType = get_readable_message_type (tmp);
1577 1611
1612 if (player *pl = op->contr)
1613 if (client *ns = pl->ns)
1614 if (ns->can_msg)
1615 {
1616 dynbuf_text buf;
1617 buf << long_desc (tmp, op)
1618 << "\n\n"
1619 << tmp->msg
1620 << '\0';
1621 ns->send_msg (NDI_NAVY, msgType->msgtype, buf.linearise ());
1622 }
1623 else
1578 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, 1624 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1579 msgType->message_type, msgType->message_subtype, 1625 msgType->message_type, msgType->message_subtype,
1580 "You open the %s and start reading.\n%s", (char *)"%s\n%s", 1626 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1581 long_desc (tmp, op), &tmp->msg); 1627 long_desc (tmp, op), &tmp->msg);
1582 1628
1583 /* gain xp from reading */ 1629 /* gain xp from reading */
1584 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1630 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1585 { /* only if not read before */ 1631 { /* only if not read before */
1586 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1632 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
… …
1652 return; 1698 return;
1653 } 1699 }
1654 return; 1700 return;
1655 } 1701 }
1656 1702
1657 play_sound_player_only (op->contr, SOUND_LEARN_SPELL, 0, 0); 1703 op->contr->play_sound (sound_find ("learn_spell"));
1704
1658 tmp = spell->clone (); 1705 tmp = spell->clone ();
1659 insert_ob_in_ob (tmp, op); 1706 insert_ob_in_ob (tmp, op);
1660 1707
1661 if (special_prayer) 1708 if (special_prayer)
1662 SET_FLAG (tmp, FLAG_STARTEQUIP); 1709 SET_FLAG (tmp, FLAG_STARTEQUIP);
… …
1707 1754
1708 /* artifact_spellbooks have 'slaying' field point to a spell name, 1755 /* artifact_spellbooks have 'slaying' field point to a spell name,
1709 * instead of having their spell stored in stats.sp. These are 1756 * instead of having their spell stored in stats.sp. These are
1710 * legacy spellbooks 1757 * legacy spellbooks
1711 */ 1758 */
1712
1713 if (tmp->slaying != NULL) 1759 if (tmp->slaying)
1714 { 1760 {
1715 spell = arch_to_object (find_archetype_by_object_name (tmp->slaying)); 1761 spell = arch_to_object (find_archetype_by_object_name (tmp->slaying));
1716 if (!spell) 1762 if (!spell)
1717 { 1763 {
1718 new_draw_info_format (NDI_UNIQUE, 0, op, "The book's formula for %s is incomplete", &tmp->slaying); 1764 new_draw_info_format (NDI_UNIQUE, 0, op, "The book's formula for %s is incomplete", &tmp->slaying);
1719 return; 1765 return;
1720 } 1766 }
1721 else 1767 else
1722 insert_ob_in_ob (spell, tmp); 1768 insert_ob_in_ob (spell, tmp);
1769
1723 tmp->slaying = NULL; 1770 tmp->slaying = 0;
1724 } 1771 }
1725 1772
1726 skop = find_skill_by_name (op, tmp->skill); 1773 skop = find_skill_by_name (op, tmp->skill);
1727 1774
1728 /* need a literacy skill to learn spells. Also, having a literacy level 1775 /* need a literacy skill to learn spells. Also, having a literacy level
1729 * lower than the spell will make learning the spell more difficult */ 1776 * lower than the spell will make learning the spell more difficult */
1730 if (!skop) 1777 if (!skop)
1731 { 1778 {
1732 new_draw_info (NDI_UNIQUE, 0, op, "You can't read! Your attempt fails."); 1779 new_draw_info (NDI_UNIQUE, 0, op, "You can't read! Your attempt fails. H<You lack the literacy skill.>");
1733 return; 1780 return;
1734 } 1781 }
1735 1782
1736 spell = tmp->inv; 1783 spell = tmp->inv;
1737 1784
1738 if (!spell) 1785 if (!spell)
1739 { 1786 {
1740 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name); 1787 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name);
1741 new_draw_info (NDI_UNIQUE, 0, op, "The spellbook symbols make no sense."); 1788 new_draw_info (NDI_UNIQUE, 0, op, "The spellbook symbols make no sense. This is a bug, please report!");
1742 return; 1789 return;
1743 } 1790 }
1744 1791
1745 if (skop->level < int (sqrtf (spell->level) * 1.5f)) 1792 if (skop->level < int (sqrtf (spell->level) * 1.5f))
1746 { 1793 {
1747 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. [Your literacy level is too low]"); 1794 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. H<Your literacy level is too low.>");
1748 return; 1795 return;
1749 } 1796 }
1750 1797
1751 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name); 1798 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name);
1752 1799
… …
1765 * if the player doesn't know the spell, doesn't make a lot of sense that 1812 * if the player doesn't know the spell, doesn't make a lot of sense that
1766 * they would have a special prayer mark. 1813 * they would have a special prayer mark.
1767 */ 1814 */
1768 if (check_spell_known (op, spell->name)) 1815 if (check_spell_known (op, spell->name))
1769 { 1816 {
1770 new_draw_info (NDI_UNIQUE, 0, op, "You already know that spell.\n"); 1817 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");
1771 return; 1818 return;
1772 } 1819 }
1773 1820
1774 if (spell->skill) 1821 if (spell->skill)
1775 { 1822 {
… …
1816 if (!QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 1863 if (!QUERY_FLAG (tmp, FLAG_STARTEQUIP))
1817 change_exp (op, calc_skill_exp (op, tmp, skop), skop->skill, 0); 1864 change_exp (op, calc_skill_exp (op, tmp, skop), skop->skill, 0);
1818 } 1865 }
1819 else 1866 else
1820 { 1867 {
1821 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1868 op->contr->play_sound (sound_find ("fumble_spell"));
1822 new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell.\n"); 1869 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");
1823 } 1870 }
1824 1871
1825 decrease_ob (tmp); 1872 decrease_ob (tmp);
1826} 1873}
1827 1874
… …
1839 return; 1886 return;
1840 } 1887 }
1841 1888
1842 if (!tmp->inv || tmp->inv->type != SPELL) 1889 if (!tmp->inv || tmp->inv->type != SPELL)
1843 { 1890 {
1844 new_draw_info (NDI_UNIQUE, 0, op, "The scroll just doesn't make sense!"); 1891 new_draw_info (NDI_UNIQUE, 0, op, "The scroll just doesn't make sense! H<...and never will make sense.>");
1845 return; 1892 return;
1846 } 1893 }
1847 1894
1848 if (op->type == PLAYER) 1895 if (op->type == PLAYER)
1849 { 1896 {
… …
1855 */ 1902 */
1856 skop = find_skill_by_name (op, skill_names[SK_LITERACY]); 1903 skop = find_skill_by_name (op, skill_names[SK_LITERACY]);
1857 1904
1858 if (!skop) 1905 if (!skop)
1859 { 1906 {
1860 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols."); 1907 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. H<You lack the literacy skill.>");
1861 return; 1908 return;
1862 } 1909 }
1863 1910
1864 if ((exp_gain = calc_skill_exp (op, tmp, skop))) 1911 if ((exp_gain = calc_skill_exp (op, tmp, skop)))
1865 change_exp (op, exp_gain, skop->skill, 0); 1912 change_exp (op, exp_gain, skop->skill, 0);
… …
1986 /* special food hack -b.t. */ 2033 /* special food hack -b.t. */
1987 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED)) 2034 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED))
1988 eat_special_food (op, tmp); 2035 eat_special_food (op, tmp);
1989 } 2036 }
1990 } 2037 }
2038
1991 handle_apply_yield (tmp); 2039 handle_apply_yield (tmp);
1992 decrease_ob (tmp); 2040 decrease_ob (tmp);
1993} 2041}
1994 2042
1995/** 2043/**
… …
2022 if (meal->type != FLESH || !is_dragon_pl (op)) 2070 if (meal->type != FLESH || !is_dragon_pl (op))
2023 return 0; 2071 return 0;
2024 2072
2025 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces 2073 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces
2026 from the player's inventory */ 2074 from the player's inventory */
2027 shstr_cmp dragon_ability_force ("dragon_ability_force");
2028 shstr_cmp dragon_skin_force ("dragon_skin_force");
2029
2030 for (tmp = op->inv; tmp; tmp = tmp->below) 2075 for (tmp = op->inv; tmp; tmp = tmp->below)
2031 if (tmp->type == FORCE) 2076 if (tmp->type == FORCE)
2032 if (tmp->arch->name == dragon_skin_force) 2077 if (tmp->arch->archname == shstr_dragon_skin_force)
2033 skin = tmp; 2078 skin = tmp;
2034 else if (tmp->arch->name == dragon_ability_force) 2079 else if (tmp->arch->archname == shstr_dragon_ability_force)
2035 abil = tmp; 2080 abil = tmp;
2036 2081
2037 /* if either skin or ability are missing, this is an old player 2082 /* if either skin or ability are missing, this is an old player
2038 which is not to be considered a dragon -> bail out */ 2083 which is not to be considered a dragon -> bail out */
2039 if (skin == NULL || abil == NULL) 2084 if (skin == NULL || abil == NULL)
… …
2160static void 2205static void
2161apply_armour_improver (object *op, object *tmp) 2206apply_armour_improver (object *op, object *tmp)
2162{ 2207{
2163 object *armor; 2208 object *armor;
2164 2209
2165 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) 2210 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_NO_MAGIC))
2166 { 2211 {
2167 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll."); 2212 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll. H<The area prevents magic effects.>");
2168 return; 2213 return;
2169 } 2214 }
2170 2215
2171 armor = find_marked_object (op); 2216 armor = find_marked_object (op);
2172 2217
2173 if (!armor) 2218 if (!armor)
2174 { 2219 {
2175 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark an armor object."); 2220 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.");
2176 return; 2221 return;
2177 } 2222 }
2178 2223
2179 if (armor->type != ARMOUR 2224 if (armor->type != ARMOUR
2180 && armor->type != CLOAK 2225 && armor->type != CLOAK
… …
2191extern void 2236extern void
2192apply_poison (object *op, object *tmp) 2237apply_poison (object *op, object *tmp)
2193{ 2238{
2194 if (op->type == PLAYER) 2239 if (op->type == PLAYER)
2195 { 2240 {
2196 play_sound_player_only (op->contr, SOUND_DRINK_POISON, 0, 0); 2241 op->contr->play_sound (sound_find ("drink_poison"));
2197 new_draw_info (NDI_UNIQUE, 0, op, "Yech! That tasted poisonous!"); 2242 new_draw_info (NDI_UNIQUE, 0, op, "Yech! That tasted poisonous!");
2198 strcpy (op->contr->killer, "poisonous booze"); 2243 strcpy (op->contr->killer, "poisonous booze");
2199 } 2244 }
2245
2200 if (tmp->stats.hp > 0) 2246 if (tmp->stats.hp > 0)
2201 { 2247 {
2202 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp); 2248 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp);
2203 hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1); 2249 hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1);
2204 } 2250 }
2251
2205 op->stats.food -= op->stats.food / 4; 2252 op->stats.food -= op->stats.food / 4;
2206 handle_apply_yield (tmp); 2253 handle_apply_yield (tmp);
2207 decrease_ob (tmp); 2254 decrease_ob (tmp);
2208} 2255}
2209 2256
… …
2319 2366
2320 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED)) 2367 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED))
2321 { 2368 {
2322 if (op->type == PLAYER) 2369 if (op->type == PLAYER)
2323 { 2370 {
2324 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first."); 2371 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first. H<You cannot use items marked as unpaid.>");
2325 return 1; 2372 return 1;
2326 } 2373 }
2327 else 2374 else
2328 return 0; /* monsters just skip unpaid items */ 2375 return 0; /* monsters just skip unpaid items */
2329 } 2376 }
… …
2333 2380
2334 switch (tmp->type) 2381 switch (tmp->type)
2335 { 2382 {
2336 case CF_HANDLE: 2383 case CF_HANDLE:
2337 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2384 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle.");
2338 play_sound_map (op->map, op->x, op->y, SOUND_TURN_HANDLE); 2385 op->play_sound (sound_find ("turn_handle"));
2339 tmp->value = tmp->value ? 0 : 1; 2386 tmp->value = tmp->value ? 0 : 1;
2340 SET_ANIMATION (tmp, tmp->value); 2387 SET_ANIMATION (tmp, tmp->value);
2341 update_object (tmp, UP_OBJ_FACE); 2388 update_object (tmp, UP_OBJ_FACE);
2342 push_button (tmp); 2389 push_button (tmp);
2343 return 1; 2390 return 1;
2344 2391
2345 case TRIGGER: 2392 case TRIGGER:
2346 if (check_trigger (tmp, op)) 2393 if (check_trigger (tmp, op))
2347 { 2394 {
2348 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2395 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle.");
2349 play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE); 2396 op->play_sound (sound_find ("turn_handle"));
2350 } 2397 }
2351 else 2398 else
2352 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move."); 2399 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move.");
2353 2400
2354 return 1; 2401 return 1;
… …
2366 new_draw_info (NDI_NAVY, 0, op, tmp->msg); 2413 new_draw_info (NDI_NAVY, 0, op, tmp->msg);
2367 2414
2368 op->enter_exit (tmp); 2415 op->enter_exit (tmp);
2369 } 2416 }
2370 2417
2418 return 1;
2419
2420 case INSCRIBABLE:
2421 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
2422 // maybe show a spell menu to chose from or something like that
2371 return 1; 2423 return 1;
2372 2424
2373 case SIGN: 2425 case SIGN:
2374 apply_sign (op, tmp, 0); 2426 apply_sign (op, tmp, 0);
2375 return 1; 2427 return 1;
… …
2487 2539
2488 get_tod (&tod); 2540 get_tod (&tod);
2489 sprintf (buf, "It is %d minute%s past %d o'clock %s", 2541 sprintf (buf, "It is %d minute%s past %d o'clock %s",
2490 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"), 2542 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"),
2491 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am")); 2543 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am"));
2492 play_sound_player_only (op->contr, SOUND_CLOCK, 0, 0); 2544 op->play_sound (sound_find ("sound_clock"));
2493 new_draw_info (NDI_UNIQUE, 0, op, buf); 2545 new_draw_info (NDI_UNIQUE, 0, op, buf);
2494 return 1; 2546 return 1;
2495 } 2547 }
2496 else 2548 else
2497 return 0; 2549 return 0;
… …
2537int 2589int
2538player_apply (object *pl, object *op, int aflag, int quiet) 2590player_apply (object *pl, object *op, int aflag, int quiet)
2539{ 2591{
2540 int tmp; 2592 int tmp;
2541 2593
2542 if (op->env == NULL && (pl->move_type & MOVE_FLYING)) 2594 if (op->env && (pl->move_type & MOVE_FLYING))
2543 { 2595 {
2544 /* player is flying and applying object not in inventory */ 2596 /* player is flying and applying object not in inventory */
2545 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING)) 2597 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
2546 { 2598 {
2547 new_draw_info (NDI_UNIQUE, 0, pl, "But you are floating high " "above the ground!"); 2599 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.>");
2548 return 0; 2600 return 0;
2549 } 2601 }
2550 } 2602 }
2551 2603
2552 pl->contr->last_used = op; 2604 pl->contr->last_used = op;
… …
2557 if (tmp == 0) 2609 if (tmp == 0)
2558 new_draw_info_format (NDI_UNIQUE, 0, pl, "I don't know how to apply the %s.", query_name (op)); 2610 new_draw_info_format (NDI_UNIQUE, 0, pl, "I don't know how to apply the %s.", query_name (op));
2559 else if (tmp == 2) 2611 else if (tmp == 2)
2560 new_draw_info_format (NDI_UNIQUE, 0, pl, "You must get it first!\n"); 2612 new_draw_info_format (NDI_UNIQUE, 0, pl, "You must get it first!\n");
2561 } 2613 }
2614
2562 return tmp; 2615 return tmp;
2563} 2616}
2564 2617
2565/** 2618/**
2566 * player_apply_below attempts to apply the object 'below' the player. 2619 * player_apply_below attempts to apply the object 'below' the player.
… …
2806 * Returns 0 on success, returns 1 if there is some problem. 2859 * Returns 0 on success, returns 1 if there is some problem.
2807 * if aflags is AP_PRINT, we instead print out waht to unapply 2860 * if aflags is AP_PRINT, we instead print out waht to unapply
2808 * instead of doing it. This is a lot less code than having 2861 * instead of doing it. This is a lot less code than having
2809 * another function that does just that. 2862 * another function that does just that.
2810 */ 2863 */
2864
2865#define CANNOT_REMOVE_CURSED \
2866 "H<You cannot remove cursed or damned items, you first have to remove the curse. " \
2867 "Praying over an altar, scrolls of remove curse/damnation, " \
2868 "priests or even other players might help.>"
2869
2811int 2870int
2812unapply_for_ob (object *who, object *op, int aflags) 2871unapply_for_ob (object *who, object *op, int aflags)
2813{ 2872{
2814 if (op->is_range ()) 2873 if (op->is_range ())
2815 for (object *tmp = who->inv; tmp; tmp = tmp->below) 2874 for (object *tmp = who->inv; tmp; tmp = tmp->below)
… …
2825 { 2884 {
2826 /* In this case, we want to try and remove a cursed item. 2885 /* In this case, we want to try and remove a cursed item.
2827 * While we know it won't work, we want unapply_special to 2886 * While we know it won't work, we want unapply_special to
2828 * at least generate the message. 2887 * at least generate the message.
2829 */ 2888 */
2830 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't remove the %s.", query_name (tmp)); 2889 new_draw_info_format (NDI_UNIQUE, 0, who,
2890 "No matter how hard you try, you just can't remove the %s." CANNOT_REMOVE_CURSED,
2891 query_name (tmp));
2831 return 1; 2892 return 1;
2832 } 2893 }
2833 2894
2834 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 2895 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
2835 { 2896 {
… …
2869 /* Cursed item that we can't unequip - tell the player. 2930 /* Cursed item that we can't unequip - tell the player.
2870 * Note this could be annoying if this is just one of a few, 2931 * Note this could be annoying if this is just one of a few,
2871 * so it may not be critical (eg, putting on a ring and you have 2932 * so it may not be critical (eg, putting on a ring and you have
2872 * one cursed ring.) 2933 * one cursed ring.)
2873 */ 2934 */
2874 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp)); 2935 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off." CANNOT_REMOVE_CURSED, query_name (tmp));
2875 } 2936 }
2876 2937
2877 last = tmp->below; 2938 last = tmp->below;
2878 } 2939 }
2879 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the 2940 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the
… …
3032 * 3093 *
3033 * Usage example: apply_special (who, op, AP_UNAPPLY | AP_IGNORE_CURSE) 3094 * Usage example: apply_special (who, op, AP_UNAPPLY | AP_IGNORE_CURSE)
3034 * 3095 *
3035 * apply_special() doesn't check for unpaid items. 3096 * apply_special() doesn't check for unpaid items.
3036 */ 3097 */
3098
3099#define LACK_ITEM_POWER \
3100 " H<You lack enough unused item power to use this weapon, see the skills command.>"
3101
3037int 3102int
3038apply_special (object *who, object *op, int aflags) 3103apply_special (object *who, object *op, int aflags)
3039{ 3104{
3040 int basic_flag = aflags & AP_BASIC_FLAGS; 3105 int basic_flag = aflags & AP_BASIC_FLAGS;
3041 object *tmp, *tmp2, *skop = NULL; 3106 object *tmp, *tmp2, *skop = NULL;
… …
3056 if (basic_flag == AP_APPLY) 3121 if (basic_flag == AP_APPLY)
3057 return 0; 3122 return 0;
3058 3123
3059 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 3124 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
3060 { 3125 {
3061 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't remove %s.", query_name (op)); 3126 new_draw_info_format (NDI_UNIQUE, 0, who,
3127 "No matter how hard you try, you just can't remove %s." CANNOT_REMOVE_CURSED,
3128 query_name (op));
3062 return 1; 3129 return 1;
3063 } 3130 }
3064 3131
3065 return unapply_special (who, op, aflags); 3132 return unapply_special (who, op, aflags);
3066 } 3133 }
… …
3082 /* Can't just apply this object. Lets see what not and what to do */ 3149 /* Can't just apply this object. Lets see what not and what to do */
3083 if (int i = can_apply_object (who, op)) 3150 if (int i = can_apply_object (who, op))
3084 { 3151 {
3085 if (i & CAN_APPLY_NEVER) 3152 if (i & CAN_APPLY_NEVER)
3086 { 3153 {
3087 new_draw_info_format (NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name (op)); 3154 new_draw_info_format (NDI_UNIQUE, 0, who,
3155 "You don't have the body to use a %s. H<You can never apply this item.>",
3156 query_name (op));
3088 return 1; 3157 return 1;
3089 } 3158 }
3090 else if (i & CAN_APPLY_RESTRICTION) 3159 else if (i & CAN_APPLY_RESTRICTION)
3091 { 3160 {
3092 new_draw_info_format (NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name (op)); 3161 new_draw_info_format (NDI_UNIQUE, 0, who,
3162 "You have a prohibition against using a %s. "
3163 "H<Your belief, profession or class prevents you from applying this item.>",
3164 query_name (op));
3093 return 1; 3165 return 1;
3094 } 3166 }
3095 3167
3096 if (who->type != PLAYER) 3168 if (who->type != PLAYER)
3097 { 3169 {
… …
3132 if (who->type == PLAYER 3204 if (who->type == PLAYER
3133 && op->item_power 3205 && op->item_power
3134 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level) 3206 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level)
3135 { 3207 {
3136 new_draw_info (NDI_UNIQUE, 0, who, 3208 new_draw_info (NDI_UNIQUE, 0, who,
3137 "Equipping that combined with other items would consume your soul! " 3209 "Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER);
3138 "[use the skills command to check your available item power]");
3139 return 1; 3210 return 1;
3140 } 3211 }
3141 3212
3142 /* Ok. We are now at the state where we can apply the new object. 3213 /* Ok. We are now at the state where we can apply the new object.
3143 * Note that we don't have the checks for can_use_... 3214 * Note that we don't have the checks for can_use_...
… …
3155 { 3226 {
3156 case WEAPON: 3227 case WEAPON:
3157 if (!check_weapon_power (who, op->last_eat)) 3228 if (!check_weapon_power (who, op->last_eat))
3158 { 3229 {
3159 new_draw_info (NDI_UNIQUE, 0, who, "This weapon is too powerful for you to use. " 3230 new_draw_info (NDI_UNIQUE, 0, who, "This weapon is too powerful for you to use. "
3160 "It would consume your soul!."); 3231 "It would consume your soul!." LACK_ITEM_POWER);
3161 3232
3162 if (tmp) 3233 if (tmp)
3163 insert_ob_in_ob (tmp, who); 3234 insert_ob_in_ob (tmp, who);
3164 3235
3165 return 1; 3236 return 1;
… …
3169 // i.e. "R" can use Ragnarok's sword. 3240 // i.e. "R" can use Ragnarok's sword.
3170 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3241 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3171 { 3242 {
3172 /* if the weapon does not have the name as the character, can't use it. */ 3243 /* if the weapon does not have the name as the character, can't use it. */
3173 /* (Ragnarok's sword attempted to be used by Foo: won't work) */ 3244 /* (Ragnarok's sword attempted to be used by Foo: won't work) */
3174 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3245 new_draw_info (NDI_UNIQUE, 0, who,
3246 "The weapon does not recognize you as its owner. "
3247 "H<Its name indicates that it belongs to somebody else.>");
3175 3248
3176 if (tmp) 3249 if (tmp)
3177 insert_ob_in_ob (tmp, who); 3250 insert_ob_in_ob (tmp, who);
3178 3251
3179 return 1; 3252 return 1;
… …
3213 break; 3286 break;
3214 3287
3215 case LAMP: 3288 case LAMP:
3216 if (op->stats.food < 1) 3289 if (op->stats.food < 1)
3217 { 3290 {
3218 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of fuel!", &op->name); 3291 new_draw_info_format (NDI_UNIQUE, 0, who,
3292 "Your %s is out of fuel! "
3293 "H<Lamps and similar items need fuel. They cannot be refilled.>", &op->name);
3219 return 1; 3294 return 1;
3220 } 3295 }
3221 3296
3222 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name); 3297 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name);
3223 tmp2 = arch_to_object (op->other_arch); 3298 tmp2 = arch_to_object (op->other_arch);
… …
3246 who->update_stats (); 3321 who->update_stats ();
3247 3322
3248 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3323 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3249 if (who->type == PLAYER) 3324 if (who->type == PLAYER)
3250 { 3325 {
3251 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3326 new_draw_info (NDI_UNIQUE, 0, who,
3327 "Oops, it feels deadly cold! "
3328 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>");
3252 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 3329 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3253 } 3330 }
3254 3331
3255 if (who->type == PLAYER) 3332 if (who->type == PLAYER)
3256 esrv_send_item (who, tmp2); 3333 esrv_send_item (who, tmp2);
… …
3284 who->change_weapon (pl->combat_ob = item); 3361 who->change_weapon (pl->combat_ob = item);
3285 goto found_weapon; 3362 goto found_weapon;
3286 } 3363 }
3287 } 3364 }
3288 3365
3289 new_draw_info_format (NDI_UNIQUE, 0, who, "You need to apply a '%s' melee weapon before readying this skill", &op->skill); 3366 new_draw_info_format (NDI_UNIQUE, 0, who,
3367 "You need to apply a '%s' melee weapon before readying this skill. "
3368 "H<Some skills need an item, in this case a melee weapon, to function.>",
3369 &op->skill);
3290 return 1; 3370 return 1;
3291 3371
3292 found_weapon:; 3372 found_weapon:;
3293 } 3373 }
3294 else 3374 else
… …
3304 //TODO: bows should/must all have skill missile weapon right now 3384 //TODO: bows should/must all have skill missile weapon right now
3305 who->change_weapon (pl->ranged_ob = item); 3385 who->change_weapon (pl->ranged_ob = item);
3306 goto found_bow; 3386 goto found_bow;
3307 } 3387 }
3308 3388
3389 new_draw_info (NDI_UNIQUE, 0, who,
3309 new_draw_info (NDI_UNIQUE, 0, who, "You need to apply a missile weapon before readying this skill"); 3390 "You need to apply a missile weapon before readying this skill. "
3391 "H<Some skills need an item, in this case a missile weapon, to function.>");
3310 return 1; 3392 return 1;
3311 3393
3312 found_bow:; 3394 found_bow:;
3313 } 3395 }
3314 else 3396 else
… …
3334 break; 3416 break;
3335 3417
3336 case BOW: 3418 case BOW:
3337 if (!check_weapon_power (who, op->last_eat)) 3419 if (!check_weapon_power (who, op->last_eat))
3338 { 3420 {
3339 new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use."); 3421 new_draw_info (NDI_UNIQUE, 0, who,
3340 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3422 "That weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3341 3423
3342 if (tmp) 3424 if (tmp)
3343 insert_ob_in_ob (tmp, who); 3425 insert_ob_in_ob (tmp, who);
3344 3426
3345 return 1; 3427 return 1;
3346 } 3428 }
3347 3429
3348 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3430 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3349 { 3431 {
3350 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3432 new_draw_info (NDI_UNIQUE, 0, who,
3433 "The weapon does not recognize you as its owner. "
3434 "H<Its name indicates that it belongs to somebody else.>");
3351 if (tmp) 3435 if (tmp)
3352 insert_ob_in_ob (tmp, who); 3436 insert_ob_in_ob (tmp, who);
3353 3437
3354 return 1; 3438 return 1;
3355 } 3439 }
… …
3423 */ 3507 */
3424 if (who->type == PLAYER && op->type != WAND && op->type != HORN && op->type != ROD) 3508 if (who->type == PLAYER && op->type != WAND && op->type != HORN && op->type != ROD)
3425 SET_FLAG (op, FLAG_BEEN_APPLIED); 3509 SET_FLAG (op, FLAG_BEEN_APPLIED);
3426 3510
3427 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3511 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3428 {
3429 if (who->type == PLAYER) 3512 if (who->type == PLAYER)
3430 { 3513 {
3431 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3514 new_draw_info (NDI_UNIQUE, 0, who,
3515 "Oops, it feels deadly cold! "
3516 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>");
3432 SET_FLAG (op, FLAG_KNOWN_CURSED); 3517 SET_FLAG (op, FLAG_KNOWN_CURSED);
3433 } 3518 }
3434 }
3435 3519
3436 if (who->type == PLAYER) 3520 if (who->type == PLAYER)
3437 { 3521 {
3438 /* if multiple objects were applied, update both slots */ 3522 /* if multiple objects were applied, update both slots */
3439 if (tmp) 3523 if (tmp)
… …
3448int 3532int
3449monster_apply_special (object *who, object *op, int aflags) 3533monster_apply_special (object *who, object *op, int aflags)
3450{ 3534{
3451 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED)) 3535 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
3452 return 1; 3536 return 1;
3537
3453 return apply_special (who, op, aflags); 3538 return apply_special (who, op, aflags);
3454} 3539}
3455 3540
3456/** 3541/**
3457 * Map was just loaded, handle op's initialisation. 3542 * Map was just loaded, handle op's initialisation.
… …
3783 3868
3784 if (failure <= -1 && failure > -15) 3869 if (failure <= -1 && failure > -15)
3785 { /* wonder */ 3870 { /* wonder */
3786 object *tmp; 3871 object *tmp;
3787 3872
3788 new_draw_info (NDI_UNIQUE, 0, op, "Your spell warps!."); 3873 new_draw_info (NDI_UNIQUE, 0, op, "Your spell warps!");
3789 tmp = get_archetype (SPELL_WONDER); 3874 tmp = get_archetype (SPELL_WONDER);
3790 cast_wonder (op, op, 0, tmp); 3875 cast_wonder (op, op, 0, tmp);
3791 tmp->destroy (); 3876 tmp->destroy ();
3792 } 3877 }
3793 else if (failure <= -15 && failure > -35) 3878 else if (failure <= -15 && failure > -35)
… …
3846 */ 3931 */
3847 int i, j; 3932 int i, j;
3848 3933
3849 for (i = 0; i < NUM_STATS; i++) 3934 for (i = 0; i < NUM_STATS; i++)
3850 { 3935 {
3851 int race_bonus = pl->arch->clone.stats.stat (i); 3936 int race_bonus = pl->arch->stats.stat (i);
3852 sint8 stat = stats->stat (i) + ns->stat (i); 3937 sint8 stat = stats->stat (i) + ns->stat (i);
3853 3938
3854 if (stat > 20 + race_bonus) 3939 if (stat > 20 + race_bonus)
3855 { 3940 {
3856 excess_stat++; 3941 excess_stat++;
… …
3866 3951
3867 if (i == CHA) 3952 if (i == CHA)
3868 continue; /* exclude cha from this */ 3953 continue; /* exclude cha from this */
3869 3954
3870 int stat = stats->stat (i); 3955 int stat = stats->stat (i);
3871 int race_bonus = pl->arch->clone.stats.stat (i); 3956 int race_bonus = pl->arch->stats.stat (i);
3872 if (stat < 20 + race_bonus) 3957 if (stat < 20 + race_bonus)
3873 { 3958 {
3874 change_attr_value (stats, i, 1); 3959 change_attr_value (stats, i, 1);
3875 excess_stat--; 3960 excess_stat--;
3876 } 3961 }
… …
3933 char got[MAX_BUF]; 4018 char got[MAX_BUF];
3934 int len; 4019 int len;
3935 4020
3936 if (!pl || !transformer) 4021 if (!pl || !transformer)
3937 return; 4022 return;
4023
3938 marked = find_marked_object (pl); 4024 marked = find_marked_object (pl);
4025
3939 if (!marked) 4026 if (!marked)
3940 { 4027 {
3941 new_draw_info_format (NDI_UNIQUE, 0, pl, "Use the %s with what item?", query_name (transformer)); 4028 new_draw_info_format (NDI_UNIQUE, 0, pl, "Use the %s with what item?", query_name (transformer));
3942 return; 4029 return;
3943 } 4030 }
4031
3944 if (!marked->slaying) 4032 if (!marked->slaying)
3945 { 4033 {
3946 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked)); 4034 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked));
3947 return; 4035 return;
3948 } 4036 }
4037
3949 /* check whether they are compatible or not */ 4038 /* check whether they are compatible or not */
3950 find = strstr (marked->slaying, transformer->arch->name); 4039 find = strstr (marked->slaying, transformer->arch->archname);
3951 if (!find || (*(find + strlen (transformer->arch->name)) != ':')) 4040 if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
3952 { 4041 {
3953 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked)); 4042 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked));
3954 return; 4043 return;
3955 } 4044 }
4045
3956 find += strlen (transformer->arch->name) + 1; 4046 find += strlen (transformer->arch->archname) + 1;
3957 /* Item can be used, now find how many and what it yields */ 4047 /* Item can be used, now find how many and what it yields */
3958 if (isdigit (*(find))) 4048 if (isdigit (*(find)))
3959 { 4049 {
3960 yield = atoi (find); 4050 yield = atoi (find);
3961 if (yield < 1) 4051 if (yield < 1)
… …
3969 4059
3970 while (isdigit (*find)) 4060 while (isdigit (*find))
3971 find++; 4061 find++;
3972 while (*find == ' ') 4062 while (*find == ' ')
3973 find++; 4063 find++;
4064
3974 memset (got, 0, MAX_BUF); 4065 memset (got, 0, MAX_BUF);
4066
3975 if ((separator = strchr (find, ';')) != NULL) 4067 if ((separator = strchr (find, ';')) != NULL)
3976 {
3977 len = separator - find; 4068 len = separator - find;
3978 }
3979 else 4069 else
3980 {
3981 len = strlen (find); 4070 len = strlen (find);
3982 } 4071
3983 if (len > MAX_BUF - 1) 4072 if (len > MAX_BUF - 1)
3984 len = MAX_BUF - 1; 4073 len = MAX_BUF - 1;
4074
3985 strcpy (got, find); 4075 strcpy (got, find);
3986 got[len] = '\0'; 4076 got[len] = '\0';
3987 4077
3988 /* Now create new item, remove used ones when required. */ 4078 /* Now create new item, remove used ones when required. */
3989 new_item = get_archetype (got); 4079 new_item = get_archetype (got);
… …
3997 new_draw_info_format (NDI_UNIQUE, 0, pl, "You %s the %s.", &transformer->slaying, query_base_name (marked, 0)); 4087 new_draw_info_format (NDI_UNIQUE, 0, pl, "You %s the %s.", &transformer->slaying, query_base_name (marked, 0));
3998 insert_ob_in_ob (new_item, pl); 4088 insert_ob_in_ob (new_item, pl);
3999 esrv_send_inventory (pl, pl); 4089 esrv_send_inventory (pl, pl);
4000 /* Eat up one item */ 4090 /* Eat up one item */
4001 decrease_ob_nr (marked, 1); 4091 decrease_ob_nr (marked, 1);
4092
4002 /* Eat one transformer if needed */ 4093 /* Eat one transformer if needed */
4003 if (transformer->stats.food) 4094 if (transformer->stats.food)
4004 if (--transformer->stats.food == 0) 4095 if (--transformer->stats.food == 0)
4005 decrease_ob_nr (transformer, 1); 4096 decrease_ob_nr (transformer, 1);
4006} 4097}

Diff Legend

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