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.37 by root, Tue Dec 12 21:39:57 2006 UTC vs.
Revision 1.113 by root, Tue Jul 10 05:51:38 2007 UTC

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

Diff Legend

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