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.76 by root, Mon Apr 30 04:25:30 2007 UTC vs.
Revision 1.118 by root, Thu Jul 26 00:27:08 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.
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 */
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 */
… …
70 68
71 /* 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,
72 * name or race that matches. 70 * name or race that matches.
73 */ 71 */
74 if ((op->race) && 72 if ((op->race) &&
75 ((!(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)) &&
76 ((!(victim->name && name_flag) || op->race != victim->name)) && 74 ((!(victim->name && name_flag) || op->race != victim->name)) &&
77 ((!(victim->race && race_flag) || op->race != victim->race))) 75 ((!(victim->race && race_flag) || op->race != victim->race)))
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 && 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 && op->slaying == victim->name)) || 82 ((victim->name && name_flag && op->slaying == victim->name)) ||
85 ((victim->race && race_flag && op->slaying == victim->race))) 83 ((victim->race && race_flag && op->slaying == victim->race)))
86 return 1; 84 return 1;
87 85
88 return 0; 86 return 0;
… …
159 157
160/** 158/**
161 * 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
162 * matching item. 160 * matching item.
163 **/ 161 **/
164static void 162void
165handle_apply_yield (object *tmp) 163handle_apply_yield (object *tmp)
166{ 164{
167 const char *yield; 165 const char *yield;
168 166
169 yield = get_ob_key_value (tmp, "on_use_yield"); 167 yield = get_ob_key_value (tmp, "on_use_yield");
… …
233 depl = present_arch_in_ob (at, op); 231 depl = present_arch_in_ob (at, op);
234 232
235 if (depl) 233 if (depl)
236 { 234 {
237 for (i = 0; i < NUM_STATS; i++) 235 for (i = 0; i < NUM_STATS; i++)
238 if (get_attr_value (&depl->stats, i)) 236 if (depl->stats.stat (i))
239 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]); 237 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]);
240 238
241 depl->destroy (); 239 depl->destroy ();
242 op->update_stats (); 240 op->update_stats ();
243 } 241 }
… …
375 force->stats.food *= 10; 373 force->stats.food *= 10;
376 for (i = 0; i < NROFATTACKS; i++) 374 for (i = 0; i < NROFATTACKS; i++)
377 if (force->resist[i] > 0) 375 if (force->resist[i] > 0)
378 force->resist[i] = -force->resist[i]; /* prot => vuln */ 376 force->resist[i] = -force->resist[i]; /* prot => vuln */
379 } 377 }
378
380 force->speed_left = -1; 379 force->speed_left = -1;
381 force = insert_ob_in_ob (force, op); 380 force = insert_ob_in_ob (force, op);
382 CLEAR_FLAG (tmp, FLAG_APPLIED); 381 CLEAR_FLAG (tmp, FLAG_APPLIED);
383 SET_FLAG (force, FLAG_APPLIED); 382 SET_FLAG (force, FLAG_APPLIED);
384 change_abil (op, force); 383 change_abil (op, force);
… …
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);
… …
765{ 765{
766 object *otmp; 766 object *otmp;
767 767
768 if (op->type != PLAYER) 768 if (op->type != PLAYER)
769 return 0; 769 return 0;
770
770 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) 771 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC))
771 { 772 {
772 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll."); 773 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll.");
773 return 0; 774 return 0;
774 } 775 }
776
775 otmp = find_marked_object (op); 777 otmp = find_marked_object (op);
776 if (!otmp) 778 if (!otmp)
777 { 779 {
778 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark a weapon object."); 780 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark a weapon object.");
779 return 0; 781 return 0;
780 } 782 }
783
781 if (otmp->type != WEAPON && otmp->type != BOW) 784 if (otmp->type != WEAPON && otmp->type != BOW)
782 { 785 {
783 new_draw_info (NDI_UNIQUE, 0, op, "Marked item is not a weapon or bow"); 786 new_draw_info (NDI_UNIQUE, 0, op, "Marked item is not a weapon or bow");
784 return 0; 787 return 0;
785 } 788 }
789
786 new_draw_info (NDI_UNIQUE, 0, op, "Applied weapon builder."); 790 new_draw_info (NDI_UNIQUE, 0, op, "Applied weapon builder.");
787 improve_weapon (op, tmp, otmp); 791 improve_weapon (op, tmp, otmp);
788 esrv_send_item (op, otmp); 792 esrv_send_item (op, otmp);
789 return 1; 793 return 1;
790} 794}
… …
851 { 855 {
852 base = base - (base * settings.armor_speed_improvement) / 100; 856 base = base - (base * settings.armor_speed_improvement) / 100;
853 pow++; 857 pow++;
854 } 858 }
855 859
856 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (&armour->arch->clone) * base) / 100; 860 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (armour->arch) * base) / 100;
857 } 861 }
858 else 862 else
859 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;
860 864
861 if (!settings.armor_weight_linear) 865 if (!settings.armor_weight_linear)
862 { 866 {
863 int base = 100; 867 int base = 100;
864 int pow = 0; 868 int pow = 0;
… …
867 { 871 {
868 base = base - (base * settings.armor_weight_reduction) / 100; 872 base = base - (base * settings.armor_weight_reduction) / 100;
869 pow++; 873 pow++;
870 } 874 }
871 875
872 armour->weight = (armour->arch->clone.weight * base) / 100; 876 armour->weight = (armour->arch->weight * base) / 100;
873 } 877 }
874 else 878 else
875 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;
876 880
877 if (armour->weight <= 0) 881 if (armour->weight <= 0)
878 { 882 {
879 LOG (llevInfo, "Warning: enchanted armours can have negative weight\n."); 883 LOG (llevInfo, "Warning: enchanted armours can have negative weight\n.");
880 armour->weight = 1; 884 armour->weight = 1;
881 } 885 }
882 886
883 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);
884 888
885 if (op->type == PLAYER) 889 if (op->type == PLAYER)
886 { 890 {
887 esrv_send_item (op, armour); 891 esrv_send_item (op, armour);
888 if (QUERY_FLAG (armour, FLAG_APPLIED)) 892 if (QUERY_FLAG (armour, FLAG_APPLIED))
… …
940 944
941 price_in = cost * item->value; 945 price_in = cost * item->value;
942 } 946 }
943 else 947 else
944 { 948 {
945 if (item->type == PLAYER || CONV_FROM (converter) != item->arch->name || 949 if (item->type == PLAYER || CONV_FROM (converter) != item->arch->archname ||
946 (CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof)) 950 (CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof))
947 return 0; 951 return 0;
948 952
949 if (CONV_NEED (converter)) 953 if (CONV_NEED (converter))
950 { 954 {
… …
1002 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",
1003 &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);
1004 1008
1005 /** 1009 /**
1006 * 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
1007 * propably had something in mind when doing this 1011 * probably had something in mind when doing this
1008 */ 1012 */
1009 } 1013 }
1010 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y); 1014 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y);
1011 return 1; 1015 return 1;
1012} 1016}
… …
1241 */ 1245 */
1242static void 1246static void
1243apply_sign (object *op, object *sign, int autoapply) 1247apply_sign (object *op, object *sign, int autoapply)
1244{ 1248{
1245 readable_message_type *msgType; 1249 readable_message_type *msgType;
1246 char newbuf[HUGE_BUF];
1247 1250
1248 if (sign->msg == NULL) 1251 if (sign->msg == NULL)
1249 { 1252 {
1250 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is written on it."); 1253 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is written on it.");
1251 return; 1254 return;
… …
1272 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ) && !sign->move_on) 1275 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ) && !sign->move_on)
1273 { 1276 {
1274 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1277 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind.");
1275 return; 1278 return;
1276 } 1279 }
1280
1281 if (op->contr)
1282 if (client *ns = op->contr->ns)
1283 {
1277 msgType = get_readable_message_type (sign); 1284 msgType = get_readable_message_type (sign);
1285
1286 if (ns->can_msg)
1287 ns->send_msg (NDI_NAVY, msgType->msgtype, &sign->msg);
1288 else
1289 {
1290 char newbuf[HUGE_BUF];
1278 snprintf (newbuf, sizeof (newbuf), "%hhu %s", autoapply ? 1 : 0, &sign->msg); 1291 snprintf (newbuf, sizeof (newbuf), "%u %s", autoapply ? 1 : 0, &sign->msg);
1279 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, newbuf, &sign->msg); 1292 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, newbuf, &sign->msg);
1293 }
1294 }
1280} 1295}
1281 1296
1282/** 1297/**
1283 * 'victim' moves onto 'trap' 1298 * 'victim' moves onto 'trap'
1284 * 'victim' leaves 'trap' 1299 * 'victim' leaves 'trap'
… …
1307 * proper. This code was causing needless crashes. 1322 * proper. This code was causing needless crashes.
1308 */ 1323 */
1309 if (recursion_depth >= 500) 1324 if (recursion_depth >= 500)
1310 { 1325 {
1311 LOG (llevDebug, "WARNING: move_apply(): aborting recursion " 1326 LOG (llevDebug, "WARNING: move_apply(): aborting recursion "
1312 "[trap arch %s, name %s; victim arch %s, name %s]\n", &trap->arch->name, &trap->name, &victim->arch->name, &victim->name); 1327 "[trap arch %s, name %s; victim arch %s, name %s]\n", &trap->arch->archname, &trap->name, &victim->arch->archname, &victim->name);
1313 return; 1328 return;
1314 } 1329 }
1330
1315 recursion_depth++; 1331 recursion_depth++;
1316 if (trap->head) 1332 if (trap->head)
1317 trap = trap->head; 1333 trap = trap->head;
1318 1334
1319 if (INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator))) 1335 if (INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator)))
… …
1334 1350
1335 /* Just put in some sanity check. I think there is a bug in the 1351 /* Just put in some sanity check. I think there is a bug in the
1336 * above with some objects have zero speed, and thus the player 1352 * above with some objects have zero speed, and thus the player
1337 * getting permanently paralyzed. 1353 * getting permanently paralyzed.
1338 */ 1354 */
1339 if (victim->speed_left < -50.0) 1355 if (victim->speed_left < -50.f)
1340 victim->speed_left = -50.0; 1356 victim->speed_left = -50.f;
1341 /* LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left); */ 1357 /* LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left); */
1342 } 1358 }
1343 goto leave; 1359 goto leave;
1344 1360
1345 case SPINNER: 1361 case SPINNER:
… …
1417 1433
1418 if ((ab->move_type && trap->move_on) || ab->move_type == 0) 1434 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1419 { 1435 {
1420 if (!sound_was_played) 1436 if (!sound_was_played)
1421 { 1437 {
1422 play_sound_map (trap->map, trap->x, trap->y, SOUND_FALL_HOLE); 1438 trap->play_sound (sound_find ("fall_hole"));
1423 sound_was_played = 1; 1439 sound_was_played = 1;
1424 } 1440 }
1441
1425 new_draw_info (NDI_UNIQUE, 0, ab, "You fall into a trapdoor!"); 1442 new_draw_info (NDI_UNIQUE, 0, ab, "You fall into a trapdoor!");
1426 transfer_ob (ab, (int) EXIT_X (trap), (int) EXIT_Y (trap), 0, ab); 1443 transfer_ob (ab, (int) EXIT_X (trap), (int) EXIT_Y (trap), 0, ab);
1427 } 1444 }
1428 } 1445 }
1429 goto leave; 1446 goto leave;
… …
1462 * Processing will happen if the head runs into the pit 1479 * Processing will happen if the head runs into the pit
1463 */ 1480 */
1464 if (victim->head) 1481 if (victim->head)
1465 goto leave; 1482 goto leave;
1466 1483
1467 play_sound_map (victim->map, victim->x, victim->y, SOUND_FALL_HOLE); 1484 victim->play_sound (sound_find ("fall_hole"));
1468 new_draw_info (NDI_UNIQUE, 0, victim, "You fall through the hole!\n"); 1485 new_draw_info (NDI_UNIQUE, 0, victim, "You fall through the hole!\n");
1469 transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim); 1486 transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim);
1470 goto leave; 1487 goto leave;
1471 1488
1472 case EXIT: 1489 case EXIT:
… …
1514 } 1531 }
1515 goto leave; 1532 goto leave;
1516 1533
1517 default: 1534 default:
1518 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not " 1535 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not "
1519 "handled in move_apply()\n", &trap->name, &trap->arch->name, trap->type); 1536 "handled in move_apply()\n", &trap->name, &trap->arch->archname, trap->type);
1520 goto leave; 1537 goto leave;
1521 } 1538 }
1522 1539
1523leave: 1540leave:
1524 recursion_depth--; 1541 recursion_depth--;
… …
1536 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ)) 1553 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
1537 { 1554 {
1538 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1555 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind.");
1539 return; 1556 return;
1540 } 1557 }
1558
1541 if (tmp->msg == NULL) 1559 if (!tmp->msg)
1542 { 1560 {
1543 new_draw_info_format (NDI_UNIQUE, 0, op, "You open the %s and find it empty.", &tmp->name); 1561 new_draw_info_format (NDI_UNIQUE, 0, op, "You open the %s and find it empty.", &tmp->name);
1544 return; 1562 return;
1545 } 1563 }
1546 1564
1547 /* need a literacy skill to read stuff! */ 1565 /* need a literacy skill to read stuff! */
1548 skill_ob = find_skill_by_name (op, tmp->skill); 1566 skill_ob = find_skill_by_name (op, tmp->skill);
1549 if (!skill_ob) 1567 if (!skill_ob)
1550 { 1568 {
1551 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols."); 1569 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. H<You lack the skill to read this>");
1552 return; 1570 return;
1553 } 1571 }
1572
1554 lev_diff = tmp->level - (skill_ob->level + 5); 1573 lev_diff = tmp->level - (skill_ob->level + 5);
1555 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0) 1574 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0)
1556 { 1575 {
1557 if (lev_diff < 2) 1576 if (lev_diff < 2)
1558 new_draw_info (NDI_UNIQUE, 0, op, "This book is just barely beyond your comprehension."); 1577 new_draw_info (NDI_UNIQUE, 0, op, "This book is just barely beyond your comprehension.");
… …
1569 return; 1588 return;
1570 } 1589 }
1571 1590
1572 readable_message_type *msgType = get_readable_message_type (tmp); 1591 readable_message_type *msgType = get_readable_message_type (tmp);
1573 1592
1593 if (player *pl = op->contr)
1594 if (client *ns = pl->ns)
1595 if (ns->can_msg)
1596 {
1597 dynbuf_text buf;
1598 buf << long_desc (tmp, op)
1599 << "\n\n"
1600 << tmp->msg
1601 << '\0';
1602 ns->send_msg (NDI_NAVY, msgType->msgtype, buf.linearise ());
1603 }
1604 else
1574 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, 1605 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1575 msgType->message_type, msgType->message_subtype, 1606 msgType->message_type, msgType->message_subtype,
1576 "You open the %s and start reading.\n%s", (char *)"%s\n%s", 1607 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1577 long_desc (tmp, op), &tmp->msg); 1608 long_desc (tmp, op), &tmp->msg);
1578 1609
1579 /* gain xp from reading */ 1610 /* gain xp from reading */
1580 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1611 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1581 { /* only if not read before */ 1612 { /* only if not read before */
1582 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1613 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
… …
1648 return; 1679 return;
1649 } 1680 }
1650 return; 1681 return;
1651 } 1682 }
1652 1683
1653 play_sound_player_only (op->contr, SOUND_LEARN_SPELL, 0, 0); 1684 op->contr->play_sound (sound_find ("learn_spell"));
1685
1654 tmp = spell->clone (); 1686 tmp = spell->clone ();
1655 insert_ob_in_ob (tmp, op); 1687 insert_ob_in_ob (tmp, op);
1656 1688
1657 if (special_prayer) 1689 if (special_prayer)
1658 SET_FLAG (tmp, FLAG_STARTEQUIP); 1690 SET_FLAG (tmp, FLAG_STARTEQUIP);
… …
1703 1735
1704 /* artifact_spellbooks have 'slaying' field point to a spell name, 1736 /* artifact_spellbooks have 'slaying' field point to a spell name,
1705 * instead of having their spell stored in stats.sp. These are 1737 * instead of having their spell stored in stats.sp. These are
1706 * legacy spellbooks 1738 * legacy spellbooks
1707 */ 1739 */
1708
1709 if (tmp->slaying != NULL) 1740 if (tmp->slaying)
1710 { 1741 {
1711 spell = arch_to_object (find_archetype_by_object_name (tmp->slaying)); 1742 spell = arch_to_object (find_archetype_by_object_name (tmp->slaying));
1712 if (!spell) 1743 if (!spell)
1713 { 1744 {
1714 new_draw_info_format (NDI_UNIQUE, 0, op, "The book's formula for %s is incomplete", &tmp->slaying); 1745 new_draw_info_format (NDI_UNIQUE, 0, op, "The book's formula for %s is incomplete", &tmp->slaying);
1715 return; 1746 return;
1716 } 1747 }
1717 else 1748 else
1718 insert_ob_in_ob (spell, tmp); 1749 insert_ob_in_ob (spell, tmp);
1750
1719 tmp->slaying = NULL; 1751 tmp->slaying = 0;
1720 } 1752 }
1721 1753
1722 skop = find_skill_by_name (op, tmp->skill); 1754 skop = find_skill_by_name (op, tmp->skill);
1723 1755
1724 /* need a literacy skill to learn spells. Also, having a literacy level 1756 /* need a literacy skill to learn spells. Also, having a literacy level
1725 * lower than the spell will make learning the spell more difficult */ 1757 * lower than the spell will make learning the spell more difficult */
1726 if (!skop) 1758 if (!skop)
1727 { 1759 {
1728 new_draw_info (NDI_UNIQUE, 0, op, "You can't read! Your attempt fails."); 1760 new_draw_info (NDI_UNIQUE, 0, op, "You can't read! Your attempt fails. H<You lack the literacy skill.>");
1729 return; 1761 return;
1730 } 1762 }
1731 1763
1732 spell = tmp->inv; 1764 spell = tmp->inv;
1733 1765
1734 if (!spell) 1766 if (!spell)
1735 { 1767 {
1736 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name); 1768 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name);
1737 new_draw_info (NDI_UNIQUE, 0, op, "The spellbook symbols make no sense."); 1769 new_draw_info (NDI_UNIQUE, 0, op, "The spellbook symbols make no sense. This is a bug, please report!");
1738 return; 1770 return;
1739 } 1771 }
1740 1772
1741 if (skop->level < int (sqrtf (spell->level) * 1.5f)) 1773 if (skop->level < int (sqrtf (spell->level) * 1.5f))
1742 { 1774 {
1743 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. [Your literacy level is too low]"); 1775 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. H<Your literacy level is too low.>");
1744 return; 1776 return;
1745 } 1777 }
1746 1778
1747 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name); 1779 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name);
1748 1780
… …
1761 * if the player doesn't know the spell, doesn't make a lot of sense that 1793 * if the player doesn't know the spell, doesn't make a lot of sense that
1762 * they would have a special prayer mark. 1794 * they would have a special prayer mark.
1763 */ 1795 */
1764 if (check_spell_known (op, spell->name)) 1796 if (check_spell_known (op, spell->name))
1765 { 1797 {
1766 new_draw_info (NDI_UNIQUE, 0, op, "You already know that spell.\n"); 1798 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");
1767 return; 1799 return;
1768 } 1800 }
1769 1801
1770 if (spell->skill) 1802 if (spell->skill)
1771 { 1803 {
… …
1812 if (!QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 1844 if (!QUERY_FLAG (tmp, FLAG_STARTEQUIP))
1813 change_exp (op, calc_skill_exp (op, tmp, skop), skop->skill, 0); 1845 change_exp (op, calc_skill_exp (op, tmp, skop), skop->skill, 0);
1814 } 1846 }
1815 else 1847 else
1816 { 1848 {
1817 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1849 op->contr->play_sound (sound_find ("fumble_spell"));
1818 new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell.\n"); 1850 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");
1819 } 1851 }
1820 1852
1821 decrease_ob (tmp); 1853 decrease_ob (tmp);
1822} 1854}
1823 1855
… …
1835 return; 1867 return;
1836 } 1868 }
1837 1869
1838 if (!tmp->inv || tmp->inv->type != SPELL) 1870 if (!tmp->inv || tmp->inv->type != SPELL)
1839 { 1871 {
1840 new_draw_info (NDI_UNIQUE, 0, op, "The scroll just doesn't make sense!"); 1872 new_draw_info (NDI_UNIQUE, 0, op, "The scroll just doesn't make sense! H<...and never will make sense.>");
1841 return; 1873 return;
1842 } 1874 }
1843 1875
1844 if (op->type == PLAYER) 1876 if (op->type == PLAYER)
1845 { 1877 {
… …
1851 */ 1883 */
1852 skop = find_skill_by_name (op, skill_names[SK_LITERACY]); 1884 skop = find_skill_by_name (op, skill_names[SK_LITERACY]);
1853 1885
1854 if (!skop) 1886 if (!skop)
1855 { 1887 {
1856 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols."); 1888 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. H<You lack the literacy skill.>");
1857 return; 1889 return;
1858 } 1890 }
1859 1891
1860 if ((exp_gain = calc_skill_exp (op, tmp, skop))) 1892 if ((exp_gain = calc_skill_exp (op, tmp, skop)))
1861 change_exp (op, exp_gain, skop->skill, 0); 1893 change_exp (op, exp_gain, skop->skill, 0);
… …
1863 1895
1864 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1896 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1865 identify (tmp); 1897 identify (tmp);
1866 1898
1867 new_draw_info_format (NDI_BLACK, 0, op, "The scroll of %s turns to dust.", &tmp->inv->name); 1899 new_draw_info_format (NDI_BLACK, 0, op, "The scroll of %s turns to dust.", &tmp->inv->name);
1868
1869 1900
1870 cast_spell (op, tmp, dir, tmp->inv, NULL); 1901 cast_spell (op, tmp, dir, tmp->inv, NULL);
1871 decrease_ob (tmp); 1902 decrease_ob (tmp);
1872} 1903}
1873 1904
… …
1877 * chest. 1908 * chest.
1878 */ 1909 */
1879static void 1910static void
1880apply_treasure (object *op, object *tmp) 1911apply_treasure (object *op, object *tmp)
1881{ 1912{
1882 object *treas;
1883
1884
1885 /* Nice side effect of new treasure creation method is that the treasure 1913 /* Nice side effect of new treasure creation method is that the treasure
1886 * for the chest is done when the chest is created, and put into the chest 1914 * for the chest is done when the chest is created, and put into the chest
1887 * inventory. So that when the chest burns up, the items still exist. Also 1915 * inventory. So that when the chest burns up, the items still exist. Also
1888 * prevents people fromt moving chests to more difficult maps to get better 1916 * prevents people fromt moving chests to more difficult maps to get better
1889 * treasure 1917 * treasure
1890 */ 1918 */
1891
1892 treas = tmp->inv; 1919 object *treas = tmp->inv;
1893 if (treas == NULL) 1920
1921 if (!treas)
1894 { 1922 {
1895 new_draw_info (NDI_UNIQUE, 0, op, "The chest was empty."); 1923 new_draw_info (NDI_UNIQUE, 0, op, "The chest was empty.");
1896 decrease_ob (tmp); 1924 decrease_ob (tmp);
1897 return; 1925 return;
1898 } 1926 }
1927
1899 while (tmp->inv) 1928 while (tmp->inv)
1900 { 1929 {
1901 treas = tmp->inv; 1930 treas = tmp->inv;
1902 1931
1903 treas->remove (); 1932 treas->remove ();
… …
1985 /* special food hack -b.t. */ 2014 /* special food hack -b.t. */
1986 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED)) 2015 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED))
1987 eat_special_food (op, tmp); 2016 eat_special_food (op, tmp);
1988 } 2017 }
1989 } 2018 }
2019
1990 handle_apply_yield (tmp); 2020 handle_apply_yield (tmp);
1991 decrease_ob (tmp); 2021 decrease_ob (tmp);
1992} 2022}
1993 2023
1994/** 2024/**
… …
2021 if (meal->type != FLESH || !is_dragon_pl (op)) 2051 if (meal->type != FLESH || !is_dragon_pl (op))
2022 return 0; 2052 return 0;
2023 2053
2024 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces 2054 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces
2025 from the player's inventory */ 2055 from the player's inventory */
2026 shstr_cmp dragon_ability_force ("dragon_ability_force");
2027 shstr_cmp dragon_skin_force ("dragon_skin_force");
2028
2029 for (tmp = op->inv; tmp; tmp = tmp->below) 2056 for (tmp = op->inv; tmp; tmp = tmp->below)
2030 if (tmp->type == FORCE) 2057 if (tmp->type == FORCE)
2031 if (tmp->arch->name == dragon_skin_force) 2058 if (tmp->arch->archname == shstr_dragon_skin_force)
2032 skin = tmp; 2059 skin = tmp;
2033 else if (tmp->arch->name == dragon_ability_force) 2060 else if (tmp->arch->archname == shstr_dragon_ability_force)
2034 abil = tmp; 2061 abil = tmp;
2035 2062
2036 /* if either skin or ability are missing, this is an old player 2063 /* if either skin or ability are missing, this is an old player
2037 which is not to be considered a dragon -> bail out */ 2064 which is not to be considered a dragon -> bail out */
2038 if (skin == NULL || abil == NULL) 2065 if (skin == NULL || abil == NULL)
… …
2159static void 2186static void
2160apply_armour_improver (object *op, object *tmp) 2187apply_armour_improver (object *op, object *tmp)
2161{ 2188{
2162 object *armor; 2189 object *armor;
2163 2190
2164 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) 2191 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_NO_MAGIC))
2165 { 2192 {
2166 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll."); 2193 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll. H<The area prevents magic effects.>");
2167 return; 2194 return;
2168 } 2195 }
2169 2196
2170 armor = find_marked_object (op); 2197 armor = find_marked_object (op);
2171 2198
2172 if (!armor) 2199 if (!armor)
2173 { 2200 {
2174 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark an armor object."); 2201 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.");
2175 return; 2202 return;
2176 } 2203 }
2177 2204
2178 if (armor->type != ARMOUR 2205 if (armor->type != ARMOUR
2179 && armor->type != CLOAK 2206 && armor->type != CLOAK
… …
2190extern void 2217extern void
2191apply_poison (object *op, object *tmp) 2218apply_poison (object *op, object *tmp)
2192{ 2219{
2193 if (op->type == PLAYER) 2220 if (op->type == PLAYER)
2194 { 2221 {
2195 play_sound_player_only (op->contr, SOUND_DRINK_POISON, 0, 0); 2222 op->contr->play_sound (sound_find ("drink_poison"));
2196 new_draw_info (NDI_UNIQUE, 0, op, "Yech! That tasted poisonous!"); 2223 new_draw_info (NDI_UNIQUE, 0, op, "Yech! That tasted poisonous!");
2197 strcpy (op->contr->killer, "poisonous booze"); 2224 strcpy (op->contr->killer, "poisonous booze");
2198 } 2225 }
2226
2199 if (tmp->stats.hp > 0) 2227 if (tmp->stats.hp > 0)
2200 { 2228 {
2201 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp); 2229 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp);
2202 hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1); 2230 hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1);
2203 } 2231 }
2232
2204 op->stats.food -= op->stats.food / 4; 2233 op->stats.food -= op->stats.food / 4;
2205 handle_apply_yield (tmp); 2234 handle_apply_yield (tmp);
2206 decrease_ob (tmp); 2235 decrease_ob (tmp);
2207} 2236}
2208 2237
… …
2291 } 2320 }
2292 } 2321 }
2293 2322
2294 return 0; 2323 return 0;
2295} 2324}
2296
2297 2325
2298/** 2326/**
2299 * Main apply handler. 2327 * Main apply handler.
2300 * 2328 *
2301 * Checks for unpaid items before applying. 2329 * Checks for unpaid items before applying.
… …
2309 * being applied. 2337 * being applied.
2310 * 2338 *
2311 * aflag is special (always apply/unapply) flags. Nothing is done with 2339 * aflag is special (always apply/unapply) flags. Nothing is done with
2312 * them in this function - they are passed to apply_special 2340 * them in this function - they are passed to apply_special
2313 */ 2341 */
2314
2315int 2342int
2316manual_apply (object *op, object *tmp, int aflag) 2343manual_apply (object *op, object *tmp, int aflag)
2317{ 2344{
2318 if (tmp->head) 2345 if (tmp->head)
2319 tmp = tmp->head; 2346 tmp = tmp->head;
2320 2347
2321 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED)) 2348 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED))
2322 { 2349 {
2323 if (op->type == PLAYER) 2350 if (op->type == PLAYER)
2324 { 2351 {
2325 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first."); 2352 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first. H<You cannot use items marked as unpaid.>");
2326 return 1; 2353 return 1;
2327 } 2354 }
2328 else 2355 else
2329 return 0; /* monsters just skip unpaid items */ 2356 return 0; /* monsters just skip unpaid items */
2330 } 2357 }
… …
2334 2361
2335 switch (tmp->type) 2362 switch (tmp->type)
2336 { 2363 {
2337 case CF_HANDLE: 2364 case CF_HANDLE:
2338 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2365 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle.");
2339 play_sound_map (op->map, op->x, op->y, SOUND_TURN_HANDLE); 2366 op->play_sound (sound_find ("turn_handle"));
2340 tmp->value = tmp->value ? 0 : 1; 2367 tmp->value = tmp->value ? 0 : 1;
2341 SET_ANIMATION (tmp, tmp->value); 2368 SET_ANIMATION (tmp, tmp->value);
2342 update_object (tmp, UP_OBJ_FACE); 2369 update_object (tmp, UP_OBJ_FACE);
2343 push_button (tmp); 2370 push_button (tmp);
2344 return 1; 2371 return 1;
2345 2372
2346 case TRIGGER: 2373 case TRIGGER:
2347 if (check_trigger (tmp, op)) 2374 if (check_trigger (tmp, op))
2348 { 2375 {
2349 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2376 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle.");
2350 play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE); 2377 op->play_sound (sound_find ("turn_handle"));
2351 } 2378 }
2352 else 2379 else
2353 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move."); 2380 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move.");
2354 2381
2355 return 1; 2382 return 1;
… …
2357 case EXIT: 2384 case EXIT:
2358 if (op->type != PLAYER) 2385 if (op->type != PLAYER)
2359 return 0; 2386 return 0;
2360 2387
2361 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2388 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp))
2362 {
2363 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp)); 2389 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp));
2364 }
2365 else 2390 else
2366 { 2391 {
2367 /* Don't display messages for random maps. */ 2392 /* Don't display messages for random maps. */
2368 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2)) 2393 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2))
2369 new_draw_info (NDI_NAVY, 0, op, tmp->msg); 2394 new_draw_info (NDI_NAVY, 0, op, tmp->msg);
2370 2395
2371 op->enter_exit (tmp); 2396 op->enter_exit (tmp);
2372 } 2397 }
2398
2373 return 1; 2399 return 1;
2374 2400
2375 case SIGN: 2401 case SIGN:
2376 apply_sign (op, tmp, 0); 2402 apply_sign (op, tmp, 0);
2377 return 1; 2403 return 1;
… …
2381 { 2407 {
2382 apply_book (op, tmp); 2408 apply_book (op, tmp);
2383 return 1; 2409 return 1;
2384 } 2410 }
2385 else 2411 else
2386 {
2387 return 0; 2412 return 0;
2388 }
2389 2413
2390 case SKILLSCROLL: 2414 case SKILLSCROLL:
2391 if (op->type == PLAYER) 2415 if (op->type == PLAYER)
2392 { 2416 {
2393 apply_skillscroll (op, tmp); 2417 apply_skillscroll (op, tmp);
2394 return 1; 2418 return 1;
2395 } 2419 }
2420 else
2396 return 0; 2421 return 0;
2397 2422
2398 case SPELLBOOK: 2423 case SPELLBOOK:
2399 if (op->type == PLAYER) 2424 if (op->type == PLAYER)
2400 { 2425 {
2401 apply_spellbook (op, tmp); 2426 apply_spellbook (op, tmp);
2402 return 1; 2427 return 1;
2403 } 2428 }
2429 else
2404 return 0; 2430 return 0;
2405 2431
2406 case SCROLL: 2432 case SCROLL:
2407 apply_scroll (op, tmp, 0); 2433 apply_scroll (op, tmp, 0);
2408 return 1; 2434 return 1;
2409 2435
2410 case POTION: 2436 case POTION:
2411 (void) apply_potion (op, tmp); 2437 apply_potion (op, tmp);
2412 return 1; 2438 return 1;
2413 2439
2414 /* Eneq(@csd.uu.se): Handle apply on containers. */ 2440 /* Eneq(@csd.uu.se): Handle apply on containers. */
2415 //TODO: remove, as it is unsed? 2441 //TODO: remove, as it is unsed?
2416 case CLOSE_CON: 2442 case CLOSE_CON:
… …
2449 case LAMP: 2475 case LAMP:
2450 case BUILDER: 2476 case BUILDER:
2451 case SKILL_TOOL: 2477 case SKILL_TOOL:
2452 if (tmp->env != op) 2478 if (tmp->env != op)
2453 return 2; /* not in inventory */ 2479 return 2; /* not in inventory */
2480
2454 (void) apply_special (op, tmp, aflag); 2481 apply_special (op, tmp, aflag);
2455 return 1; 2482 return 1;
2456 2483
2457 case DRINK: 2484 case DRINK:
2458 case FOOD: 2485 case FOOD:
2459 case FLESH: 2486 case FLESH:
… …
2475 } 2502 }
2476 else 2503 else
2477 return 0; 2504 return 0;
2478 2505
2479 case WEAPON_IMPROVER: 2506 case WEAPON_IMPROVER:
2480 (void) check_improve_weapon (op, tmp); 2507 check_improve_weapon (op, tmp);
2481 return 1; 2508 return 1;
2482 2509
2483 case CLOCK: 2510 case CLOCK:
2484 if (op->type == PLAYER) 2511 if (op->type == PLAYER)
2485 { 2512 {
… …
2488 2515
2489 get_tod (&tod); 2516 get_tod (&tod);
2490 sprintf (buf, "It is %d minute%s past %d o'clock %s", 2517 sprintf (buf, "It is %d minute%s past %d o'clock %s",
2491 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"), 2518 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"),
2492 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am")); 2519 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am"));
2493 play_sound_player_only (op->contr, SOUND_CLOCK, 0, 0); 2520 op->play_sound (sound_find ("sound_clock"));
2494 new_draw_info (NDI_UNIQUE, 0, op, buf); 2521 new_draw_info (NDI_UNIQUE, 0, op, buf);
2495 return 1; 2522 return 1;
2496 } 2523 }
2497 else 2524 else
2498 {
2499 return 0; 2525 return 0;
2500 }
2501 2526
2502 case MENU: 2527 case MENU:
2503 if (op->type == PLAYER) 2528 if (op->type == PLAYER)
2504 { 2529 {
2505 shop_listing (tmp, op); 2530 shop_listing (tmp, op);
2506 return 1; 2531 return 1;
2507 } 2532 }
2508 else 2533 else
2509 {
2510 return 0; 2534 return 0;
2511 }
2512 2535
2513 case POWER_CRYSTAL: 2536 case POWER_CRYSTAL:
2514 apply_power_crystal (op, tmp); /* see egoitem.c */ 2537 apply_power_crystal (op, tmp); /* see egoitem.c */
2515 return 1; 2538 return 1;
2516 2539
… …
2519 { 2542 {
2520 apply_lighter (op, tmp); 2543 apply_lighter (op, tmp);
2521 return 1; 2544 return 1;
2522 } 2545 }
2523 else 2546 else
2524 {
2525 return 0; 2547 return 0;
2526 }
2527 2548
2528 case ITEM_TRANSFORMER: 2549 case ITEM_TRANSFORMER:
2529 apply_item_transformer (op, tmp); 2550 apply_item_transformer (op, tmp);
2530 return 1; 2551 return 1;
2531 2552
… …
2544int 2565int
2545player_apply (object *pl, object *op, int aflag, int quiet) 2566player_apply (object *pl, object *op, int aflag, int quiet)
2546{ 2567{
2547 int tmp; 2568 int tmp;
2548 2569
2549 if (op->env == NULL && (pl->move_type & MOVE_FLYING)) 2570 if (op->env && (pl->move_type & MOVE_FLYING))
2550 { 2571 {
2551 /* player is flying and applying object not in inventory */ 2572 /* player is flying and applying object not in inventory */
2552 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING)) 2573 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
2553 { 2574 {
2554 new_draw_info (NDI_UNIQUE, 0, pl, "But you are floating high " "above the ground!"); 2575 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.>");
2555 return 0; 2576 return 0;
2556 } 2577 }
2557 }
2558
2559 /* Check for PLAYER to avoid a DM to disappear in a puff of smoke if
2560 * applied.
2561 */
2562 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_WAS_WIZ) && !QUERY_FLAG (pl, FLAG_WAS_WIZ))
2563 {
2564 play_sound_map (pl->map, pl->x, pl->y, SOUND_OB_EVAPORATE);
2565 new_draw_info (NDI_UNIQUE, 0, pl, "The object disappears in a puff " "of smoke!");
2566 new_draw_info (NDI_UNIQUE, 0, pl, "It must have been an illusion.");
2567 op->destroy ();
2568 return 1;
2569 } 2578 }
2570 2579
2571 pl->contr->last_used = op; 2580 pl->contr->last_used = op;
2572 2581
2573 tmp = manual_apply (pl, op, aflag); 2582 tmp = manual_apply (pl, op, aflag);
… …
2576 if (tmp == 0) 2585 if (tmp == 0)
2577 new_draw_info_format (NDI_UNIQUE, 0, pl, "I don't know how to apply the %s.", query_name (op)); 2586 new_draw_info_format (NDI_UNIQUE, 0, pl, "I don't know how to apply the %s.", query_name (op));
2578 else if (tmp == 2) 2587 else if (tmp == 2)
2579 new_draw_info_format (NDI_UNIQUE, 0, pl, "You must get it first!\n"); 2588 new_draw_info_format (NDI_UNIQUE, 0, pl, "You must get it first!\n");
2580 } 2589 }
2590
2581 return tmp; 2591 return tmp;
2582} 2592}
2583 2593
2584/** 2594/**
2585 * player_apply_below attempts to apply the object 'below' the player. 2595 * player_apply_below attempts to apply the object 'below' the player.
2586 * If the player has an open container, we use that for below, otherwise 2596 * If the player has an open container, we use that for below, otherwise
2587 * we use the ground. 2597 * we use the ground.
2588 */ 2598 */
2589
2590void 2599void
2591player_apply_below (object *pl) 2600player_apply_below (object *pl)
2592{ 2601{
2593 int floors = 0; 2602 int floors = 0;
2594 2603
… …
2631 * to keep the size of apply_special to a more managable size. 2640 * to keep the size of apply_special to a more managable size.
2632 */ 2641 */
2633static int 2642static int
2634unapply_special (object *who, object *op, int aflags) 2643unapply_special (object *who, object *op, int aflags)
2635{ 2644{
2636 if (INVOKE_OBJECT (BE_UNREADY, op, ARG_OBJECT (who), ARG_INT (aflags)) || INVOKE_OBJECT (UNREADY, who, ARG_OBJECT (op), ARG_INT (aflags))) 2645 if (INVOKE_OBJECT (BE_UNREADY, op, ARG_OBJECT (who), ARG_INT (aflags))
2646 || INVOKE_OBJECT (UNREADY, who, ARG_OBJECT (op), ARG_INT (aflags)))
2637 return RESULT_INT (0); 2647 return RESULT_INT (0);
2638 2648
2639 object *tmp2;
2640
2641 CLEAR_FLAG (op, FLAG_APPLIED); 2649 CLEAR_FLAG (op, FLAG_APPLIED);
2642 2650
2643 switch (op->type) 2651 switch (op->type)
2644 { 2652 {
2653 case SKILL_TOOL:
2654 // unapplying a skill tool should also unapply the skill it governs
2655 // but this is hard, as it shouldn't do so when the skill can
2656 // be used for other reasons
2657 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2658 if (tmp->skill == op->skill
2659 && tmp->type == SKILL
2660 && tmp->flag [FLAG_APPLIED]
2661 && !tmp->flag [FLAG_CAN_USE_SKILL])
2662 unapply_special (who, tmp, 0);
2663
2664 change_abil (who, op);
2665 break;
2666
2645 case WEAPON: 2667 case WEAPON:
2668 if (player *pl = who->contr)
2669 if (op == pl->combat_ob)
2670 {
2671 pl->combat_ob = 0;
2672 who->change_weapon (pl->ranged_ob);
2673 }
2674
2646 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op)); 2675 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op));
2647 2676
2648 (void) change_abil (who, op); 2677 change_abil (who, op);
2649 if (QUERY_FLAG (who, FLAG_READY_WEAPON))
2650 CLEAR_FLAG (who, FLAG_READY_WEAPON); 2678 CLEAR_FLAG (who, FLAG_READY_WEAPON);
2651 clear_skill (who);
2652 break; 2679 break;
2653 2680
2654 case SKILL: /* allows objects to impart skills */
2655 case SKILL_TOOL: 2681 case SKILL:
2656 if (op != who->chosen_skill) 2682 if (who->contr)
2657 LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n");
2658
2659 if (who->type == PLAYER)
2660 {
2661 if (who->contr->ranged_ob == op)
2662 { 2683 {
2663 who->contr->ranged_skill = 0;
2664 who->contr->ranged_ob = 0;
2665 }
2666
2667 if (!op->invisible) 2684 if (!op->invisible)
2668 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op)); 2685 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op));
2669 else 2686 else
2670 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill); 2687 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill);
2671 } 2688 }
2672 2689
2673 change_abil (who, op); 2690 change_abil (who, op);
2674 who->chosen_skill = 0;
2675 CLEAR_FLAG (who, FLAG_READY_SKILL); 2691 CLEAR_FLAG (who, FLAG_READY_SKILL);
2676 break; 2692 break;
2677 2693
2678 case ARMOUR: 2694 case ARMOUR:
2679 case HELMET: 2695 case HELMET:
… …
2684 case AMULET: 2700 case AMULET:
2685 case GIRDLE: 2701 case GIRDLE:
2686 case BRACERS: 2702 case BRACERS:
2687 case CLOAK: 2703 case CLOAK:
2688 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op)); 2704 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op));
2689 (void) change_abil (who, op); 2705 change_abil (who, op);
2690 break; 2706 break;
2707
2691 case LAMP: 2708 case LAMP:
2709 {
2692 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name); 2710 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name);
2711
2693 tmp2 = arch_to_object (op->other_arch); 2712 object *tmp2 = arch_to_object (op->other_arch);
2694 tmp2->x = op->x; 2713 tmp2->x = op->x;
2695 tmp2->y = op->y; 2714 tmp2->y = op->y;
2696 tmp2->map = op->map; 2715 tmp2->map = op->map;
2697 tmp2->below = op->below; 2716 tmp2->below = op->below;
2698 tmp2->above = op->above; 2717 tmp2->above = op->above;
2699 tmp2->stats.food = op->stats.food; 2718 tmp2->stats.food = op->stats.food;
2700 CLEAR_FLAG (tmp2, FLAG_APPLIED); 2719 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2701 2720
2702 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 2721 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2703 SET_FLAG (tmp2, FLAG_INV_LOCKED); 2722 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2704 2723
2705 if (who->type == PLAYER) 2724 if (who->contr)
2706 esrv_del_item (who->contr, op->count); 2725 esrv_del_item (who->contr, op->count);
2707 2726
2708 op->destroy (); 2727 op->destroy ();
2709 insert_ob_in_ob (tmp2, who); 2728 insert_ob_in_ob (tmp2, who);
2710 who->update_stats (); 2729 who->update_stats ();
2730
2711 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 2731 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2712 { 2732 {
2713 if (who->type == PLAYER) 2733 if (who->contr)
2714 { 2734 {
2715 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 2735 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
2716 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 2736 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2717 } 2737 }
2718 } 2738 }
2719 if (who->type == PLAYER) 2739
2740 if (who->contr)
2720 esrv_send_item (who, tmp2); 2741 esrv_send_item (who, tmp2);
2742 }
2743
2721 return 1; /* otherwise, an attempt to drop causes problems */ 2744 return 1; /* otherwise, an attempt to drop causes problems */
2722 break;
2723 2745
2724 case BOW: 2746 case BOW:
2725 case WAND: 2747 case WAND:
2726 case ROD: 2748 case ROD:
2727 case HORN: 2749 case HORN:
2728 clear_skill (who); 2750 if (player *pl = who->contr)
2729 if (who->type == PLAYER) 2751 {
2752 if (op == pl->ranged_ob)
2730 { 2753 {
2754 pl->ranged_ob = 0;
2755 who->change_weapon (pl->combat_ob);
2756 }
2757
2731 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2758 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2732
2733 who->contr->ranged_skill = 0;
2734 who->contr->ranged_ob = 0;
2735 } 2759 }
2736 else 2760 else
2737 { 2761 {
2762 who->change_skill (0);
2763
2738 if (op->type == BOW) 2764 if (op->type == BOW)
2739 CLEAR_FLAG (who, FLAG_READY_BOW); 2765 CLEAR_FLAG (who, FLAG_READY_BOW);
2740 else 2766 else
2741 CLEAR_FLAG (who, FLAG_READY_RANGE); 2767 CLEAR_FLAG (who, FLAG_READY_RANGE);
2742 } 2768 }
2743 2769
2744 break; 2770 break;
2745 2771
2746 case BUILDER: 2772 case BUILDER:
2747 if (who->type == PLAYER) 2773 if (who->contr)
2748 {
2749 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2774 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2750
2751 who->contr->ranged_skill = 0;
2752 who->contr->ranged_ob = 0;
2753 }
2754 break; 2775 break;
2755 2776
2756 default: 2777 default:
2757 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op)); 2778 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op));
2758 break; 2779 break;
… …
2760 2781
2761 who->update_stats (); 2782 who->update_stats ();
2762 2783
2763 if (!(aflags & AP_NO_MERGE)) 2784 if (!(aflags & AP_NO_MERGE))
2764 { 2785 {
2765 object *tmp;
2766
2767 tmp = merge_ob (op, NULL); 2786 object *tmp = merge_ob (op, 0);
2768 if (who->type == PLAYER) 2787
2788 if (who->contr)
2769 { 2789 {
2770 if (tmp) 2790 if (tmp)
2771 { /* it was merged */ 2791 { /* it was merged */
2772 esrv_del_item (who->contr, op->count); 2792 esrv_del_item (who->contr, op->count);
2773 op = tmp; 2793 op = tmp;
2774 } 2794 }
2775 2795
2776 esrv_send_item (who, op); 2796 esrv_send_item (who, op);
2777 } 2797 }
2778 } 2798 }
2799
2779 return 0; 2800 return 0;
2780} 2801}
2781 2802
2782/** 2803/**
2783 * Returns the object that is using location 'loc'. 2804 * Returns the object that is using location 'loc'.
2784 * Note that 'start' is the first object to start examing - we 2805 * Note that 'start' is the first object to start examing - we
2785 * then go through the below of this. In this way, you can do 2806 * then go through the below of this. In this way, you can do
2786 * something like: 2807 * something like:
2787 * tmp = get_item_from_body_location(who->inv, 1); 2808 * tmp = get_next_item_from_body_location(who->inv, 1);
2788 * if (tmp) tmp1 = get_item_from_body_location(tmp->below, 1); 2809 * if (tmp) tmp1 = get_next_item_from_body_location(tmp->below, 1);
2789 * to find the second object that may use this location, etc. 2810 * to find the second object that may use this location, etc.
2790 * Returns NULL if no match is found. 2811 * Returns NULL if no match is found.
2791 * loc is the index into the array we are looking for a match. 2812 * loc is the index into the array we are looking for a match.
2792 * don't return invisible objects unless they are skill objects 2813 * don't return invisible objects unless they are skill objects
2793 * invisible other objects that use 2814 * invisible other objects that use
2794 * up body locations can be used as restrictions. 2815 * up body locations can be used as restrictions.
2795 */ 2816 */
2796object * 2817static object *
2797get_item_from_body_location (object *start, int loc) 2818get_next_item_from_body_location (int loc, object *start)
2798{ 2819{
2799 object *tmp;
2800
2801 if (!start)
2802 return NULL;
2803
2804 for (tmp = start; tmp; tmp = tmp->below) 2820 for (object *tmp = start; tmp; tmp = tmp->below)
2805 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->body_info[loc] && (!tmp->invisible || tmp->type == SKILL)) 2821 if (tmp->flag [FLAG_APPLIED]
2822 && tmp->slot[loc].info
2823 && (!tmp->invisible || tmp->type == SKILL))
2806 return tmp; 2824 return tmp;
2807 2825
2808 return NULL; 2826 return 0;
2809} 2827}
2810
2811
2812 2828
2813/** 2829/**
2814 * 'op' wants to apply an object, but can't because of other equipment. 2830 * 'op' wants to apply an object, but can't because of other equipment.
2815 * This should only be called when it is known 2831 * This should only be called when it is known
2816 * that there are objects to unapply. This makes pretty heavy 2832 * that there are objects to unapply. This makes pretty heavy
… …
2819 * Returns 0 on success, returns 1 if there is some problem. 2835 * Returns 0 on success, returns 1 if there is some problem.
2820 * if aflags is AP_PRINT, we instead print out waht to unapply 2836 * if aflags is AP_PRINT, we instead print out waht to unapply
2821 * instead of doing it. This is a lot less code than having 2837 * instead of doing it. This is a lot less code than having
2822 * another function that does just that. 2838 * another function that does just that.
2823 */ 2839 */
2840
2841#define CANNOT_REMOVE_CURSED \
2842 "H<You cannot remove cursed or damned items, you first have to remove the curse. " \
2843 "Praying over an altar, scrolls of remove curse/damnation, " \
2844 "priests or even other players might help.>"
2845
2824int 2846int
2825unapply_for_ob (object *who, object *op, int aflags) 2847unapply_for_ob (object *who, object *op, int aflags)
2826{ 2848{
2827 int i; 2849 if (op->is_range ())
2828 object *tmp = NULL, *last;
2829
2830 /* If we are applying a shield or weapon, unapply any equipped shield
2831 * or weapons first - only allowed to use one weapon/shield at a time.
2832 */
2833 if (op->type == WEAPON || op->type == SHIELD)
2834 {
2835 for (tmp = who->inv; tmp; tmp = tmp->below) 2850 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2836 {
2837 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type) 2851 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ())
2838 {
2839 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))) 2852 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)))
2840 { 2853 {
2841 if (aflags & AP_PRINT) 2854 if (aflags & AP_PRINT)
2842 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2855 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp));
2843 else 2856 else
2844 unapply_special (who, tmp, aflags); 2857 unapply_special (who, tmp, aflags);
2845 } 2858 }
2846 else 2859 else
2847 { 2860 {
2848 /* In this case, we want to try and remove a cursed item. 2861 /* In this case, we want to try and remove a cursed item.
2849 * While we know it won't work, we want unapply_special to 2862 * While we know it won't work, we want unapply_special to
2850 * at least generate the message. 2863 * at least generate the message.
2851 */ 2864 */
2852 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (tmp)); 2865 new_draw_info_format (NDI_UNIQUE, 0, who,
2866 "No matter how hard you try, you just can't remove the %s." CANNOT_REMOVE_CURSED,
2867 query_name (tmp));
2853 return 1; 2868 return 1;
2854 }
2855
2856 } 2869 }
2857 }
2858 }
2859 2870
2860 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 2871 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
2861 { 2872 {
2862 /* this used up a slot that we need to free */ 2873 /* this used up a slot that we need to free */
2863 if (op->body_info[i]) 2874 if (op->slot[i].info)
2864 { 2875 {
2865 last = who->inv; 2876 object *last = who->inv;
2866 2877
2867 /* We do a while loop - may need to remove several items in order 2878 /* We do a while loop - may need to remove several items in order
2868 * to free up enough slots. 2879 * to free up enough slots.
2869 */ 2880 */
2870 while ((who->body_used[i] + op->body_info[i]) < 0) 2881 while ((who->slot[i].used + op->slot[i].info) < 0)
2871 { 2882 {
2872 tmp = get_item_from_body_location (last, i); 2883 object *tmp = get_next_item_from_body_location (i, last);
2884
2873 if (!tmp) 2885 if (!tmp)
2874 { 2886 {
2875#if 0 2887#if 0
2876 /* Not a bug - we'll get this if the player has cursed items 2888 /* Not a bug - we'll get this if the player has cursed items
2877 * equipped. 2889 * equipped.
2878 */ 2890 */
2879 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name); 2891 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name);
2880#endif 2892#endif
2881 return 1; 2893 return 1;
2882 } 2894 }
2895
2883 /* If we are just printing, we don't care about cursed status */ 2896 /* If we are just printing, we don't care about cursed status */
2884 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))) 2897 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))))
2885 { 2898 {
2886 if (aflags & AP_PRINT) 2899 if (aflags & AP_PRINT)
2887 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2900 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp));
… …
2893 /* Cursed item that we can't unequip - tell the player. 2906 /* Cursed item that we can't unequip - tell the player.
2894 * Note this could be annoying if this is just one of a few, 2907 * Note this could be annoying if this is just one of a few,
2895 * so it may not be critical (eg, putting on a ring and you have 2908 * so it may not be critical (eg, putting on a ring and you have
2896 * one cursed ring.) 2909 * one cursed ring.)
2897 */ 2910 */
2898 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp)); 2911 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off." CANNOT_REMOVE_CURSED, query_name (tmp));
2899 } 2912 }
2913
2900 last = tmp->below; 2914 last = tmp->below;
2901 } 2915 }
2902 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the 2916 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the
2903 * return in the !tmp would have kicked in. 2917 * return in the !tmp would have kicked in.
2904 */ 2918 */
2905 } /* if op is using this body location */ 2919 } /* if op is using this body location */
2906 } /* for body lcoations */ 2920 } /* for body lcoations */
2921
2907 return 0; 2922 return 0;
2908} 2923}
2909 2924
2910/** 2925/**
2911 * Checks to see if 'who' can apply object 'op'. 2926 * Checks to see if 'who' can apply object 'op'.
2912 * Returns 0 if apply can be done without anything special. 2927 * Returns 0 if apply can be done without anything special.
2913 * Otherwise returns a bitmask - potentially several of these may be 2928 * Otherwise returns a bitmask - potentially several of these may be
2914 * set, but largely depends on circumstance - in the future, processing 2929 * set, but largely depends on circumstance - in the future, processing
2915 * may be pruned once we know some status (eg, once CAN_APPLY_NEVER 2930 * may be pruned once we know some status (eg, once CAN_APPLY_NEVER
2916 * is set, do we really are what the other flags may be?) 2931 * is set, do we really care what the other flags may be?)
2917 * 2932 *
2918 * See include/define.h for detailed description of the meaning of 2933 * See include/define.h for detailed description of the meaning of
2919 * these return values. 2934 * these return values.
2920 */ 2935 */
2921int 2936int
2922can_apply_object (object *who, object *op) 2937can_apply_object (object *who, object *op)
2923{ 2938{
2924 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op))) 2939 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op)))
2925 return RESULT_INT (0); 2940 return RESULT_INT (0);
2926 2941
2927 int i, retval = 0; 2942 int retval = 0;
2928 object *tmp = NULL, *ws = NULL; 2943 object *tmp = 0, *ws = 0;
2929 2944
2930 /* Players have 2 'arm's, so they could in theory equip 2 shields or 2945 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
2931 * 2 weapons, but we don't want to let them do that. So if they are
2932 * trying to equip a weapon or shield, see if they already have one
2933 * in place and store that way.
2934 */
2935 if (op->type == WEAPON || op->type == SHIELD)
2936 { 2946 {
2937 for (tmp = who->inv; tmp && !ws; tmp = tmp->below) 2947 if (op->slot[i].info)
2938 { 2948 {
2939 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type) 2949 /* Item uses more slots than we have */
2950 if (who->slot[i].info + op->slot [i].info < 0)
2940 { 2951 {
2941 retval = CAN_APPLY_UNAPPLY;
2942 ws = tmp;
2943 }
2944 }
2945 }
2946
2947 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
2948 {
2949 if (op->body_info[i])
2950 {
2951 /* Item uses more slots than we have */
2952 if (FABS (op->body_info[i]) > who->body_info[i])
2953 {
2954 /* Could return now for efficiently - rest of info below isn' 2952 /* Could return now for efficiency - rest of info below isn't
2955 * really needed. 2953 * really needed.
2956 */ 2954 */
2957 retval |= CAN_APPLY_NEVER; 2955 retval |= CAN_APPLY_NEVER;
2958 } 2956 }
2959 else if ((who->body_used[i] + op->body_info[i]) < 0) 2957 else if (who->slot[i].used + op->slot[i].info < 0)
2960 { 2958 {
2961 /* in this case, equipping this would use more free spots than 2959 /* in this case, equipping this would use more free spots than
2962 * we have. 2960 * we have.
2963 */ 2961 */
2964 object *tmp1;
2965
2966 2962
2967 /* if we have an applied weapon/shield, and unapply it would free 2963 /* if we have an applied weapon/shield, and unapply it would free
2968 * enough slots to equip the new item, then just set this can 2964 * enough slots to equip the new item, then just set "can
2969 * continue. We don't care about the logic below - if you have 2965 * apply unapply". We don't care about the logic below - if you have a
2970 * shield equipped and try to equip another shield, there is only 2966 * shield equipped and try to equip another shield, there is only
2971 * one choice. However, the check for the number of body locations 2967 * one choice. However, the check for the number of body locations
2972 * does take into the account cases where what is being applied 2968 * does take into the account cases where what is being applied
2973 * may be two handed for example. 2969 * may be two handed for example.
2974 */ 2970 */
2975 if (ws) 2971 if (ws)
2976 { 2972 if ((who->slot[i].used - ws->slot[i].info + op->slot[i].info) >= 0)
2977 if ((who->body_used[i] - ws->body_info[i] + op->body_info[i]) >= 0)
2978 { 2973 {
2979 retval |= CAN_APPLY_UNAPPLY; 2974 retval |= CAN_APPLY_UNAPPLY;
2980 continue; 2975 continue;
2981 } 2976 }
2982 }
2983 2977
2984 tmp1 = get_item_from_body_location (who->inv, i); 2978 object *tmp1 = get_next_item_from_body_location (i, who->inv);
2985 if (!tmp1) 2979 if (!tmp1)
2986 { 2980 {
2987#if 0 2981#if 0
2988 /* This is sort of an error, but happens a lot when old players 2982 /* This is sort of an error, but happens a lot when old players
2989 * join in with more stuff equipped than they are now allowed. 2983 * join in with more stuff equipped than they are now allowed.
… …
2997 /* need to unapply something. However, if this something 2991 /* need to unapply something. However, if this something
2998 * is different than we had found before, it means they need 2992 * is different than we had found before, it means they need
2999 * to apply multiple objects 2993 * to apply multiple objects
3000 */ 2994 */
3001 retval |= CAN_APPLY_UNAPPLY; 2995 retval |= CAN_APPLY_UNAPPLY;
2996
3002 if (!tmp) 2997 if (!tmp)
3003 tmp = tmp1; 2998 tmp = tmp1;
3004 else if (tmp != tmp1) 2999 else if (tmp != tmp1)
3005 {
3006 retval |= CAN_APPLY_UNAPPLY_MULT; 3000 retval |= CAN_APPLY_UNAPPLY_MULT;
3007 } 3001
3008 /* This object isn't using up all the slots, so there must 3002 /* This object isn't using up all the slots, so there must
3009 * be another. If so, and it the new item doesn't need all 3003 * be another. If so, and it the new item doesn't need all
3010 * the slots, the player then has a choice. 3004 * the slots, the player then has a choice.
3011 */ 3005 */
3012 if (((who->body_used[i] - tmp1->body_info[i]) != who->body_info[i]) && (FABS (op->body_info[i]) < who->body_info[i])) 3006 if ((who->slot[i].used - tmp1->slot[i].info != who->slot[i].info)
3007 && abs (op->slot[i].info) < who->slot[i].info)
3013 retval |= CAN_APPLY_UNAPPLY_CHOICE; 3008 retval |= CAN_APPLY_UNAPPLY_CHOICE;
3014 3009
3015 /* Does unequippint 'tmp1' free up enough slots for this to be 3010 /* Does unequippint 'tmp1' free up enough slots for this to be
3016 * equipped? If not, there must be something else to unapply. 3011 * equipped? If not, there must be something else to unapply.
3017 */ 3012 */
3018 if ((who->body_used[i] + op->body_info[i] - tmp1->body_info[i]) < 0) 3013 if (who->slot[i].used + op->slot[i].info < tmp1->slot[i].info)
3019 retval |= CAN_APPLY_UNAPPLY_MULT; 3014 retval |= CAN_APPLY_UNAPPLY_MULT;
3020
3021 } 3015 }
3022 } /* if not enough free slots */ 3016 } /* if not enough free slots */
3023 } /* if this object uses location i */ 3017 } /* if this object uses location i */
3024 } /* for i -> num_body_locations loop */ 3018 } /* for i -> num_body_locations loop */
3025 3019
… …
3038 3032
3039 if (who->type != PLAYER) 3033 if (who->type != PLAYER)
3040 { 3034 {
3041 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE)) 3035 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE))
3042 retval |= CAN_APPLY_RESTRICTION; 3036 retval |= CAN_APPLY_RESTRICTION;
3037
3043 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3038 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3044 retval |= CAN_APPLY_RESTRICTION; 3039 retval |= CAN_APPLY_RESTRICTION;
3040
3045 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING)) 3041 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING))
3046 retval |= CAN_APPLY_RESTRICTION; 3042 retval |= CAN_APPLY_RESTRICTION;
3043
3047 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3044 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3048 retval |= CAN_APPLY_RESTRICTION; 3045 retval |= CAN_APPLY_RESTRICTION;
3049 } 3046 }
3050 3047
3051 return retval; 3048 return retval;
… …
3066 * AP_UNAPPLY=always unapply). 3063 * AP_UNAPPLY=always unapply).
3067 * 3064 *
3068 * Optional flags: 3065 * Optional flags:
3069 * AP_NO_MERGE: don't merge an unapplied object with other objects 3066 * AP_NO_MERGE: don't merge an unapplied object with other objects
3070 * AP_IGNORE_CURSE: unapply cursed items 3067 * AP_IGNORE_CURSE: unapply cursed items
3068 * AP_NO_READY: do not ready skills when applying skill tools
3071 * 3069 *
3072 * Usage example: apply_special (who, op, AP_UNAPPLY | AP_IGNORE_CURSE) 3070 * Usage example: apply_special (who, op, AP_UNAPPLY | AP_IGNORE_CURSE)
3073 * 3071 *
3074 * apply_special() doesn't check for unpaid items. 3072 * apply_special() doesn't check for unpaid items.
3075 */ 3073 */
3074
3075#define LACK_ITEM_POWER \
3076 " H<You lack enough unused item power to use this weapon, see the skills command.>"
3077
3076int 3078int
3077apply_special (object *who, object *op, int aflags) 3079apply_special (object *who, object *op, int aflags)
3078{ 3080{
3079 int basic_flag = aflags & AP_BASIC_FLAGS; 3081 int basic_flag = aflags & AP_BASIC_FLAGS;
3080 object *tmp, *tmp2, *skop = NULL; 3082 object *tmp, *tmp2, *skop = NULL;
3081 int i;
3082 3083
3083 if (who == NULL) 3084 if (who == NULL)
3084 { 3085 {
3085 LOG (llevError, "apply_special() from object without environment.\n"); 3086 LOG (llevError, "apply_special() from object without environment.\n");
3086 return 1; 3087 return 1;
… …
3096 if (basic_flag == AP_APPLY) 3097 if (basic_flag == AP_APPLY)
3097 return 0; 3098 return 0;
3098 3099
3099 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 3100 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
3100 { 3101 {
3101 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (op)); 3102 new_draw_info_format (NDI_UNIQUE, 0, who,
3103 "No matter how hard you try, you just can't remove %s." CANNOT_REMOVE_CURSED,
3104 query_name (op));
3102 return 1; 3105 return 1;
3103 } 3106 }
3107
3104 return unapply_special (who, op, aflags); 3108 return unapply_special (who, op, aflags);
3105 } 3109 }
3106 3110
3107 if (basic_flag == AP_UNAPPLY) 3111 if (basic_flag == AP_UNAPPLY)
3108 return 0; 3112 return 0;
3109 3113
3110 i = can_apply_object (who, op); 3114 // if the item is combat/ranged, wield the relevant slot first
3115 // to resolve conflicts.
3116 if (player *pl = who->contr)
3117 switch (op->slottype ())
3118 {
3119 case slot_combat: who->change_weapon (pl->combat_ob); break;
3120 case slot_ranged: who->change_weapon (pl->ranged_ob); break;
3121 }
3122
3123 splay (op);
3111 3124
3112 /* Can't just apply this object. Lets see what not and what to do */ 3125 /* Can't just apply this object. Lets see what not and what to do */
3113 if (i) 3126 if (int i = can_apply_object (who, op))
3114 { 3127 {
3115 if (i & CAN_APPLY_NEVER) 3128 if (i & CAN_APPLY_NEVER)
3116 { 3129 {
3117 new_draw_info_format (NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name (op)); 3130 new_draw_info_format (NDI_UNIQUE, 0, who,
3131 "You don't have the body to use a %s. H<You can never apply this item.>",
3132 query_name (op));
3118 return 1; 3133 return 1;
3119 } 3134 }
3120 else if (i & CAN_APPLY_RESTRICTION) 3135 else if (i & CAN_APPLY_RESTRICTION)
3121 { 3136 {
3122 new_draw_info_format (NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name (op)); 3137 new_draw_info_format (NDI_UNIQUE, 0, who,
3138 "You have a prohibition against using a %s. "
3139 "H<Your belief, profession or class prevents you from applying this item.>",
3140 query_name (op));
3123 return 1; 3141 return 1;
3124 } 3142 }
3143
3125 if (who->type != PLAYER) 3144 if (who->type != PLAYER)
3126 { 3145 {
3127 /* Some error, so don't try to equip something more */ 3146 /* Some error, so don't try to equip something more */
3128 if (unapply_for_ob (who, op, aflags)) 3147 if (unapply_for_ob (who, op, aflags))
3129 return 1; 3148 return 1;
… …
3135 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some of the following item(s) or change your applymode:"); 3154 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some of the following item(s) or change your applymode:");
3136 unapply_for_ob (who, op, AP_PRINT); 3155 unapply_for_ob (who, op, AP_PRINT);
3137 return 1; 3156 return 1;
3138 } 3157 }
3139 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE)) 3158 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE))
3140 {
3141 i = unapply_for_ob (who, op, aflags); 3159 if (unapply_for_ob (who, op, aflags))
3142 if (i)
3143 return 1; 3160 return 1;
3144 }
3145 } 3161 }
3146 } 3162 }
3147 3163
3148 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL) 3164 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL)
3149 { 3165 {
3150 skop = find_skill_by_name (who, op->skill); 3166 skop = find_skill_by_name (who, op->skill);
3167
3151 if (!skop) 3168 if (!skop)
3152 { 3169 {
3153 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill); 3170 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill);
3154 return 1; 3171 return 1;
3155 } 3172 }
3156 else 3173 else
3157 /* While experience will be credited properly, we want to change the 3174 /* While experience will be credited properly, we want to change the
3158 * skill so that the dam and wc get updated 3175 * skill so that the dam and wc get updated
3159 */ 3176 */
3160 change_skill (who, skop, 0); 3177 who->change_skill (skop);
3161 } 3178 }
3162 3179
3180 if (who->type == PLAYER
3181 && op->item_power
3163 if (who->type == PLAYER && op->item_power && (op->item_power + who->contr->item_power) > (settings.item_power_factor * who->level)) 3182 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level)
3164 { 3183 {
3165 new_draw_info (NDI_UNIQUE, 0, who, 3184 new_draw_info (NDI_UNIQUE, 0, who,
3166 "Equipping that combined with other items would consume your soul! " 3185 "Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER);
3167 "[use the skills command to check your available item power]");
3168 return 1; 3186 return 1;
3169 } 3187 }
3170
3171 3188
3172 /* Ok. We are now at the state where we can apply the new object. 3189 /* Ok. We are now at the state where we can apply the new object.
3173 * Note that we don't have the checks for can_use_... 3190 * Note that we don't have the checks for can_use_...
3174 * below - that is already taken care of by can_apply_object. 3191 * below - that is already taken care of by can_apply_object.
3175 */ 3192 */
3176
3177 if (op->nrof > 1) 3193 if (op->nrof > 1)
3178 tmp = get_split_ob (op, op->nrof - 1); 3194 tmp = get_split_ob (op, op->nrof - 1);
3179 else 3195 else
3180 tmp = NULL; 3196 tmp = 0;
3181 3197
3182 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op))) 3198 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
3183 return RESULT_INT (0); 3199 return RESULT_INT (0);
3184 3200
3185 switch (op->type) 3201 switch (op->type)
3186 { 3202 {
3187 case WEAPON: 3203 case WEAPON:
3188 if (!check_weapon_power (who, op->last_eat)) 3204 if (!check_weapon_power (who, op->last_eat))
3189 { 3205 {
3190 new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use."); 3206 new_draw_info (NDI_UNIQUE, 0, who, "This weapon is too powerful for you to use. "
3191 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3207 "It would consume your soul!." LACK_ITEM_POWER);
3208
3192 if (tmp != NULL) 3209 if (tmp)
3193 (void) insert_ob_in_ob (tmp, who); 3210 insert_ob_in_ob (tmp, who);
3211
3194 return 1; 3212 return 1;
3195 } 3213 }
3196 3214
3197 //TODO: this obviously fails for players using a shiorter prefix 3215 //TODO: this obviously fails for players using a shorter prefix
3198 // i.e. "R" can use Ragnarok's swors. 3216 // i.e. "R" can use Ragnarok's sword.
3199 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3217 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3200 { 3218 {
3201 /* if the weapon does not have the name as the character, can't use it. */ 3219 /* if the weapon does not have the name as the character, can't use it. */
3202 /* (Ragnarok's sword attempted to be used by Foo: won't work) */ 3220 /* (Ragnarok's sword attempted to be used by Foo: won't work) */
3203 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3221 new_draw_info (NDI_UNIQUE, 0, who,
3222 "The weapon does not recognize you as its owner. "
3223 "H<Its name indicates that it belongs to somebody else.>");
3204 3224
3205 if (tmp) 3225 if (tmp)
3206 insert_ob_in_ob (tmp, who); 3226 insert_ob_in_ob (tmp, who);
3207 3227
3208 return 1; 3228 return 1;
3209 } 3229 }
3210 3230
3231 if (!skop)
3232 {
3233 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO
3234 return 1;
3235 }
3236
3211 SET_FLAG (op, FLAG_APPLIED); 3237 SET_FLAG (op, FLAG_APPLIED);
3212
3213 if (skop)
3214 change_skill (who, skop, 1); 3238 who->change_skill (skop);
3215 3239
3216 if (!QUERY_FLAG (who, FLAG_READY_WEAPON)) 3240 if (who->contr)
3217 SET_FLAG (who, FLAG_READY_WEAPON); 3241 who->change_weapon (who->contr->combat_ob = op);
3218 3242
3219 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op)); 3243 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op));
3220 3244
3245 SET_FLAG (who, FLAG_READY_WEAPON);
3221 change_abil (who, op); 3246 change_abil (who, op);
3222 break; 3247 break;
3223 3248
3224 case ARMOUR: 3249 case ARMOUR:
3225 case HELMET: 3250 case HELMET:
… …
3237 break; 3262 break;
3238 3263
3239 case LAMP: 3264 case LAMP:
3240 if (op->stats.food < 1) 3265 if (op->stats.food < 1)
3241 { 3266 {
3242 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of" " fuel!", &op->name); 3267 new_draw_info_format (NDI_UNIQUE, 0, who,
3268 "Your %s is out of fuel! "
3269 "H<Lamps and similar items need fuel. They cannot be refilled.>", &op->name);
3243 return 1; 3270 return 1;
3244 } 3271 }
3245 3272
3246 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name); 3273 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name);
3247 tmp2 = arch_to_object (op->other_arch); 3274 tmp2 = arch_to_object (op->other_arch);
… …
3268 } 3295 }
3269 3296
3270 who->update_stats (); 3297 who->update_stats ();
3271 3298
3272 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3299 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3273 {
3274 if (who->type == PLAYER) 3300 if (who->type == PLAYER)
3275 { 3301 {
3276 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3302 new_draw_info (NDI_UNIQUE, 0, who,
3303 "Oops, it feels deadly cold! "
3304 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>");
3277 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 3305 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3278 } 3306 }
3279 }
3280 3307
3281 if (who->type == PLAYER) 3308 if (who->type == PLAYER)
3282 esrv_send_item (who, tmp2); 3309 esrv_send_item (who, tmp2);
3283 3310
3284 return 0; 3311 return 0;
3285 3312
3286 /* this part is needed for skill-tools */ 3313 case SKILL_TOOL:
3314 // applying a skill tool also readies the skill
3315 SET_FLAG (op, FLAG_APPLIED);
3316
3317 if (!(aflags & AP_NO_READY))
3318 {
3319 skop = find_skill_by_name (who, op->skill);
3320 if (!skop->flag [FLAG_APPLIED])
3321 apply_special (who, skop, AP_APPLY);
3322 }
3323 break;
3324
3287 case SKILL: 3325 case SKILL:
3288 case SKILL_TOOL: 3326 if (player *pl = who->contr)
3289 if (who->chosen_skill)
3290 {
3291 LOG (llevError, "BUG: apply_special(): can't apply two skills\n");
3292 return 1;
3293 } 3327 {
3294 3328 if (IS_COMBAT_SKILL (op->subtype))
3295 if (who->type == PLAYER)
3296 { 3329 {
3297 who->contr->ranged_skill = who; 3330 if (skill_flags [op->subtype] & SF_NEED_WEAPON)
3298 who->contr->ranged_ob = op; 3331 {
3332 for (object *item = who->inv; item; item = item->below)
3333 if (item->type == WEAPON && item->flag [FLAG_APPLIED])
3334 {
3335 if (item->skill == op->skill)
3336 {
3337 who->change_weapon (pl->combat_ob = item);
3338 goto found_weapon;
3339 }
3340 }
3341
3342 new_draw_info_format (NDI_UNIQUE, 0, who,
3343 "You need to apply a '%s' melee weapon before readying this skill. "
3344 "H<Some skills need an item, in this case a melee weapon, to function.>",
3345 &op->skill);
3346 return 1;
3347
3348 found_weapon:;
3349 }
3350 else
3351 who->change_weapon (pl->combat_ob = op);
3352 }
3353 else if (IS_RANGED_SKILL (op->subtype))
3354 {
3355 if (skill_flags [op->subtype] & SF_NEED_BOW)
3356 {
3357 for (object *item = who->inv; item; item = item->below)
3358 if (item->type == BOW && item->flag [FLAG_APPLIED])
3359 {
3360 //TODO: bows should/must all have skill missile weapon right now
3361 who->change_weapon (pl->ranged_ob = item);
3362 goto found_bow;
3363 }
3364
3365 new_draw_info (NDI_UNIQUE, 0, who,
3366 "You need to apply a missile weapon before readying this skill. "
3367 "H<Some skills need an item, in this case a missile weapon, to function.>");
3368 return 1;
3369
3370 found_bow:;
3371 }
3372 else
3373 who->change_weapon (pl->ranged_ob = op);
3374 }
3299 3375
3300 if (!op->invisible) 3376 if (!op->invisible)
3301 { 3377 {
3302 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3378 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3303 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill); 3379 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill);
3304 } 3380 }
3305 else 3381 else
3306 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name); 3382 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name);
3307 } 3383 }
3308 3384 else
3385 {
3309 SET_FLAG (op, FLAG_APPLIED); 3386 SET_FLAG (op, FLAG_APPLIED);
3310 change_abil (who, op); 3387 change_abil (who, op);
3311 who->chosen_skill = op; 3388 who->chosen_skill = op;
3312 SET_FLAG (who, FLAG_READY_SKILL); 3389 SET_FLAG (who, FLAG_READY_SKILL);
3390 }
3391
3313 break; 3392 break;
3314 3393
3315 case BOW: 3394 case BOW:
3316 if (!check_weapon_power (who, op->last_eat)) 3395 if (!check_weapon_power (who, op->last_eat))
3317 { 3396 {
3318 new_draw_info (NDI_UNIQUE, 0, who, "That item is too powerful for you to use."); 3397 new_draw_info (NDI_UNIQUE, 0, who,
3319 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3398 "That weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3320 3399
3321 if (tmp) 3400 if (tmp)
3322 insert_ob_in_ob (tmp, who); 3401 insert_ob_in_ob (tmp, who);
3323 3402
3324 return 1; 3403 return 1;
3325 } 3404 }
3326 3405
3327 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3406 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3328 { 3407 {
3329 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3408 new_draw_info (NDI_UNIQUE, 0, who,
3409 "The weapon does not recognize you as its owner. "
3410 "H<Its name indicates that it belongs to somebody else.>");
3330 if (tmp != NULL) 3411 if (tmp)
3331 insert_ob_in_ob (tmp, who); 3412 insert_ob_in_ob (tmp, who);
3332 3413
3333 return 1; 3414 return 1;
3334 } 3415 }
3335 3416
3336 /*FALLTHROUGH*/ 3417 /*FALLTHROUGH*/
3337 case WAND: 3418 case WAND:
3338 case ROD: 3419 case ROD:
3339 case HORN: 3420 case HORN:
3340 /* check for skill, alter player status */ 3421 /* check for skill, alter player status */
3422
3423 if (!skop)
3424 {
3425 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO
3426 return 1;
3427 }
3428
3341 SET_FLAG (op, FLAG_APPLIED); 3429 SET_FLAG (op, FLAG_APPLIED);
3342 if (skop)
3343 change_skill (who, skop, 0); 3430 who->change_skill (skop);
3344 3431
3345 if (who->type == PLAYER) 3432 if (who->contr)
3346 { 3433 {
3434 who->contr->ranged_ob = op;
3435
3347 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3436 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3348 3437
3349 if (op->type == BOW) 3438 if (op->type == BOW)
3350 { 3439 {
3440 who->current_weapon = op;
3351 change_abil (who, op); 3441 change_abil (who, op);
3352 new_draw_info_format (NDI_UNIQUE, 0, who, 3442 new_draw_info_format (NDI_UNIQUE, 0, who,
3353 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)); 3443 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op));
3354 } 3444 }
3355
3356 who->contr->ranged_skill = find_skill_by_name (who, op->skill);//TODO
3357 who->contr->ranged_ob = op;
3358 } 3445 }
3359 else 3446 else
3360 { 3447 {
3361 if (op->type == BOW) 3448 if (op->type == BOW)
3362 SET_FLAG (who, FLAG_READY_BOW); 3449 SET_FLAG (who, FLAG_READY_BOW);
… …
3367 break; 3454 break;
3368 3455
3369 case BUILDER: 3456 case BUILDER:
3370 if (who->type == PLAYER) 3457 if (who->type == PLAYER)
3371 { 3458 {
3459 //TODO: wtf does this do? shouldn't this be managed automatically (slots?)
3372 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER) 3460 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER)
3373 unapply_special (who, who->contr->ranged_ob, 0); 3461 unapply_special (who, who->contr->ranged_ob, 0);
3374 3462
3375 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op)); 3463 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op));
3376 3464
3377 who->contr->ranged_skill = who;
3378 who->contr->ranged_ob = op; 3465 who->contr->ranged_ob = op;
3379 } 3466 }
3380 break; 3467 break;
3381 3468
3382 default: 3469 default:
3383 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op)); 3470 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op));
3384 } /* end of switch op->type */ 3471 } /* end of switch op->type */
3385 3472
3386 SET_FLAG (op, FLAG_APPLIED); 3473 SET_FLAG (op, FLAG_APPLIED);
3387 3474
3388 if (tmp != NULL) 3475 if (tmp)
3389 tmp = insert_ob_in_ob (tmp, who); 3476 tmp = insert_ob_in_ob (tmp, who);
3390 3477
3391 who->update_stats (); 3478 who->update_stats ();
3392 3479
3393 /* We exclude spell casting objects. The fire code will set the 3480 /* We exclude spell casting objects. The fire code will set the
… …
3396 */ 3483 */
3397 if (who->type == PLAYER && op->type != WAND && op->type != HORN && op->type != ROD) 3484 if (who->type == PLAYER && op->type != WAND && op->type != HORN && op->type != ROD)
3398 SET_FLAG (op, FLAG_BEEN_APPLIED); 3485 SET_FLAG (op, FLAG_BEEN_APPLIED);
3399 3486
3400 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3487 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3401 {
3402 if (who->type == PLAYER) 3488 if (who->type == PLAYER)
3403 { 3489 {
3404 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3490 new_draw_info (NDI_UNIQUE, 0, who,
3491 "Oops, it feels deadly cold! "
3492 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>");
3405 SET_FLAG (op, FLAG_KNOWN_CURSED); 3493 SET_FLAG (op, FLAG_KNOWN_CURSED);
3406 } 3494 }
3407 }
3408 3495
3409 if (who->type == PLAYER) 3496 if (who->type == PLAYER)
3410 { 3497 {
3411 /* if multiple objects were applied, update both slots */ 3498 /* if multiple objects were applied, update both slots */
3412 if (tmp) 3499 if (tmp)
… …
3421int 3508int
3422monster_apply_special (object *who, object *op, int aflags) 3509monster_apply_special (object *who, object *op, int aflags)
3423{ 3510{
3424 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED)) 3511 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
3425 return 1; 3512 return 1;
3513
3426 return apply_special (who, op, aflags); 3514 return apply_special (who, op, aflags);
3427} 3515}
3428 3516
3429/** 3517/**
3430 * Map was just loaded, handle op's initialisation. 3518 * Map was just loaded, handle op's initialisation.
… …
3583 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && tmp->has_random_items ()) 3671 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && tmp->has_random_items ())
3584 { 3672 {
3585 create_treasure (tmp->randomitems, tmp, GT_APPLY, difficulty, 0); 3673 create_treasure (tmp->randomitems, tmp, GT_APPLY, difficulty, 0);
3586 tmp->randomitems = NULL; 3674 tmp->randomitems = NULL;
3587 } 3675 }
3676
3588 // close all containers 3677 // close all containers
3589 else if (tmp->type == CONTAINER) 3678 else if (tmp->type == CONTAINER)
3590 tmp->flag [FLAG_APPLIED] = 0; 3679 tmp->flag [FLAG_APPLIED] = 0;
3591 3680
3592 tmp = above; 3681 tmp = above;
… …
3602 * Handles player eating food that temporarily changes status (resistances, stats). 3691 * Handles player eating food that temporarily changes status (resistances, stats).
3603 * This used to call cast_change_attr(), but 3692 * This used to call cast_change_attr(), but
3604 * that doesn't work with the new spell code. Since we know what 3693 * that doesn't work with the new spell code. Since we know what
3605 * the food changes, just grab a force and use that instead. 3694 * the food changes, just grab a force and use that instead.
3606 */ 3695 */
3607
3608void 3696void
3609eat_special_food (object *who, object *food) 3697eat_special_food (object *who, object *food)
3610{ 3698{
3611 object *force; 3699 object *force;
3612 int i, did_one = 0; 3700 int i, did_one = 0;
3613 sint8 k;
3614 3701
3615 force = get_archetype (FORCE_NAME); 3702 force = get_archetype (FORCE_NAME);
3616 3703
3617 for (i = 0; i < NUM_STATS; i++) 3704 for (i = 0; i < NUM_STATS; i++)
3618 { 3705 if (sint8 k = food->stats.stat (i))
3619 k = get_attr_value (&food->stats, i);
3620 if (k)
3621 { 3706 {
3622 set_attr_value (&force->stats, i, k); 3707 force->stats.stat (i) = k;
3623 did_one = 1; 3708 did_one = 1;
3624 } 3709 }
3625 }
3626 3710
3627 /* check if we can protect the eater */ 3711 /* check if we can protect the eater */
3628 for (i = 0; i < NROFATTACKS; i++) 3712 for (i = 0; i < NROFATTACKS; i++)
3629 { 3713 {
3630 if (food->resist[i] > 0) 3714 if (food->resist[i] > 0)
… …
3760 3844
3761 if (failure <= -1 && failure > -15) 3845 if (failure <= -1 && failure > -15)
3762 { /* wonder */ 3846 { /* wonder */
3763 object *tmp; 3847 object *tmp;
3764 3848
3765 new_draw_info (NDI_UNIQUE, 0, op, "Your spell warps!."); 3849 new_draw_info (NDI_UNIQUE, 0, op, "Your spell warps!");
3766 tmp = get_archetype (SPELL_WONDER); 3850 tmp = get_archetype (SPELL_WONDER);
3767 cast_wonder (op, op, 0, tmp); 3851 cast_wonder (op, op, 0, tmp);
3768 tmp->destroy (); 3852 tmp->destroy ();
3769 } 3853 }
3770 else if (failure <= -15 && failure > -35) 3854 else if (failure <= -15 && failure > -35)
… …
3791 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!"); 3875 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!");
3792 blind_player (op, op, power); 3876 blind_player (op, op, power);
3793 } 3877 }
3794 else if (failure <= -80) 3878 else if (failure <= -80)
3795 { /* blast the immediate area */ 3879 { /* blast the immediate area */
3796 object *tmp;
3797
3798 tmp = get_archetype (LOOSE_MANA); 3880 object *tmp = get_archetype (LOOSE_MANA);
3799 cast_magic_storm (op, tmp, power); 3881 cast_magic_storm (op, tmp, power);
3800 new_draw_info (NDI_UNIQUE, 0, op, "You unlease uncontrolled mana!"); 3882 new_draw_info (NDI_UNIQUE, 0, op, "You unleash uncontrolled mana!");
3801 tmp->destroy (); 3883 tmp->destroy ();
3802 } 3884 }
3803 } 3885 }
3804} 3886}
3805 3887
… …
3825 */ 3907 */
3826 int i, j; 3908 int i, j;
3827 3909
3828 for (i = 0; i < NUM_STATS; i++) 3910 for (i = 0; i < NUM_STATS; i++)
3829 { 3911 {
3830 sint8 stat = get_attr_value (stats, i); 3912 int race_bonus = pl->arch->stats.stat (i);
3831 int race_bonus = get_attr_value (&(pl->arch->clone.stats), i); 3913 sint8 stat = stats->stat (i) + ns->stat (i);
3832 3914
3833 stat += get_attr_value (ns, i);
3834 if (stat > 20 + race_bonus) 3915 if (stat > 20 + race_bonus)
3835 { 3916 {
3836 excess_stat++; 3917 excess_stat++;
3837 stat = 20 + race_bonus; 3918 stat = 20 + race_bonus;
3838 } 3919 }
3839 set_attr_value (stats, i, stat); 3920
3921 stats->stat (i) = stat;
3840 } 3922 }
3841 3923
3842 for (j = 0; excess_stat > 0 && j < 100; j++) 3924 for (j = 0; excess_stat > 0 && j < 100; j++)
3843 { /* try 100 times to assign excess stats */ 3925 { /* try 100 times to assign excess stats */
3844 int i = rndm (0, 6); 3926 int i = rndm (0, 6);
3845 int stat = get_attr_value (stats, i);
3846 int race_bonus = get_attr_value (&(pl->arch->clone.stats), i);
3847 3927
3848 if (i == CHA) 3928 if (i == CHA)
3849 continue; /* exclude cha from this */ 3929 continue; /* exclude cha from this */
3930
3931 int stat = stats->stat (i);
3932 int race_bonus = pl->arch->stats.stat (i);
3850 if (stat < 20 + race_bonus) 3933 if (stat < 20 + race_bonus)
3851 { 3934 {
3852 change_attr_value (stats, i, 1); 3935 change_attr_value (stats, i, 1);
3853 excess_stat--; 3936 excess_stat--;
3854 } 3937 }
… …
3857 /* insert the randomitems from the change's treasurelist into 3940 /* insert the randomitems from the change's treasurelist into
3858 * the player ref: player.c 3941 * the player ref: player.c
3859 */ 3942 */
3860 if (change->randomitems != NULL) 3943 if (change->randomitems != NULL)
3861 give_initial_items (pl, change->randomitems); 3944 give_initial_items (pl, change->randomitems);
3862
3863 3945
3864 /* set up the face, for some races. */ 3946 /* set up the face, for some races. */
3865 3947
3866 /* first, look for the force object banning 3948 /* first, look for the force object banning
3867 * changing the face. Certain races never change face with class. 3949 * changing the face. Certain races never change face with class.
… …
3912 char got[MAX_BUF]; 3994 char got[MAX_BUF];
3913 int len; 3995 int len;
3914 3996
3915 if (!pl || !transformer) 3997 if (!pl || !transformer)
3916 return; 3998 return;
3999
3917 marked = find_marked_object (pl); 4000 marked = find_marked_object (pl);
4001
3918 if (!marked) 4002 if (!marked)
3919 { 4003 {
3920 new_draw_info_format (NDI_UNIQUE, 0, pl, "Use the %s with what item?", query_name (transformer)); 4004 new_draw_info_format (NDI_UNIQUE, 0, pl, "Use the %s with what item?", query_name (transformer));
3921 return; 4005 return;
3922 } 4006 }
4007
3923 if (!marked->slaying) 4008 if (!marked->slaying)
3924 { 4009 {
3925 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked)); 4010 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked));
3926 return; 4011 return;
3927 } 4012 }
4013
3928 /* check whether they are compatible or not */ 4014 /* check whether they are compatible or not */
3929 find = strstr (marked->slaying, transformer->arch->name); 4015 find = strstr (marked->slaying, transformer->arch->archname);
3930 if (!find || (*(find + strlen (transformer->arch->name)) != ':')) 4016 if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
3931 { 4017 {
3932 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked)); 4018 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked));
3933 return; 4019 return;
3934 } 4020 }
4021
3935 find += strlen (transformer->arch->name) + 1; 4022 find += strlen (transformer->arch->archname) + 1;
3936 /* Item can be used, now find how many and what it yields */ 4023 /* Item can be used, now find how many and what it yields */
3937 if (isdigit (*(find))) 4024 if (isdigit (*(find)))
3938 { 4025 {
3939 yield = atoi (find); 4026 yield = atoi (find);
3940 if (yield < 1) 4027 if (yield < 1)
… …
3948 4035
3949 while (isdigit (*find)) 4036 while (isdigit (*find))
3950 find++; 4037 find++;
3951 while (*find == ' ') 4038 while (*find == ' ')
3952 find++; 4039 find++;
4040
3953 memset (got, 0, MAX_BUF); 4041 memset (got, 0, MAX_BUF);
4042
3954 if ((separator = strchr (find, ';')) != NULL) 4043 if ((separator = strchr (find, ';')) != NULL)
3955 {
3956 len = separator - find; 4044 len = separator - find;
3957 }
3958 else 4045 else
3959 {
3960 len = strlen (find); 4046 len = strlen (find);
3961 } 4047
3962 if (len > MAX_BUF - 1) 4048 if (len > MAX_BUF - 1)
3963 len = MAX_BUF - 1; 4049 len = MAX_BUF - 1;
4050
3964 strcpy (got, find); 4051 strcpy (got, find);
3965 got[len] = '\0'; 4052 got[len] = '\0';
3966 4053
3967 /* Now create new item, remove used ones when required. */ 4054 /* Now create new item, remove used ones when required. */
3968 new_item = get_archetype (got); 4055 new_item = get_archetype (got);
… …
3976 new_draw_info_format (NDI_UNIQUE, 0, pl, "You %s the %s.", &transformer->slaying, query_base_name (marked, 0)); 4063 new_draw_info_format (NDI_UNIQUE, 0, pl, "You %s the %s.", &transformer->slaying, query_base_name (marked, 0));
3977 insert_ob_in_ob (new_item, pl); 4064 insert_ob_in_ob (new_item, pl);
3978 esrv_send_inventory (pl, pl); 4065 esrv_send_inventory (pl, pl);
3979 /* Eat up one item */ 4066 /* Eat up one item */
3980 decrease_ob_nr (marked, 1); 4067 decrease_ob_nr (marked, 1);
4068
3981 /* Eat one transformer if needed */ 4069 /* Eat one transformer if needed */
3982 if (transformer->stats.food) 4070 if (transformer->stats.food)
3983 if (--transformer->stats.food == 0) 4071 if (--transformer->stats.food == 0)
3984 decrease_ob_nr (transformer, 1); 4072 decrease_ob_nr (transformer, 1);
3985} 4073}

Diff Legend

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