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.110 by root, Sun Jun 24 04:09:29 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 it
8 it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
9 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
10 (at your option) any later version. 11 * 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, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15 GNU General Public License for more details. 16 * 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 along
18 along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 21 *
21 The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
24
25#include <cmath>
23 26
24#include <global.h> 27#include <global.h>
25#include <living.h> 28#include <living.h>
26#include <spells.h> 29#include <spells.h>
27#include <skills.h> 30#include <skills.h>
28#include <tod.h> 31#include <tod.h>
29 32
30#ifndef __CEXTRACT__
31# include <sproto.h> 33#include <sproto.h>
32#endif
33 34
34/* Want this regardless of rplay. */ 35/* Want this regardless of rplay. */
35#include <sounds.h> 36#include <sounds.h>
36
37/* need math lib for double-precision and pow() in dragon_eat_flesh() */
38#include <math.h>
39 37
40/** 38/**
41 * Check if op should abort moving victim because of it's race or slaying. 39 * 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. 40 * Returns 1 if it should abort, returns 0 if it should continue.
43 */ 41 */
… …
66 { 64 {
67 arch_flag = 1; 65 arch_flag = 1;
68 name_flag = 1; 66 name_flag = 1;
69 race_flag = 1; 67 race_flag = 1;
70 } 68 }
69
71 /* If the director has race set, only affect objects with a arch, 70 /* If the director has race set, only affect objects with a arch,
72 * name or race that matches. 71 * name or race that matches.
73 */ 72 */
74 if ((op->race) && 73 if ((op->race) &&
75 ((!(victim->arch && arch_flag && victim->arch->name) || strcmp (op->race, victim->arch->name))) && 74 ((!(victim->arch && arch_flag && victim->arch->archname) || op->race != victim->arch->archname)) &&
76 ((!(victim->name && name_flag) || strcmp (op->race, victim->name))) && 75 ((!(victim->name && name_flag) || op->race != victim->name)) &&
77 ((!(victim->race && race_flag) || strcmp (op->race, victim->race)))) 76 ((!(victim->race && race_flag) || op->race != victim->race)))
78 {
79 return 1; 77 return 1;
80 } 78
81 /* If the director has slaying set, only affect objects where none 79 /* If the director has slaying set, only affect objects where none
82 * of arch, name, or race match. 80 * of arch, name, or race match.
83 */ 81 */
84 if ((op->slaying) && (((victim->arch && arch_flag && victim->arch->name && !strcmp (op->slaying, victim->arch->name))) || 82 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))) || 83 ((victim->name && name_flag && op->slaying == victim->name)) ||
86 ((victim->race && race_flag && !strcmp (op->slaying, victim->race))))) 84 ((victim->race && race_flag && op->slaying == victim->race)))
87 {
88 return 1; 85 return 1;
89 } 86
90 return 0; 87 return 0;
91} 88}
92 89
93/** 90/**
94 * This handles a player dropping money on an altar to identify stuff. 91 * This handles a player dropping money on an altar to identify stuff.
… …
195apply_potion (object *op, object *tmp) 192apply_potion (object *op, object *tmp)
196{ 193{
197 int got_one = 0, i; 194 int got_one = 0, i;
198 object *force = 0, *floor = 0; 195 object *force = 0, *floor = 0;
199 196
200 floor = get_map_ob (op->map, op->x, op->y); 197 floor = GET_MAP_OB (op->map, op->x, op->y);
201 198
202 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 199 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
203 { 200 {
204 if (op->type == PLAYER) 201 if (op->type == PLAYER)
205 new_draw_info (NDI_UNIQUE, 0, op, "Gods prevent you from using this here, it's sacred ground!"); 202 new_draw_info (NDI_UNIQUE, 0, op, "Gods prevent you from using this here, it's sacred ground!");
… …
219 object *depl; 216 object *depl;
220 archetype *at; 217 archetype *at;
221 218
222 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 219 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
223 { 220 {
224 drain_stat (op); 221 op->drain_stat ();
225 fix_player (op); 222 op->update_stats ();
226 decrease_ob (tmp); 223 decrease_ob (tmp);
227 return 1; 224 return 1;
228 } 225 }
229 226
230 if ((at = archetype::find (ARCH_DEPLETION)) == NULL) 227 if (!(at = archetype::find (ARCH_DEPLETION)))
231 { 228 {
232 LOG (llevError, "Could not find archetype depletion\n"); 229 LOG (llevError, "Could not find archetype depletion\n");
233 return 0; 230 return 0;
234 } 231 }
235 depl = present_arch_in_ob (at, op); 232 depl = present_arch_in_ob (at, op);
236 233
237 if (depl != NULL) 234 if (depl)
238 { 235 {
239 for (i = 0; i < NUM_STATS; i++) 236 for (i = 0; i < NUM_STATS; i++)
240 if (get_attr_value (&depl->stats, i)) 237 if (depl->stats.stat (i))
241 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]); 238 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]);
242 239
243 depl->destroy (); 240 depl->destroy ();
244 fix_player (op); 241 op->update_stats ();
245 } 242 }
246 else 243 else
247 new_draw_info (NDI_UNIQUE, 0, op, "You potion had no effect."); 244 new_draw_info (NDI_UNIQUE, 0, op, "You potion had no effect.");
248 245
249 decrease_ob (tmp); 246 decrease_ob (tmp);
… …
299 296
300 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)) 297 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))
301 { 298 {
302 if (got_one) 299 if (got_one)
303 { 300 {
304 fix_player (op); 301 op->update_stats ();
305 new_draw_info (NDI_UNIQUE, 0, op, "The Gods smile upon you and remake you"); 302 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."); 303 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."); 304 new_draw_info (NDI_UNIQUE, 0, op, "You feel a little more perfect.");
308 } 305 }
309 else 306 else
… …
311 } 308 }
312 else 309 else
313 { /* cursed potion */ 310 { /* cursed potion */
314 if (got_one) 311 if (got_one)
315 { 312 {
316 fix_player (op); 313 op->update_stats ();
317 new_draw_info (NDI_UNIQUE, 0, op, "The Gods are angry and punish you."); 314 new_draw_info (NDI_UNIQUE, 0, op, "The Gods are angry and punish you.");
318 } 315 }
319 else 316 else
320 new_draw_info (NDI_UNIQUE, 0, op, "You are fortunate that you are so pathetic."); 317 new_draw_info (NDI_UNIQUE, 0, op, "You are fortunate that you are so pathetic.");
321 } 318 }
… …
349 cast_spell (op, tmp, op->facing, tmp->inv, NULL); 346 cast_spell (op, tmp, op->facing, tmp->inv, NULL);
350 347
351 decrease_ob (tmp); 348 decrease_ob (tmp);
352 /* if youre dead, no point in doing this... */ 349 /* if youre dead, no point in doing this... */
353 if (!QUERY_FLAG (op, FLAG_REMOVED)) 350 if (!QUERY_FLAG (op, FLAG_REMOVED))
354 fix_player (op); 351 op->update_stats ();
355 return 1; 352 return 1;
356 } 353 }
357 354
358 /* Deal with protection potions */ 355 /* Deal with protection potions */
359 force = NULL; 356 force = NULL;
… …
377 force->stats.food *= 10; 374 force->stats.food *= 10;
378 for (i = 0; i < NROFATTACKS; i++) 375 for (i = 0; i < NROFATTACKS; i++)
379 if (force->resist[i] > 0) 376 if (force->resist[i] > 0)
380 force->resist[i] = -force->resist[i]; /* prot => vuln */ 377 force->resist[i] = -force->resist[i]; /* prot => vuln */
381 } 378 }
379
382 force->speed_left = -1; 380 force->speed_left = -1;
383 force = insert_ob_in_ob (force, op); 381 force = insert_ob_in_ob (force, op);
384 CLEAR_FLAG (tmp, FLAG_APPLIED); 382 CLEAR_FLAG (tmp, FLAG_APPLIED);
385 SET_FLAG (force, FLAG_APPLIED); 383 SET_FLAG (force, FLAG_APPLIED);
386 change_abil (op, force); 384 change_abil (op, force);
… …
403 * that were grouped with the one consumed, his 401 * that were grouped with the one consumed, his
404 * stat will not be raised by them. fix_player just clears 402 * stat will not be raised by them. fix_player just clears
405 * up all the stats. 403 * up all the stats.
406 */ 404 */
407 CLEAR_FLAG (tmp, FLAG_APPLIED); 405 CLEAR_FLAG (tmp, FLAG_APPLIED);
408 fix_player (op); 406 op->update_stats ();
409 decrease_ob (tmp); 407 decrease_ob (tmp);
410 return 1; 408 return 1;
411} 409}
412 410
413/**************************************************************************** 411/****************************************************************************
… …
423 int count = 0; 421 int count = 0;
424 422
425 423
426 if (item == NULL) 424 if (item == NULL)
427 return 0; 425 return 0;
426
428 op = op->below; 427 op = op->below;
429 while (op != NULL) 428 while (op != NULL)
430 { 429 {
431 if (strcmp (op->arch->name, item) == 0) 430 if (strcmp (op->arch->archname, item) == 0)
432 { 431 {
433 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED) 432 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED)
434 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID)) 433 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID))
435 { 434 {
436 if (op->nrof == 0) /* this is necessary for artifact sacrifices --FD-- */ 435 if (op->nrof == 0) /* this is necessary for artifact sacrifices --FD-- */
437 count++; 436 count++;
438 else 437 else
439 count += op->nrof; 438 count += op->nrof;
440 } 439 }
441 } 440 }
441
442 op = op->below; 442 op = op->below;
443 } 443 }
444
444 return count; 445 return count;
445} 446}
446 447
447/** 448/**
448 * This removes 'nrof' of what item->slaying says to remove. 449 * This removes 'nrof' of what item->slaying says to remove.
… …
458 prev = op; 459 prev = op;
459 op = op->below; 460 op = op->below;
460 461
461 while (op != NULL) 462 while (op != NULL)
462 { 463 {
463 if (strcmp (op->arch->name, item) == 0) 464 if (strcmp (op->arch->archname, item) == 0)
464 { 465 {
465 if (op->nrof >= nrof) 466 if (op->nrof >= nrof)
466 { 467 {
467 decrease_ob_nr (op, nrof); 468 decrease_ob_nr (op, nrof);
468 return; 469 return;
… …
570 weapon->last_eat++; 571 weapon->last_eat++;
571 new_draw_info_format (NDI_UNIQUE, 0, op, "Weapon's bonus to %s improved by %d", statname, sacrifice_count); 572 new_draw_info_format (NDI_UNIQUE, 0, op, "Weapon's bonus to %s improved by %d", statname, sacrifice_count);
572 decrease_ob (improver); 573 decrease_ob (improver);
573 574
574 /* So it updates the players stats and the window */ 575 /* So it updates the players stats and the window */
575 fix_player (op); 576 op->update_stats ();
576 return 1; 577 return 1;
577} 578}
578 579
579/* Types of improvements, hidden in the sp field. */ 580/* Types of improvements, hidden in the sp field. */
580#define IMPROVE_PREPARE 1 581#define IMPROVE_PREPARE 1
… …
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--;
… …
1779 1587
1780 readable_message_type *msgType = get_readable_message_type (tmp); 1588 readable_message_type *msgType = get_readable_message_type (tmp);
1781 1589
1782 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, 1590 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1783 msgType->message_type, msgType->message_subtype, 1591 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); 1592 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1593 long_desc (tmp, op), &tmp->msg);
1785 1594
1786 /* gain xp from reading */ 1595 /* gain xp from reading */
1787 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1596 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1788 { /* only if not read before */ 1597 { /* only if not read before */
1789 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1598 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
… …
1795 1604
1796 /* If in a container, update how it looks */ 1605 /* If in a container, update how it looks */
1797 if (tmp->env) 1606 if (tmp->env)
1798 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1607 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1799 else 1608 else
1800 op->contr->socket->floorbox_update (); 1609 op->contr->ns->floorbox_update ();
1801 } 1610 }
1802 1611
1803 change_exp (op, exp_gain, skill_ob->skill, 0); 1612 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 */ 1613 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */
1805 } 1614 }
… …
1945 return; 1754 return;
1946 } 1755 }
1947 1756
1948 if (skop->level < int (sqrtf (spell->level) * 1.5f)) 1757 if (skop->level < int (sqrtf (spell->level) * 1.5f))
1949 { 1758 {
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."); 1759 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. [Your literacy level is too low]");
1951 return; 1760 return;
1952 } 1761 }
1953 1762
1954 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name); 1763 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name);
1955 1764
… …
1958 identify (tmp); 1767 identify (tmp);
1959 1768
1960 if (tmp->env) 1769 if (tmp->env)
1961 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1770 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1962 else 1771 else
1963 op->contr->socket->floorbox_update (); 1772 op->contr->ns->floorbox_update ();
1964 } 1773 }
1965 1774
1966 /* I removed the check for special_prayer_mark here - it didn't make 1775 /* 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 1776 * 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 1777 * if the player doesn't know the spell, doesn't make a lot of sense that
… …
1978 { 1787 {
1979 spell_skill = find_skill_by_name (op, spell->skill); 1788 spell_skill = find_skill_by_name (op, spell->skill);
1980 1789
1981 if (!spell_skill) 1790 if (!spell_skill)
1982 { 1791 {
1983 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use this spell", &spell->skill); 1792 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use this spell.", &spell->skill);
1984 return; 1793 return;
1985 } 1794 }
1986 1795
1987 if (spell_skill->level < spell->level) 1796 if (spell_skill->level < spell->level)
1988 { 1797 {
… …
2022 else 1831 else
2023 { 1832 {
2024 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1833 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"); 1834 new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell.\n");
2026 } 1835 }
1836
2027 decrease_ob (tmp); 1837 decrease_ob (tmp);
2028} 1838}
2029 1839
2030/** 1840/**
2031 * Handles applying a spell scroll. 1841 * Handles applying a spell scroll.
… …
2070 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1880 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
2071 identify (tmp); 1881 identify (tmp);
2072 1882
2073 new_draw_info_format (NDI_BLACK, 0, op, "The scroll of %s turns to dust.", &tmp->inv->name); 1883 new_draw_info_format (NDI_BLACK, 0, op, "The scroll of %s turns to dust.", &tmp->inv->name);
2074 1884
2075
2076 cast_spell (op, tmp, dir, tmp->inv, NULL); 1885 cast_spell (op, tmp, dir, tmp->inv, NULL);
2077 decrease_ob (tmp); 1886 decrease_ob (tmp);
2078} 1887}
2079 1888
2080/** 1889/**
… …
2083 * chest. 1892 * chest.
2084 */ 1893 */
2085static void 1894static void
2086apply_treasure (object *op, object *tmp) 1895apply_treasure (object *op, object *tmp)
2087{ 1896{
2088 object *treas;
2089
2090
2091 /* Nice side effect of new treasure creation method is that the treasure 1897 /* 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 1898 * 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 1899 * 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 1900 * prevents people fromt moving chests to more difficult maps to get better
2095 * treasure 1901 * treasure
2096 */ 1902 */
2097
2098 treas = tmp->inv; 1903 object *treas = tmp->inv;
2099 if (treas == NULL) 1904
1905 if (!treas)
2100 { 1906 {
2101 new_draw_info (NDI_UNIQUE, 0, op, "The chest was empty."); 1907 new_draw_info (NDI_UNIQUE, 0, op, "The chest was empty.");
2102 decrease_ob (tmp); 1908 decrease_ob (tmp);
2103 return; 1909 return;
2104 } 1910 }
1911
2105 while (tmp->inv) 1912 while (tmp->inv)
2106 { 1913 {
2107 treas = tmp->inv; 1914 treas = tmp->inv;
2108 1915
2109 treas->remove (); 1916 treas->remove ();
… …
2227 if (meal->type != FLESH || !is_dragon_pl (op)) 2034 if (meal->type != FLESH || !is_dragon_pl (op))
2228 return 0; 2035 return 0;
2229 2036
2230 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces 2037 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces
2231 from the player's inventory */ 2038 from the player's inventory */
2039 shstr_cmp dragon_ability_force ("dragon_ability_force");
2040 shstr_cmp dragon_skin_force ("dragon_skin_force");
2041
2232 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2042 for (tmp = op->inv; tmp; tmp = tmp->below)
2233 {
2234 if (tmp->type == FORCE) 2043 if (tmp->type == FORCE)
2235 { 2044 if (tmp->arch->archname == dragon_skin_force)
2236 if (strcmp (tmp->arch->name, "dragon_skin_force") == 0)
2237 skin = tmp; 2045 skin = tmp;
2238 else if (strcmp (tmp->arch->name, "dragon_ability_force") == 0) 2046 else if (tmp->arch->archname == dragon_ability_force)
2239 abil = tmp; 2047 abil = tmp;
2240 }
2241 }
2242 2048
2243 /* if either skin or ability are missing, this is an old player 2049 /* if either skin or ability are missing, this is an old player
2244 which is not to be considered a dragon -> bail out */ 2050 which is not to be considered a dragon -> bail out */
2245 if (skin == NULL || abil == NULL) 2051 if (skin == NULL || abil == NULL)
2246 return 0; 2052 return 0;
… …
2287 /* doubled chance for resistance of ability-focus */ 2093 /* doubled chance for resistance of ability-focus */
2288 if (i == abil->stats.exp) 2094 if (i == abil->stats.exp)
2289 chance = MIN (100., chance * 2.); 2095 chance = MIN (100., chance * 2.);
2290 2096
2291 /* now make the throw and save all winners (Don't insert luck bonus here!) */ 2097 /* now make the throw and save all winners (Don't insert luck bonus here!) */
2292 if (RANDOM () % 10000 < (int) (chance * 100)) 2098 if (rndm (10000) < (unsigned int) (chance * 100))
2293 { 2099 {
2294 atnr_winner[winners] = i; 2100 atnr_winner[winners] = i;
2295 winners++; 2101 winners++;
2296 } 2102 }
2297 2103
… …
2328 2134
2329 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95) 2135 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95)
2330 { 2136 {
2331 /* resistance increased! */ 2137 /* resistance increased! */
2332 skin->resist[i]++; 2138 skin->resist[i]++;
2333 fix_player (op); 2139 op->update_stats ();
2334 2140
2335 sprintf (buf, "Your skin is now more resistant to %s!", change_resist_msg[i]); 2141 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); 2142 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, buf);
2337 } 2143 }
2338 2144
… …
2357 } 2163 }
2358 } 2164 }
2359 return 1; 2165 return 1;
2360} 2166}
2361 2167
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/** 2168/**
2397 * Handles applying an improve armor scroll. 2169 * Handles applying an improve armor scroll.
2398 * Does some sanity checks, then calls improve_armour. 2170 * Does some sanity checks, then calls improve_armour.
2399 */ 2171 */
2400static void 2172static void
… …
2405 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) 2177 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC))
2406 { 2178 {
2407 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll."); 2179 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll.");
2408 return; 2180 return;
2409 } 2181 }
2182
2410 armor = find_marked_object (op); 2183 armor = find_marked_object (op);
2184
2411 if (!armor) 2185 if (!armor)
2412 { 2186 {
2413 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark an armor object."); 2187 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark an armor object.");
2414 return; 2188 return;
2415 } 2189 }
2190
2416 if (armor->type != ARMOUR 2191 if (armor->type != ARMOUR
2417 && armor->type != CLOAK 2192 && armor->type != CLOAK
2418 && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET) 2193 && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET)
2419 { 2194 {
2420 new_draw_info (NDI_UNIQUE, 0, op, "Your marked item is not armour!\n"); 2195 new_draw_info (NDI_UNIQUE, 0, op, "Your marked item is not armour!\n");
… …
2423 2198
2424 new_draw_info (NDI_UNIQUE, 0, op, "Applying armour enchantment."); 2199 new_draw_info (NDI_UNIQUE, 0, op, "Applying armour enchantment.");
2425 improve_armour (op, tmp, armor); 2200 improve_armour (op, tmp, armor);
2426} 2201}
2427 2202
2428
2429extern void 2203extern void
2430apply_poison (object *op, object *tmp) 2204apply_poison (object *op, object *tmp)
2431{ 2205{
2432 if (op->type == PLAYER) 2206 if (op->type == PLAYER)
2433 { 2207 {
… …
2444 handle_apply_yield (tmp); 2218 handle_apply_yield (tmp);
2445 decrease_ob (tmp); 2219 decrease_ob (tmp);
2446} 2220}
2447 2221
2448/** 2222/**
2449 * This fonction return true if the exit is not a 2 ways one or it is 2 ways, valid exit. 2223 * 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: 2224 * A valid 2 way exit means:
2451 * -You can come back (there is another exit at the other side) 2225 * -You can come back (there is another exit at the other side)
2452 * -You are 2226 * -You are
2453 * ° the owner of the exit 2227 * ° the owner of the exit
2454 * ° or in the same party as the owner 2228 * ° or in the same party as the owner
2455 * 2229 *
2456 * Note: a owner in a 2 way exit is saved as the owner's name 2230 * 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 2231 * 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). 2232 * survive in the swapping (in fact the whole exit doesn't survive).
2459 */ 2233 */
2460int 2234int
2461is_legal_2ways_exit (object *op, object *exit) 2235is_legal_2ways_exit (object *op, object *exit)
2462{ 2236{
2463 object *tmp;
2464 object *exit_owner;
2465 player *pp;
2466 maptile *exitmap;
2467
2468 if (exit->stats.exp != 1) 2237 if (exit->stats.exp != 1)
2469 return 1; /*This is not a 2 way, so it is legal */ 2238 return 1; /*This is not a 2 way, so it is legal */
2239
2240#if 0 //TODO
2470 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race) 2241 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race)
2471 return 0; /* This is a reset town portal */ 2242 return 0; /* This is a reset town portal */
2472 /* To know if an exit has a correspondant, we look at 2243#endif
2473 * all the exits in destination and try to find one with same path as 2244
2474 * the current exit's position */ 2245 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map);
2475 if (!strncmp (EXIT_PATH (exit), settings.localdir, strlen (settings.localdir))) 2246
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) 2247 if (exitmap)
2480 { 2248 {
2249 exitmap->load_sync ();
2250
2481 tmp = get_map_ob (exitmap, EXIT_X (exit), EXIT_Y (exit)); 2251 object *tmp = exitmap->at (EXIT_X (exit), EXIT_Y (exit)).bot;
2252
2482 if (!tmp) 2253 if (!tmp)
2483 return 0; 2254 return 0;
2484 for ((tmp = get_map_ob (exitmap, EXIT_X (exit), EXIT_Y (exit))); tmp; tmp = tmp->above) 2255
2256 for (; tmp; tmp = tmp->above)
2485 { 2257 {
2486 if (tmp->type != EXIT) 2258 if (tmp->type != EXIT)
2487 continue; /*Not an exit */ 2259 continue; /*Not an exit */
2260
2488 if (!EXIT_PATH (tmp)) 2261 if (!EXIT_PATH (tmp))
2489 continue; /*Not a valid exit */ 2262 continue; /*Not a valid exit */
2263
2490 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y)) 2264 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y))
2491 continue; /*Not in the same place */ 2265 continue; /*Not in the same place */
2266
2492 if (strcmp (exit->map->path, EXIT_PATH (tmp)) != 0) 2267 if (exit->map->path != EXIT_PATH (tmp))
2493 continue; /*Not in the same map */ 2268 continue; /*Not in the same map */
2494 2269
2495 /* From here we have found the exit is valid. However we do 2270 /* 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 2271 * here the check of the exit owner. It is important for the
2497 * town portals to prevent strangers from visiting your appartments 2272 * town portals to prevent strangers from visiting your appartments
2498 */ 2273 */
2499 if (!exit->race) 2274 if (!exit->race)
2500 return 1; /*No owner, free for all! */ 2275 return 1; /*No owner, free for all! */
2276
2501 exit_owner = NULL; 2277 object *exit_owner = 0;
2502 for (pp = first_player; pp; pp = pp->next) 2278
2279 for_all_players (pp)
2503 { 2280 {
2504 if (!pp->ob) 2281 if (!pp->ob)
2505 continue; 2282 continue;
2283
2506 if (pp->ob->name != exit->race) 2284 if (pp->ob->name != exit->race)
2507 continue; 2285 continue;
2286
2508 exit_owner = pp->ob; /*We found a player which correspond to the player name */ 2287 exit_owner = pp->ob; /*We found a player which correspond to the player name */
2509 break; 2288 break;
2510 } 2289 }
2290
2511 if (!exit_owner) 2291 if (!exit_owner)
2512 return 0; /* No more owner */ 2292 return 0; /* No more owner */
2293
2513 if (exit_owner->contr == op->contr) 2294 if (exit_owner->contr == op->contr)
2514 return 1; /*It is your exit */ 2295 return 1; /*It is your exit */
2296
2515 if (exit_owner && /*There is a owner */ 2297 if (exit_owner && /*There is a owner */
2516 (op->contr) && /*A player tries to pass */ 2298 (op->contr) && /*A player tries to pass */
2517 ((exit_owner->contr->party == NULL) || /*No pass if controller has no party */ 2299 ((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 */ 2300 (exit_owner->contr->party != op->contr->party))) /* Or not the same as op */
2519 return 0; 2301 return 0;
2302
2520 return 1; 2303 return 1;
2521 } 2304 }
2522 } 2305 }
2306
2523 return 0; 2307 return 0;
2524} 2308}
2525
2526 2309
2527/** 2310/**
2528 * Main apply handler. 2311 * Main apply handler.
2529 * 2312 *
2530 * Checks for unpaid items before applying. 2313 * Checks for unpaid items before applying.
… …
2538 * being applied. 2321 * being applied.
2539 * 2322 *
2540 * aflag is special (always apply/unapply) flags. Nothing is done with 2323 * aflag is special (always apply/unapply) flags. Nothing is done with
2541 * them in this function - they are passed to apply_special 2324 * them in this function - they are passed to apply_special
2542 */ 2325 */
2543
2544int 2326int
2545manual_apply (object *op, object *tmp, int aflag) 2327manual_apply (object *op, object *tmp, int aflag)
2546{ 2328{
2547 if (tmp->head) 2329 if (tmp->head)
2548 tmp = tmp->head; 2330 tmp = tmp->head;
… …
2553 { 2335 {
2554 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first."); 2336 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first.");
2555 return 1; 2337 return 1;
2556 } 2338 }
2557 else 2339 else
2558 {
2559 return 0; /* monsters just skip unpaid items */ 2340 return 0; /* monsters just skip unpaid items */
2560 }
2561 } 2341 }
2562 2342
2563 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op))) 2343 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op)))
2564 return RESULT_INT (0); 2344 return RESULT_INT (0);
2565 2345
2566 switch (tmp->type) 2346 switch (tmp->type)
2567 { 2347 {
2568
2569 case CF_HANDLE: 2348 case CF_HANDLE:
2570 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2349 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle.");
2571 play_sound_map (op->map, op->x, op->y, SOUND_TURN_HANDLE); 2350 play_sound_map (op->map, op->x, op->y, SOUND_TURN_HANDLE);
2572 tmp->value = tmp->value ? 0 : 1; 2351 tmp->value = tmp->value ? 0 : 1;
2573 SET_ANIMATION (tmp, tmp->value); 2352 SET_ANIMATION (tmp, tmp->value);
… …
2580 { 2359 {
2581 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2360 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle.");
2582 play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE); 2361 play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE);
2583 } 2362 }
2584 else 2363 else
2585 {
2586 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move."); 2364 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move.");
2587 } 2365
2588 return 1; 2366 return 1;
2589 2367
2590 case EXIT: 2368 case EXIT:
2591 if (op->type != PLAYER) 2369 if (op->type != PLAYER)
2592 return 0; 2370 return 0;
2371
2593 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2372 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)); 2373 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp));
2596 }
2597 else 2374 else
2598 { 2375 {
2599 /* Don't display messages for random maps. */ 2376 /* Don't display messages for random maps. */
2600 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2) && strncmp (EXIT_PATH (tmp), "/random/", 8)) 2377 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2))
2601 new_draw_info (NDI_NAVY, 0, op, tmp->msg); 2378 new_draw_info (NDI_NAVY, 0, op, tmp->msg);
2379
2602 enter_exit (op, tmp); 2380 op->enter_exit (tmp);
2603 } 2381 }
2382
2604 return 1; 2383 return 1;
2605 2384
2606 case SIGN: 2385 case SIGN:
2607 apply_sign (op, tmp, 0); 2386 apply_sign (op, tmp, 0);
2608 return 1; 2387 return 1;
… …
2612 { 2391 {
2613 apply_book (op, tmp); 2392 apply_book (op, tmp);
2614 return 1; 2393 return 1;
2615 } 2394 }
2616 else 2395 else
2617 {
2618 return 0; 2396 return 0;
2619 }
2620 2397
2621 case SKILLSCROLL: 2398 case SKILLSCROLL:
2622 if (op->type == PLAYER) 2399 if (op->type == PLAYER)
2623 { 2400 {
2624 apply_skillscroll (op, tmp); 2401 apply_skillscroll (op, tmp);
2625 return 1; 2402 return 1;
2626 } 2403 }
2404 else
2627 return 0; 2405 return 0;
2628 2406
2629 case SPELLBOOK: 2407 case SPELLBOOK:
2630 if (op->type == PLAYER) 2408 if (op->type == PLAYER)
2631 { 2409 {
2632 apply_spellbook (op, tmp); 2410 apply_spellbook (op, tmp);
2633 return 1; 2411 return 1;
2634 } 2412 }
2413 else
2635 return 0; 2414 return 0;
2636 2415
2637 case SCROLL: 2416 case SCROLL:
2638 apply_scroll (op, tmp, 0); 2417 apply_scroll (op, tmp, 0);
2639 return 1; 2418 return 1;
2640 2419
2641 case POTION: 2420 case POTION:
2642 (void) apply_potion (op, tmp); 2421 apply_potion (op, tmp);
2643 return 1; 2422 return 1;
2644 2423
2645 /* Eneq(@csd.uu.se): Handle apply on containers. */ 2424 /* Eneq(@csd.uu.se): Handle apply on containers. */
2425 //TODO: remove, as it is unsed?
2646 case CLOSE_CON: 2426 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); 2427 apply_container (op, tmp->env);
2651 return 1; 2428 return 1;
2652 2429
2653 case CONTAINER: 2430 case CONTAINER:
2654 if (op->type == PLAYER)
2655 (void) esrv_apply_container (op, tmp);
2656 else
2657 (void) apply_container (op, tmp); 2431 apply_container (op, tmp);
2658 return 1; 2432 return 1;
2659 2433
2660 case TREASURE: 2434 case TREASURE:
2661 if (op->type == PLAYER) 2435 if (op->type == PLAYER)
2662 { 2436 {
2663 apply_treasure (op, tmp); 2437 apply_treasure (op, tmp);
2664 return 1; 2438 return 1;
2665 } 2439 }
2666 else 2440 else
2667 {
2668 return 0; 2441 return 0;
2669 }
2670 2442
2671 case WEAPON: 2443 case WEAPON:
2672 case ARMOUR: 2444 case ARMOUR:
2673 case BOOTS: 2445 case BOOTS:
2674 case GLOVES: 2446 case GLOVES:
… …
2687 case LAMP: 2459 case LAMP:
2688 case BUILDER: 2460 case BUILDER:
2689 case SKILL_TOOL: 2461 case SKILL_TOOL:
2690 if (tmp->env != op) 2462 if (tmp->env != op)
2691 return 2; /* not in inventory */ 2463 return 2; /* not in inventory */
2464
2692 (void) apply_special (op, tmp, aflag); 2465 apply_special (op, tmp, aflag);
2693 return 1; 2466 return 1;
2694 2467
2695 case DRINK: 2468 case DRINK:
2696 case FOOD: 2469 case FOOD:
2697 case FLESH: 2470 case FLESH:
… …
2701 case POISON: 2474 case POISON:
2702 apply_poison (op, tmp); 2475 apply_poison (op, tmp);
2703 return 1; 2476 return 1;
2704 2477
2705 case SAVEBED: 2478 case SAVEBED:
2706 if (op->type == PLAYER)
2707 {
2708 apply_savebed (op);
2709 return 1; 2479 return 1;
2710 }
2711 else
2712 {
2713 return 0;
2714 }
2715 2480
2716 case ARMOUR_IMPROVER: 2481 case ARMOUR_IMPROVER:
2717 if (op->type == PLAYER) 2482 if (op->type == PLAYER)
2718 { 2483 {
2719 apply_armour_improver (op, tmp); 2484 apply_armour_improver (op, tmp);
2720 return 1; 2485 return 1;
2721 } 2486 }
2722 else 2487 else
2723 {
2724 return 0; 2488 return 0;
2725 }
2726 2489
2727 case WEAPON_IMPROVER: 2490 case WEAPON_IMPROVER:
2728 (void) check_improve_weapon (op, tmp); 2491 check_improve_weapon (op, tmp);
2729 return 1; 2492 return 1;
2730 2493
2731 case CLOCK: 2494 case CLOCK:
2732 if (op->type == PLAYER) 2495 if (op->type == PLAYER)
2733 { 2496 {
… …
2741 play_sound_player_only (op->contr, SOUND_CLOCK, 0, 0); 2504 play_sound_player_only (op->contr, SOUND_CLOCK, 0, 0);
2742 new_draw_info (NDI_UNIQUE, 0, op, buf); 2505 new_draw_info (NDI_UNIQUE, 0, op, buf);
2743 return 1; 2506 return 1;
2744 } 2507 }
2745 else 2508 else
2746 {
2747 return 0; 2509 return 0;
2748 }
2749 2510
2750 case MENU: 2511 case MENU:
2751 if (op->type == PLAYER) 2512 if (op->type == PLAYER)
2752 { 2513 {
2753 shop_listing (op); 2514 shop_listing (tmp, op);
2754 return 1; 2515 return 1;
2755 } 2516 }
2756 else 2517 else
2757 {
2758 return 0; 2518 return 0;
2759 }
2760 2519
2761 case POWER_CRYSTAL: 2520 case POWER_CRYSTAL:
2762 apply_power_crystal (op, tmp); /* see egoitem.c */ 2521 apply_power_crystal (op, tmp); /* see egoitem.c */
2763 return 1; 2522 return 1;
2764 2523
… …
2767 { 2526 {
2768 apply_lighter (op, tmp); 2527 apply_lighter (op, tmp);
2769 return 1; 2528 return 1;
2770 } 2529 }
2771 else 2530 else
2772 {
2773 return 0; 2531 return 0;
2774 }
2775 2532
2776 case ITEM_TRANSFORMER: 2533 case ITEM_TRANSFORMER:
2777 apply_item_transformer (op, tmp); 2534 apply_item_transformer (op, tmp);
2778 return 1; 2535 return 1;
2779 2536
… …
2802 new_draw_info (NDI_UNIQUE, 0, pl, "But you are floating high " "above the ground!"); 2559 new_draw_info (NDI_UNIQUE, 0, pl, "But you are floating high " "above the ground!");
2803 return 0; 2560 return 0;
2804 } 2561 }
2805 } 2562 }
2806 2563
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 }
2818
2819 pl->contr->last_used = op; 2564 pl->contr->last_used = op;
2820 2565
2821 tmp = manual_apply (pl, op, aflag); 2566 tmp = manual_apply (pl, op, aflag);
2822 if (!quiet) 2567 if (!quiet)
2823 { 2568 {
… …
2832/** 2577/**
2833 * player_apply_below attempts to apply the object 'below' the player. 2578 * 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 2579 * If the player has an open container, we use that for below, otherwise
2835 * we use the ground. 2580 * we use the ground.
2836 */ 2581 */
2837
2838void 2582void
2839player_apply_below (object *pl) 2583player_apply_below (object *pl)
2840{ 2584{
2841 object *tmp, *next;
2842 int floors; 2585 int floors = 0;
2843 2586
2844 /* If using a container, set the starting item to be the top 2587 /* If using a container, set the starting item to be the top
2845 * item in the container. Otherwise, use the map. 2588 * 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 2589 * 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 2590 * 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 2591 * 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 2592 * problem if player_apply() has a bug in that it uses the object but does
2853 * not return a proper value. 2593 * not return a proper value.
2854 */ 2594 */
2855 for (floors = 0; tmp != NULL; tmp = next) 2595 for (object *next, *tmp = pl->container ? pl->container->inv : pl->below; tmp; tmp = next)
2856 { 2596 {
2857 next = tmp->below; 2597 next = tmp->below;
2598
2858 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 2599 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
2859 floors++; 2600 floors++;
2860 else if (floors > 0) 2601 else if (floors > 0)
2861 return; /* process only floor objects after first floor object */ 2602 return; /* process only floor objects after first floor object */
2862 2603
… …
2882 * to keep the size of apply_special to a more managable size. 2623 * to keep the size of apply_special to a more managable size.
2883 */ 2624 */
2884static int 2625static int
2885unapply_special (object *who, object *op, int aflags) 2626unapply_special (object *who, object *op, int aflags)
2886{ 2627{
2887 if (INVOKE_OBJECT (BE_UNREADY, op, ARG_OBJECT (who), ARG_INT (aflags)) || INVOKE_OBJECT (UNREADY, who, ARG_OBJECT (op), ARG_INT (aflags))) 2628 if (INVOKE_OBJECT (BE_UNREADY, op, ARG_OBJECT (who), ARG_INT (aflags))
2629 || INVOKE_OBJECT (UNREADY, who, ARG_OBJECT (op), ARG_INT (aflags)))
2888 return RESULT_INT (0); 2630 return RESULT_INT (0);
2889 2631
2890 object *tmp2;
2891
2892 CLEAR_FLAG (op, FLAG_APPLIED); 2632 CLEAR_FLAG (op, FLAG_APPLIED);
2633
2893 switch (op->type) 2634 switch (op->type)
2894 { 2635 {
2636 case SKILL_TOOL:
2637 // unapplying a skill tool should also unapply the skill it governs
2638 // but this is hard, as it shouldn't do so when the skill can
2639 // be used for other reasons
2640 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2641 if (tmp->skill == op->skill
2642 && tmp->type == SKILL
2643 && tmp->flag [FLAG_APPLIED]
2644 && !tmp->flag [FLAG_CAN_USE_SKILL])
2645 unapply_special (who, tmp, 0);
2646
2647 change_abil (who, op);
2648 break;
2649
2895 case WEAPON: 2650 case WEAPON:
2651 if (player *pl = who->contr)
2652 if (op == pl->combat_ob)
2653 {
2654 pl->combat_ob = 0;
2655 who->change_weapon (pl->ranged_ob);
2656 }
2657
2896 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op)); 2658 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op));
2897 2659
2898 (void) change_abil (who, op); 2660 change_abil (who, op);
2899 if (QUERY_FLAG (who, FLAG_READY_WEAPON))
2900 CLEAR_FLAG (who, FLAG_READY_WEAPON); 2661 CLEAR_FLAG (who, FLAG_READY_WEAPON);
2901 clear_skill (who);
2902 break; 2662 break;
2903 2663
2904 case SKILL: /* allows objects to impart skills */
2905 case SKILL_TOOL: 2664 case SKILL:
2906 if (op != who->chosen_skill) 2665 if (who->contr)
2907 {
2908 LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n");
2909 } 2666 {
2910 if (who->type == PLAYER)
2911 {
2912 if (who->contr->shoottype == range_skill)
2913 who->contr->shoottype = range_none;
2914 if (!op->invisible) 2667 if (!op->invisible)
2915 {
2916 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op)); 2668 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op));
2917 }
2918 else 2669 else
2919 {
2920 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill); 2670 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill);
2921 } 2671 }
2922 } 2672
2923 (void) change_abil (who, op); 2673 change_abil (who, op);
2924 who->chosen_skill = NULL;
2925 CLEAR_FLAG (who, FLAG_READY_SKILL); 2674 CLEAR_FLAG (who, FLAG_READY_SKILL);
2926 break; 2675 break;
2927 2676
2928 case ARMOUR: 2677 case ARMOUR:
2929 case HELMET: 2678 case HELMET:
… …
2934 case AMULET: 2683 case AMULET:
2935 case GIRDLE: 2684 case GIRDLE:
2936 case BRACERS: 2685 case BRACERS:
2937 case CLOAK: 2686 case CLOAK:
2938 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op)); 2687 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op));
2939 (void) change_abil (who, op); 2688 change_abil (who, op);
2940 break; 2689 break;
2690
2941 case LAMP: 2691 case LAMP:
2692 {
2942 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name); 2693 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name);
2694
2943 tmp2 = arch_to_object (op->other_arch); 2695 object *tmp2 = arch_to_object (op->other_arch);
2944 tmp2->x = op->x; 2696 tmp2->x = op->x;
2945 tmp2->y = op->y; 2697 tmp2->y = op->y;
2946 tmp2->map = op->map; 2698 tmp2->map = op->map;
2947 tmp2->below = op->below; 2699 tmp2->below = op->below;
2948 tmp2->above = op->above; 2700 tmp2->above = op->above;
2949 tmp2->stats.food = op->stats.food; 2701 tmp2->stats.food = op->stats.food;
2950 CLEAR_FLAG (tmp2, FLAG_APPLIED); 2702 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2951 2703
2952 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 2704 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2953 SET_FLAG (tmp2, FLAG_INV_LOCKED); 2705 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2954 2706
2955 if (who->type == PLAYER) 2707 if (who->contr)
2956 esrv_del_item (who->contr, op->count); 2708 esrv_del_item (who->contr, op->count);
2957 2709
2958 op->destroy (); 2710 op->destroy ();
2959 insert_ob_in_ob (tmp2, who); 2711 insert_ob_in_ob (tmp2, who);
2960 fix_player (who); 2712 who->update_stats ();
2713
2961 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 2714 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2962 { 2715 {
2963 if (who->type == PLAYER) 2716 if (who->contr)
2964 { 2717 {
2965 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 2718 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
2966 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 2719 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2967 } 2720 }
2968 } 2721 }
2969 if (who->type == PLAYER) 2722
2723 if (who->contr)
2970 esrv_send_item (who, tmp2); 2724 esrv_send_item (who, tmp2);
2725 }
2726
2971 return 1; /* otherwise, an attempt to drop causes problems */ 2727 return 1; /* otherwise, an attempt to drop causes problems */
2972 break; 2728
2973 case BOW: 2729 case BOW:
2974 case WAND: 2730 case WAND:
2975 case ROD: 2731 case ROD:
2976 case HORN: 2732 case HORN:
2977 clear_skill (who); 2733 if (player *pl = who->contr)
2734 {
2735 if (op == pl->ranged_ob)
2736 {
2737 pl->ranged_ob = 0;
2738 who->change_weapon (pl->combat_ob);
2739 }
2740
2978 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2741 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 } 2742 }
2983 else 2743 else
2984 { 2744 {
2745 who->change_skill (0);
2746
2985 if (op->type == BOW) 2747 if (op->type == BOW)
2986 CLEAR_FLAG (who, FLAG_READY_BOW); 2748 CLEAR_FLAG (who, FLAG_READY_BOW);
2987 else 2749 else
2988 CLEAR_FLAG (who, FLAG_READY_RANGE); 2750 CLEAR_FLAG (who, FLAG_READY_RANGE);
2989 } 2751 }
2752
2990 break; 2753 break;
2991 2754
2992 case BUILDER: 2755 case BUILDER:
2756 if (who->contr)
2993 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2757 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; 2758 break;
2997 2759
2998 default: 2760 default:
2999 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op)); 2761 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op));
3000 break; 2762 break;
3001 } 2763 }
3002 2764
3003 fix_player (who); 2765 who->update_stats ();
3004 2766
3005 if (!(aflags & AP_NO_MERGE)) 2767 if (!(aflags & AP_NO_MERGE))
3006 { 2768 {
3007 object *tmp;
3008
3009 tmp = merge_ob (op, NULL); 2769 object *tmp = merge_ob (op, 0);
3010 if (who->type == PLAYER) 2770
2771 if (who->contr)
3011 { 2772 {
3012 if (tmp) 2773 if (tmp)
3013 { /* it was merged */ 2774 { /* it was merged */
3014 esrv_del_item (who->contr, op->count); 2775 esrv_del_item (who->contr, op->count);
3015 op = tmp; 2776 op = tmp;
3016 } 2777 }
3017 2778
3018 esrv_send_item (who, op); 2779 esrv_send_item (who, op);
3019 } 2780 }
3020 } 2781 }
2782
3021 return 0; 2783 return 0;
3022} 2784}
3023 2785
3024/** 2786/**
3025 * Returns the object that is using location 'loc'. 2787 * Returns the object that is using location 'loc'.
3026 * Note that 'start' is the first object to start examing - we 2788 * 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 2789 * then go through the below of this. In this way, you can do
3028 * something like: 2790 * something like:
3029 * tmp = get_item_from_body_location(who->inv, 1); 2791 * tmp = get_next_item_from_body_location(who->inv, 1);
3030 * if (tmp) tmp1 = get_item_from_body_location(tmp->below, 1); 2792 * if (tmp) tmp1 = get_next_item_from_body_location(tmp->below, 1);
3031 * to find the second object that may use this location, etc. 2793 * to find the second object that may use this location, etc.
3032 * Returns NULL if no match is found. 2794 * Returns NULL if no match is found.
3033 * loc is the index into the array we are looking for a match. 2795 * loc is the index into the array we are looking for a match.
3034 * don't return invisible objects unless they are skill objects 2796 * don't return invisible objects unless they are skill objects
3035 * invisible other objects that use 2797 * invisible other objects that use
3036 * up body locations can be used as restrictions. 2798 * up body locations can be used as restrictions.
3037 */ 2799 */
3038object * 2800static object *
3039get_item_from_body_location (object *start, int loc) 2801get_next_item_from_body_location (int loc, object *start)
3040{ 2802{
3041 object *tmp;
3042
3043 if (!start)
3044 return NULL;
3045
3046 for (tmp = start; tmp; tmp = tmp->below) 2803 for (object *tmp = start; tmp; tmp = tmp->below)
3047 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->body_info[loc] && (!tmp->invisible || tmp->type == SKILL)) 2804 if (tmp->flag [FLAG_APPLIED]
2805 && tmp->slot[loc].info
2806 && (!tmp->invisible || tmp->type == SKILL))
3048 return tmp; 2807 return tmp;
3049 2808
3050 return NULL; 2809 return 0;
3051} 2810}
3052
3053
3054 2811
3055/** 2812/**
3056 * 'op' wants to apply an object, but can't because of other equipment. 2813 * 'op' wants to apply an object, but can't because of other equipment.
3057 * This should only be called when it is known 2814 * This should only be called when it is known
3058 * that there are objects to unapply. This makes pretty heavy 2815 * that there are objects to unapply. This makes pretty heavy
… …
3064 * another function that does just that. 2821 * another function that does just that.
3065 */ 2822 */
3066int 2823int
3067unapply_for_ob (object *who, object *op, int aflags) 2824unapply_for_ob (object *who, object *op, int aflags)
3068{ 2825{
3069 int i; 2826 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) 2827 for (object *tmp = who->inv; tmp; tmp = tmp->below)
3078 {
3079 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type) 2828 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))) 2829 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)))
3082 { 2830 {
3083 if (aflags & AP_PRINT) 2831 if (aflags & AP_PRINT)
3084 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2832 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp));
3085 else 2833 else
3086 unapply_special (who, tmp, aflags); 2834 unapply_special (who, tmp, aflags);
3087 } 2835 }
3088 else 2836 else
3089 { 2837 {
3090 /* In this case, we want to try and remove a cursed item. 2838 /* 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 2839 * While we know it won't work, we want unapply_special to
3092 * at least generate the message. 2840 * at least generate the message.
3093 */ 2841 */
3094 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (tmp)); 2842 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't remove the %s.", query_name (tmp));
3095 return 1; 2843 return 1;
3096 }
3097
3098 } 2844 }
3099 }
3100 }
3101 2845
3102 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 2846 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
3103 { 2847 {
3104 /* this used up a slot that we need to free */ 2848 /* this used up a slot that we need to free */
3105 if (op->body_info[i]) 2849 if (op->slot[i].info)
3106 { 2850 {
3107 last = who->inv; 2851 object *last = who->inv;
3108 2852
3109 /* We do a while loop - may need to remove several items in order 2853 /* We do a while loop - may need to remove several items in order
3110 * to free up enough slots. 2854 * to free up enough slots.
3111 */ 2855 */
3112 while ((who->body_used[i] + op->body_info[i]) < 0) 2856 while ((who->slot[i].used + op->slot[i].info) < 0)
3113 { 2857 {
3114 tmp = get_item_from_body_location (last, i); 2858 object *tmp = get_next_item_from_body_location (i, last);
2859
3115 if (!tmp) 2860 if (!tmp)
3116 { 2861 {
3117#if 0 2862#if 0
3118 /* Not a bug - we'll get this if the player has cursed items 2863 /* Not a bug - we'll get this if the player has cursed items
3119 * equipped. 2864 * equipped.
3120 */ 2865 */
3121 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name); 2866 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name);
3122#endif 2867#endif
3123 return 1; 2868 return 1;
3124 } 2869 }
2870
3125 /* If we are just printing, we don't care about cursed status */ 2871 /* 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)))) 2872 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))))
3127 { 2873 {
3128 if (aflags & AP_PRINT) 2874 if (aflags & AP_PRINT)
3129 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2875 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp));
… …
3137 * so it may not be critical (eg, putting on a ring and you have 2883 * so it may not be critical (eg, putting on a ring and you have
3138 * one cursed ring.) 2884 * one cursed ring.)
3139 */ 2885 */
3140 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp)); 2886 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp));
3141 } 2887 }
2888
3142 last = tmp->below; 2889 last = tmp->below;
3143 } 2890 }
3144 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the 2891 /* 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. 2892 * return in the !tmp would have kicked in.
3146 */ 2893 */
3147 } /* if op is using this body location */ 2894 } /* if op is using this body location */
3148 } /* for body lcoations */ 2895 } /* for body lcoations */
2896
3149 return 0; 2897 return 0;
3150} 2898}
3151 2899
3152/** 2900/**
3153 * Checks to see if 'who' can apply object 'op'. 2901 * Checks to see if 'who' can apply object 'op'.
3154 * Returns 0 if apply can be done without anything special. 2902 * Returns 0 if apply can be done without anything special.
3155 * Otherwise returns a bitmask - potentially several of these may be 2903 * Otherwise returns a bitmask - potentially several of these may be
3156 * set, but largely depends on circumstance - in the future, processing 2904 * set, but largely depends on circumstance - in the future, processing
3157 * may be pruned once we know some status (eg, once CAN_APPLY_NEVER 2905 * 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?) 2906 * is set, do we really care what the other flags may be?)
3159 * 2907 *
3160 * See include/define.h for detailed description of the meaning of 2908 * See include/define.h for detailed description of the meaning of
3161 * these return values. 2909 * these return values.
3162 */ 2910 */
3163int 2911int
3164can_apply_object (object *who, object *op) 2912can_apply_object (object *who, object *op)
3165{ 2913{
3166 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op))) 2914 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op)))
3167 return RESULT_INT (0); 2915 return RESULT_INT (0);
3168 2916
3169 int i, retval = 0; 2917 int retval = 0;
3170 object *tmp = NULL, *ws = NULL; 2918 object *tmp = 0, *ws = 0;
3171 2919
3172 /* Players have 2 'arm's, so they could in theory equip 2 shields or 2920 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 { 2921 {
3179 for (tmp = who->inv; tmp && !ws; tmp = tmp->below) 2922 if (op->slot[i].info)
3180 { 2923 {
3181 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type) 2924 /* Item uses more slots than we have */
2925 if (who->slot[i].info + op->slot [i].info < 0)
3182 { 2926 {
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' 2927 /* Could return now for efficiency - rest of info below isn't
3198 * really needed. 2928 * really needed.
3199 */ 2929 */
3200 retval |= CAN_APPLY_NEVER; 2930 retval |= CAN_APPLY_NEVER;
3201 } 2931 }
3202 else if ((who->body_used[i] + op->body_info[i]) < 0) 2932 else if (who->slot[i].used + op->slot[i].info < 0)
3203 { 2933 {
3204 /* in this case, equipping this would use more free spots than 2934 /* in this case, equipping this would use more free spots than
3205 * we have. 2935 * we have.
3206 */ 2936 */
3207 object *tmp1;
3208
3209 2937
3210 /* if we have an applied weapon/shield, and unapply it would free 2938 /* 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 2939 * enough slots to equip the new item, then just set "can
3212 * continue. We don't care about the logic below - if you have 2940 * 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 2941 * shield equipped and try to equip another shield, there is only
3214 * one choice. However, the check for the number of body locations 2942 * one choice. However, the check for the number of body locations
3215 * does take into the account cases where what is being applied 2943 * does take into the account cases where what is being applied
3216 * may be two handed for example. 2944 * may be two handed for example.
3217 */ 2945 */
3218 if (ws) 2946 if (ws)
3219 { 2947 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 { 2948 {
3222 retval |= CAN_APPLY_UNAPPLY; 2949 retval |= CAN_APPLY_UNAPPLY;
3223 continue; 2950 continue;
3224 } 2951 }
3225 }
3226 2952
3227 tmp1 = get_item_from_body_location (who->inv, i); 2953 object *tmp1 = get_next_item_from_body_location (i, who->inv);
3228 if (!tmp1) 2954 if (!tmp1)
3229 { 2955 {
3230#if 0 2956#if 0
3231 /* This is sort of an error, but happens a lot when old players 2957 /* 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. 2958 * join in with more stuff equipped than they are now allowed.
… …
3240 /* need to unapply something. However, if this something 2966 /* need to unapply something. However, if this something
3241 * is different than we had found before, it means they need 2967 * is different than we had found before, it means they need
3242 * to apply multiple objects 2968 * to apply multiple objects
3243 */ 2969 */
3244 retval |= CAN_APPLY_UNAPPLY; 2970 retval |= CAN_APPLY_UNAPPLY;
2971
3245 if (!tmp) 2972 if (!tmp)
3246 tmp = tmp1; 2973 tmp = tmp1;
3247 else if (tmp != tmp1) 2974 else if (tmp != tmp1)
3248 {
3249 retval |= CAN_APPLY_UNAPPLY_MULT; 2975 retval |= CAN_APPLY_UNAPPLY_MULT;
3250 } 2976
3251 /* This object isn't using up all the slots, so there must 2977 /* 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 2978 * be another. If so, and it the new item doesn't need all
3253 * the slots, the player then has a choice. 2979 * the slots, the player then has a choice.
3254 */ 2980 */
3255 if (((who->body_used[i] - tmp1->body_info[i]) != who->body_info[i]) && (FABS (op->body_info[i]) < who->body_info[i])) 2981 if ((who->slot[i].used - tmp1->slot[i].info != who->slot[i].info)
2982 && abs (op->slot[i].info) < who->slot[i].info)
3256 retval |= CAN_APPLY_UNAPPLY_CHOICE; 2983 retval |= CAN_APPLY_UNAPPLY_CHOICE;
3257 2984
3258 /* Does unequippint 'tmp1' free up enough slots for this to be 2985 /* Does unequippint 'tmp1' free up enough slots for this to be
3259 * equipped? If not, there must be something else to unapply. 2986 * equipped? If not, there must be something else to unapply.
3260 */ 2987 */
3261 if ((who->body_used[i] + op->body_info[i] - tmp1->body_info[i]) < 0) 2988 if (who->slot[i].used + op->slot[i].info < tmp1->slot[i].info)
3262 retval |= CAN_APPLY_UNAPPLY_MULT; 2989 retval |= CAN_APPLY_UNAPPLY_MULT;
3263
3264 } 2990 }
3265 } /* if not enough free slots */ 2991 } /* if not enough free slots */
3266 } /* if this object uses location i */ 2992 } /* if this object uses location i */
3267 } /* for i -> num_body_locations loop */ 2993 } /* for i -> num_body_locations loop */
3268 2994
… …
3273 * and weapons all use the same slot. Similar for horn/rod/wand - they 2999 * and weapons all use the same slot. Similar for horn/rod/wand - they
3274 * all use the same location. 3000 * all use the same location.
3275 */ 3001 */
3276 if (op->type == WEAPON && !QUERY_FLAG (who, FLAG_USE_WEAPON)) 3002 if (op->type == WEAPON && !QUERY_FLAG (who, FLAG_USE_WEAPON))
3277 retval |= CAN_APPLY_RESTRICTION; 3003 retval |= CAN_APPLY_RESTRICTION;
3004
3278 if (op->type == SHIELD && !QUERY_FLAG (who, FLAG_USE_SHIELD)) 3005 if (op->type == SHIELD && !QUERY_FLAG (who, FLAG_USE_SHIELD))
3279 retval |= CAN_APPLY_RESTRICTION; 3006 retval |= CAN_APPLY_RESTRICTION;
3280 3007
3281
3282 if (who->type != PLAYER) 3008 if (who->type != PLAYER)
3283 { 3009 {
3284 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE)) 3010 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE))
3285 retval |= CAN_APPLY_RESTRICTION; 3011 retval |= CAN_APPLY_RESTRICTION;
3012
3286 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3013 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3287 retval |= CAN_APPLY_RESTRICTION; 3014 retval |= CAN_APPLY_RESTRICTION;
3015
3288 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING)) 3016 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING))
3289 retval |= CAN_APPLY_RESTRICTION; 3017 retval |= CAN_APPLY_RESTRICTION;
3018
3290 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3019 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3291 retval |= CAN_APPLY_RESTRICTION; 3020 retval |= CAN_APPLY_RESTRICTION;
3292 } 3021 }
3022
3293 return retval; 3023 return retval;
3294} 3024}
3295
3296
3297 3025
3298/** 3026/**
3299 * who is the object using the object. It can be a monster. 3027 * 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, 3028 * 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 3029 * eg, one which you put on and keep on for a while, and not something
… …
3310 * AP_UNAPPLY=always unapply). 3038 * AP_UNAPPLY=always unapply).
3311 * 3039 *
3312 * Optional flags: 3040 * Optional flags:
3313 * AP_NO_MERGE: don't merge an unapplied object with other objects 3041 * AP_NO_MERGE: don't merge an unapplied object with other objects
3314 * AP_IGNORE_CURSE: unapply cursed items 3042 * AP_IGNORE_CURSE: unapply cursed items
3043 * AP_NO_READY: do not ready skills when applying skill tools
3315 * 3044 *
3316 * Usage example: apply_special (who, op, AP_UNAPPLY | AP_IGNORE_CURSE) 3045 * Usage example: apply_special (who, op, AP_UNAPPLY | AP_IGNORE_CURSE)
3317 * 3046 *
3318 * apply_special() doesn't check for unpaid items. 3047 * apply_special() doesn't check for unpaid items.
3319 */ 3048 */
3320int 3049int
3321apply_special (object *who, object *op, int aflags) 3050apply_special (object *who, object *op, int aflags)
3322{ 3051{
3323 int basic_flag = aflags & AP_BASIC_FLAGS; 3052 int basic_flag = aflags & AP_BASIC_FLAGS;
3324 object *tmp, *tmp2, *skop = NULL; 3053 object *tmp, *tmp2, *skop = NULL;
3325 int i;
3326 3054
3327 if (who == NULL) 3055 if (who == NULL)
3328 { 3056 {
3329 LOG (llevError, "apply_special() from object without environment.\n"); 3057 LOG (llevError, "apply_special() from object without environment.\n");
3330 return 1; 3058 return 1;
… …
3340 if (basic_flag == AP_APPLY) 3068 if (basic_flag == AP_APPLY)
3341 return 0; 3069 return 0;
3342 3070
3343 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 3071 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
3344 { 3072 {
3345 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (op)); 3073 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't remove %s.", query_name (op));
3346 return 1; 3074 return 1;
3347 } 3075 }
3076
3348 return unapply_special (who, op, aflags); 3077 return unapply_special (who, op, aflags);
3349 } 3078 }
3350 3079
3351 if (basic_flag == AP_UNAPPLY) 3080 if (basic_flag == AP_UNAPPLY)
3352 return 0; 3081 return 0;
3353 3082
3354 i = can_apply_object (who, op); 3083 // if the item is combat/ranged, wield the relevant slot first
3084 // to resolve conflicts.
3085 if (player *pl = who->contr)
3086 switch (op->slottype ())
3087 {
3088 case slot_combat: who->change_weapon (pl->combat_ob); break;
3089 case slot_ranged: who->change_weapon (pl->ranged_ob); break;
3090 }
3091
3092 splay (op);
3355 3093
3356 /* Can't just apply this object. Lets see what not and what to do */ 3094 /* Can't just apply this object. Lets see what not and what to do */
3357 if (i) 3095 if (int i = can_apply_object (who, op))
3358 { 3096 {
3359 if (i & CAN_APPLY_NEVER) 3097 if (i & CAN_APPLY_NEVER)
3360 { 3098 {
3361 new_draw_info_format (NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name (op)); 3099 new_draw_info_format (NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name (op));
3362 return 1; 3100 return 1;
… …
3364 else if (i & CAN_APPLY_RESTRICTION) 3102 else if (i & CAN_APPLY_RESTRICTION)
3365 { 3103 {
3366 new_draw_info_format (NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name (op)); 3104 new_draw_info_format (NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name (op));
3367 return 1; 3105 return 1;
3368 } 3106 }
3107
3369 if (who->type != PLAYER) 3108 if (who->type != PLAYER)
3370 { 3109 {
3371 /* Some error, so don't try to equip something more */ 3110 /* Some error, so don't try to equip something more */
3372 if (unapply_for_ob (who, op, aflags)) 3111 if (unapply_for_ob (who, op, aflags))
3373 return 1; 3112 return 1;
3374 } 3113 }
3375 else 3114 else
3376 { 3115 {
3377 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice)) 3116 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice))
3378 { 3117 {
3379 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some item(s):"); 3118 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); 3119 unapply_for_ob (who, op, AP_PRINT);
3381 return 1; 3120 return 1;
3382 } 3121 }
3383 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE)) 3122 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE))
3384 {
3385 i = unapply_for_ob (who, op, aflags); 3123 if (unapply_for_ob (who, op, aflags))
3386 if (i)
3387 return 1; 3124 return 1;
3388 } 3125 }
3389 }
3390 } 3126 }
3127
3391 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL) 3128 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL)
3392 { 3129 {
3393 skop = find_skill_by_name (who, op->skill); 3130 skop = find_skill_by_name (who, op->skill);
3131
3394 if (!skop) 3132 if (!skop)
3395 { 3133 {
3396 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill); 3134 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill);
3397 return 1; 3135 return 1;
3398 } 3136 }
3399 else 3137 else
3400 {
3401 /* While experience will be credited properly, we want to change the 3138 /* While experience will be credited properly, we want to change the
3402 * skill so that the dam and wc get updated 3139 * skill so that the dam and wc get updated
3403 */ 3140 */
3404 change_skill (who, skop, 0); 3141 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 { 3142 }
3410 new_draw_info (NDI_UNIQUE, 0, who, "Equipping that combined with other items would consume your soul!"); 3143
3144 if (who->type == PLAYER
3145 && op->item_power
3146 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level)
3147 {
3148 new_draw_info (NDI_UNIQUE, 0, who,
3149 "Equipping that combined with other items would consume your soul! "
3150 "[use the skills command to check your available item power]");
3411 return 1; 3151 return 1;
3412 } 3152 }
3413
3414 3153
3415 /* Ok. We are now at the state where we can apply the new object. 3154 /* 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_... 3155 * Note that we don't have the checks for can_use_...
3417 * below - that is already taken care of by can_apply_object. 3156 * below - that is already taken care of by can_apply_object.
3418 */ 3157 */
3419
3420
3421 if (op->nrof > 1) 3158 if (op->nrof > 1)
3422 tmp = get_split_ob (op, op->nrof - 1); 3159 tmp = get_split_ob (op, op->nrof - 1);
3423 else 3160 else
3424 tmp = NULL; 3161 tmp = 0;
3425 3162
3426 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op))) 3163 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
3427 return RESULT_INT (0); 3164 return RESULT_INT (0);
3428 3165
3429 switch (op->type) 3166 switch (op->type)
3430 { 3167 {
3431 case WEAPON: 3168 case WEAPON:
3432 if (!check_weapon_power (who, op->last_eat)) 3169 if (!check_weapon_power (who, op->last_eat))
3433 { 3170 {
3434 new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use."); 3171 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!."); 3172 "It would consume your soul!.");
3173
3436 if (tmp != NULL) 3174 if (tmp)
3437 (void) insert_ob_in_ob (tmp, who); 3175 insert_ob_in_ob (tmp, who);
3176
3438 return 1; 3177 return 1;
3439 } 3178 }
3179
3180 //TODO: this obviously fails for players using a shorter prefix
3181 // i.e. "R" can use Ragnarok's sword.
3440 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3182 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3441 { 3183 {
3442 /* if the weapon does not have the name as the character, can't use it. */ 3184 /* 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) */ 3185 /* (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."); 3186 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner.");
3187
3445 if (tmp != NULL) 3188 if (tmp)
3446 (void) insert_ob_in_ob (tmp, who); 3189 insert_ob_in_ob (tmp, who);
3190
3447 return 1; 3191 return 1;
3448 } 3192 }
3193
3194 if (!skop)
3195 {
3196 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO
3197 return 1;
3198 }
3199
3449 SET_FLAG (op, FLAG_APPLIED); 3200 SET_FLAG (op, FLAG_APPLIED);
3450
3451 if (skop)
3452 change_skill (who, skop, 1); 3201 who->change_skill (skop);
3453 if (!QUERY_FLAG (who, FLAG_READY_WEAPON)) 3202
3454 SET_FLAG (who, FLAG_READY_WEAPON); 3203 if (who->contr)
3204 who->change_weapon (who->contr->combat_ob = op);
3455 3205
3456 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op)); 3206 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op));
3457 3207
3208 SET_FLAG (who, FLAG_READY_WEAPON);
3458 (void) change_abil (who, op); 3209 change_abil (who, op);
3459 break; 3210 break;
3460 3211
3461 case ARMOUR: 3212 case ARMOUR:
3462 case HELMET: 3213 case HELMET:
3463 case SHIELD: 3214 case SHIELD:
… …
3468 case CLOAK: 3219 case CLOAK:
3469 case RING: 3220 case RING:
3470 case AMULET: 3221 case AMULET:
3471 SET_FLAG (op, FLAG_APPLIED); 3222 SET_FLAG (op, FLAG_APPLIED);
3472 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op)); 3223 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op));
3473 (void) change_abil (who, op); 3224 change_abil (who, op);
3474 break; 3225 break;
3226
3475 case LAMP: 3227 case LAMP:
3476 if (op->stats.food < 1) 3228 if (op->stats.food < 1)
3477 { 3229 {
3478 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of" " fuel!", &op->name); 3230 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of fuel!", &op->name);
3479 return 1; 3231 return 1;
3480 } 3232 }
3233
3481 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name); 3234 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name);
3482 tmp2 = arch_to_object (op->other_arch); 3235 tmp2 = arch_to_object (op->other_arch);
3483 tmp2->stats.food = op->stats.food; 3236 tmp2->stats.food = op->stats.food;
3484 SET_FLAG (tmp2, FLAG_APPLIED); 3237 SET_FLAG (tmp2, FLAG_APPLIED);
3238
3485 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 3239 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3486 SET_FLAG (tmp2, FLAG_INV_LOCKED); 3240 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3241
3487 insert_ob_in_ob (tmp2, who); 3242 insert_ob_in_ob (tmp2, who);
3488 3243
3489 /* Remove the old lantern */ 3244 /* Remove the old lantern */
3490 if (who->type == PLAYER) 3245 if (who->type == PLAYER)
3491 esrv_del_item (who->contr, op->count); 3246 esrv_del_item (who->contr, op->count);
3492 3247
3493 op->destroy (); 3248 op->destroy ();
3494 3249
3495 /* insert the portion that was split off */ 3250 /* insert the portion that was split off */
3496 if (tmp != NULL) 3251 if (tmp)
3497 { 3252 {
3498 (void) insert_ob_in_ob (tmp, who); 3253 insert_ob_in_ob (tmp, who);
3499 if (who->type == PLAYER) 3254 if (who->type == PLAYER)
3500 esrv_send_item (who, tmp); 3255 esrv_send_item (who, tmp);
3501 } 3256 }
3502 fix_player (who); 3257
3258 who->update_stats ();
3259
3503 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3260 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3504 {
3505 if (who->type == PLAYER) 3261 if (who->type == PLAYER)
3506 { 3262 {
3507 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3263 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
3508 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 3264 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3509 } 3265 }
3510 } 3266
3511 if (who->type == PLAYER) 3267 if (who->type == PLAYER)
3512 esrv_send_item (who, tmp2); 3268 esrv_send_item (who, tmp2);
3269
3513 return 0; 3270 return 0;
3271
3272 case SKILL_TOOL:
3273 // applying a skill tool also readies the skill
3274 SET_FLAG (op, FLAG_APPLIED);
3275
3276 if (!(aflags & AP_NO_READY))
3277 {
3278 skop = find_skill_by_name (who, op->skill);
3279 if (!skop->flag [FLAG_APPLIED])
3280 apply_special (who, skop, AP_APPLY);
3281 }
3514 break; 3282 break;
3515 3283
3516 /* this part is needed for skill-tools */
3517 case SKILL: 3284 case SKILL:
3518 case SKILL_TOOL: 3285 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 } 3286 {
3524 if (who->type == PLAYER) 3287 if (IS_COMBAT_SKILL (op->subtype))
3525 { 3288 {
3526 who->contr->shoottype = range_skill; 3289 if (skill_flags [op->subtype] & SF_NEED_WEAPON)
3527 who->contr->ranges[range_skill] = op; 3290 {
3291 for (object *item = who->inv; item; item = item->below)
3292 if (item->type == WEAPON && item->flag [FLAG_APPLIED])
3293 {
3294 if (item->skill == op->skill)
3295 {
3296 who->change_weapon (pl->combat_ob = item);
3297 goto found_weapon;
3298 }
3299 }
3300
3301 new_draw_info_format (NDI_UNIQUE, 0, who, "You need to apply a '%s' melee weapon before readying this skill", &op->skill);
3302 return 1;
3303
3304 found_weapon:;
3305 }
3306 else
3307 who->change_weapon (pl->combat_ob = op);
3308 }
3309 else if (IS_RANGED_SKILL (op->subtype))
3310 {
3311 if (skill_flags [op->subtype] & SF_NEED_BOW)
3312 {
3313 for (object *item = who->inv; item; item = item->below)
3314 if (item->type == BOW && item->flag [FLAG_APPLIED])
3315 {
3316 //TODO: bows should/must all have skill missile weapon right now
3317 who->change_weapon (pl->ranged_ob = item);
3318 goto found_bow;
3319 }
3320
3321 new_draw_info (NDI_UNIQUE, 0, who, "You need to apply a missile weapon before readying this skill");
3322 return 1;
3323
3324 found_bow:;
3325 }
3326 else
3327 who->change_weapon (pl->ranged_ob = op);
3328 }
3329
3528 if (!op->invisible) 3330 if (!op->invisible)
3529 { 3331 {
3530 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3332 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); 3333 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill);
3532 } 3334 }
3533 else 3335 else
3534 {
3535 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name); 3336 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name);
3536 } 3337 }
3338 else
3537 } 3339 {
3538 SET_FLAG (op, FLAG_APPLIED); 3340 SET_FLAG (op, FLAG_APPLIED);
3539 (void) change_abil (who, op); 3341 change_abil (who, op);
3540 who->chosen_skill = op; 3342 who->chosen_skill = op;
3541 SET_FLAG (who, FLAG_READY_SKILL); 3343 SET_FLAG (who, FLAG_READY_SKILL);
3344 }
3345
3542 break; 3346 break;
3543 3347
3544 case BOW: 3348 case BOW:
3545 if (!check_weapon_power (who, op->last_eat)) 3349 if (!check_weapon_power (who, op->last_eat))
3546 { 3350 {
3547 new_draw_info (NDI_UNIQUE, 0, who, "That item is too powerful for you to use."); 3351 new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use.");
3548 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3352 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!.");
3353
3549 if (tmp != NULL) 3354 if (tmp)
3550 (void) insert_ob_in_ob (tmp, who); 3355 insert_ob_in_ob (tmp, who);
3356
3551 return 1; 3357 return 1;
3552 } 3358 }
3359
3553 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3360 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3554 { 3361 {
3555 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3362 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner.");
3556 if (tmp != NULL) 3363 if (tmp)
3557 (void) insert_ob_in_ob (tmp, who); 3364 insert_ob_in_ob (tmp, who);
3365
3558 return 1; 3366 return 1;
3559 } 3367 }
3368
3560 /*FALLTHROUGH*/ case WAND: 3369 /*FALLTHROUGH*/
3370 case WAND:
3561 case ROD: 3371 case ROD:
3562 case HORN: 3372 case HORN:
3563 /* check for skill, alter player status */ 3373 /* check for skill, alter player status */
3374
3375 if (!skop)
3376 {
3377 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO
3378 return 1;
3379 }
3380
3564 SET_FLAG (op, FLAG_APPLIED); 3381 SET_FLAG (op, FLAG_APPLIED);
3565 if (skop)
3566 change_skill (who, skop, 0); 3382 who->change_skill (skop);
3383
3384 if (who->contr)
3385 {
3386 who->contr->ranged_ob = op;
3387
3567 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3388 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3568 3389
3569 if (who->type == PLAYER)
3570 {
3571 if (op->type == BOW) 3390 if (op->type == BOW)
3572 { 3391 {
3392 who->current_weapon = op;
3573 (void) change_abil (who, op); 3393 change_abil (who, op);
3574 new_draw_info_format (NDI_UNIQUE, 0, who, 3394 new_draw_info_format (NDI_UNIQUE, 0, who,
3575 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)); 3395 "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 } 3396 }
3582 } 3397 }
3583 else 3398 else
3584 { 3399 {
3585 if (op->type == BOW) 3400 if (op->type == BOW)
3586 SET_FLAG (who, FLAG_READY_BOW); 3401 SET_FLAG (who, FLAG_READY_BOW);
3587 else 3402 else
3588 SET_FLAG (who, FLAG_READY_RANGE); 3403 SET_FLAG (who, FLAG_READY_RANGE);
3589 } 3404 }
3405
3590 break; 3406 break;
3591 3407
3592 case BUILDER: 3408 case BUILDER:
3593 if (who->contr->ranges[range_builder]) 3409 if (who->type == PLAYER)
3410 {
3411 //TODO: wtf does this do? shouldn't this be managed automatically (slots?)
3412 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER)
3594 unapply_special (who, who->contr->ranges[range_builder], 0); 3413 unapply_special (who, who->contr->ranged_ob, 0);
3595 who->contr->shoottype = range_builder; 3414
3596 who->contr->ranges[range_builder] = op;
3597 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op)); 3415 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op));
3416
3417 who->contr->ranged_ob = op;
3418 }
3598 break; 3419 break;
3599 3420
3600 default: 3421 default:
3601 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op)); 3422 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op));
3602 } /* end of switch op->type */ 3423 } /* end of switch op->type */
3603 3424
3604 SET_FLAG (op, FLAG_APPLIED); 3425 SET_FLAG (op, FLAG_APPLIED);
3605 3426
3606 if (tmp != NULL) 3427 if (tmp)
3607 tmp = insert_ob_in_ob (tmp, who); 3428 tmp = insert_ob_in_ob (tmp, who);
3608 3429
3609 fix_player (who); 3430 who->update_stats ();
3610 3431
3611 /* We exclude spell casting objects. The fire code will set the 3432 /* We exclude spell casting objects. The fire code will set the
3612 * been applied flag when they are used - until that point, 3433 * been applied flag when they are used - until that point,
3613 * you don't know anything about them. 3434 * you don't know anything about them.
3614 */ 3435 */
… …
3621 { 3442 {
3622 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3443 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
3623 SET_FLAG (op, FLAG_KNOWN_CURSED); 3444 SET_FLAG (op, FLAG_KNOWN_CURSED);
3624 } 3445 }
3625 } 3446 }
3447
3626 if (who->type == PLAYER) 3448 if (who->type == PLAYER)
3627 { 3449 {
3628 /* if multiple objects were applied, update both slots */ 3450 /* if multiple objects were applied, update both slots */
3629 if (tmp) 3451 if (tmp)
3630 esrv_send_item (who, tmp); 3452 esrv_send_item (who, tmp);
3453
3631 esrv_send_item (who, op); 3454 esrv_send_item (who, op);
3632 } 3455 }
3456
3633 return 0; 3457 return 0;
3634} 3458}
3635
3636 3459
3637int 3460int
3638monster_apply_special (object *who, object *op, int aflags) 3461monster_apply_special (object *who, object *op, int aflags)
3639{ 3462{
3640 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED)) 3463 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
… …
3684 3507
3685 case TREASURE: 3508 case TREASURE:
3686 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 3509 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
3687 return 0; 3510 return 0;
3688 3511
3689 while ((op->stats.hp--) > 0) 3512 while (op->stats.hp-- > 0)
3690 create_treasure (op->randomitems, op, op->map ? GT_ENVIRONMENT : 0, 3513 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); 3514 op->stats.exp ? (int) op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0);
3692 3515
3693 /* If we generated an object and put it in this object inventory, 3516 /* 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 3517 * move it to the parent object as the current object is about
… …
3711 } 3534 }
3712 return tmp ? 1 : 0; 3535 return tmp ? 1 : 0;
3713} 3536}
3714 3537
3715/** 3538/**
3716 * fix_auto_apply goes through the entire map (only the first time 3539 * fix_auto_apply goes through the entire map every time a map
3717 * when an original map is loaded) and performs special actions for 3540 * is loaded or swapped in and performs special actions for
3718 * certain objects (most initialization of chests and creation of 3541 * certain objects (most initialization of chests and creation of
3719 * treasures and stuff). Calls auto_apply if appropriate. 3542 * treasures and stuff). Calls auto_apply if appropriate.
3720 */ 3543 */
3721void 3544void
3722fix_auto_apply (maptile *m) 3545maptile::fix_auto_apply ()
3723{ 3546{
3724 object *tmp, *above = NULL; 3547 if (!spaces)
3725 int x, y;
3726
3727 if (m == NULL)
3728 return; 3548 return;
3729 3549
3730 for (x = 0; x < MAP_WIDTH (m); x++) 3550 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3731 for (y = 0; y < MAP_HEIGHT (m); y++) 3551 for (object *tmp = ms->bot; tmp; )
3732 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = above)
3733 { 3552 {
3734 above = tmp->above; 3553 object *above = tmp->above;
3735 3554
3736 if (tmp->inv) 3555 if (tmp->inv)
3737 { 3556 {
3738 object *invtmp, *invnext; 3557 object *invtmp, *invnext;
3739 3558
3740 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext) 3559 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext)
3741 { 3560 {
3742 invnext = invtmp->below; 3561 invnext = invtmp->below;
3743 3562
3744 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY)) 3563 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY))
3745 auto_apply (invtmp); 3564 auto_apply (invtmp);
3746 else if (invtmp->type == TREASURE && invtmp->has_random_items ()) 3565 else if (invtmp->type == TREASURE && invtmp->has_random_items ())
3747 { 3566 {
3748 while ((invtmp->stats.hp--) > 0) 3567 while ((invtmp->stats.hp--) > 0)
3749 create_treasure (invtmp->randomitems, invtmp, 0, m->difficulty, 0); 3568 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3750 3569
3751 invtmp->randomitems = NULL; 3570 invtmp->randomitems = NULL;
3752 } 3571 }
3753 else if (invtmp && invtmp->arch 3572 else if (invtmp && invtmp->arch
3754 && invtmp->type != TREASURE && invtmp->type != SPELL && invtmp->type != CLASS && invtmp->has_random_items ()) 3573 && invtmp->type != TREASURE && invtmp->type != SPELL && invtmp->type != CLASS && invtmp->has_random_items ())
3755 { 3574 {
3756 create_treasure (invtmp->randomitems, invtmp, 0, m->difficulty, 0); 3575 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3757 /* Need to clear this so that we never try to create 3576 /* Need to clear this so that we never try to create
3758 * treasure again for this object 3577 * treasure again for this object
3759 */ 3578 */
3760 invtmp->randomitems = NULL; 3579 invtmp->randomitems = NULL;
3761 } 3580 }
3762 } 3581 }
3763 /* This is really temporary - the code at the bottom will 3582 /* This is really temporary - the code at the bottom will
3764 * also set randomitems to null. The problem is there are bunches 3583 * also set randomitems to null. The problem is there are bunches
3765 * of maps/players already out there with items that have spells 3584 * of maps/players already out there with items that have spells
3766 * which haven't had the randomitems set to null yet. 3585 * which haven't had the randomitems set to null yet.
3767 * MSW 2004-05-13 3586 * MSW 2004-05-13
3768 * 3587 *
3769 * And if it's a spellbook, it's better to set randomitems to NULL too, 3588 * And if it's a spellbook, it's better to set randomitems to NULL too,
3770 * else you get two spells in the book ^_- 3589 * else you get two spells in the book ^_-
3771 * Ryo 2004-08-16 3590 * Ryo 2004-08-16
3772 */ 3591 */
3773 if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL 3592 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) 3593 || 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; 3594 tmp->randomitems = NULL;
3595
3786 } 3596 }
3597
3598 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY))
3599 auto_apply (tmp);
3600 else if ((tmp->type == TREASURE || (tmp->type == CONTAINER)) && tmp->has_random_items ())
3601 {
3602 while ((tmp->stats.hp--) > 0)
3603 create_treasure (tmp->randomitems, tmp, 0, difficulty, 0);
3604 tmp->randomitems = NULL;
3605 }
3787 else if (tmp->type == TIMED_GATE) 3606 else if (tmp->type == TIMED_GATE)
3788 { 3607 {
3789 object *head = tmp->head != NULL ? tmp->head : tmp; 3608 object *head = tmp->head != NULL ? tmp->head : tmp;
3790 3609
3791 if (QUERY_FLAG (head, FLAG_IS_LINKED)) 3610 if (QUERY_FLAG (head, FLAG_IS_LINKED))
3792 {
3793 tmp->speed = 0; 3611 tmp->set_speed (0);
3794 update_ob_speed (tmp);
3795 }
3796 } 3612 }
3797 /* This function can be called everytime a map is loaded, even when 3613 /* 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 3614 * 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 3615 * 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. 3616 * 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 3617 * This is a problem for the above objects, because they have counters
3802 * which say how many times to make the treasure. 3618 * which say how many times to make the treasure.
3803 */ 3619 */
3804 else if (tmp && tmp->arch && tmp->type != PLAYER 3620 else if (tmp && tmp->arch && tmp->type != PLAYER
3805 && tmp->type != TREASURE && tmp->type != SPELL 3621 && tmp->type != TREASURE && tmp->type != SPELL
3806 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && tmp->has_random_items ()) 3622 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && tmp->has_random_items ())
3807 { 3623 {
3808 create_treasure (tmp->randomitems, tmp, GT_APPLY, m->difficulty, 0); 3624 create_treasure (tmp->randomitems, tmp, GT_APPLY, difficulty, 0);
3809 tmp->randomitems = NULL; 3625 tmp->randomitems = NULL;
3810 } 3626 }
3627
3628 // close all containers
3629 else if (tmp->type == CONTAINER)
3630 tmp->flag [FLAG_APPLIED] = 0;
3631
3632 tmp = above;
3811 } 3633 }
3812 3634
3813 for (x = 0; x < MAP_WIDTH (m); x++) 3635 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3814 for (y = 0; y < MAP_HEIGHT (m); y++) 3636 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)) 3637 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL))
3817 check_trigger (tmp, tmp->above); 3638 check_trigger (tmp, tmp->above);
3818} 3639}
3819 3640
3820/** 3641/**
3821 * Handles player eating food that temporarily changes status (resistances, stats). 3642 * Handles player eating food that temporarily changes status (resistances, stats).
3822 * This used to call cast_change_attr(), but 3643 * This used to call cast_change_attr(), but
3823 * that doesn't work with the new spell code. Since we know what 3644 * 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. 3645 * the food changes, just grab a force and use that instead.
3825 */ 3646 */
3826
3827void 3647void
3828eat_special_food (object *who, object *food) 3648eat_special_food (object *who, object *food)
3829{ 3649{
3830 object *force; 3650 object *force;
3831 int i, did_one = 0; 3651 int i, did_one = 0;
3832 sint8 k;
3833 3652
3834 force = get_archetype (FORCE_NAME); 3653 force = get_archetype (FORCE_NAME);
3835 3654
3836 for (i = 0; i < NUM_STATS; i++) 3655 for (i = 0; i < NUM_STATS; i++)
3837 { 3656 if (sint8 k = food->stats.stat (i))
3838 k = get_attr_value (&food->stats, i);
3839 if (k)
3840 { 3657 {
3841 set_attr_value (&force->stats, i, k); 3658 force->stats.stat (i) = k;
3842 did_one = 1; 3659 did_one = 1;
3843 } 3660 }
3844 }
3845 3661
3846 /* check if we can protect the eater */ 3662 /* check if we can protect the eater */
3847 for (i = 0; i < NROFATTACKS; i++) 3663 for (i = 0; i < NROFATTACKS; i++)
3848 { 3664 {
3849 if (food->resist[i] > 0) 3665 if (food->resist[i] > 0)
3850 { 3666 {
3851 force->resist[i] = food->resist[i] / 2; 3667 force->resist[i] = food->resist[i] / 2;
3852 did_one = 1; 3668 did_one = 1;
3853 } 3669 }
3854 } 3670 }
3671
3855 if (did_one) 3672 if (did_one)
3856 { 3673 {
3857 force->speed = 0.1; 3674 force->set_speed (0.1);
3858 update_ob_speed (force);
3859 /* bigger morsel of food = longer effect time */ 3675 /* bigger morsel of food = longer effect time */
3860 force->stats.food = food->stats.food / 5; 3676 force->duration = food->stats.food / 5;
3861 SET_FLAG (force, FLAG_IS_USED_UP);
3862 SET_FLAG (force, FLAG_APPLIED); 3677 SET_FLAG (force, FLAG_APPLIED);
3863 change_abil (who, force); 3678 change_abil (who, force);
3864 insert_ob_in_ob (force, who); 3679 insert_ob_in_ob (force, who);
3865 } 3680 }
3866 else 3681 else
… …
3869 /* check for hp, sp change */ 3684 /* check for hp, sp change */
3870 if (food->stats.hp != 0) 3685 if (food->stats.hp != 0)
3871 { 3686 {
3872 if (QUERY_FLAG (food, FLAG_CURSED)) 3687 if (QUERY_FLAG (food, FLAG_CURSED))
3873 { 3688 {
3874 strcpy (who->contr->killer, food->name); 3689 assign (who->contr->killer, food->name);
3875 hit_player (who, food->stats.hp, food, AT_POISON, 1); 3690 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3876 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!"); 3691 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!");
3877 } 3692 }
3878 else 3693 else
3879 { 3694 {
… …
3898 new_draw_info (NDI_UNIQUE, 0, who, "You feel a rush of magical energy!"); 3713 new_draw_info (NDI_UNIQUE, 0, who, "You feel a rush of magical energy!");
3899 who->stats.sp += food->stats.sp; 3714 who->stats.sp += food->stats.sp;
3900 /* place limit on max sp from food? */ 3715 /* place limit on max sp from food? */
3901 } 3716 }
3902 } 3717 }
3903 fix_player (who); 3718 who->update_stats ();
3904} 3719}
3905
3906 3720
3907/** 3721/**
3908 * Designed primarily to light torches/lanterns/etc. 3722 * Designed primarily to light torches/lanterns/etc.
3909 * Also burns up burnable material too. First object in the inventory is 3723 * Also burns up burnable material too. First object in the inventory is
3910 * the selected object to "burn". -b.t. 3724 * the selected object to "burn". -b.t.
3911 */ 3725 */
3912
3913void 3726void
3914apply_lighter (object *who, object *lighter) 3727apply_lighter (object *who, object *lighter)
3915{ 3728{
3916 object *item; 3729 object *item;
3917 int is_player_env = 0; 3730 int is_player_env = 0;
3918 char item_name[MAX_BUF];
3919 3731
3920 item = find_marked_object (who); 3732 item = find_marked_object (who);
3921 if (item) 3733 if (item)
3922 { 3734 {
3923 if (lighter->last_eat && lighter->stats.food) 3735 if (lighter->last_eat && lighter->stats.food)
… …
3941 else if (lighter->last_eat) 3753 else if (lighter->last_eat)
3942 { /* no charges left in lighter */ 3754 { /* 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); 3755 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; 3756 return;
3945 } 3757 }
3758
3946 /* Perhaps we should split what we are trying to light on fire? 3759 /* 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 3760 * I can't see many times when you would want to light multiple
3948 * objects at once. 3761 * objects at once.
3949 */ 3762 */
3950 /* If the item is destroyed, we don't have a valid pointer to the 3763
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)) 3764 if (who == item->in_player ())
3956 is_player_env = 1; 3765 is_player_env = 1;
3957 3766
3958 save_throw_object (item, AT_FIRE, who); 3767 save_throw_object (item, AT_FIRE, who);
3959 /* Change to check count and not freed, since the object pointer 3768
3960 * may have gotten recycled
3961 */
3962 if (item->destroyed ()) 3769 if (item->destroyed ())
3963 { 3770 {
3964 new_draw_info_format (NDI_UNIQUE, 0, who, "You light the %s with the %s.", &item_name, &lighter->name); 3771 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 3772 /* Need to update the player so that the players glow radius
3966 * gets changed. 3773 * gets changed.
3967 */ 3774 */
3968 if (is_player_env) 3775 if (is_player_env)
3969 fix_player (who); 3776 who->update_stats ();
3970 } 3777 }
3971 else 3778 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); 3779 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with the %s and fail.", &item->name, &lighter->name);
3973 } 3780 }
3974 else /* nothing to light */ 3781 else /* nothing to light */
… …
4019 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!"); 3826 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!");
4020 blind_player (op, op, power); 3827 blind_player (op, op, power);
4021 } 3828 }
4022 else if (failure <= -80) 3829 else if (failure <= -80)
4023 { /* blast the immediate area */ 3830 { /* blast the immediate area */
4024 object *tmp;
4025
4026 tmp = get_archetype (LOOSE_MANA); 3831 object *tmp = get_archetype (LOOSE_MANA);
4027 cast_magic_storm (op, tmp, power); 3832 cast_magic_storm (op, tmp, power);
4028 new_draw_info (NDI_UNIQUE, 0, op, "You unlease uncontrolled mana!"); 3833 new_draw_info (NDI_UNIQUE, 0, op, "You unleash uncontrolled mana!");
4029 tmp->destroy (); 3834 tmp->destroy ();
4030 } 3835 }
4031 } 3836 }
4032} 3837}
4033 3838
… …
4053 */ 3858 */
4054 int i, j; 3859 int i, j;
4055 3860
4056 for (i = 0; i < NUM_STATS; i++) 3861 for (i = 0; i < NUM_STATS; i++)
4057 { 3862 {
4058 sint8 stat = get_attr_value (stats, i); 3863 int race_bonus = pl->arch->stats.stat (i);
4059 int race_bonus = get_attr_value (&(pl->arch->clone.stats), i); 3864 sint8 stat = stats->stat (i) + ns->stat (i);
4060 3865
4061 stat += get_attr_value (ns, i);
4062 if (stat > 20 + race_bonus) 3866 if (stat > 20 + race_bonus)
4063 { 3867 {
4064 excess_stat++; 3868 excess_stat++;
4065 stat = 20 + race_bonus; 3869 stat = 20 + race_bonus;
4066 } 3870 }
4067 set_attr_value (stats, i, stat); 3871
3872 stats->stat (i) = stat;
4068 } 3873 }
4069 3874
4070 for (j = 0; excess_stat > 0 && j < 100; j++) 3875 for (j = 0; excess_stat > 0 && j < 100; j++)
4071 { /* try 100 times to assign excess stats */ 3876 { /* try 100 times to assign excess stats */
4072 int i = rndm (0, 6); 3877 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 3878
4076 if (i == CHA) 3879 if (i == CHA)
4077 continue; /* exclude cha from this */ 3880 continue; /* exclude cha from this */
3881
3882 int stat = stats->stat (i);
3883 int race_bonus = pl->arch->stats.stat (i);
4078 if (stat < 20 + race_bonus) 3884 if (stat < 20 + race_bonus)
4079 { 3885 {
4080 change_attr_value (stats, i, 1); 3886 change_attr_value (stats, i, 1);
4081 excess_stat--; 3887 excess_stat--;
4082 } 3888 }
… …
4085 /* insert the randomitems from the change's treasurelist into 3891 /* insert the randomitems from the change's treasurelist into
4086 * the player ref: player.c 3892 * the player ref: player.c
4087 */ 3893 */
4088 if (change->randomitems != NULL) 3894 if (change->randomitems != NULL)
4089 give_initial_items (pl, change->randomitems); 3895 give_initial_items (pl, change->randomitems);
4090
4091 3896
4092 /* set up the face, for some races. */ 3897 /* set up the face, for some races. */
4093 3898
4094 /* first, look for the force object banning 3899 /* first, look for the force object banning
4095 * changing the face. Certain races never change face with class. 3900 * changing the face. Certain races never change face with class.
… …
4152 { 3957 {
4153 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked)); 3958 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; 3959 return;
4155 } 3960 }
4156 /* check whether they are compatible or not */ 3961 /* check whether they are compatible or not */
4157 find = strstr (marked->slaying, transformer->arch->name); 3962 find = strstr (marked->slaying, transformer->arch->archname);
4158 if (!find || (*(find + strlen (transformer->arch->name)) != ':')) 3963 if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
4159 { 3964 {
4160 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked)); 3965 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; 3966 return;
4162 } 3967 }
4163 find += strlen (transformer->arch->name) + 1; 3968 find += strlen (transformer->arch->archname) + 1;
4164 /* Item can be used, now find how many and what it yields */ 3969 /* Item can be used, now find how many and what it yields */
4165 if (isdigit (*(find))) 3970 if (isdigit (*(find)))
4166 { 3971 {
4167 yield = atoi (find); 3972 yield = atoi (find);
4168 if (yield < 1) 3973 if (yield < 1)

Diff Legend

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