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.43 by root, Tue Dec 19 05:12:52 2006 UTC vs.
Revision 1.115 by root, Tue Jul 10 06:48:02 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 (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 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
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20
21 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>
22*/ 22 */
23
24#include <cmath>
23 25
24#include <global.h> 26#include <global.h>
25#include <living.h> 27#include <living.h>
26#include <spells.h> 28#include <spells.h>
27#include <skills.h> 29#include <skills.h>
28#include <tod.h> 30#include <tod.h>
29 31
30#ifndef __CEXTRACT__
31# include <sproto.h> 32#include <sproto.h>
32#endif
33 33
34/* Want this regardless of rplay. */ 34/* Want this regardless of rplay. */
35#include <sounds.h> 35#include <sounds.h>
36
37/* need math lib for double-precision and pow() in dragon_eat_flesh() */
38#include <math.h>
39 36
40/** 37/**
41 * 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.
42 * 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.
43 */ 40 */
… …
66 { 63 {
67 arch_flag = 1; 64 arch_flag = 1;
68 name_flag = 1; 65 name_flag = 1;
69 race_flag = 1; 66 race_flag = 1;
70 } 67 }
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) || strcmp (op->race, victim->arch->name))) && 73 ((!(victim->arch && arch_flag && victim->arch->archname) || op->race != victim->arch->archname)) &&
76 ((!(victim->name && name_flag) || strcmp (op->race, victim->name))) && 74 ((!(victim->name && name_flag) || op->race != victim->name)) &&
77 ((!(victim->race && race_flag) || strcmp (op->race, victim->race)))) 75 ((!(victim->race && race_flag) || op->race != victim->race)))
78 {
79 return 1; 76 return 1;
80 } 77
81 /* If the director has slaying set, only affect objects where none 78 /* If the director has slaying set, only affect objects where none
82 * of arch, name, or race match. 79 * of arch, name, or race match.
83 */ 80 */
84 if ((op->slaying) && (((victim->arch && arch_flag && victim->arch->name && !strcmp (op->slaying, victim->arch->name))) || 81 if ((op->slaying) && (((victim->arch && arch_flag && victim->arch->archname && op->slaying == victim->arch->archname))) ||
85 ((victim->name && name_flag && !strcmp (op->slaying, victim->name))) || 82 ((victim->name && name_flag && op->slaying == victim->name)) ||
86 ((victim->race && race_flag && !strcmp (op->slaying, victim->race))))) 83 ((victim->race && race_flag && op->slaying == victim->race)))
87 {
88 return 1; 84 return 1;
89 } 85
90 return 0; 86 return 0;
91} 87}
92 88
93/** 89/**
94 * This handles a player dropping money on an altar to identify stuff. 90 * This handles a player dropping money on an altar to identify stuff.
… …
195apply_potion (object *op, object *tmp) 191apply_potion (object *op, object *tmp)
196{ 192{
197 int got_one = 0, i; 193 int got_one = 0, i;
198 object *force = 0, *floor = 0; 194 object *force = 0, *floor = 0;
199 195
200 floor = get_map_ob (op->map, op->x, op->y); 196 floor = GET_MAP_OB (op->map, op->x, op->y);
201 197
202 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 198 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
203 { 199 {
204 if (op->type == PLAYER) 200 if (op->type == PLAYER)
205 new_draw_info (NDI_UNIQUE, 0, op, "Gods prevent you from using this here, it's sacred ground!"); 201 new_draw_info (NDI_UNIQUE, 0, op, "Gods prevent you from using this here, it's sacred ground!");
… …
219 object *depl; 215 object *depl;
220 archetype *at; 216 archetype *at;
221 217
222 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 218 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
223 { 219 {
224 drain_stat (op); 220 op->drain_stat ();
225 fix_player (op); 221 op->update_stats ();
226 decrease_ob (tmp); 222 decrease_ob (tmp);
227 return 1; 223 return 1;
228 } 224 }
229 225
230 if ((at = archetype::find (ARCH_DEPLETION)) == NULL) 226 if (!(at = archetype::find (ARCH_DEPLETION)))
231 { 227 {
232 LOG (llevError, "Could not find archetype depletion\n"); 228 LOG (llevError, "Could not find archetype depletion\n");
233 return 0; 229 return 0;
234 } 230 }
235 depl = present_arch_in_ob (at, op); 231 depl = present_arch_in_ob (at, op);
236 232
237 if (depl != NULL) 233 if (depl)
238 { 234 {
239 for (i = 0; i < NUM_STATS; i++) 235 for (i = 0; i < NUM_STATS; i++)
240 if (get_attr_value (&depl->stats, i)) 236 if (depl->stats.stat (i))
241 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]); 237 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]);
242 238
243 depl->destroy (); 239 depl->destroy ();
244 fix_player (op); 240 op->update_stats ();
245 } 241 }
246 else 242 else
247 new_draw_info (NDI_UNIQUE, 0, op, "You potion had no effect."); 243 new_draw_info (NDI_UNIQUE, 0, op, "You potion had no effect.");
248 244
249 decrease_ob (tmp); 245 decrease_ob (tmp);
… …
299 295
300 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)) 296 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))
301 { 297 {
302 if (got_one) 298 if (got_one)
303 { 299 {
304 fix_player (op); 300 op->update_stats ();
305 new_draw_info (NDI_UNIQUE, 0, op, "The Gods smile upon you and remake you"); 301 new_draw_info (NDI_UNIQUE, 0, op, "The Gods smile upon you and remake you");
306 new_draw_info (NDI_UNIQUE, 0, op, "a little more in their image."); 302 new_draw_info (NDI_UNIQUE, 0, op, "a little more in their image.");
307 new_draw_info (NDI_UNIQUE, 0, op, "You feel a little more perfect."); 303 new_draw_info (NDI_UNIQUE, 0, op, "You feel a little more perfect.");
308 } 304 }
309 else 305 else
… …
311 } 307 }
312 else 308 else
313 { /* cursed potion */ 309 { /* cursed potion */
314 if (got_one) 310 if (got_one)
315 { 311 {
316 fix_player (op); 312 op->update_stats ();
317 new_draw_info (NDI_UNIQUE, 0, op, "The Gods are angry and punish you."); 313 new_draw_info (NDI_UNIQUE, 0, op, "The Gods are angry and punish you.");
318 } 314 }
319 else 315 else
320 new_draw_info (NDI_UNIQUE, 0, op, "You are fortunate that you are so pathetic."); 316 new_draw_info (NDI_UNIQUE, 0, op, "You are fortunate that you are so pathetic.");
321 } 317 }
… …
349 cast_spell (op, tmp, op->facing, tmp->inv, NULL); 345 cast_spell (op, tmp, op->facing, tmp->inv, NULL);
350 346
351 decrease_ob (tmp); 347 decrease_ob (tmp);
352 /* if youre dead, no point in doing this... */ 348 /* if youre dead, no point in doing this... */
353 if (!QUERY_FLAG (op, FLAG_REMOVED)) 349 if (!QUERY_FLAG (op, FLAG_REMOVED))
354 fix_player (op); 350 op->update_stats ();
355 return 1; 351 return 1;
356 } 352 }
357 353
358 /* Deal with protection potions */ 354 /* Deal with protection potions */
359 force = NULL; 355 force = NULL;
… …
377 force->stats.food *= 10; 373 force->stats.food *= 10;
378 for (i = 0; i < NROFATTACKS; i++) 374 for (i = 0; i < NROFATTACKS; i++)
379 if (force->resist[i] > 0) 375 if (force->resist[i] > 0)
380 force->resist[i] = -force->resist[i]; /* prot => vuln */ 376 force->resist[i] = -force->resist[i]; /* prot => vuln */
381 } 377 }
378
382 force->speed_left = -1; 379 force->speed_left = -1;
383 force = insert_ob_in_ob (force, op); 380 force = insert_ob_in_ob (force, op);
384 CLEAR_FLAG (tmp, FLAG_APPLIED); 381 CLEAR_FLAG (tmp, FLAG_APPLIED);
385 SET_FLAG (force, FLAG_APPLIED); 382 SET_FLAG (force, FLAG_APPLIED);
386 change_abil (op, force); 383 change_abil (op, force);
… …
403 * that were grouped with the one consumed, his 400 * that were grouped with the one consumed, his
404 * stat will not be raised by them. fix_player just clears 401 * stat will not be raised by them. fix_player just clears
405 * up all the stats. 402 * up all the stats.
406 */ 403 */
407 CLEAR_FLAG (tmp, FLAG_APPLIED); 404 CLEAR_FLAG (tmp, FLAG_APPLIED);
408 fix_player (op); 405 op->update_stats ();
409 decrease_ob (tmp); 406 decrease_ob (tmp);
410 return 1; 407 return 1;
411} 408}
412 409
413/**************************************************************************** 410/****************************************************************************
… …
423 int count = 0; 420 int count = 0;
424 421
425 422
426 if (item == NULL) 423 if (item == NULL)
427 return 0; 424 return 0;
425
428 op = op->below; 426 op = op->below;
429 while (op != NULL) 427 while (op != NULL)
430 { 428 {
431 if (strcmp (op->arch->name, item) == 0) 429 if (strcmp (op->arch->archname, item) == 0)
432 { 430 {
433 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED) 431 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED)
434 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID)) 432 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID))
435 { 433 {
436 if (op->nrof == 0) /* this is necessary for artifact sacrifices --FD-- */ 434 if (op->nrof == 0) /* this is necessary for artifact sacrifices --FD-- */
437 count++; 435 count++;
438 else 436 else
439 count += op->nrof; 437 count += op->nrof;
440 } 438 }
441 } 439 }
440
442 op = op->below; 441 op = op->below;
443 } 442 }
443
444 return count; 444 return count;
445} 445}
446 446
447/** 447/**
448 * This removes 'nrof' of what item->slaying says to remove. 448 * This removes 'nrof' of what item->slaying says to remove.
… …
458 prev = op; 458 prev = op;
459 op = op->below; 459 op = op->below;
460 460
461 while (op != NULL) 461 while (op != NULL)
462 { 462 {
463 if (strcmp (op->arch->name, item) == 0) 463 if (strcmp (op->arch->archname, item) == 0)
464 { 464 {
465 if (op->nrof >= nrof) 465 if (op->nrof >= nrof)
466 { 466 {
467 decrease_ob_nr (op, nrof); 467 decrease_ob_nr (op, nrof);
468 return; 468 return;
… …
570 weapon->last_eat++; 570 weapon->last_eat++;
571 new_draw_info_format (NDI_UNIQUE, 0, op, "Weapon's bonus to %s improved by %d", statname, sacrifice_count); 571 new_draw_info_format (NDI_UNIQUE, 0, op, "Weapon's bonus to %s improved by %d", statname, sacrifice_count);
572 decrease_ob (improver); 572 decrease_ob (improver);
573 573
574 /* So it updates the players stats and the window */ 574 /* So it updates the players stats and the window */
575 fix_player (op); 575 op->update_stats ();
576 return 1; 576 return 1;
577} 577}
578 578
579/* Types of improvements, hidden in the sp field. */ 579/* Types of improvements, hidden in the sp field. */
580#define IMPROVE_PREPARE 1 580#define IMPROVE_PREPARE 1
581#define IMPROVE_DAMAGE 2 581#define IMPROVE_DAMAGE 2
582#define IMPROVE_WEIGHT 3 582#define IMPROVE_WEIGHT 3
583#define IMPROVE_ENCHANT 4 583#define IMPROVE_ENCHANT 4
584#define IMPROVE_STR 5 584#define IMPROVE_STR 5
585#define IMPROVE_DEX 6 585#define IMPROVE_DEX 6
586#define IMPROVE_CON 7 586#define IMPROVE_CON 7
587#define IMPROVE_WIS 8 587#define IMPROVE_WIS 8
588#define IMPROVE_CHA 9 588#define IMPROVE_CHA 9
589#define IMPROVE_INT 10 589#define IMPROVE_INT 10
590#define IMPROVE_POW 11 590#define IMPROVE_POW 11
591
592 591
593/** 592/**
594 * This does the prepare weapon scroll. 593 * This does the prepare weapon scroll.
595 * Checks for sacrifice, and so on. 594 * Checks for sacrifice, and so on.
596 */ 595 */
597
598int 596int
599prepare_weapon (object *op, object *improver, object *weapon) 597prepare_weapon (object *op, object *improver, object *weapon)
600{ 598{
601 int sacrifice_count, i; 599 int sacrifice_count, i;
602 char buf[MAX_BUF]; 600 char buf[MAX_BUF];
… …
604 if (weapon->level != 0) 602 if (weapon->level != 0)
605 { 603 {
606 new_draw_info (NDI_UNIQUE, 0, op, "Weapon already prepared."); 604 new_draw_info (NDI_UNIQUE, 0, op, "Weapon already prepared.");
607 return 0; 605 return 0;
608 } 606 }
607
609 for (i = 0; i < NROFATTACKS; i++) 608 for (i = 0; i < NROFATTACKS; i++)
610 if (weapon->resist[i]) 609 if (weapon->resist[i])
611 break; 610 break;
612 611
613 /* If we break out, i will be less than nrofattacks, preventing 612 /* If we break out, i will be less than nrofattacks, preventing
… …
619 weapon->stats.ac) /* AC - only taifu's I think */ 618 weapon->stats.ac) /* AC - only taifu's I think */
620 { 619 {
621 new_draw_info (NDI_UNIQUE, 0, op, "Cannot prepare magic weapons."); 620 new_draw_info (NDI_UNIQUE, 0, op, "Cannot prepare magic weapons.");
622 return 0; 621 return 0;
623 } 622 }
623
624 sacrifice_count = check_sacrifice (op, improver); 624 sacrifice_count = check_sacrifice (op, improver);
625 if (sacrifice_count <= 0) 625 if (sacrifice_count <= 0)
626 return 0; 626 return 0;
627
627 weapon->level = isqrt (sacrifice_count); 628 weapon->level = isqrt (sacrifice_count);
628 new_draw_info (NDI_UNIQUE, 0, op, "Your sacrifice was accepted."); 629 new_draw_info (NDI_UNIQUE, 0, op, "Your sacrifice was accepted.");
629 eat_item (op, improver->slaying, sacrifice_count); 630 eat_item (op, improver->slaying, sacrifice_count);
630 631
631 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);
… …
764{ 765{
765 object *otmp; 766 object *otmp;
766 767
767 if (op->type != PLAYER) 768 if (op->type != PLAYER)
768 return 0; 769 return 0;
770
769 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))
770 { 772 {
771 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.");
772 return 0; 774 return 0;
773 } 775 }
776
774 otmp = find_marked_object (op); 777 otmp = find_marked_object (op);
775 if (!otmp) 778 if (!otmp)
776 { 779 {
777 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.");
778 return 0; 781 return 0;
779 } 782 }
783
780 if (otmp->type != WEAPON && otmp->type != BOW) 784 if (otmp->type != WEAPON && otmp->type != BOW)
781 { 785 {
782 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");
783 return 0; 787 return 0;
784 } 788 }
789
785 new_draw_info (NDI_UNIQUE, 0, op, "Applied weapon builder."); 790 new_draw_info (NDI_UNIQUE, 0, op, "Applied weapon builder.");
786 improve_weapon (op, tmp, otmp); 791 improve_weapon (op, tmp, otmp);
787 esrv_send_item (op, otmp); 792 esrv_send_item (op, otmp);
788 return 1; 793 return 1;
789} 794}
… …
850 { 855 {
851 base = base - (base * settings.armor_speed_improvement) / 100; 856 base = base - (base * settings.armor_speed_improvement) / 100;
852 pow++; 857 pow++;
853 } 858 }
854 859
855 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (&armour->arch->clone) * base) / 100; 860 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (armour->arch) * base) / 100;
856 } 861 }
857 else 862 else
858 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;
859 864
860 if (!settings.armor_weight_linear) 865 if (!settings.armor_weight_linear)
861 { 866 {
862 int base = 100; 867 int base = 100;
863 int pow = 0; 868 int pow = 0;
… …
866 { 871 {
867 base = base - (base * settings.armor_weight_reduction) / 100; 872 base = base - (base * settings.armor_weight_reduction) / 100;
868 pow++; 873 pow++;
869 } 874 }
870 875
871 armour->weight = (armour->arch->clone.weight * base) / 100; 876 armour->weight = (armour->arch->weight * base) / 100;
872 } 877 }
873 else 878 else
874 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;
875 880
876 if (armour->weight <= 0) 881 if (armour->weight <= 0)
877 { 882 {
878 LOG (llevInfo, "Warning: enchanted armours can have negative weight\n."); 883 LOG (llevInfo, "Warning: enchanted armours can have negative weight\n.");
879 armour->weight = 1; 884 armour->weight = 1;
880 } 885 }
881 886
882 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);
883 888
884 if (op->type == PLAYER) 889 if (op->type == PLAYER)
885 { 890 {
886 esrv_send_item (op, armour); 891 esrv_send_item (op, armour);
887 if (QUERY_FLAG (armour, FLAG_APPLIED)) 892 if (QUERY_FLAG (armour, FLAG_APPLIED))
888 fix_player (op); 893 op->update_stats ();
889 } 894 }
890 decrease_ob (improver); 895 decrease_ob (improver);
891 if (tmp) 896 if (tmp)
892 { 897 {
893 insert_ob_in_ob (tmp, op); 898 insert_ob_in_ob (tmp, op);
… …
939 944
940 price_in = cost * item->value; 945 price_in = cost * item->value;
941 } 946 }
942 else 947 else
943 { 948 {
944 if (item->type == PLAYER || CONV_FROM (converter) != item->arch->name || 949 if (item->type == PLAYER || CONV_FROM (converter) != item->arch->archname ||
945 (CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof)) 950 (CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof))
946 return 0; 951 return 0;
947 952
948 if (CONV_NEED (converter)) 953 if (CONV_NEED (converter))
949 { 954 {
… …
980 else 985 else
981 { 986 {
982 if (converter->other_arch == NULL) 987 if (converter->other_arch == NULL)
983 { 988 {
984 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n", 989 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n",
985 &converter->name, converter->map->path, converter->x, converter->y); 990 &converter->name, &converter->map->path, converter->x, converter->y);
986 return -1; 991 return -1;
987 } 992 }
988 993
989 item = object_create_arch (converter->other_arch); 994 item = object_create_arch (converter->other_arch);
990 fix_generated_item (item, converter, 0, 0, GT_MINIMAL); 995 fix_generated_item (item, converter, 0, 0, GT_MINIMAL);
… …
997 if (is_in_shop (converter)) 1002 if (is_in_shop (converter))
998 SET_FLAG (item, FLAG_UNPAID); 1003 SET_FLAG (item, FLAG_UNPAID);
999 else if (price_in < item->nrof * item->value) 1004 else if (price_in < item->nrof * item->value)
1000 { 1005 {
1001 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",
1002 &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);
1003 1008
1004 /** 1009 /**
1005 * 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
1006 * propably had something in mind when doing this 1011 * probably had something in mind when doing this
1007 */ 1012 */
1008 } 1013 }
1009 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);
1010 return 1; 1015 return 1;
1011} 1016}
… …
1014 * Handle apply on containers. 1019 * Handle apply on containers.
1015 * By Eneq(@csd.uu.se). 1020 * By Eneq(@csd.uu.se).
1016 * Moved to own function and added many features [Tero.Haatanen@lut.fi] 1021 * Moved to own function and added many features [Tero.Haatanen@lut.fi]
1017 * added the alchemical cauldron to the code -b.t. 1022 * added the alchemical cauldron to the code -b.t.
1018 */ 1023 */
1019
1020int 1024int
1021apply_container (object *op, object *sack) 1025apply_container (object *op, object *sack)
1022{ 1026{
1023 char buf[MAX_BUF]; 1027 if (op->type != PLAYER || !op->contr->ns)
1024 object *tmp;
1025
1026 if (op->type != PLAYER)
1027 return 0; /* This might change */ 1028 return 0; /* This might change */
1028 1029
1029 if (sack == NULL || sack->type != CONTAINER) 1030 if (!sack || sack->type != CONTAINER)
1030 { 1031 {
1031 LOG (llevError, "apply_container: %s is not container!\n", sack ? &sack->name : "[nullobject]"); 1032 LOG (llevError, "apply_container: %s is not container!\n", sack ? &sack->name : "[nullobject]");
1032 return 0; 1033 return 0;
1033 } 1034 }
1034 1035
1035 op->contr->last_used = 0; 1036 op->contr->last_used = 0;
1036 1037
1037 if (sack->env != op) 1038 if (sack->env && sack->env != op)
1039 {
1040 new_draw_info (NDI_UNIQUE, 0, op, "You must put it onto the floor or into your inventory first.");
1041 return 1;
1038 { 1042 }
1039 if (sack->other_arch == NULL || sack->env != NULL) 1043
1044 // already applied == open on ground, or open in inv, or active in inv
1045 if (sack->flag [FLAG_APPLIED])
1046 {
1047 if (op->container == sack)
1040 { 1048 {
1041 new_draw_info (NDI_UNIQUE, 0, op, "You must get it first."); 1049 // open on ground or inv, so close
1050 op->close_container ();
1042 return 1; 1051 return 1;
1043 } 1052 }
1044 1053 else if (!sack->env)
1045 /* It's on the ground, the problems begin */
1046 if (op->container != sack)
1047 {
1048 /* it's closed OR some player has opened it */
1049 if (QUERY_FLAG (sack, FLAG_APPLIED))
1050 { 1054 {
1051 for (tmp = get_map_ob (sack->map, sack->x, sack->y); tmp && tmp->container != sack; tmp = tmp->above); 1055 // active, but not ours: some other player has opened it
1052 if (tmp)
1053 {
1054 /* some other player have opened it */
1055 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already occupied.", query_name (sack)); 1056 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already occupied.", query_name (sack));
1056 return 1; 1057 return 1;
1057 }
1058 }
1059 }
1060 if (QUERY_FLAG (sack, FLAG_APPLIED))
1061 { 1058 }
1062 if (op->container == NULL)
1063 {
1064 tmp = arch_to_object (sack->other_arch);
1065 /* not good, but insert_ob_in_ob() is too smart */
1066 CLEAR_FLAG (tmp, FLAG_REMOVED);
1067 tmp->x = tmp->y = 0;
1068 tmp->map = NULL;
1069 tmp->env = sack;
1070 if (sack->inv)
1071 sack->inv->above = tmp;
1072 tmp->below = sack->inv;
1073 tmp->above = NULL;
1074 sack->inv = tmp;
1075 sack->move_off = MOVE_ALL; /* trying force closing it */
1076 }
1077 else
1078 {
1079 sack->move_off = 0;
1080 tmp = sack->inv;
1081 1059
1082 if (tmp && tmp->type == CLOSE_CON) 1060 // fall through to opening it (active in inv)
1083 tmp->destroy ();
1084 }
1085 }
1086 }
1087
1088 if (QUERY_FLAG (sack, FLAG_APPLIED))
1089 { 1061 }
1062 else if (sack->env)
1063 {
1064 // it is in our env, so activate it, do not open yet
1090 if (op->container) 1065 op->close_container ();
1091 { 1066 sack->flag [FLAG_APPLIED] = 1;
1092 if (op->container != sack) 1067 esrv_update_item (UPD_FLAGS, op, sack);
1093 { 1068 new_draw_info_format (NDI_UNIQUE, 0, op, "You ready %s.", query_name (sack));
1094 tmp = op->container; 1069 return 1;
1095 apply_container (op, tmp); 1070 }
1096 sprintf (buf, "You close %s and open ", query_name (tmp)); 1071
1097 op->container = sack; 1072 // it's locked?
1098 strcat (buf, query_name (sack)); 1073 if (sack->slaying)
1099 strcat (buf, "."); 1074 {
1100 } 1075 if (object *tmp = find_key (op, op, sack))
1101 else 1076 new_draw_info_format (NDI_UNIQUE, 0, op, "You unlock %s with %s.", query_name (sack), query_name (tmp));
1102 {
1103 CLEAR_FLAG (sack, FLAG_APPLIED);
1104 op->container = NULL;
1105 sprintf (buf, "You close %s.", query_name (sack));
1106 }
1107 }
1108 else 1077 else
1109 { 1078 {
1110 CLEAR_FLAG (sack, FLAG_APPLIED);
1111 sprintf (buf, "You open %s.", query_name (sack));
1112 SET_FLAG (sack, FLAG_APPLIED);
1113 op->container = sack;
1114 }
1115 }
1116 else
1117 { /* not applied */
1118 if (sack->slaying)
1119 { /* it's locked */
1120 tmp = find_key (op, op, sack);
1121 if (tmp)
1122 {
1123 sprintf (buf, "You unlock %s with %s.", query_name (sack), query_name (tmp));
1124 SET_FLAG (sack, FLAG_APPLIED);
1125 if (sack->env == NULL)
1126 { /* if it's on ground,open it also */
1127 new_draw_info (NDI_UNIQUE, 0, op, buf);
1128 apply_container (op, sack);
1129 return 1;
1130 }
1131 }
1132 else
1133 {
1134 sprintf (buf, "You don't have the key to unlock %s.", query_name (sack)); 1079 new_draw_info_format (NDI_UNIQUE, 0, op, "You don't have the key to unlock %s.", query_name (sack));
1135 }
1136 }
1137 else
1138 {
1139 sprintf (buf, "You readied %s.", query_name (sack));
1140 SET_FLAG (sack, FLAG_APPLIED);
1141 if (sack->env == NULL)
1142 { /* if it's on ground,open it also */
1143 new_draw_info (NDI_UNIQUE, 0, op, buf);
1144 apply_container (op, sack);
1145 return 1; 1080 return 1;
1146 } 1081 }
1147 }
1148 } 1082 }
1149 1083
1150 new_draw_info (NDI_UNIQUE, 0, op, buf); 1084 op->open_container (sack);
1151
1152 if (op->contr)
1153 op->contr->socket->floorbox_update ();
1154 1085
1155 return 1; 1086 return 1;
1156} 1087}
1157
1158/**
1159 * Eneq(@csd.uu.se): Handle apply on containers. This is for containers
1160 * the player has in their inventory, eg, sacks, luggages, etc.
1161 *
1162 * Moved to own function and added many features [Tero.Haatanen@lut.fi]
1163 * This version is for client/server mode.
1164 * op is the player, sack is the container the player is opening or closing.
1165 * return 1 if an object is apllied somehow or another, 0 if error/no apply
1166 *
1167 * Reminder - there are three states for any container - closed (non applied),
1168 * applied (not open, but objects that match get tossed into it), and open
1169 * (applied flag set, and op->container points to the open container)
1170 */
1171
1172int
1173esrv_apply_container (object *op, object *sack)
1174{
1175 object *tmp = op->container;
1176
1177 if (op->type != PLAYER)
1178 return 0; /* This might change */
1179
1180 if (sack == NULL || sack->type != CONTAINER)
1181 {
1182 LOG (llevError, "esrv_apply_container: %s is not container!\n", sack ? &sack->name : "[nullobject]");
1183 return 0;
1184 }
1185
1186 /* If we have a currently open container, then it needs to be closed in all cases
1187 * if we are opening this one up. We then fall through if appropriate for
1188 * openening the new container.
1189 */
1190
1191 if (op->container && QUERY_FLAG (sack, FLAG_APPLIED))
1192 {
1193 if (op->container->env != op)
1194 { /* if container is on the ground */
1195 op->container->move_off = 0;
1196 }
1197
1198 if (INVOKE_OBJECT (CLOSE, tmp, ARG_OBJECT (op)))
1199 return 1;
1200
1201 new_draw_info_format (NDI_UNIQUE, 0, op, "You close %s.", query_name (op->container));
1202 CLEAR_FLAG (op->container, FLAG_APPLIED);
1203 op->container = NULL;
1204 esrv_update_item (UPD_FLAGS, op, tmp);
1205 if (tmp == sack)
1206 return 1;
1207 }
1208
1209
1210 /* If the player is trying to open it (which he must be doing if we got here),
1211 * and it is locked, check to see if player has the equipment to open it.
1212 */
1213
1214 if (sack->slaying)
1215 { /* it's locked */
1216 tmp = find_key (op, op, sack);
1217 if (tmp)
1218 {
1219 new_draw_info_format (NDI_UNIQUE, 0, op, "You unlock %s with %s.", query_name (sack), query_name (tmp));
1220 }
1221 else
1222 {
1223 new_draw_info_format (NDI_UNIQUE, 0, op, "You don't have the key to unlock %s.", query_name (sack));
1224 return 0;
1225 }
1226 }
1227
1228 /* By the time we get here, we have made sure any other container has been closed and
1229 * if this is a locked container, the player they key to open it.
1230 */
1231
1232 /* There are really two cases - the sack is either on the ground, or the sack is
1233 * part of the players inventory. If on the ground, we assume that the player is
1234 * opening it, since if it was being closed, that would have been taken care of above.
1235 */
1236
1237
1238 if (sack->env != op)
1239 {
1240 /* Hypothetical case - the player is trying to open a sack that belong to someone
1241 * else. This normally should not happen, but a misbehaving client/player could
1242 * try to do it, so lets handle it gracefully.
1243 */
1244 if (sack->env)
1245 {
1246 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't open %s", query_name (sack));
1247 return 0;
1248 }
1249 /* set these so when the player walks off, we can unapply the sack */
1250 sack->move_off = MOVE_ALL; /* trying force closing it */
1251
1252 CLEAR_FLAG (sack, FLAG_APPLIED);
1253 new_draw_info_format (NDI_UNIQUE, 0, op, "You open %s.", query_name (sack));
1254 SET_FLAG (sack, FLAG_APPLIED);
1255 op->container = sack;
1256 esrv_update_item (UPD_FLAGS, op, sack);
1257 esrv_send_inventory (op, sack);
1258
1259 }
1260 else
1261 { /* sack is in players inventory */
1262 if (QUERY_FLAG (sack, FLAG_APPLIED))
1263 { /* readied sack becoming open */
1264 CLEAR_FLAG (sack, FLAG_APPLIED);
1265 new_draw_info_format (NDI_UNIQUE, 0, op, "You open %s.", query_name (sack));
1266 SET_FLAG (sack, FLAG_APPLIED);
1267 op->container = sack;
1268 esrv_update_item (UPD_FLAGS, op, sack);
1269 esrv_send_inventory (op, sack);
1270 }
1271 else
1272 {
1273 CLEAR_FLAG (sack, FLAG_APPLIED);
1274 new_draw_info_format (NDI_UNIQUE, 0, op, "You readied %s.", query_name (sack));
1275 SET_FLAG (sack, FLAG_APPLIED);
1276 esrv_update_item (UPD_FLAGS, op, sack);
1277 }
1278 }
1279 return 1;
1280}
1281
1282 1088
1283/** 1089/**
1284 * Handles dropping things on altar. 1090 * Handles dropping things on altar.
1285 * Returns true if sacrifice was accepted. 1091 * Returns true if sacrifice was accepted.
1286 */ 1092 */
… …
1439 */ 1245 */
1440static void 1246static void
1441apply_sign (object *op, object *sign, int autoapply) 1247apply_sign (object *op, object *sign, int autoapply)
1442{ 1248{
1443 readable_message_type *msgType; 1249 readable_message_type *msgType;
1444 char newbuf[HUGE_BUF];
1445 1250
1446 if (sign->msg == NULL) 1251 if (sign->msg == NULL)
1447 { 1252 {
1448 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.");
1449 return; 1254 return;
… …
1470 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)
1471 { 1276 {
1472 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.");
1473 return; 1278 return;
1474 } 1279 }
1280
1281 if (op->contr)
1282 if (client *ns = op->contr->ns)
1283 {
1475 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];
1476 snprintf (newbuf, sizeof (newbuf), "%hhu %s", autoapply ? 1 : 0, &sign->msg); 1291 snprintf (newbuf, sizeof (newbuf), "%u %s", autoapply ? 1 : 0, &sign->msg);
1477 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 }
1478} 1295}
1479 1296
1480/** 1297/**
1481 * 'victim' moves onto 'trap' 1298 * 'victim' moves onto 'trap'
1482 * 'victim' leaves 'trap' 1299 * 'victim' leaves 'trap'
… …
1505 * proper. This code was causing needless crashes. 1322 * proper. This code was causing needless crashes.
1506 */ 1323 */
1507 if (recursion_depth >= 500) 1324 if (recursion_depth >= 500)
1508 { 1325 {
1509 LOG (llevDebug, "WARNING: move_apply(): aborting recursion " 1326 LOG (llevDebug, "WARNING: move_apply(): aborting recursion "
1510 "[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);
1511 return; 1328 return;
1512 } 1329 }
1330
1513 recursion_depth++; 1331 recursion_depth++;
1514 if (trap->head) 1332 if (trap->head)
1515 trap = trap->head; 1333 trap = trap->head;
1516 1334
1517 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)))
… …
1532 1350
1533 /* 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
1534 * above with some objects have zero speed, and thus the player 1352 * above with some objects have zero speed, and thus the player
1535 * getting permanently paralyzed. 1353 * getting permanently paralyzed.
1536 */ 1354 */
1537 if (victim->speed_left < -50.0) 1355 if (victim->speed_left < -50.f)
1538 victim->speed_left = -50.0; 1356 victim->speed_left = -50.f;
1539 /* 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); */
1540 } 1358 }
1541 goto leave; 1359 goto leave;
1542 1360
1543 case SPINNER: 1361 case SPINNER:
… …
1629 1447
1630 1448
1631 case CONVERTER: 1449 case CONVERTER:
1632 if (convert_item (victim, trap) < 0) 1450 if (convert_item (victim, trap) < 0)
1633 { 1451 {
1634 object *op;
1635
1636 new_draw_info_format (NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name (trap)); 1452 new_draw_info_format (NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name (trap));
1637 1453 get_archetype ("burnout")->insert_at (trap, trap);
1638 op = get_archetype ("burnout");
1639 if (op != NULL)
1640 {
1641 op->x = trap->x;
1642 op->y = trap->y;
1643 insert_ob_in_map (op, trap->map, trap, 0);
1644 } 1454 }
1645 } 1455
1646 goto leave; 1456 goto leave;
1647 1457
1648 case TRIGGER_BUTTON: 1458 case TRIGGER_BUTTON:
1649 case TRIGGER_PEDESTAL: 1459 case TRIGGER_PEDESTAL:
1650 case TRIGGER_ALTAR: 1460 case TRIGGER_ALTAR:
… …
1679 if (victim->type == PLAYER && EXIT_PATH (trap)) 1489 if (victim->type == PLAYER && EXIT_PATH (trap))
1680 { 1490 {
1681 /* Basically, don't show exits leading to random maps the 1491 /* Basically, don't show exits leading to random maps the
1682 * players output. 1492 * players output.
1683 */ 1493 */
1684 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2) && strncmp (EXIT_PATH (trap), "/random/", 8)) 1494 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2))
1685 new_draw_info (NDI_NAVY, 0, victim, trap->msg); 1495 new_draw_info (NDI_NAVY, 0, victim, trap->msg);
1496
1686 enter_exit (victim, trap); 1497 victim->enter_exit (trap);
1687 } 1498 }
1688 goto leave; 1499 goto leave;
1689 1500
1690 case ENCOUNTER: 1501 case ENCOUNTER:
1691 /* may be some leftovers on this */ 1502 /* may be some leftovers on this */
… …
1706 1517
1707 apply_sign (victim, trap, 1); 1518 apply_sign (victim, trap, 1);
1708 goto leave; 1519 goto leave;
1709 1520
1710 case CONTAINER: 1521 case CONTAINER:
1711 if (victim->type == PLAYER)
1712 (void) esrv_apply_container (victim, trap);
1713 else
1714 (void) apply_container (victim, trap); 1522 apply_container (victim, trap);
1715 goto leave; 1523 goto leave;
1716 1524
1717 case RUNE: 1525 case RUNE:
1718 case TRAP: 1526 case TRAP:
1719 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE)) 1527 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE))
… …
1722 } 1530 }
1723 goto leave; 1531 goto leave;
1724 1532
1725 default: 1533 default:
1726 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not " 1534 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not "
1727 "handled in move_apply()\n", &trap->name, &trap->arch->name, trap->type); 1535 "handled in move_apply()\n", &trap->name, &trap->arch->archname, trap->type);
1728 goto leave; 1536 goto leave;
1729 } 1537 }
1730 1538
1731leave: 1539leave:
1732 recursion_depth--; 1540 recursion_depth--;
… …
1744 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ)) 1552 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
1745 { 1553 {
1746 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1554 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind.");
1747 return; 1555 return;
1748 } 1556 }
1557
1749 if (tmp->msg == NULL) 1558 if (!tmp->msg)
1750 { 1559 {
1751 new_draw_info_format (NDI_UNIQUE, 0, op, "You open the %s and find it empty.", &tmp->name); 1560 new_draw_info_format (NDI_UNIQUE, 0, op, "You open the %s and find it empty.", &tmp->name);
1752 return; 1561 return;
1753 } 1562 }
1754 1563
1755 /* need a literacy skill to read stuff! */ 1564 /* need a literacy skill to read stuff! */
1756 skill_ob = find_skill_by_name (op, tmp->skill); 1565 skill_ob = find_skill_by_name (op, tmp->skill);
1757 if (!skill_ob) 1566 if (!skill_ob)
1758 { 1567 {
1759 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols."); 1568 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. H<You lack the skill to read this>");
1760 return; 1569 return;
1761 } 1570 }
1571
1762 lev_diff = tmp->level - (skill_ob->level + 5); 1572 lev_diff = tmp->level - (skill_ob->level + 5);
1763 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0) 1573 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0)
1764 { 1574 {
1765 if (lev_diff < 2) 1575 if (lev_diff < 2)
1766 new_draw_info (NDI_UNIQUE, 0, op, "This book is just barely beyond your comprehension."); 1576 new_draw_info (NDI_UNIQUE, 0, op, "This book is just barely beyond your comprehension.");
… …
1777 return; 1587 return;
1778 } 1588 }
1779 1589
1780 readable_message_type *msgType = get_readable_message_type (tmp); 1590 readable_message_type *msgType = get_readable_message_type (tmp);
1781 1591
1592 if (player *pl = op->contr)
1593 if (client *ns = pl->ns)
1594 if (ns->can_msg)
1595 {
1596 dynbuf_text buf;
1597 buf << long_desc (tmp, op)
1598 << "\n\n"
1599 << tmp->msg
1600 << '\0';
1601 ns->send_msg (NDI_NAVY, msgType->msgtype, buf.linearise ());
1602 }
1603 else
1782 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, 1604 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1783 msgType->message_type, msgType->message_subtype, 1605 msgType->message_type, msgType->message_subtype,
1784 "You open the %s and start reading.\n%s", "%s\n%s", long_desc (tmp, op), &tmp->msg); 1606 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1607 long_desc (tmp, op), &tmp->msg);
1785 1608
1786 /* gain xp from reading */ 1609 /* gain xp from reading */
1787 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1610 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1788 { /* only if not read before */ 1611 { /* only if not read before */
1789 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1612 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
… …
1795 1618
1796 /* If in a container, update how it looks */ 1619 /* If in a container, update how it looks */
1797 if (tmp->env) 1620 if (tmp->env)
1798 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1621 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1799 else 1622 else
1800 op->contr->socket->floorbox_update (); 1623 op->contr->ns->floorbox_update ();
1801 } 1624 }
1802 1625
1803 change_exp (op, exp_gain, skill_ob->skill, 0); 1626 change_exp (op, exp_gain, skill_ob->skill, 0);
1804 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */ 1627 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */
1805 } 1628 }
… …
1910 1733
1911 /* artifact_spellbooks have 'slaying' field point to a spell name, 1734 /* artifact_spellbooks have 'slaying' field point to a spell name,
1912 * instead of having their spell stored in stats.sp. These are 1735 * instead of having their spell stored in stats.sp. These are
1913 * legacy spellbooks 1736 * legacy spellbooks
1914 */ 1737 */
1915
1916 if (tmp->slaying != NULL) 1738 if (tmp->slaying)
1917 { 1739 {
1918 spell = arch_to_object (find_archetype_by_object_name (tmp->slaying)); 1740 spell = arch_to_object (find_archetype_by_object_name (tmp->slaying));
1919 if (!spell) 1741 if (!spell)
1920 { 1742 {
1921 new_draw_info_format (NDI_UNIQUE, 0, op, "The book's formula for %s is incomplete", &tmp->slaying); 1743 new_draw_info_format (NDI_UNIQUE, 0, op, "The book's formula for %s is incomplete", &tmp->slaying);
1922 return; 1744 return;
1923 } 1745 }
1924 else 1746 else
1925 insert_ob_in_ob (spell, tmp); 1747 insert_ob_in_ob (spell, tmp);
1748
1926 tmp->slaying = NULL; 1749 tmp->slaying = 0;
1927 } 1750 }
1928 1751
1929 skop = find_skill_by_name (op, tmp->skill); 1752 skop = find_skill_by_name (op, tmp->skill);
1930 1753
1931 /* need a literacy skill to learn spells. Also, having a literacy level 1754 /* need a literacy skill to learn spells. Also, having a literacy level
1932 * lower than the spell will make learning the spell more difficult */ 1755 * lower than the spell will make learning the spell more difficult */
1933 if (!skop) 1756 if (!skop)
1934 { 1757 {
1935 new_draw_info (NDI_UNIQUE, 0, op, "You can't read! Your attempt fails."); 1758 new_draw_info (NDI_UNIQUE, 0, op, "You can't read! Your attempt fails. H<You lack the literacy skill.>");
1936 return; 1759 return;
1937 } 1760 }
1938 1761
1939 spell = tmp->inv; 1762 spell = tmp->inv;
1940 1763
1941 if (!spell) 1764 if (!spell)
1942 { 1765 {
1943 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name); 1766 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name);
1944 new_draw_info (NDI_UNIQUE, 0, op, "The spellbook symbols make no sense."); 1767 new_draw_info (NDI_UNIQUE, 0, op, "The spellbook symbols make no sense. This is a bug, please report!");
1945 return; 1768 return;
1946 } 1769 }
1947 1770
1948 if (skop->level < int (sqrtf (spell->level) * 1.5f)) 1771 if (skop->level < int (sqrtf (spell->level) * 1.5f))
1949 { 1772 {
1950 new_draw_info (NDI_UNIQUE, 0, op, "It is too hard to read at your level: You are unable to decipher the strange symbols."); 1773 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. H<Your literacy level is too low.>");
1951 return; 1774 return;
1952 } 1775 }
1953 1776
1954 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name); 1777 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name);
1955 1778
… …
1958 identify (tmp); 1781 identify (tmp);
1959 1782
1960 if (tmp->env) 1783 if (tmp->env)
1961 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1784 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1962 else 1785 else
1963 op->contr->socket->floorbox_update (); 1786 op->contr->ns->floorbox_update ();
1964 } 1787 }
1965 1788
1966 /* I removed the check for special_prayer_mark here - it didn't make 1789 /* I removed the check for special_prayer_mark here - it didn't make
1967 * a lot of sense - special prayers are not found in spellbooks, and 1790 * a lot of sense - special prayers are not found in spellbooks, and
1968 * if the player doesn't know the spell, doesn't make a lot of sense that 1791 * if the player doesn't know the spell, doesn't make a lot of sense that
1969 * they would have a special prayer mark. 1792 * they would have a special prayer mark.
1970 */ 1793 */
1971 if (check_spell_known (op, spell->name)) 1794 if (check_spell_known (op, spell->name))
1972 { 1795 {
1973 new_draw_info (NDI_UNIQUE, 0, op, "You already know that spell.\n"); 1796 new_draw_info (NDI_UNIQUE, 0, op, "You already know that spell. H<It makes no sense to leanr spells twice, and would only waste the spellbook.>\n");
1974 return; 1797 return;
1975 } 1798 }
1976 1799
1977 if (spell->skill) 1800 if (spell->skill)
1978 { 1801 {
1979 spell_skill = find_skill_by_name (op, spell->skill); 1802 spell_skill = find_skill_by_name (op, spell->skill);
1980 1803
1981 if (!spell_skill) 1804 if (!spell_skill)
1982 { 1805 {
1983 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use this spell", &spell->skill); 1806 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use this spell.", &spell->skill);
1984 return; 1807 return;
1985 } 1808 }
1986 1809
1987 if (spell_skill->level < spell->level) 1810 if (spell_skill->level < spell->level)
1988 { 1811 {
… …
2020 change_exp (op, calc_skill_exp (op, tmp, skop), skop->skill, 0); 1843 change_exp (op, calc_skill_exp (op, tmp, skop), skop->skill, 0);
2021 } 1844 }
2022 else 1845 else
2023 { 1846 {
2024 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1847 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0);
2025 new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell.\n"); 1848 new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell. H<Wis (priests) or Int (wizards) governs the chance of learning a prayer or spell.>\n");
2026 } 1849 }
1850
2027 decrease_ob (tmp); 1851 decrease_ob (tmp);
2028} 1852}
2029 1853
2030/** 1854/**
2031 * Handles applying a spell scroll. 1855 * Handles applying a spell scroll.
… …
2041 return; 1865 return;
2042 } 1866 }
2043 1867
2044 if (!tmp->inv || tmp->inv->type != SPELL) 1868 if (!tmp->inv || tmp->inv->type != SPELL)
2045 { 1869 {
2046 new_draw_info (NDI_UNIQUE, 0, op, "The scroll just doesn't make sense!"); 1870 new_draw_info (NDI_UNIQUE, 0, op, "The scroll just doesn't make sense! H<...and never will make sense.>");
2047 return; 1871 return;
2048 } 1872 }
2049 1873
2050 if (op->type == PLAYER) 1874 if (op->type == PLAYER)
2051 { 1875 {
… …
2057 */ 1881 */
2058 skop = find_skill_by_name (op, skill_names[SK_LITERACY]); 1882 skop = find_skill_by_name (op, skill_names[SK_LITERACY]);
2059 1883
2060 if (!skop) 1884 if (!skop)
2061 { 1885 {
2062 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols."); 1886 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. H<You lack the literacy skill.>");
2063 return; 1887 return;
2064 } 1888 }
2065 1889
2066 if ((exp_gain = calc_skill_exp (op, tmp, skop))) 1890 if ((exp_gain = calc_skill_exp (op, tmp, skop)))
2067 change_exp (op, exp_gain, skop->skill, 0); 1891 change_exp (op, exp_gain, skop->skill, 0);
… …
2069 1893
2070 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1894 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
2071 identify (tmp); 1895 identify (tmp);
2072 1896
2073 new_draw_info_format (NDI_BLACK, 0, op, "The scroll of %s turns to dust.", &tmp->inv->name); 1897 new_draw_info_format (NDI_BLACK, 0, op, "The scroll of %s turns to dust.", &tmp->inv->name);
2074
2075 1898
2076 cast_spell (op, tmp, dir, tmp->inv, NULL); 1899 cast_spell (op, tmp, dir, tmp->inv, NULL);
2077 decrease_ob (tmp); 1900 decrease_ob (tmp);
2078} 1901}
2079 1902
… …
2083 * chest. 1906 * chest.
2084 */ 1907 */
2085static void 1908static void
2086apply_treasure (object *op, object *tmp) 1909apply_treasure (object *op, object *tmp)
2087{ 1910{
2088 object *treas;
2089
2090
2091 /* Nice side effect of new treasure creation method is that the treasure 1911 /* Nice side effect of new treasure creation method is that the treasure
2092 * for the chest is done when the chest is created, and put into the chest 1912 * for the chest is done when the chest is created, and put into the chest
2093 * inventory. So that when the chest burns up, the items still exist. Also 1913 * inventory. So that when the chest burns up, the items still exist. Also
2094 * prevents people fromt moving chests to more difficult maps to get better 1914 * prevents people fromt moving chests to more difficult maps to get better
2095 * treasure 1915 * treasure
2096 */ 1916 */
2097
2098 treas = tmp->inv; 1917 object *treas = tmp->inv;
2099 if (treas == NULL) 1918
1919 if (!treas)
2100 { 1920 {
2101 new_draw_info (NDI_UNIQUE, 0, op, "The chest was empty."); 1921 new_draw_info (NDI_UNIQUE, 0, op, "The chest was empty.");
2102 decrease_ob (tmp); 1922 decrease_ob (tmp);
2103 return; 1923 return;
2104 } 1924 }
1925
2105 while (tmp->inv) 1926 while (tmp->inv)
2106 { 1927 {
2107 treas = tmp->inv; 1928 treas = tmp->inv;
2108 1929
2109 treas->remove (); 1930 treas->remove ();
… …
2191 /* special food hack -b.t. */ 2012 /* special food hack -b.t. */
2192 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED)) 2013 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED))
2193 eat_special_food (op, tmp); 2014 eat_special_food (op, tmp);
2194 } 2015 }
2195 } 2016 }
2017
2196 handle_apply_yield (tmp); 2018 handle_apply_yield (tmp);
2197 decrease_ob (tmp); 2019 decrease_ob (tmp);
2198} 2020}
2199 2021
2200/** 2022/**
… …
2227 if (meal->type != FLESH || !is_dragon_pl (op)) 2049 if (meal->type != FLESH || !is_dragon_pl (op))
2228 return 0; 2050 return 0;
2229 2051
2230 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces 2052 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces
2231 from the player's inventory */ 2053 from the player's inventory */
2232 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2054 for (tmp = op->inv; tmp; tmp = tmp->below)
2233 {
2234 if (tmp->type == FORCE) 2055 if (tmp->type == FORCE)
2235 { 2056 if (tmp->arch->archname == shstr_dragon_skin_force)
2236 if (strcmp (tmp->arch->name, "dragon_skin_force") == 0)
2237 skin = tmp; 2057 skin = tmp;
2238 else if (strcmp (tmp->arch->name, "dragon_ability_force") == 0) 2058 else if (tmp->arch->archname == shstr_dragon_ability_force)
2239 abil = tmp; 2059 abil = tmp;
2240 }
2241 }
2242 2060
2243 /* if either skin or ability are missing, this is an old player 2061 /* if either skin or ability are missing, this is an old player
2244 which is not to be considered a dragon -> bail out */ 2062 which is not to be considered a dragon -> bail out */
2245 if (skin == NULL || abil == NULL) 2063 if (skin == NULL || abil == NULL)
2246 return 0; 2064 return 0;
… …
2287 /* doubled chance for resistance of ability-focus */ 2105 /* doubled chance for resistance of ability-focus */
2288 if (i == abil->stats.exp) 2106 if (i == abil->stats.exp)
2289 chance = MIN (100., chance * 2.); 2107 chance = MIN (100., chance * 2.);
2290 2108
2291 /* now make the throw and save all winners (Don't insert luck bonus here!) */ 2109 /* now make the throw and save all winners (Don't insert luck bonus here!) */
2292 if (RANDOM () % 10000 < (int) (chance * 100)) 2110 if (rndm (10000) < (unsigned int) (chance * 100))
2293 { 2111 {
2294 atnr_winner[winners] = i; 2112 atnr_winner[winners] = i;
2295 winners++; 2113 winners++;
2296 } 2114 }
2297 2115
… …
2328 2146
2329 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95) 2147 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95)
2330 { 2148 {
2331 /* resistance increased! */ 2149 /* resistance increased! */
2332 skin->resist[i]++; 2150 skin->resist[i]++;
2333 fix_player (op); 2151 op->update_stats ();
2334 2152
2335 sprintf (buf, "Your skin is now more resistant to %s!", change_resist_msg[i]); 2153 sprintf (buf, "Your skin is now more resistant to %s!", change_resist_msg[i]);
2336 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, buf); 2154 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, buf);
2337 } 2155 }
2338 2156
… …
2357 } 2175 }
2358 } 2176 }
2359 return 1; 2177 return 1;
2360} 2178}
2361 2179
2362static void
2363apply_savebed (object *pl)
2364{
2365#ifndef COZY_SERVER
2366 if (!pl->contr->name_changed || !pl->stats.exp)
2367 {
2368 new_draw_info (NDI_UNIQUE, 0, pl, "You don't deserve to save your character yet.");
2369 return;
2370 }
2371#endif
2372 INVOKE_PLAYER (LOGOUT, pl->contr);
2373 /* Need to call terminate_all_pets() before we remove the player ob */
2374 terminate_all_pets (pl);
2375 pl->remove ();
2376 pl->direction = 0;
2377 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, pl, "%s leaves the game.", &pl->name);
2378
2379 /* update respawn position */
2380 strcpy (pl->contr->savebed_map, pl->map->path);
2381 pl->contr->bed_x = pl->x;
2382 pl->contr->bed_y = pl->y;
2383
2384 strcpy (pl->contr->killer, "left");
2385 check_score (pl); /* Always check score */
2386 (void) save_player (pl, 0);
2387 pl->map->players--;
2388#if MAP_MAXTIMEOUT
2389 MAP_SWAP_TIME (pl->map) = MAP_TIMEOUT (pl->map);
2390#endif
2391 play_again (pl);
2392 pl->speed = 0;
2393 update_ob_speed (pl);
2394}
2395
2396/** 2180/**
2397 * Handles applying an improve armor scroll. 2181 * Handles applying an improve armor scroll.
2398 * Does some sanity checks, then calls improve_armour. 2182 * Does some sanity checks, then calls improve_armour.
2399 */ 2183 */
2400static void 2184static void
2401apply_armour_improver (object *op, object *tmp) 2185apply_armour_improver (object *op, object *tmp)
2402{ 2186{
2403 object *armor; 2187 object *armor;
2404 2188
2405 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) 2189 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_NO_MAGIC))
2406 { 2190 {
2407 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll."); 2191 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll. H<The area prevents magic effects.>");
2408 return; 2192 return;
2409 } 2193 }
2194
2410 armor = find_marked_object (op); 2195 armor = find_marked_object (op);
2196
2411 if (!armor) 2197 if (!armor)
2412 { 2198 {
2413 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark an armor object."); 2199 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.");
2414 return; 2200 return;
2415 } 2201 }
2202
2416 if (armor->type != ARMOUR 2203 if (armor->type != ARMOUR
2417 && armor->type != CLOAK 2204 && armor->type != CLOAK
2418 && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET) 2205 && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET)
2419 { 2206 {
2420 new_draw_info (NDI_UNIQUE, 0, op, "Your marked item is not armour!\n"); 2207 new_draw_info (NDI_UNIQUE, 0, op, "Your marked item is not armour!\n");
… …
2423 2210
2424 new_draw_info (NDI_UNIQUE, 0, op, "Applying armour enchantment."); 2211 new_draw_info (NDI_UNIQUE, 0, op, "Applying armour enchantment.");
2425 improve_armour (op, tmp, armor); 2212 improve_armour (op, tmp, armor);
2426} 2213}
2427 2214
2428
2429extern void 2215extern void
2430apply_poison (object *op, object *tmp) 2216apply_poison (object *op, object *tmp)
2431{ 2217{
2432 if (op->type == PLAYER) 2218 if (op->type == PLAYER)
2433 { 2219 {
2434 play_sound_player_only (op->contr, SOUND_DRINK_POISON, 0, 0); 2220 play_sound_player_only (op->contr, SOUND_DRINK_POISON, 0, 0);
2435 new_draw_info (NDI_UNIQUE, 0, op, "Yech! That tasted poisonous!"); 2221 new_draw_info (NDI_UNIQUE, 0, op, "Yech! That tasted poisonous!");
2436 strcpy (op->contr->killer, "poisonous booze"); 2222 strcpy (op->contr->killer, "poisonous booze");
2437 } 2223 }
2224
2438 if (tmp->stats.hp > 0) 2225 if (tmp->stats.hp > 0)
2439 { 2226 {
2440 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp); 2227 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp);
2441 hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1); 2228 hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1);
2442 } 2229 }
2230
2443 op->stats.food -= op->stats.food / 4; 2231 op->stats.food -= op->stats.food / 4;
2444 handle_apply_yield (tmp); 2232 handle_apply_yield (tmp);
2445 decrease_ob (tmp); 2233 decrease_ob (tmp);
2446} 2234}
2447 2235
2448/** 2236/**
2449 * This fonction return true if the exit is not a 2 ways one or it is 2 ways, valid exit. 2237 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit.
2450 * A valid 2 way exit means: 2238 * A valid 2 way exit means:
2451 * -You can come back (there is another exit at the other side) 2239 * -You can come back (there is another exit at the other side)
2452 * -You are 2240 * -You are
2453 * ° the owner of the exit 2241 * ° the owner of the exit
2454 * ° or in the same party as the owner 2242 * ° or in the same party as the owner
2455 * 2243 *
2456 * Note: a owner in a 2 way exit is saved as the owner's name 2244 * Note: a owner in a 2 way exit is saved as the owner's name
2457 * in the field exit->name cause the field exit->owner doesn't 2245 * in the field exit->name cause the field exit->owner doesn't
2458 * survive in the swapping (in fact the whole exit doesn't survive). 2246 * survive in the swapping (in fact the whole exit doesn't survive).
2459 */ 2247 */
2460int 2248int
2461is_legal_2ways_exit (object *op, object *exit) 2249is_legal_2ways_exit (object *op, object *exit)
2462{ 2250{
2463 object *tmp;
2464 object *exit_owner;
2465 player *pp;
2466 maptile *exitmap;
2467
2468 if (exit->stats.exp != 1) 2251 if (exit->stats.exp != 1)
2469 return 1; /*This is not a 2 way, so it is legal */ 2252 return 1; /*This is not a 2 way, so it is legal */
2253
2254#if 0 //TODO
2470 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race) 2255 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race)
2471 return 0; /* This is a reset town portal */ 2256 return 0; /* This is a reset town portal */
2472 /* To know if an exit has a correspondant, we look at 2257#endif
2473 * all the exits in destination and try to find one with same path as 2258
2474 * the current exit's position */ 2259 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map);
2475 if (!strncmp (EXIT_PATH (exit), settings.localdir, strlen (settings.localdir))) 2260
2476 exitmap = ready_map_name (EXIT_PATH (exit), MAP_PLAYER_UNIQUE);
2477 else
2478 exitmap = ready_map_name (EXIT_PATH (exit), 0);
2479 if (exitmap) 2261 if (exitmap)
2480 { 2262 {
2263 exitmap->load_sync ();
2264
2481 tmp = get_map_ob (exitmap, EXIT_X (exit), EXIT_Y (exit)); 2265 object *tmp = exitmap->at (EXIT_X (exit), EXIT_Y (exit)).bot;
2266
2482 if (!tmp) 2267 if (!tmp)
2483 return 0; 2268 return 0;
2484 for ((tmp = get_map_ob (exitmap, EXIT_X (exit), EXIT_Y (exit))); tmp; tmp = tmp->above) 2269
2270 for (; tmp; tmp = tmp->above)
2485 { 2271 {
2486 if (tmp->type != EXIT) 2272 if (tmp->type != EXIT)
2487 continue; /*Not an exit */ 2273 continue; /*Not an exit */
2274
2488 if (!EXIT_PATH (tmp)) 2275 if (!EXIT_PATH (tmp))
2489 continue; /*Not a valid exit */ 2276 continue; /*Not a valid exit */
2277
2490 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y)) 2278 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y))
2491 continue; /*Not in the same place */ 2279 continue; /*Not in the same place */
2280
2492 if (strcmp (exit->map->path, EXIT_PATH (tmp)) != 0) 2281 if (exit->map->path != EXIT_PATH (tmp))
2493 continue; /*Not in the same map */ 2282 continue; /*Not in the same map */
2494 2283
2495 /* From here we have found the exit is valid. However we do 2284 /* From here we have found the exit is valid. However we do
2496 * here the check of the exit owner. It is important for the 2285 * here the check of the exit owner. It is important for the
2497 * town portals to prevent strangers from visiting your appartments 2286 * town portals to prevent strangers from visiting your appartments
2498 */ 2287 */
2499 if (!exit->race) 2288 if (!exit->race)
2500 return 1; /*No owner, free for all! */ 2289 return 1; /*No owner, free for all! */
2290
2501 exit_owner = NULL; 2291 object *exit_owner = 0;
2502 for (pp = first_player; pp; pp = pp->next) 2292
2293 for_all_players (pp)
2503 { 2294 {
2504 if (!pp->ob) 2295 if (!pp->ob)
2505 continue; 2296 continue;
2297
2506 if (pp->ob->name != exit->race) 2298 if (pp->ob->name != exit->race)
2507 continue; 2299 continue;
2300
2508 exit_owner = pp->ob; /*We found a player which correspond to the player name */ 2301 exit_owner = pp->ob; /*We found a player which correspond to the player name */
2509 break; 2302 break;
2510 } 2303 }
2304
2511 if (!exit_owner) 2305 if (!exit_owner)
2512 return 0; /* No more owner */ 2306 return 0; /* No more owner */
2307
2513 if (exit_owner->contr == op->contr) 2308 if (exit_owner->contr == op->contr)
2514 return 1; /*It is your exit */ 2309 return 1; /*It is your exit */
2310
2515 if (exit_owner && /*There is a owner */ 2311 if (exit_owner && /*There is a owner */
2516 (op->contr) && /*A player tries to pass */ 2312 (op->contr) && /*A player tries to pass */
2517 ((exit_owner->contr->party == NULL) || /*No pass if controller has no party */ 2313 ((exit_owner->contr->party == NULL) || /*No pass if controller has no party */
2518 (exit_owner->contr->party != op->contr->party))) /* Or not the same as op */ 2314 (exit_owner->contr->party != op->contr->party))) /* Or not the same as op */
2519 return 0; 2315 return 0;
2316
2520 return 1; 2317 return 1;
2521 } 2318 }
2522 } 2319 }
2320
2523 return 0; 2321 return 0;
2524} 2322}
2525
2526 2323
2527/** 2324/**
2528 * Main apply handler. 2325 * Main apply handler.
2529 * 2326 *
2530 * Checks for unpaid items before applying. 2327 * Checks for unpaid items before applying.
… …
2538 * being applied. 2335 * being applied.
2539 * 2336 *
2540 * aflag is special (always apply/unapply) flags. Nothing is done with 2337 * aflag is special (always apply/unapply) flags. Nothing is done with
2541 * them in this function - they are passed to apply_special 2338 * them in this function - they are passed to apply_special
2542 */ 2339 */
2543
2544int 2340int
2545manual_apply (object *op, object *tmp, int aflag) 2341manual_apply (object *op, object *tmp, int aflag)
2546{ 2342{
2547 if (tmp->head) 2343 if (tmp->head)
2548 tmp = tmp->head; 2344 tmp = tmp->head;
2549 2345
2550 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED)) 2346 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED))
2551 { 2347 {
2552 if (op->type == PLAYER) 2348 if (op->type == PLAYER)
2553 { 2349 {
2554 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first."); 2350 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first. H<You cannot use items marked as unpaid.>");
2555 return 1; 2351 return 1;
2556 } 2352 }
2557 else 2353 else
2558 {
2559 return 0; /* monsters just skip unpaid items */ 2354 return 0; /* monsters just skip unpaid items */
2560 }
2561 } 2355 }
2562 2356
2563 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op))) 2357 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op)))
2564 return RESULT_INT (0); 2358 return RESULT_INT (0);
2565 2359
2566 switch (tmp->type) 2360 switch (tmp->type)
2567 { 2361 {
2568
2569 case CF_HANDLE: 2362 case CF_HANDLE:
2570 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2363 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle.");
2571 play_sound_map (op->map, op->x, op->y, SOUND_TURN_HANDLE); 2364 play_sound_map (op->map, op->x, op->y, SOUND_TURN_HANDLE);
2572 tmp->value = tmp->value ? 0 : 1; 2365 tmp->value = tmp->value ? 0 : 1;
2573 SET_ANIMATION (tmp, tmp->value); 2366 SET_ANIMATION (tmp, tmp->value);
… …
2580 { 2373 {
2581 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2374 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle.");
2582 play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE); 2375 play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE);
2583 } 2376 }
2584 else 2377 else
2585 {
2586 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move."); 2378 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move.");
2587 } 2379
2588 return 1; 2380 return 1;
2589 2381
2590 case EXIT: 2382 case EXIT:
2591 if (op->type != PLAYER) 2383 if (op->type != PLAYER)
2592 return 0; 2384 return 0;
2385
2593 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2386 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp))
2594 {
2595 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp)); 2387 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp));
2596 }
2597 else 2388 else
2598 { 2389 {
2599 /* Don't display messages for random maps. */ 2390 /* Don't display messages for random maps. */
2600 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2) && strncmp (EXIT_PATH (tmp), "/random/", 8)) 2391 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2))
2601 new_draw_info (NDI_NAVY, 0, op, tmp->msg); 2392 new_draw_info (NDI_NAVY, 0, op, tmp->msg);
2393
2602 enter_exit (op, tmp); 2394 op->enter_exit (tmp);
2603 } 2395 }
2396
2604 return 1; 2397 return 1;
2605 2398
2606 case SIGN: 2399 case SIGN:
2607 apply_sign (op, tmp, 0); 2400 apply_sign (op, tmp, 0);
2608 return 1; 2401 return 1;
… …
2612 { 2405 {
2613 apply_book (op, tmp); 2406 apply_book (op, tmp);
2614 return 1; 2407 return 1;
2615 } 2408 }
2616 else 2409 else
2617 {
2618 return 0; 2410 return 0;
2619 }
2620 2411
2621 case SKILLSCROLL: 2412 case SKILLSCROLL:
2622 if (op->type == PLAYER) 2413 if (op->type == PLAYER)
2623 { 2414 {
2624 apply_skillscroll (op, tmp); 2415 apply_skillscroll (op, tmp);
2625 return 1; 2416 return 1;
2626 } 2417 }
2418 else
2627 return 0; 2419 return 0;
2628 2420
2629 case SPELLBOOK: 2421 case SPELLBOOK:
2630 if (op->type == PLAYER) 2422 if (op->type == PLAYER)
2631 { 2423 {
2632 apply_spellbook (op, tmp); 2424 apply_spellbook (op, tmp);
2633 return 1; 2425 return 1;
2634 } 2426 }
2427 else
2635 return 0; 2428 return 0;
2636 2429
2637 case SCROLL: 2430 case SCROLL:
2638 apply_scroll (op, tmp, 0); 2431 apply_scroll (op, tmp, 0);
2639 return 1; 2432 return 1;
2640 2433
2641 case POTION: 2434 case POTION:
2642 (void) apply_potion (op, tmp); 2435 apply_potion (op, tmp);
2643 return 1; 2436 return 1;
2644 2437
2645 /* Eneq(@csd.uu.se): Handle apply on containers. */ 2438 /* Eneq(@csd.uu.se): Handle apply on containers. */
2439 //TODO: remove, as it is unsed?
2646 case CLOSE_CON: 2440 case CLOSE_CON:
2647 if (op->type == PLAYER)
2648 (void) esrv_apply_container (op, tmp->env);
2649 else
2650 (void) apply_container (op, tmp->env); 2441 apply_container (op, tmp->env);
2651 return 1; 2442 return 1;
2652 2443
2653 case CONTAINER: 2444 case CONTAINER:
2654 if (op->type == PLAYER)
2655 (void) esrv_apply_container (op, tmp);
2656 else
2657 (void) apply_container (op, tmp); 2445 apply_container (op, tmp);
2658 return 1; 2446 return 1;
2659 2447
2660 case TREASURE: 2448 case TREASURE:
2661 if (op->type == PLAYER) 2449 if (op->type == PLAYER)
2662 { 2450 {
2663 apply_treasure (op, tmp); 2451 apply_treasure (op, tmp);
2664 return 1; 2452 return 1;
2665 } 2453 }
2666 else 2454 else
2667 {
2668 return 0; 2455 return 0;
2669 }
2670 2456
2671 case WEAPON: 2457 case WEAPON:
2672 case ARMOUR: 2458 case ARMOUR:
2673 case BOOTS: 2459 case BOOTS:
2674 case GLOVES: 2460 case GLOVES:
… …
2687 case LAMP: 2473 case LAMP:
2688 case BUILDER: 2474 case BUILDER:
2689 case SKILL_TOOL: 2475 case SKILL_TOOL:
2690 if (tmp->env != op) 2476 if (tmp->env != op)
2691 return 2; /* not in inventory */ 2477 return 2; /* not in inventory */
2478
2692 (void) apply_special (op, tmp, aflag); 2479 apply_special (op, tmp, aflag);
2693 return 1; 2480 return 1;
2694 2481
2695 case DRINK: 2482 case DRINK:
2696 case FOOD: 2483 case FOOD:
2697 case FLESH: 2484 case FLESH:
… …
2701 case POISON: 2488 case POISON:
2702 apply_poison (op, tmp); 2489 apply_poison (op, tmp);
2703 return 1; 2490 return 1;
2704 2491
2705 case SAVEBED: 2492 case SAVEBED:
2706 if (op->type == PLAYER)
2707 {
2708 apply_savebed (op);
2709 return 1; 2493 return 1;
2710 }
2711 else
2712 {
2713 return 0;
2714 }
2715 2494
2716 case ARMOUR_IMPROVER: 2495 case ARMOUR_IMPROVER:
2717 if (op->type == PLAYER) 2496 if (op->type == PLAYER)
2718 { 2497 {
2719 apply_armour_improver (op, tmp); 2498 apply_armour_improver (op, tmp);
2720 return 1; 2499 return 1;
2721 } 2500 }
2722 else 2501 else
2723 {
2724 return 0; 2502 return 0;
2725 }
2726 2503
2727 case WEAPON_IMPROVER: 2504 case WEAPON_IMPROVER:
2728 (void) check_improve_weapon (op, tmp); 2505 check_improve_weapon (op, tmp);
2729 return 1; 2506 return 1;
2730 2507
2731 case CLOCK: 2508 case CLOCK:
2732 if (op->type == PLAYER) 2509 if (op->type == PLAYER)
2733 { 2510 {
… …
2741 play_sound_player_only (op->contr, SOUND_CLOCK, 0, 0); 2518 play_sound_player_only (op->contr, SOUND_CLOCK, 0, 0);
2742 new_draw_info (NDI_UNIQUE, 0, op, buf); 2519 new_draw_info (NDI_UNIQUE, 0, op, buf);
2743 return 1; 2520 return 1;
2744 } 2521 }
2745 else 2522 else
2746 {
2747 return 0; 2523 return 0;
2748 }
2749 2524
2750 case MENU: 2525 case MENU:
2751 if (op->type == PLAYER) 2526 if (op->type == PLAYER)
2752 { 2527 {
2753 shop_listing (op); 2528 shop_listing (tmp, op);
2754 return 1; 2529 return 1;
2755 } 2530 }
2756 else 2531 else
2757 {
2758 return 0; 2532 return 0;
2759 }
2760 2533
2761 case POWER_CRYSTAL: 2534 case POWER_CRYSTAL:
2762 apply_power_crystal (op, tmp); /* see egoitem.c */ 2535 apply_power_crystal (op, tmp); /* see egoitem.c */
2763 return 1; 2536 return 1;
2764 2537
… …
2767 { 2540 {
2768 apply_lighter (op, tmp); 2541 apply_lighter (op, tmp);
2769 return 1; 2542 return 1;
2770 } 2543 }
2771 else 2544 else
2772 {
2773 return 0; 2545 return 0;
2774 }
2775 2546
2776 case ITEM_TRANSFORMER: 2547 case ITEM_TRANSFORMER:
2777 apply_item_transformer (op, tmp); 2548 apply_item_transformer (op, tmp);
2778 return 1; 2549 return 1;
2779 2550
… …
2792int 2563int
2793player_apply (object *pl, object *op, int aflag, int quiet) 2564player_apply (object *pl, object *op, int aflag, int quiet)
2794{ 2565{
2795 int tmp; 2566 int tmp;
2796 2567
2797 if (op->env == NULL && (pl->move_type & MOVE_FLYING)) 2568 if (op->env && (pl->move_type & MOVE_FLYING))
2798 { 2569 {
2799 /* player is flying and applying object not in inventory */ 2570 /* player is flying and applying object not in inventory */
2800 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING)) 2571 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
2801 { 2572 {
2802 new_draw_info (NDI_UNIQUE, 0, pl, "But you are floating high " "above the ground!"); 2573 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.>");
2803 return 0; 2574 return 0;
2804 } 2575 }
2805 }
2806
2807 /* Check for PLAYER to avoid a DM to disappear in a puff of smoke if
2808 * applied.
2809 */
2810 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_WAS_WIZ) && !QUERY_FLAG (pl, FLAG_WAS_WIZ))
2811 {
2812 play_sound_map (pl->map, pl->x, pl->y, SOUND_OB_EVAPORATE);
2813 new_draw_info (NDI_UNIQUE, 0, pl, "The object disappears in a puff " "of smoke!");
2814 new_draw_info (NDI_UNIQUE, 0, pl, "It must have been an illusion.");
2815 op->destroy ();
2816 return 1;
2817 } 2576 }
2818 2577
2819 pl->contr->last_used = op; 2578 pl->contr->last_used = op;
2820 2579
2821 tmp = manual_apply (pl, op, aflag); 2580 tmp = manual_apply (pl, op, aflag);
… …
2824 if (tmp == 0) 2583 if (tmp == 0)
2825 new_draw_info_format (NDI_UNIQUE, 0, pl, "I don't know how to apply the %s.", query_name (op)); 2584 new_draw_info_format (NDI_UNIQUE, 0, pl, "I don't know how to apply the %s.", query_name (op));
2826 else if (tmp == 2) 2585 else if (tmp == 2)
2827 new_draw_info_format (NDI_UNIQUE, 0, pl, "You must get it first!\n"); 2586 new_draw_info_format (NDI_UNIQUE, 0, pl, "You must get it first!\n");
2828 } 2587 }
2588
2829 return tmp; 2589 return tmp;
2830} 2590}
2831 2591
2832/** 2592/**
2833 * player_apply_below attempts to apply the object 'below' the player. 2593 * player_apply_below attempts to apply the object 'below' the player.
2834 * If the player has an open container, we use that for below, otherwise 2594 * If the player has an open container, we use that for below, otherwise
2835 * we use the ground. 2595 * we use the ground.
2836 */ 2596 */
2837
2838void 2597void
2839player_apply_below (object *pl) 2598player_apply_below (object *pl)
2840{ 2599{
2841 object *tmp, *next;
2842 int floors; 2600 int floors = 0;
2843 2601
2844 /* If using a container, set the starting item to be the top 2602 /* If using a container, set the starting item to be the top
2845 * item in the container. Otherwise, use the map. 2603 * item in the container. Otherwise, use the map.
2846 */
2847 tmp = (pl->container != NULL) ? pl->container->inv : pl->below;
2848
2849 /* This is perhaps more complicated. However, I want to make sure that 2604 * This is perhaps more complicated. However, I want to make sure that
2850 * we don't use a corrupt pointer for the next object, so we get the 2605 * we don't use a corrupt pointer for the next object, so we get the
2851 * next object in the stack before applying. This is can only be a 2606 * next object in the stack before applying. This is can only be a
2852 * problem if player_apply() has a bug in that it uses the object but does 2607 * problem if player_apply() has a bug in that it uses the object but does
2853 * not return a proper value. 2608 * not return a proper value.
2854 */ 2609 */
2855 for (floors = 0; tmp != NULL; tmp = next) 2610 for (object *next, *tmp = pl->container ? pl->container->inv : pl->below; tmp; tmp = next)
2856 { 2611 {
2857 next = tmp->below; 2612 next = tmp->below;
2613
2858 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 2614 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
2859 floors++; 2615 floors++;
2860 else if (floors > 0) 2616 else if (floors > 0)
2861 return; /* process only floor objects after first floor object */ 2617 return; /* process only floor objects after first floor object */
2862 2618
… …
2882 * to keep the size of apply_special to a more managable size. 2638 * to keep the size of apply_special to a more managable size.
2883 */ 2639 */
2884static int 2640static int
2885unapply_special (object *who, object *op, int aflags) 2641unapply_special (object *who, object *op, int aflags)
2886{ 2642{
2887 if (INVOKE_OBJECT (BE_UNREADY, op, ARG_OBJECT (who), ARG_INT (aflags)) || INVOKE_OBJECT (UNREADY, who, ARG_OBJECT (op), ARG_INT (aflags))) 2643 if (INVOKE_OBJECT (BE_UNREADY, op, ARG_OBJECT (who), ARG_INT (aflags))
2644 || INVOKE_OBJECT (UNREADY, who, ARG_OBJECT (op), ARG_INT (aflags)))
2888 return RESULT_INT (0); 2645 return RESULT_INT (0);
2889 2646
2890 object *tmp2;
2891
2892 CLEAR_FLAG (op, FLAG_APPLIED); 2647 CLEAR_FLAG (op, FLAG_APPLIED);
2648
2893 switch (op->type) 2649 switch (op->type)
2894 { 2650 {
2651 case SKILL_TOOL:
2652 // unapplying a skill tool should also unapply the skill it governs
2653 // but this is hard, as it shouldn't do so when the skill can
2654 // be used for other reasons
2655 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2656 if (tmp->skill == op->skill
2657 && tmp->type == SKILL
2658 && tmp->flag [FLAG_APPLIED]
2659 && !tmp->flag [FLAG_CAN_USE_SKILL])
2660 unapply_special (who, tmp, 0);
2661
2662 change_abil (who, op);
2663 break;
2664
2895 case WEAPON: 2665 case WEAPON:
2666 if (player *pl = who->contr)
2667 if (op == pl->combat_ob)
2668 {
2669 pl->combat_ob = 0;
2670 who->change_weapon (pl->ranged_ob);
2671 }
2672
2896 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op)); 2673 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op));
2897 2674
2898 (void) change_abil (who, op); 2675 change_abil (who, op);
2899 if (QUERY_FLAG (who, FLAG_READY_WEAPON))
2900 CLEAR_FLAG (who, FLAG_READY_WEAPON); 2676 CLEAR_FLAG (who, FLAG_READY_WEAPON);
2901 clear_skill (who);
2902 break; 2677 break;
2903 2678
2904 case SKILL: /* allows objects to impart skills */
2905 case SKILL_TOOL: 2679 case SKILL:
2906 if (op != who->chosen_skill) 2680 if (who->contr)
2907 {
2908 LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n");
2909 } 2681 {
2910 if (who->type == PLAYER)
2911 {
2912 if (who->contr->shoottype == range_skill)
2913 who->contr->shoottype = range_none;
2914 if (!op->invisible) 2682 if (!op->invisible)
2915 {
2916 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op)); 2683 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op));
2917 }
2918 else 2684 else
2919 {
2920 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill); 2685 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill);
2921 } 2686 }
2922 } 2687
2923 (void) change_abil (who, op); 2688 change_abil (who, op);
2924 who->chosen_skill = NULL;
2925 CLEAR_FLAG (who, FLAG_READY_SKILL); 2689 CLEAR_FLAG (who, FLAG_READY_SKILL);
2926 break; 2690 break;
2927 2691
2928 case ARMOUR: 2692 case ARMOUR:
2929 case HELMET: 2693 case HELMET:
… …
2934 case AMULET: 2698 case AMULET:
2935 case GIRDLE: 2699 case GIRDLE:
2936 case BRACERS: 2700 case BRACERS:
2937 case CLOAK: 2701 case CLOAK:
2938 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op)); 2702 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op));
2939 (void) change_abil (who, op); 2703 change_abil (who, op);
2940 break; 2704 break;
2705
2941 case LAMP: 2706 case LAMP:
2707 {
2942 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name); 2708 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name);
2709
2943 tmp2 = arch_to_object (op->other_arch); 2710 object *tmp2 = arch_to_object (op->other_arch);
2944 tmp2->x = op->x; 2711 tmp2->x = op->x;
2945 tmp2->y = op->y; 2712 tmp2->y = op->y;
2946 tmp2->map = op->map; 2713 tmp2->map = op->map;
2947 tmp2->below = op->below; 2714 tmp2->below = op->below;
2948 tmp2->above = op->above; 2715 tmp2->above = op->above;
2949 tmp2->stats.food = op->stats.food; 2716 tmp2->stats.food = op->stats.food;
2950 CLEAR_FLAG (tmp2, FLAG_APPLIED); 2717 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2951 2718
2952 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 2719 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2953 SET_FLAG (tmp2, FLAG_INV_LOCKED); 2720 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2954 2721
2955 if (who->type == PLAYER) 2722 if (who->contr)
2956 esrv_del_item (who->contr, op->count); 2723 esrv_del_item (who->contr, op->count);
2957 2724
2958 op->destroy (); 2725 op->destroy ();
2959 insert_ob_in_ob (tmp2, who); 2726 insert_ob_in_ob (tmp2, who);
2960 fix_player (who); 2727 who->update_stats ();
2728
2961 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 2729 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2962 { 2730 {
2963 if (who->type == PLAYER) 2731 if (who->contr)
2964 { 2732 {
2965 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 2733 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
2966 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 2734 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2967 } 2735 }
2968 } 2736 }
2969 if (who->type == PLAYER) 2737
2738 if (who->contr)
2970 esrv_send_item (who, tmp2); 2739 esrv_send_item (who, tmp2);
2740 }
2741
2971 return 1; /* otherwise, an attempt to drop causes problems */ 2742 return 1; /* otherwise, an attempt to drop causes problems */
2972 break; 2743
2973 case BOW: 2744 case BOW:
2974 case WAND: 2745 case WAND:
2975 case ROD: 2746 case ROD:
2976 case HORN: 2747 case HORN:
2977 clear_skill (who); 2748 if (player *pl = who->contr)
2749 {
2750 if (op == pl->ranged_ob)
2751 {
2752 pl->ranged_ob = 0;
2753 who->change_weapon (pl->combat_ob);
2754 }
2755
2978 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2756 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2979 if (who->type == PLAYER)
2980 {
2981 who->contr->shoottype = range_none;
2982 } 2757 }
2983 else 2758 else
2984 { 2759 {
2760 who->change_skill (0);
2761
2985 if (op->type == BOW) 2762 if (op->type == BOW)
2986 CLEAR_FLAG (who, FLAG_READY_BOW); 2763 CLEAR_FLAG (who, FLAG_READY_BOW);
2987 else 2764 else
2988 CLEAR_FLAG (who, FLAG_READY_RANGE); 2765 CLEAR_FLAG (who, FLAG_READY_RANGE);
2989 } 2766 }
2767
2990 break; 2768 break;
2991 2769
2992 case BUILDER: 2770 case BUILDER:
2771 if (who->contr)
2993 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2772 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2994 who->contr->shoottype = range_none;
2995 who->contr->ranges[range_builder] = NULL;
2996 break; 2773 break;
2997 2774
2998 default: 2775 default:
2999 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op)); 2776 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op));
3000 break; 2777 break;
3001 } 2778 }
3002 2779
3003 fix_player (who); 2780 who->update_stats ();
3004 2781
3005 if (!(aflags & AP_NO_MERGE)) 2782 if (!(aflags & AP_NO_MERGE))
3006 { 2783 {
3007 object *tmp;
3008
3009 tmp = merge_ob (op, NULL); 2784 object *tmp = merge_ob (op, 0);
3010 if (who->type == PLAYER) 2785
2786 if (who->contr)
3011 { 2787 {
3012 if (tmp) 2788 if (tmp)
3013 { /* it was merged */ 2789 { /* it was merged */
3014 esrv_del_item (who->contr, op->count); 2790 esrv_del_item (who->contr, op->count);
3015 op = tmp; 2791 op = tmp;
3016 } 2792 }
3017 2793
3018 esrv_send_item (who, op); 2794 esrv_send_item (who, op);
3019 } 2795 }
3020 } 2796 }
2797
3021 return 0; 2798 return 0;
3022} 2799}
3023 2800
3024/** 2801/**
3025 * Returns the object that is using location 'loc'. 2802 * Returns the object that is using location 'loc'.
3026 * Note that 'start' is the first object to start examing - we 2803 * Note that 'start' is the first object to start examing - we
3027 * then go through the below of this. In this way, you can do 2804 * then go through the below of this. In this way, you can do
3028 * something like: 2805 * something like:
3029 * tmp = get_item_from_body_location(who->inv, 1); 2806 * tmp = get_next_item_from_body_location(who->inv, 1);
3030 * if (tmp) tmp1 = get_item_from_body_location(tmp->below, 1); 2807 * if (tmp) tmp1 = get_next_item_from_body_location(tmp->below, 1);
3031 * to find the second object that may use this location, etc. 2808 * to find the second object that may use this location, etc.
3032 * Returns NULL if no match is found. 2809 * Returns NULL if no match is found.
3033 * loc is the index into the array we are looking for a match. 2810 * loc is the index into the array we are looking for a match.
3034 * don't return invisible objects unless they are skill objects 2811 * don't return invisible objects unless they are skill objects
3035 * invisible other objects that use 2812 * invisible other objects that use
3036 * up body locations can be used as restrictions. 2813 * up body locations can be used as restrictions.
3037 */ 2814 */
3038object * 2815static object *
3039get_item_from_body_location (object *start, int loc) 2816get_next_item_from_body_location (int loc, object *start)
3040{ 2817{
3041 object *tmp;
3042
3043 if (!start)
3044 return NULL;
3045
3046 for (tmp = start; tmp; tmp = tmp->below) 2818 for (object *tmp = start; tmp; tmp = tmp->below)
3047 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->body_info[loc] && (!tmp->invisible || tmp->type == SKILL)) 2819 if (tmp->flag [FLAG_APPLIED]
2820 && tmp->slot[loc].info
2821 && (!tmp->invisible || tmp->type == SKILL))
3048 return tmp; 2822 return tmp;
3049 2823
3050 return NULL; 2824 return 0;
3051} 2825}
3052
3053
3054 2826
3055/** 2827/**
3056 * 'op' wants to apply an object, but can't because of other equipment. 2828 * 'op' wants to apply an object, but can't because of other equipment.
3057 * This should only be called when it is known 2829 * This should only be called when it is known
3058 * that there are objects to unapply. This makes pretty heavy 2830 * that there are objects to unapply. This makes pretty heavy
… …
3061 * Returns 0 on success, returns 1 if there is some problem. 2833 * Returns 0 on success, returns 1 if there is some problem.
3062 * if aflags is AP_PRINT, we instead print out waht to unapply 2834 * if aflags is AP_PRINT, we instead print out waht to unapply
3063 * instead of doing it. This is a lot less code than having 2835 * instead of doing it. This is a lot less code than having
3064 * another function that does just that. 2836 * another function that does just that.
3065 */ 2837 */
2838
2839#define CANNOT_REMOVE_CURSED \
2840 "H<You cannot remove cursed or damned items, you first have to remove the curse. " \
2841 "Praying over an altar, scrolls of remove curse/damnation, " \
2842 "priests or even other players might help.>"
2843
3066int 2844int
3067unapply_for_ob (object *who, object *op, int aflags) 2845unapply_for_ob (object *who, object *op, int aflags)
3068{ 2846{
3069 int i; 2847 if (op->is_range ())
3070 object *tmp = NULL, *last;
3071
3072 /* If we are applying a shield or weapon, unapply any equipped shield
3073 * or weapons first - only allowed to use one weapon/shield at a time.
3074 */
3075 if (op->type == WEAPON || op->type == SHIELD)
3076 {
3077 for (tmp = who->inv; tmp; tmp = tmp->below) 2848 for (object *tmp = who->inv; tmp; tmp = tmp->below)
3078 {
3079 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type) 2849 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ())
3080 {
3081 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))) 2850 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)))
3082 { 2851 {
3083 if (aflags & AP_PRINT) 2852 if (aflags & AP_PRINT)
3084 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2853 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp));
3085 else 2854 else
3086 unapply_special (who, tmp, aflags); 2855 unapply_special (who, tmp, aflags);
3087 } 2856 }
3088 else 2857 else
3089 { 2858 {
3090 /* In this case, we want to try and remove a cursed item. 2859 /* In this case, we want to try and remove a cursed item.
3091 * While we know it won't work, we want unapply_special to 2860 * While we know it won't work, we want unapply_special to
3092 * at least generate the message. 2861 * at least generate the message.
3093 */ 2862 */
3094 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (tmp)); 2863 new_draw_info_format (NDI_UNIQUE, 0, who,
2864 "No matter how hard you try, you just can't remove the %s." CANNOT_REMOVE_CURSED,
2865 query_name (tmp));
3095 return 1; 2866 return 1;
3096 }
3097
3098 } 2867 }
3099 }
3100 }
3101 2868
3102 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 2869 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
3103 { 2870 {
3104 /* this used up a slot that we need to free */ 2871 /* this used up a slot that we need to free */
3105 if (op->body_info[i]) 2872 if (op->slot[i].info)
3106 { 2873 {
3107 last = who->inv; 2874 object *last = who->inv;
3108 2875
3109 /* We do a while loop - may need to remove several items in order 2876 /* We do a while loop - may need to remove several items in order
3110 * to free up enough slots. 2877 * to free up enough slots.
3111 */ 2878 */
3112 while ((who->body_used[i] + op->body_info[i]) < 0) 2879 while ((who->slot[i].used + op->slot[i].info) < 0)
3113 { 2880 {
3114 tmp = get_item_from_body_location (last, i); 2881 object *tmp = get_next_item_from_body_location (i, last);
2882
3115 if (!tmp) 2883 if (!tmp)
3116 { 2884 {
3117#if 0 2885#if 0
3118 /* Not a bug - we'll get this if the player has cursed items 2886 /* Not a bug - we'll get this if the player has cursed items
3119 * equipped. 2887 * equipped.
3120 */ 2888 */
3121 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name); 2889 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name);
3122#endif 2890#endif
3123 return 1; 2891 return 1;
3124 } 2892 }
2893
3125 /* If we are just printing, we don't care about cursed status */ 2894 /* If we are just printing, we don't care about cursed status */
3126 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))) 2895 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))))
3127 { 2896 {
3128 if (aflags & AP_PRINT) 2897 if (aflags & AP_PRINT)
3129 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2898 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp));
… …
3135 /* Cursed item that we can't unequip - tell the player. 2904 /* Cursed item that we can't unequip - tell the player.
3136 * Note this could be annoying if this is just one of a few, 2905 * Note this could be annoying if this is just one of a few,
3137 * so it may not be critical (eg, putting on a ring and you have 2906 * so it may not be critical (eg, putting on a ring and you have
3138 * one cursed ring.) 2907 * one cursed ring.)
3139 */ 2908 */
3140 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp)); 2909 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off." CANNOT_REMOVE_CURSED, query_name (tmp));
3141 } 2910 }
2911
3142 last = tmp->below; 2912 last = tmp->below;
3143 } 2913 }
3144 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the 2914 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the
3145 * return in the !tmp would have kicked in. 2915 * return in the !tmp would have kicked in.
3146 */ 2916 */
3147 } /* if op is using this body location */ 2917 } /* if op is using this body location */
3148 } /* for body lcoations */ 2918 } /* for body lcoations */
2919
3149 return 0; 2920 return 0;
3150} 2921}
3151 2922
3152/** 2923/**
3153 * Checks to see if 'who' can apply object 'op'. 2924 * Checks to see if 'who' can apply object 'op'.
3154 * Returns 0 if apply can be done without anything special. 2925 * Returns 0 if apply can be done without anything special.
3155 * Otherwise returns a bitmask - potentially several of these may be 2926 * Otherwise returns a bitmask - potentially several of these may be
3156 * set, but largely depends on circumstance - in the future, processing 2927 * set, but largely depends on circumstance - in the future, processing
3157 * may be pruned once we know some status (eg, once CAN_APPLY_NEVER 2928 * may be pruned once we know some status (eg, once CAN_APPLY_NEVER
3158 * is set, do we really are what the other flags may be?) 2929 * is set, do we really care what the other flags may be?)
3159 * 2930 *
3160 * See include/define.h for detailed description of the meaning of 2931 * See include/define.h for detailed description of the meaning of
3161 * these return values. 2932 * these return values.
3162 */ 2933 */
3163int 2934int
3164can_apply_object (object *who, object *op) 2935can_apply_object (object *who, object *op)
3165{ 2936{
3166 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op))) 2937 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op)))
3167 return RESULT_INT (0); 2938 return RESULT_INT (0);
3168 2939
3169 int i, retval = 0; 2940 int retval = 0;
3170 object *tmp = NULL, *ws = NULL; 2941 object *tmp = 0, *ws = 0;
3171 2942
3172 /* Players have 2 'arm's, so they could in theory equip 2 shields or 2943 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
3173 * 2 weapons, but we don't want to let them do that. So if they are
3174 * trying to equip a weapon or shield, see if they already have one
3175 * in place and store that way.
3176 */
3177 if (op->type == WEAPON || op->type == SHIELD)
3178 { 2944 {
3179 for (tmp = who->inv; tmp && !ws; tmp = tmp->below) 2945 if (op->slot[i].info)
3180 { 2946 {
3181 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type) 2947 /* Item uses more slots than we have */
2948 if (who->slot[i].info + op->slot [i].info < 0)
3182 { 2949 {
3183 retval = CAN_APPLY_UNAPPLY;
3184 ws = tmp;
3185 }
3186 }
3187 }
3188
3189
3190 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
3191 {
3192 if (op->body_info[i])
3193 {
3194 /* Item uses more slots than we have */
3195 if (FABS (op->body_info[i]) > who->body_info[i])
3196 {
3197 /* Could return now for efficiently - rest of info below isn' 2950 /* Could return now for efficiency - rest of info below isn't
3198 * really needed. 2951 * really needed.
3199 */ 2952 */
3200 retval |= CAN_APPLY_NEVER; 2953 retval |= CAN_APPLY_NEVER;
3201 } 2954 }
3202 else if ((who->body_used[i] + op->body_info[i]) < 0) 2955 else if (who->slot[i].used + op->slot[i].info < 0)
3203 { 2956 {
3204 /* in this case, equipping this would use more free spots than 2957 /* in this case, equipping this would use more free spots than
3205 * we have. 2958 * we have.
3206 */ 2959 */
3207 object *tmp1;
3208
3209 2960
3210 /* if we have an applied weapon/shield, and unapply it would free 2961 /* if we have an applied weapon/shield, and unapply it would free
3211 * enough slots to equip the new item, then just set this can 2962 * enough slots to equip the new item, then just set "can
3212 * continue. We don't care about the logic below - if you have 2963 * apply unapply". We don't care about the logic below - if you have a
3213 * shield equipped and try to equip another shield, there is only 2964 * shield equipped and try to equip another shield, there is only
3214 * one choice. However, the check for the number of body locations 2965 * one choice. However, the check for the number of body locations
3215 * does take into the account cases where what is being applied 2966 * does take into the account cases where what is being applied
3216 * may be two handed for example. 2967 * may be two handed for example.
3217 */ 2968 */
3218 if (ws) 2969 if (ws)
3219 { 2970 if ((who->slot[i].used - ws->slot[i].info + op->slot[i].info) >= 0)
3220 if ((who->body_used[i] - ws->body_info[i] + op->body_info[i]) >= 0)
3221 { 2971 {
3222 retval |= CAN_APPLY_UNAPPLY; 2972 retval |= CAN_APPLY_UNAPPLY;
3223 continue; 2973 continue;
3224 } 2974 }
3225 }
3226 2975
3227 tmp1 = get_item_from_body_location (who->inv, i); 2976 object *tmp1 = get_next_item_from_body_location (i, who->inv);
3228 if (!tmp1) 2977 if (!tmp1)
3229 { 2978 {
3230#if 0 2979#if 0
3231 /* This is sort of an error, but happens a lot when old players 2980 /* This is sort of an error, but happens a lot when old players
3232 * join in with more stuff equipped than they are now allowed. 2981 * join in with more stuff equipped than they are now allowed.
… …
3240 /* need to unapply something. However, if this something 2989 /* need to unapply something. However, if this something
3241 * is different than we had found before, it means they need 2990 * is different than we had found before, it means they need
3242 * to apply multiple objects 2991 * to apply multiple objects
3243 */ 2992 */
3244 retval |= CAN_APPLY_UNAPPLY; 2993 retval |= CAN_APPLY_UNAPPLY;
2994
3245 if (!tmp) 2995 if (!tmp)
3246 tmp = tmp1; 2996 tmp = tmp1;
3247 else if (tmp != tmp1) 2997 else if (tmp != tmp1)
3248 {
3249 retval |= CAN_APPLY_UNAPPLY_MULT; 2998 retval |= CAN_APPLY_UNAPPLY_MULT;
3250 } 2999
3251 /* This object isn't using up all the slots, so there must 3000 /* This object isn't using up all the slots, so there must
3252 * be another. If so, and it the new item doesn't need all 3001 * be another. If so, and it the new item doesn't need all
3253 * the slots, the player then has a choice. 3002 * the slots, the player then has a choice.
3254 */ 3003 */
3255 if (((who->body_used[i] - tmp1->body_info[i]) != who->body_info[i]) && (FABS (op->body_info[i]) < who->body_info[i])) 3004 if ((who->slot[i].used - tmp1->slot[i].info != who->slot[i].info)
3005 && abs (op->slot[i].info) < who->slot[i].info)
3256 retval |= CAN_APPLY_UNAPPLY_CHOICE; 3006 retval |= CAN_APPLY_UNAPPLY_CHOICE;
3257 3007
3258 /* Does unequippint 'tmp1' free up enough slots for this to be 3008 /* Does unequippint 'tmp1' free up enough slots for this to be
3259 * equipped? If not, there must be something else to unapply. 3009 * equipped? If not, there must be something else to unapply.
3260 */ 3010 */
3261 if ((who->body_used[i] + op->body_info[i] - tmp1->body_info[i]) < 0) 3011 if (who->slot[i].used + op->slot[i].info < tmp1->slot[i].info)
3262 retval |= CAN_APPLY_UNAPPLY_MULT; 3012 retval |= CAN_APPLY_UNAPPLY_MULT;
3263
3264 } 3013 }
3265 } /* if not enough free slots */ 3014 } /* if not enough free slots */
3266 } /* if this object uses location i */ 3015 } /* if this object uses location i */
3267 } /* for i -> num_body_locations loop */ 3016 } /* for i -> num_body_locations loop */
3268 3017
… …
3273 * and weapons all use the same slot. Similar for horn/rod/wand - they 3022 * and weapons all use the same slot. Similar for horn/rod/wand - they
3274 * all use the same location. 3023 * all use the same location.
3275 */ 3024 */
3276 if (op->type == WEAPON && !QUERY_FLAG (who, FLAG_USE_WEAPON)) 3025 if (op->type == WEAPON && !QUERY_FLAG (who, FLAG_USE_WEAPON))
3277 retval |= CAN_APPLY_RESTRICTION; 3026 retval |= CAN_APPLY_RESTRICTION;
3027
3278 if (op->type == SHIELD && !QUERY_FLAG (who, FLAG_USE_SHIELD)) 3028 if (op->type == SHIELD && !QUERY_FLAG (who, FLAG_USE_SHIELD))
3279 retval |= CAN_APPLY_RESTRICTION; 3029 retval |= CAN_APPLY_RESTRICTION;
3280 3030
3281
3282 if (who->type != PLAYER) 3031 if (who->type != PLAYER)
3283 { 3032 {
3284 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE)) 3033 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE))
3285 retval |= CAN_APPLY_RESTRICTION; 3034 retval |= CAN_APPLY_RESTRICTION;
3035
3286 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3036 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3287 retval |= CAN_APPLY_RESTRICTION; 3037 retval |= CAN_APPLY_RESTRICTION;
3038
3288 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING)) 3039 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING))
3289 retval |= CAN_APPLY_RESTRICTION; 3040 retval |= CAN_APPLY_RESTRICTION;
3041
3290 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3042 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3291 retval |= CAN_APPLY_RESTRICTION; 3043 retval |= CAN_APPLY_RESTRICTION;
3292 } 3044 }
3045
3293 return retval; 3046 return retval;
3294} 3047}
3295
3296
3297 3048
3298/** 3049/**
3299 * who is the object using the object. It can be a monster. 3050 * who is the object using the object. It can be a monster.
3300 * op is the object they are using. op is an equipment type item, 3051 * op is the object they are using. op is an equipment type item,
3301 * eg, one which you put on and keep on for a while, and not something 3052 * eg, one which you put on and keep on for a while, and not something
… …
3310 * AP_UNAPPLY=always unapply). 3061 * AP_UNAPPLY=always unapply).
3311 * 3062 *
3312 * Optional flags: 3063 * Optional flags:
3313 * AP_NO_MERGE: don't merge an unapplied object with other objects 3064 * AP_NO_MERGE: don't merge an unapplied object with other objects
3314 * AP_IGNORE_CURSE: unapply cursed items 3065 * AP_IGNORE_CURSE: unapply cursed items
3066 * AP_NO_READY: do not ready skills when applying skill tools
3315 * 3067 *
3316 * Usage example: apply_special (who, op, AP_UNAPPLY | AP_IGNORE_CURSE) 3068 * Usage example: apply_special (who, op, AP_UNAPPLY | AP_IGNORE_CURSE)
3317 * 3069 *
3318 * apply_special() doesn't check for unpaid items. 3070 * apply_special() doesn't check for unpaid items.
3319 */ 3071 */
3072
3073#define LACK_ITEM_POWER \
3074 " H<You lack enough unused item power to use this weapon, see the skills command.>"
3075
3320int 3076int
3321apply_special (object *who, object *op, int aflags) 3077apply_special (object *who, object *op, int aflags)
3322{ 3078{
3323 int basic_flag = aflags & AP_BASIC_FLAGS; 3079 int basic_flag = aflags & AP_BASIC_FLAGS;
3324 object *tmp, *tmp2, *skop = NULL; 3080 object *tmp, *tmp2, *skop = NULL;
3325 int i;
3326 3081
3327 if (who == NULL) 3082 if (who == NULL)
3328 { 3083 {
3329 LOG (llevError, "apply_special() from object without environment.\n"); 3084 LOG (llevError, "apply_special() from object without environment.\n");
3330 return 1; 3085 return 1;
… …
3340 if (basic_flag == AP_APPLY) 3095 if (basic_flag == AP_APPLY)
3341 return 0; 3096 return 0;
3342 3097
3343 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 3098 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
3344 { 3099 {
3345 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (op)); 3100 new_draw_info_format (NDI_UNIQUE, 0, who,
3101 "No matter how hard you try, you just can't remove %s." CANNOT_REMOVE_CURSED,
3102 query_name (op));
3346 return 1; 3103 return 1;
3347 } 3104 }
3105
3348 return unapply_special (who, op, aflags); 3106 return unapply_special (who, op, aflags);
3349 } 3107 }
3350 3108
3351 if (basic_flag == AP_UNAPPLY) 3109 if (basic_flag == AP_UNAPPLY)
3352 return 0; 3110 return 0;
3353 3111
3354 i = can_apply_object (who, op); 3112 // if the item is combat/ranged, wield the relevant slot first
3113 // to resolve conflicts.
3114 if (player *pl = who->contr)
3115 switch (op->slottype ())
3116 {
3117 case slot_combat: who->change_weapon (pl->combat_ob); break;
3118 case slot_ranged: who->change_weapon (pl->ranged_ob); break;
3119 }
3120
3121 splay (op);
3355 3122
3356 /* Can't just apply this object. Lets see what not and what to do */ 3123 /* Can't just apply this object. Lets see what not and what to do */
3357 if (i) 3124 if (int i = can_apply_object (who, op))
3358 { 3125 {
3359 if (i & CAN_APPLY_NEVER) 3126 if (i & CAN_APPLY_NEVER)
3360 { 3127 {
3361 new_draw_info_format (NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name (op)); 3128 new_draw_info_format (NDI_UNIQUE, 0, who,
3129 "You don't have the body to use a %s. H<You can never apply this item.>",
3130 query_name (op));
3362 return 1; 3131 return 1;
3363 } 3132 }
3364 else if (i & CAN_APPLY_RESTRICTION) 3133 else if (i & CAN_APPLY_RESTRICTION)
3365 { 3134 {
3366 new_draw_info_format (NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name (op)); 3135 new_draw_info_format (NDI_UNIQUE, 0, who,
3136 "You have a prohibition against using a %s. "
3137 "H<Your belief, profession or class prevents you from applying this item.>",
3138 query_name (op));
3367 return 1; 3139 return 1;
3368 } 3140 }
3141
3369 if (who->type != PLAYER) 3142 if (who->type != PLAYER)
3370 { 3143 {
3371 /* Some error, so don't try to equip something more */ 3144 /* Some error, so don't try to equip something more */
3372 if (unapply_for_ob (who, op, aflags)) 3145 if (unapply_for_ob (who, op, aflags))
3373 return 1; 3146 return 1;
3374 } 3147 }
3375 else 3148 else
3376 { 3149 {
3377 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice)) 3150 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice))
3378 { 3151 {
3379 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some item(s):"); 3152 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some of the following item(s) or change your applymode:");
3380 unapply_for_ob (who, op, AP_PRINT); 3153 unapply_for_ob (who, op, AP_PRINT);
3381 return 1; 3154 return 1;
3382 } 3155 }
3383 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE)) 3156 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE))
3384 {
3385 i = unapply_for_ob (who, op, aflags); 3157 if (unapply_for_ob (who, op, aflags))
3386 if (i)
3387 return 1; 3158 return 1;
3388 } 3159 }
3389 }
3390 } 3160 }
3161
3391 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL) 3162 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL)
3392 { 3163 {
3393 skop = find_skill_by_name (who, op->skill); 3164 skop = find_skill_by_name (who, op->skill);
3165
3394 if (!skop) 3166 if (!skop)
3395 { 3167 {
3396 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill); 3168 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill);
3397 return 1; 3169 return 1;
3398 } 3170 }
3399 else 3171 else
3400 {
3401 /* While experience will be credited properly, we want to change the 3172 /* While experience will be credited properly, we want to change the
3402 * skill so that the dam and wc get updated 3173 * skill so that the dam and wc get updated
3403 */ 3174 */
3404 change_skill (who, skop, 0); 3175 who->change_skill (skop);
3405 }
3406 }
3407
3408 if (who->type == PLAYER && op->item_power && (op->item_power + who->contr->item_power) > (settings.item_power_factor * who->level))
3409 { 3176 }
3410 new_draw_info (NDI_UNIQUE, 0, who, "Equipping that combined with other items would consume your soul!"); 3177
3178 if (who->type == PLAYER
3179 && op->item_power
3180 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level)
3181 {
3182 new_draw_info (NDI_UNIQUE, 0, who,
3183 "Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER);
3411 return 1; 3184 return 1;
3412 } 3185 }
3413
3414 3186
3415 /* Ok. We are now at the state where we can apply the new object. 3187 /* Ok. We are now at the state where we can apply the new object.
3416 * Note that we don't have the checks for can_use_... 3188 * Note that we don't have the checks for can_use_...
3417 * below - that is already taken care of by can_apply_object. 3189 * below - that is already taken care of by can_apply_object.
3418 */ 3190 */
3419
3420
3421 if (op->nrof > 1) 3191 if (op->nrof > 1)
3422 tmp = get_split_ob (op, op->nrof - 1); 3192 tmp = get_split_ob (op, op->nrof - 1);
3423 else 3193 else
3424 tmp = NULL; 3194 tmp = 0;
3425 3195
3426 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op))) 3196 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
3427 return RESULT_INT (0); 3197 return RESULT_INT (0);
3428 3198
3429 switch (op->type) 3199 switch (op->type)
3430 { 3200 {
3431 case WEAPON: 3201 case WEAPON:
3432 if (!check_weapon_power (who, op->last_eat)) 3202 if (!check_weapon_power (who, op->last_eat))
3433 { 3203 {
3434 new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use."); 3204 new_draw_info (NDI_UNIQUE, 0, who, "This weapon is too powerful for you to use. "
3435 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3205 "It would consume your soul!." LACK_ITEM_POWER);
3206
3436 if (tmp != NULL) 3207 if (tmp)
3437 (void) insert_ob_in_ob (tmp, who); 3208 insert_ob_in_ob (tmp, who);
3209
3438 return 1; 3210 return 1;
3439 } 3211 }
3212
3213 //TODO: this obviously fails for players using a shorter prefix
3214 // i.e. "R" can use Ragnarok's sword.
3440 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3215 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3441 { 3216 {
3442 /* if the weapon does not have the name as the character, can't use it. */ 3217 /* if the weapon does not have the name as the character, can't use it. */
3443 /* (Ragnarok's sword attempted to be used by Foo: won't work) */ 3218 /* (Ragnarok's sword attempted to be used by Foo: won't work) */
3444 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3219 new_draw_info (NDI_UNIQUE, 0, who,
3220 "The weapon does not recognize you as its owner. "
3221 "H<Its name indicates that it belongs to somebody else.>");
3222
3445 if (tmp != NULL) 3223 if (tmp)
3446 (void) insert_ob_in_ob (tmp, who); 3224 insert_ob_in_ob (tmp, who);
3225
3447 return 1; 3226 return 1;
3448 } 3227 }
3228
3229 if (!skop)
3230 {
3231 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO
3232 return 1;
3233 }
3234
3449 SET_FLAG (op, FLAG_APPLIED); 3235 SET_FLAG (op, FLAG_APPLIED);
3450
3451 if (skop)
3452 change_skill (who, skop, 1); 3236 who->change_skill (skop);
3453 if (!QUERY_FLAG (who, FLAG_READY_WEAPON)) 3237
3454 SET_FLAG (who, FLAG_READY_WEAPON); 3238 if (who->contr)
3239 who->change_weapon (who->contr->combat_ob = op);
3455 3240
3456 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op)); 3241 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op));
3457 3242
3243 SET_FLAG (who, FLAG_READY_WEAPON);
3458 (void) change_abil (who, op); 3244 change_abil (who, op);
3459 break; 3245 break;
3460 3246
3461 case ARMOUR: 3247 case ARMOUR:
3462 case HELMET: 3248 case HELMET:
3463 case SHIELD: 3249 case SHIELD:
… …
3468 case CLOAK: 3254 case CLOAK:
3469 case RING: 3255 case RING:
3470 case AMULET: 3256 case AMULET:
3471 SET_FLAG (op, FLAG_APPLIED); 3257 SET_FLAG (op, FLAG_APPLIED);
3472 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op)); 3258 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op));
3473 (void) change_abil (who, op); 3259 change_abil (who, op);
3474 break; 3260 break;
3261
3475 case LAMP: 3262 case LAMP:
3476 if (op->stats.food < 1) 3263 if (op->stats.food < 1)
3477 { 3264 {
3478 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of" " fuel!", &op->name); 3265 new_draw_info_format (NDI_UNIQUE, 0, who,
3266 "Your %s is out of fuel! "
3267 "H<Lamps and similar items need fuel. They cannot be refilled.>", &op->name);
3479 return 1; 3268 return 1;
3480 } 3269 }
3270
3481 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name); 3271 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name);
3482 tmp2 = arch_to_object (op->other_arch); 3272 tmp2 = arch_to_object (op->other_arch);
3483 tmp2->stats.food = op->stats.food; 3273 tmp2->stats.food = op->stats.food;
3484 SET_FLAG (tmp2, FLAG_APPLIED); 3274 SET_FLAG (tmp2, FLAG_APPLIED);
3275
3485 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 3276 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3486 SET_FLAG (tmp2, FLAG_INV_LOCKED); 3277 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3278
3487 insert_ob_in_ob (tmp2, who); 3279 insert_ob_in_ob (tmp2, who);
3488 3280
3489 /* Remove the old lantern */ 3281 /* Remove the old lantern */
3490 if (who->type == PLAYER) 3282 if (who->type == PLAYER)
3491 esrv_del_item (who->contr, op->count); 3283 esrv_del_item (who->contr, op->count);
3492 3284
3493 op->destroy (); 3285 op->destroy ();
3494 3286
3495 /* insert the portion that was split off */ 3287 /* insert the portion that was split off */
3496 if (tmp != NULL) 3288 if (tmp)
3497 { 3289 {
3498 (void) insert_ob_in_ob (tmp, who); 3290 insert_ob_in_ob (tmp, who);
3499 if (who->type == PLAYER) 3291 if (who->type == PLAYER)
3500 esrv_send_item (who, tmp); 3292 esrv_send_item (who, tmp);
3501 } 3293 }
3502 fix_player (who); 3294
3295 who->update_stats ();
3296
3503 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3297 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3504 {
3505 if (who->type == PLAYER) 3298 if (who->type == PLAYER)
3506 { 3299 {
3507 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3300 new_draw_info (NDI_UNIQUE, 0, who,
3301 "Oops, it feels deadly cold! "
3302 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>");
3508 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 3303 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3509 } 3304 }
3510 } 3305
3511 if (who->type == PLAYER) 3306 if (who->type == PLAYER)
3512 esrv_send_item (who, tmp2); 3307 esrv_send_item (who, tmp2);
3308
3513 return 0; 3309 return 0;
3310
3311 case SKILL_TOOL:
3312 // applying a skill tool also readies the skill
3313 SET_FLAG (op, FLAG_APPLIED);
3314
3315 if (!(aflags & AP_NO_READY))
3316 {
3317 skop = find_skill_by_name (who, op->skill);
3318 if (!skop->flag [FLAG_APPLIED])
3319 apply_special (who, skop, AP_APPLY);
3320 }
3514 break; 3321 break;
3515 3322
3516 /* this part is needed for skill-tools */
3517 case SKILL: 3323 case SKILL:
3518 case SKILL_TOOL: 3324 if (player *pl = who->contr)
3519 if (who->chosen_skill)
3520 {
3521 LOG (llevError, "BUG: apply_special(): can't apply two skills\n");
3522 return 1;
3523 } 3325 {
3524 if (who->type == PLAYER) 3326 if (IS_COMBAT_SKILL (op->subtype))
3525 { 3327 {
3526 who->contr->shoottype = range_skill; 3328 if (skill_flags [op->subtype] & SF_NEED_WEAPON)
3527 who->contr->ranges[range_skill] = op; 3329 {
3330 for (object *item = who->inv; item; item = item->below)
3331 if (item->type == WEAPON && item->flag [FLAG_APPLIED])
3332 {
3333 if (item->skill == op->skill)
3334 {
3335 who->change_weapon (pl->combat_ob = item);
3336 goto found_weapon;
3337 }
3338 }
3339
3340 new_draw_info_format (NDI_UNIQUE, 0, who,
3341 "You need to apply a '%s' melee weapon before readying this skill. "
3342 "H<Some skills need an item, in this case a melee weapon, to function.>",
3343 &op->skill);
3344 return 1;
3345
3346 found_weapon:;
3347 }
3348 else
3349 who->change_weapon (pl->combat_ob = op);
3350 }
3351 else if (IS_RANGED_SKILL (op->subtype))
3352 {
3353 if (skill_flags [op->subtype] & SF_NEED_BOW)
3354 {
3355 for (object *item = who->inv; item; item = item->below)
3356 if (item->type == BOW && item->flag [FLAG_APPLIED])
3357 {
3358 //TODO: bows should/must all have skill missile weapon right now
3359 who->change_weapon (pl->ranged_ob = item);
3360 goto found_bow;
3361 }
3362
3363 new_draw_info (NDI_UNIQUE, 0, who,
3364 "You need to apply a missile weapon before readying this skill. "
3365 "H<Some skills need an item, in this case a missile weapon, to function.>");
3366 return 1;
3367
3368 found_bow:;
3369 }
3370 else
3371 who->change_weapon (pl->ranged_ob = op);
3372 }
3373
3528 if (!op->invisible) 3374 if (!op->invisible)
3529 { 3375 {
3530 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3376 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3531 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill); 3377 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill);
3532 } 3378 }
3533 else 3379 else
3534 {
3535 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name); 3380 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name);
3536 } 3381 }
3382 else
3537 } 3383 {
3538 SET_FLAG (op, FLAG_APPLIED); 3384 SET_FLAG (op, FLAG_APPLIED);
3539 (void) change_abil (who, op); 3385 change_abil (who, op);
3540 who->chosen_skill = op; 3386 who->chosen_skill = op;
3541 SET_FLAG (who, FLAG_READY_SKILL); 3387 SET_FLAG (who, FLAG_READY_SKILL);
3388 }
3389
3542 break; 3390 break;
3543 3391
3544 case BOW: 3392 case BOW:
3545 if (!check_weapon_power (who, op->last_eat)) 3393 if (!check_weapon_power (who, op->last_eat))
3546 { 3394 {
3547 new_draw_info (NDI_UNIQUE, 0, who, "That item is too powerful for you to use."); 3395 new_draw_info (NDI_UNIQUE, 0, who,
3548 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3396 "That weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3397
3549 if (tmp != NULL) 3398 if (tmp)
3550 (void) insert_ob_in_ob (tmp, who); 3399 insert_ob_in_ob (tmp, who);
3400
3551 return 1; 3401 return 1;
3552 } 3402 }
3403
3553 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3404 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3554 { 3405 {
3555 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3406 new_draw_info (NDI_UNIQUE, 0, who,
3407 "The weapon does not recognize you as its owner. "
3408 "H<Its name indicates that it belongs to somebody else.>");
3556 if (tmp != NULL) 3409 if (tmp)
3557 (void) insert_ob_in_ob (tmp, who); 3410 insert_ob_in_ob (tmp, who);
3411
3558 return 1; 3412 return 1;
3559 } 3413 }
3414
3560 /*FALLTHROUGH*/ case WAND: 3415 /*FALLTHROUGH*/
3416 case WAND:
3561 case ROD: 3417 case ROD:
3562 case HORN: 3418 case HORN:
3563 /* check for skill, alter player status */ 3419 /* check for skill, alter player status */
3420
3421 if (!skop)
3422 {
3423 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO
3424 return 1;
3425 }
3426
3564 SET_FLAG (op, FLAG_APPLIED); 3427 SET_FLAG (op, FLAG_APPLIED);
3565 if (skop)
3566 change_skill (who, skop, 0); 3428 who->change_skill (skop);
3429
3430 if (who->contr)
3431 {
3432 who->contr->ranged_ob = op;
3433
3567 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3434 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3568 3435
3569 if (who->type == PLAYER)
3570 {
3571 if (op->type == BOW) 3436 if (op->type == BOW)
3572 { 3437 {
3438 who->current_weapon = op;
3573 (void) change_abil (who, op); 3439 change_abil (who, op);
3574 new_draw_info_format (NDI_UNIQUE, 0, who, 3440 new_draw_info_format (NDI_UNIQUE, 0, who,
3575 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)); 3441 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op));
3576 who->contr->shoottype = range_bow;
3577 }
3578 else
3579 {
3580 who->contr->shoottype = range_misc;
3581 } 3442 }
3582 } 3443 }
3583 else 3444 else
3584 { 3445 {
3585 if (op->type == BOW) 3446 if (op->type == BOW)
3586 SET_FLAG (who, FLAG_READY_BOW); 3447 SET_FLAG (who, FLAG_READY_BOW);
3587 else 3448 else
3588 SET_FLAG (who, FLAG_READY_RANGE); 3449 SET_FLAG (who, FLAG_READY_RANGE);
3589 } 3450 }
3451
3590 break; 3452 break;
3591 3453
3592 case BUILDER: 3454 case BUILDER:
3593 if (who->contr->ranges[range_builder]) 3455 if (who->type == PLAYER)
3456 {
3457 //TODO: wtf does this do? shouldn't this be managed automatically (slots?)
3458 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER)
3594 unapply_special (who, who->contr->ranges[range_builder], 0); 3459 unapply_special (who, who->contr->ranged_ob, 0);
3595 who->contr->shoottype = range_builder; 3460
3596 who->contr->ranges[range_builder] = op;
3597 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op)); 3461 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op));
3462
3463 who->contr->ranged_ob = op;
3464 }
3598 break; 3465 break;
3599 3466
3600 default: 3467 default:
3601 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op)); 3468 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op));
3602 } /* end of switch op->type */ 3469 } /* end of switch op->type */
3603 3470
3604 SET_FLAG (op, FLAG_APPLIED); 3471 SET_FLAG (op, FLAG_APPLIED);
3605 3472
3606 if (tmp != NULL) 3473 if (tmp)
3607 tmp = insert_ob_in_ob (tmp, who); 3474 tmp = insert_ob_in_ob (tmp, who);
3608 3475
3609 fix_player (who); 3476 who->update_stats ();
3610 3477
3611 /* We exclude spell casting objects. The fire code will set the 3478 /* We exclude spell casting objects. The fire code will set the
3612 * been applied flag when they are used - until that point, 3479 * been applied flag when they are used - until that point,
3613 * you don't know anything about them. 3480 * you don't know anything about them.
3614 */ 3481 */
3615 if (who->type == PLAYER && op->type != WAND && op->type != HORN && op->type != ROD) 3482 if (who->type == PLAYER && op->type != WAND && op->type != HORN && op->type != ROD)
3616 SET_FLAG (op, FLAG_BEEN_APPLIED); 3483 SET_FLAG (op, FLAG_BEEN_APPLIED);
3617 3484
3618 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3485 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3619 {
3620 if (who->type == PLAYER) 3486 if (who->type == PLAYER)
3621 { 3487 {
3622 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3488 new_draw_info (NDI_UNIQUE, 0, who,
3489 "Oops, it feels deadly cold! "
3490 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>");
3623 SET_FLAG (op, FLAG_KNOWN_CURSED); 3491 SET_FLAG (op, FLAG_KNOWN_CURSED);
3624 } 3492 }
3625 } 3493
3626 if (who->type == PLAYER) 3494 if (who->type == PLAYER)
3627 { 3495 {
3628 /* if multiple objects were applied, update both slots */ 3496 /* if multiple objects were applied, update both slots */
3629 if (tmp) 3497 if (tmp)
3630 esrv_send_item (who, tmp); 3498 esrv_send_item (who, tmp);
3499
3631 esrv_send_item (who, op); 3500 esrv_send_item (who, op);
3632 } 3501 }
3502
3633 return 0; 3503 return 0;
3634} 3504}
3635
3636 3505
3637int 3506int
3638monster_apply_special (object *who, object *op, int aflags) 3507monster_apply_special (object *who, object *op, int aflags)
3639{ 3508{
3640 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED)) 3509 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
3641 return 1; 3510 return 1;
3511
3642 return apply_special (who, op, aflags); 3512 return apply_special (who, op, aflags);
3643} 3513}
3644 3514
3645/** 3515/**
3646 * Map was just loaded, handle op's initialisation. 3516 * Map was just loaded, handle op's initialisation.
… …
3684 3554
3685 case TREASURE: 3555 case TREASURE:
3686 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 3556 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
3687 return 0; 3557 return 0;
3688 3558
3689 while ((op->stats.hp--) > 0) 3559 while (op->stats.hp-- > 0)
3690 create_treasure (op->randomitems, op, op->map ? GT_ENVIRONMENT : 0, 3560 create_treasure (op->randomitems, op, op->map ? GT_ENVIRONMENT : 0,
3691 op->stats.exp ? (int) op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0); 3561 op->stats.exp ? (int) op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0);
3692 3562
3693 /* If we generated an object and put it in this object inventory, 3563 /* If we generated an object and put it in this object inventory,
3694 * move it to the parent object as the current object is about 3564 * move it to the parent object as the current object is about
… …
3711 } 3581 }
3712 return tmp ? 1 : 0; 3582 return tmp ? 1 : 0;
3713} 3583}
3714 3584
3715/** 3585/**
3716 * fix_auto_apply goes through the entire map (only the first time 3586 * fix_auto_apply goes through the entire map every time a map
3717 * when an original map is loaded) and performs special actions for 3587 * is loaded or swapped in and performs special actions for
3718 * certain objects (most initialization of chests and creation of 3588 * certain objects (most initialization of chests and creation of
3719 * treasures and stuff). Calls auto_apply if appropriate. 3589 * treasures and stuff). Calls auto_apply if appropriate.
3720 */ 3590 */
3721void 3591void
3722fix_auto_apply (maptile *m) 3592maptile::fix_auto_apply ()
3723{ 3593{
3724 object *tmp, *above = NULL; 3594 if (!spaces)
3725 int x, y;
3726
3727 if (m == NULL)
3728 return; 3595 return;
3729 3596
3730 for (x = 0; x < MAP_WIDTH (m); x++) 3597 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3731 for (y = 0; y < MAP_HEIGHT (m); y++) 3598 for (object *tmp = ms->bot; tmp; )
3732 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = above)
3733 { 3599 {
3734 above = tmp->above; 3600 object *above = tmp->above;
3735 3601
3736 if (tmp->inv) 3602 if (tmp->inv)
3737 { 3603 {
3738 object *invtmp, *invnext; 3604 object *invtmp, *invnext;
3739 3605
3740 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext) 3606 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext)
3741 { 3607 {
3742 invnext = invtmp->below; 3608 invnext = invtmp->below;
3743 3609
3744 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY)) 3610 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY))
3745 auto_apply (invtmp); 3611 auto_apply (invtmp);
3746 else if (invtmp->type == TREASURE && invtmp->has_random_items ()) 3612 else if (invtmp->type == TREASURE && invtmp->has_random_items ())
3747 { 3613 {
3748 while ((invtmp->stats.hp--) > 0) 3614 while ((invtmp->stats.hp--) > 0)
3749 create_treasure (invtmp->randomitems, invtmp, 0, m->difficulty, 0); 3615 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3750 3616
3751 invtmp->randomitems = NULL; 3617 invtmp->randomitems = NULL;
3752 } 3618 }
3753 else if (invtmp && invtmp->arch 3619 else if (invtmp && invtmp->arch
3754 && invtmp->type != TREASURE && invtmp->type != SPELL && invtmp->type != CLASS && invtmp->has_random_items ()) 3620 && invtmp->type != TREASURE && invtmp->type != SPELL && invtmp->type != CLASS && invtmp->has_random_items ())
3755 { 3621 {
3756 create_treasure (invtmp->randomitems, invtmp, 0, m->difficulty, 0); 3622 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3757 /* Need to clear this so that we never try to create 3623 /* Need to clear this so that we never try to create
3758 * treasure again for this object 3624 * treasure again for this object
3759 */ 3625 */
3760 invtmp->randomitems = NULL; 3626 invtmp->randomitems = NULL;
3761 } 3627 }
3762 } 3628 }
3763 /* This is really temporary - the code at the bottom will 3629 /* This is really temporary - the code at the bottom will
3764 * also set randomitems to null. The problem is there are bunches 3630 * also set randomitems to null. The problem is there are bunches
3765 * of maps/players already out there with items that have spells 3631 * of maps/players already out there with items that have spells
3766 * which haven't had the randomitems set to null yet. 3632 * which haven't had the randomitems set to null yet.
3767 * MSW 2004-05-13 3633 * MSW 2004-05-13
3768 * 3634 *
3769 * And if it's a spellbook, it's better to set randomitems to NULL too, 3635 * And if it's a spellbook, it's better to set randomitems to NULL too,
3770 * else you get two spells in the book ^_- 3636 * else you get two spells in the book ^_-
3771 * Ryo 2004-08-16 3637 * Ryo 2004-08-16
3772 */ 3638 */
3773 if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL 3639 if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL
3774 || tmp->type == HORN || tmp->type == FIREWALL || tmp->type == POTION || tmp->type == ALTAR || tmp->type == SPELLBOOK) 3640 || tmp->type == HORN || tmp->type == FIREWALL || tmp->type == POTION || tmp->type == ALTAR || tmp->type == SPELLBOOK)
3775 tmp->randomitems = NULL;
3776
3777 }
3778
3779 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY))
3780 auto_apply (tmp);
3781 else if ((tmp->type == TREASURE || (tmp->type == CONTAINER)) && tmp->has_random_items ())
3782 {
3783 while ((tmp->stats.hp--) > 0)
3784 create_treasure (tmp->randomitems, tmp, 0, m->difficulty, 0);
3785 tmp->randomitems = NULL; 3641 tmp->randomitems = NULL;
3642
3786 } 3643 }
3644
3645 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY))
3646 auto_apply (tmp);
3647 else if ((tmp->type == TREASURE || (tmp->type == CONTAINER)) && tmp->has_random_items ())
3648 {
3649 while ((tmp->stats.hp--) > 0)
3650 create_treasure (tmp->randomitems, tmp, 0, difficulty, 0);
3651 tmp->randomitems = NULL;
3652 }
3787 else if (tmp->type == TIMED_GATE) 3653 else if (tmp->type == TIMED_GATE)
3788 { 3654 {
3789 object *head = tmp->head != NULL ? tmp->head : tmp; 3655 object *head = tmp->head != NULL ? tmp->head : tmp;
3790 3656
3791 if (QUERY_FLAG (head, FLAG_IS_LINKED)) 3657 if (QUERY_FLAG (head, FLAG_IS_LINKED))
3792 {
3793 tmp->speed = 0; 3658 tmp->set_speed (0);
3794 update_ob_speed (tmp);
3795 }
3796 } 3659 }
3797 /* This function can be called everytime a map is loaded, even when 3660 /* This function can be called everytime a map is loaded, even when
3798 * swapping back in. As such, we don't want to create the treasure 3661 * swapping back in. As such, we don't want to create the treasure
3799 * over and ove again, so after we generate the treasure, blank out 3662 * over and ove again, so after we generate the treasure, blank out
3800 * randomitems so if it is swapped in again, it won't make anything. 3663 * randomitems so if it is swapped in again, it won't make anything.
3801 * This is a problem for the above objects, because they have counters 3664 * This is a problem for the above objects, because they have counters
3802 * which say how many times to make the treasure. 3665 * which say how many times to make the treasure.
3803 */ 3666 */
3804 else if (tmp && tmp->arch && tmp->type != PLAYER 3667 else if (tmp && tmp->arch && tmp->type != PLAYER
3805 && tmp->type != TREASURE && tmp->type != SPELL 3668 && tmp->type != TREASURE && tmp->type != SPELL
3806 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && tmp->has_random_items ()) 3669 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && tmp->has_random_items ())
3807 { 3670 {
3808 create_treasure (tmp->randomitems, tmp, GT_APPLY, m->difficulty, 0); 3671 create_treasure (tmp->randomitems, tmp, GT_APPLY, difficulty, 0);
3809 tmp->randomitems = NULL; 3672 tmp->randomitems = NULL;
3810 } 3673 }
3674
3675 // close all containers
3676 else if (tmp->type == CONTAINER)
3677 tmp->flag [FLAG_APPLIED] = 0;
3678
3679 tmp = above;
3811 } 3680 }
3812 3681
3813 for (x = 0; x < MAP_WIDTH (m); x++) 3682 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3814 for (y = 0; y < MAP_HEIGHT (m); y++) 3683 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
3815 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above)
3816 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL)) 3684 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL))
3817 check_trigger (tmp, tmp->above); 3685 check_trigger (tmp, tmp->above);
3818} 3686}
3819 3687
3820/** 3688/**
3821 * Handles player eating food that temporarily changes status (resistances, stats). 3689 * Handles player eating food that temporarily changes status (resistances, stats).
3822 * This used to call cast_change_attr(), but 3690 * This used to call cast_change_attr(), but
3823 * that doesn't work with the new spell code. Since we know what 3691 * that doesn't work with the new spell code. Since we know what
3824 * the food changes, just grab a force and use that instead. 3692 * the food changes, just grab a force and use that instead.
3825 */ 3693 */
3826
3827void 3694void
3828eat_special_food (object *who, object *food) 3695eat_special_food (object *who, object *food)
3829{ 3696{
3830 object *force; 3697 object *force;
3831 int i, did_one = 0; 3698 int i, did_one = 0;
3832 sint8 k;
3833 3699
3834 force = get_archetype (FORCE_NAME); 3700 force = get_archetype (FORCE_NAME);
3835 3701
3836 for (i = 0; i < NUM_STATS; i++) 3702 for (i = 0; i < NUM_STATS; i++)
3837 { 3703 if (sint8 k = food->stats.stat (i))
3838 k = get_attr_value (&food->stats, i);
3839 if (k)
3840 { 3704 {
3841 set_attr_value (&force->stats, i, k); 3705 force->stats.stat (i) = k;
3842 did_one = 1; 3706 did_one = 1;
3843 } 3707 }
3844 }
3845 3708
3846 /* check if we can protect the eater */ 3709 /* check if we can protect the eater */
3847 for (i = 0; i < NROFATTACKS; i++) 3710 for (i = 0; i < NROFATTACKS; i++)
3848 { 3711 {
3849 if (food->resist[i] > 0) 3712 if (food->resist[i] > 0)
3850 { 3713 {
3851 force->resist[i] = food->resist[i] / 2; 3714 force->resist[i] = food->resist[i] / 2;
3852 did_one = 1; 3715 did_one = 1;
3853 } 3716 }
3854 } 3717 }
3718
3855 if (did_one) 3719 if (did_one)
3856 { 3720 {
3857 force->speed = 0.1; 3721 force->set_speed (0.1);
3858 update_ob_speed (force);
3859 /* bigger morsel of food = longer effect time */ 3722 /* bigger morsel of food = longer effect time */
3860 force->stats.food = food->stats.food / 5; 3723 force->duration = food->stats.food / 5;
3861 SET_FLAG (force, FLAG_IS_USED_UP);
3862 SET_FLAG (force, FLAG_APPLIED); 3724 SET_FLAG (force, FLAG_APPLIED);
3863 change_abil (who, force); 3725 change_abil (who, force);
3864 insert_ob_in_ob (force, who); 3726 insert_ob_in_ob (force, who);
3865 } 3727 }
3866 else 3728 else
… …
3869 /* check for hp, sp change */ 3731 /* check for hp, sp change */
3870 if (food->stats.hp != 0) 3732 if (food->stats.hp != 0)
3871 { 3733 {
3872 if (QUERY_FLAG (food, FLAG_CURSED)) 3734 if (QUERY_FLAG (food, FLAG_CURSED))
3873 { 3735 {
3874 strcpy (who->contr->killer, food->name); 3736 assign (who->contr->killer, food->name);
3875 hit_player (who, food->stats.hp, food, AT_POISON, 1); 3737 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3876 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!"); 3738 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!");
3877 } 3739 }
3878 else 3740 else
3879 { 3741 {
… …
3898 new_draw_info (NDI_UNIQUE, 0, who, "You feel a rush of magical energy!"); 3760 new_draw_info (NDI_UNIQUE, 0, who, "You feel a rush of magical energy!");
3899 who->stats.sp += food->stats.sp; 3761 who->stats.sp += food->stats.sp;
3900 /* place limit on max sp from food? */ 3762 /* place limit on max sp from food? */
3901 } 3763 }
3902 } 3764 }
3903 fix_player (who); 3765 who->update_stats ();
3904} 3766}
3905
3906 3767
3907/** 3768/**
3908 * Designed primarily to light torches/lanterns/etc. 3769 * Designed primarily to light torches/lanterns/etc.
3909 * Also burns up burnable material too. First object in the inventory is 3770 * Also burns up burnable material too. First object in the inventory is
3910 * the selected object to "burn". -b.t. 3771 * the selected object to "burn". -b.t.
3911 */ 3772 */
3912
3913void 3773void
3914apply_lighter (object *who, object *lighter) 3774apply_lighter (object *who, object *lighter)
3915{ 3775{
3916 object *item; 3776 object *item;
3917 int is_player_env = 0; 3777 int is_player_env = 0;
3918 char item_name[MAX_BUF];
3919 3778
3920 item = find_marked_object (who); 3779 item = find_marked_object (who);
3921 if (item) 3780 if (item)
3922 { 3781 {
3923 if (lighter->last_eat && lighter->stats.food) 3782 if (lighter->last_eat && lighter->stats.food)
… …
3941 else if (lighter->last_eat) 3800 else if (lighter->last_eat)
3942 { /* no charges left in lighter */ 3801 { /* no charges left in lighter */
3943 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with a used up %s.", &item->name, &lighter->name); 3802 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with a used up %s.", &item->name, &lighter->name);
3944 return; 3803 return;
3945 } 3804 }
3805
3946 /* Perhaps we should split what we are trying to light on fire? 3806 /* Perhaps we should split what we are trying to light on fire?
3947 * I can't see many times when you would want to light multiple 3807 * I can't see many times when you would want to light multiple
3948 * objects at once. 3808 * objects at once.
3949 */ 3809 */
3950 /* If the item is destroyed, we don't have a valid pointer to the 3810
3951 * name object, so make a copy so the message we print out makes
3952 * some sense.
3953 */
3954 strcpy (item_name, item->name);
3955 if (who == is_player_inv (item)) 3811 if (who == item->in_player ())
3956 is_player_env = 1; 3812 is_player_env = 1;
3957 3813
3958 save_throw_object (item, AT_FIRE, who); 3814 save_throw_object (item, AT_FIRE, who);
3959 /* Change to check count and not freed, since the object pointer 3815
3960 * may have gotten recycled
3961 */
3962 if (item->destroyed ()) 3816 if (item->destroyed ())
3963 { 3817 {
3964 new_draw_info_format (NDI_UNIQUE, 0, who, "You light the %s with the %s.", &item_name, &lighter->name); 3818 new_draw_info_format (NDI_UNIQUE, 0, who, "You light the %s with the %s.", &item->name, &lighter->name);
3965 /* Need to update the player so that the players glow radius 3819 /* Need to update the player so that the players glow radius
3966 * gets changed. 3820 * gets changed.
3967 */ 3821 */
3968 if (is_player_env) 3822 if (is_player_env)
3969 fix_player (who); 3823 who->update_stats ();
3970 } 3824 }
3971 else 3825 else
3972 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with the %s and fail.", &item->name, &lighter->name); 3826 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with the %s and fail.", &item->name, &lighter->name);
3973 } 3827 }
3974 else /* nothing to light */ 3828 else /* nothing to light */
… …
3988 3842
3989 if (failure <= -1 && failure > -15) 3843 if (failure <= -1 && failure > -15)
3990 { /* wonder */ 3844 { /* wonder */
3991 object *tmp; 3845 object *tmp;
3992 3846
3993 new_draw_info (NDI_UNIQUE, 0, op, "Your spell warps!."); 3847 new_draw_info (NDI_UNIQUE, 0, op, "Your spell warps!");
3994 tmp = get_archetype (SPELL_WONDER); 3848 tmp = get_archetype (SPELL_WONDER);
3995 cast_wonder (op, op, 0, tmp); 3849 cast_wonder (op, op, 0, tmp);
3996 tmp->destroy (); 3850 tmp->destroy ();
3997 } 3851 }
3998 else if (failure <= -15 && failure > -35) 3852 else if (failure <= -15 && failure > -35)
… …
4019 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!"); 3873 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!");
4020 blind_player (op, op, power); 3874 blind_player (op, op, power);
4021 } 3875 }
4022 else if (failure <= -80) 3876 else if (failure <= -80)
4023 { /* blast the immediate area */ 3877 { /* blast the immediate area */
4024 object *tmp;
4025
4026 tmp = get_archetype (LOOSE_MANA); 3878 object *tmp = get_archetype (LOOSE_MANA);
4027 cast_magic_storm (op, tmp, power); 3879 cast_magic_storm (op, tmp, power);
4028 new_draw_info (NDI_UNIQUE, 0, op, "You unlease uncontrolled mana!"); 3880 new_draw_info (NDI_UNIQUE, 0, op, "You unleash uncontrolled mana!");
4029 tmp->destroy (); 3881 tmp->destroy ();
4030 } 3882 }
4031 } 3883 }
4032} 3884}
4033 3885
… …
4053 */ 3905 */
4054 int i, j; 3906 int i, j;
4055 3907
4056 for (i = 0; i < NUM_STATS; i++) 3908 for (i = 0; i < NUM_STATS; i++)
4057 { 3909 {
4058 sint8 stat = get_attr_value (stats, i); 3910 int race_bonus = pl->arch->stats.stat (i);
4059 int race_bonus = get_attr_value (&(pl->arch->clone.stats), i); 3911 sint8 stat = stats->stat (i) + ns->stat (i);
4060 3912
4061 stat += get_attr_value (ns, i);
4062 if (stat > 20 + race_bonus) 3913 if (stat > 20 + race_bonus)
4063 { 3914 {
4064 excess_stat++; 3915 excess_stat++;
4065 stat = 20 + race_bonus; 3916 stat = 20 + race_bonus;
4066 } 3917 }
4067 set_attr_value (stats, i, stat); 3918
3919 stats->stat (i) = stat;
4068 } 3920 }
4069 3921
4070 for (j = 0; excess_stat > 0 && j < 100; j++) 3922 for (j = 0; excess_stat > 0 && j < 100; j++)
4071 { /* try 100 times to assign excess stats */ 3923 { /* try 100 times to assign excess stats */
4072 int i = rndm (0, 6); 3924 int i = rndm (0, 6);
4073 int stat = get_attr_value (stats, i);
4074 int race_bonus = get_attr_value (&(pl->arch->clone.stats), i);
4075 3925
4076 if (i == CHA) 3926 if (i == CHA)
4077 continue; /* exclude cha from this */ 3927 continue; /* exclude cha from this */
3928
3929 int stat = stats->stat (i);
3930 int race_bonus = pl->arch->stats.stat (i);
4078 if (stat < 20 + race_bonus) 3931 if (stat < 20 + race_bonus)
4079 { 3932 {
4080 change_attr_value (stats, i, 1); 3933 change_attr_value (stats, i, 1);
4081 excess_stat--; 3934 excess_stat--;
4082 } 3935 }
… …
4085 /* insert the randomitems from the change's treasurelist into 3938 /* insert the randomitems from the change's treasurelist into
4086 * the player ref: player.c 3939 * the player ref: player.c
4087 */ 3940 */
4088 if (change->randomitems != NULL) 3941 if (change->randomitems != NULL)
4089 give_initial_items (pl, change->randomitems); 3942 give_initial_items (pl, change->randomitems);
4090
4091 3943
4092 /* set up the face, for some races. */ 3944 /* set up the face, for some races. */
4093 3945
4094 /* first, look for the force object banning 3946 /* first, look for the force object banning
4095 * changing the face. Certain races never change face with class. 3947 * changing the face. Certain races never change face with class.
… …
4140 char got[MAX_BUF]; 3992 char got[MAX_BUF];
4141 int len; 3993 int len;
4142 3994
4143 if (!pl || !transformer) 3995 if (!pl || !transformer)
4144 return; 3996 return;
3997
4145 marked = find_marked_object (pl); 3998 marked = find_marked_object (pl);
3999
4146 if (!marked) 4000 if (!marked)
4147 { 4001 {
4148 new_draw_info_format (NDI_UNIQUE, 0, pl, "Use the %s with what item?", query_name (transformer)); 4002 new_draw_info_format (NDI_UNIQUE, 0, pl, "Use the %s with what item?", query_name (transformer));
4149 return; 4003 return;
4150 } 4004 }
4005
4151 if (!marked->slaying) 4006 if (!marked->slaying)
4152 { 4007 {
4153 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked)); 4008 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked));
4154 return; 4009 return;
4155 } 4010 }
4011
4156 /* check whether they are compatible or not */ 4012 /* check whether they are compatible or not */
4157 find = strstr (marked->slaying, transformer->arch->name); 4013 find = strstr (marked->slaying, transformer->arch->archname);
4158 if (!find || (*(find + strlen (transformer->arch->name)) != ':')) 4014 if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
4159 { 4015 {
4160 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked)); 4016 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked));
4161 return; 4017 return;
4162 } 4018 }
4019
4163 find += strlen (transformer->arch->name) + 1; 4020 find += strlen (transformer->arch->archname) + 1;
4164 /* Item can be used, now find how many and what it yields */ 4021 /* Item can be used, now find how many and what it yields */
4165 if (isdigit (*(find))) 4022 if (isdigit (*(find)))
4166 { 4023 {
4167 yield = atoi (find); 4024 yield = atoi (find);
4168 if (yield < 1) 4025 if (yield < 1)
… …
4176 4033
4177 while (isdigit (*find)) 4034 while (isdigit (*find))
4178 find++; 4035 find++;
4179 while (*find == ' ') 4036 while (*find == ' ')
4180 find++; 4037 find++;
4038
4181 memset (got, 0, MAX_BUF); 4039 memset (got, 0, MAX_BUF);
4040
4182 if ((separator = strchr (find, ';')) != NULL) 4041 if ((separator = strchr (find, ';')) != NULL)
4183 {
4184 len = separator - find; 4042 len = separator - find;
4185 }
4186 else 4043 else
4187 {
4188 len = strlen (find); 4044 len = strlen (find);
4189 } 4045
4190 if (len > MAX_BUF - 1) 4046 if (len > MAX_BUF - 1)
4191 len = MAX_BUF - 1; 4047 len = MAX_BUF - 1;
4048
4192 strcpy (got, find); 4049 strcpy (got, find);
4193 got[len] = '\0'; 4050 got[len] = '\0';
4194 4051
4195 /* Now create new item, remove used ones when required. */ 4052 /* Now create new item, remove used ones when required. */
4196 new_item = get_archetype (got); 4053 new_item = get_archetype (got);
… …
4204 new_draw_info_format (NDI_UNIQUE, 0, pl, "You %s the %s.", &transformer->slaying, query_base_name (marked, 0)); 4061 new_draw_info_format (NDI_UNIQUE, 0, pl, "You %s the %s.", &transformer->slaying, query_base_name (marked, 0));
4205 insert_ob_in_ob (new_item, pl); 4062 insert_ob_in_ob (new_item, pl);
4206 esrv_send_inventory (pl, pl); 4063 esrv_send_inventory (pl, pl);
4207 /* Eat up one item */ 4064 /* Eat up one item */
4208 decrease_ob_nr (marked, 1); 4065 decrease_ob_nr (marked, 1);
4066
4209 /* Eat one transformer if needed */ 4067 /* Eat one transformer if needed */
4210 if (transformer->stats.food) 4068 if (transformer->stats.food)
4211 if (--transformer->stats.food == 0) 4069 if (--transformer->stats.food == 0)
4212 decrease_ob_nr (transformer, 1); 4070 decrease_ob_nr (transformer, 1);
4213} 4071}

Diff Legend

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