ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/apply.C
(Generate patch)

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.43 by root, Tue Dec 19 05:12:52 2006 UTC vs.
Revision 1.82 by root, Mon May 7 03:05:58 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program 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 2 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, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
24
25#include <cmath>
23 26
24#include <global.h> 27#include <global.h>
25#include <living.h> 28#include <living.h>
26#include <spells.h> 29#include <spells.h>
27#include <skills.h> 30#include <skills.h>
28#include <tod.h> 31#include <tod.h>
29 32
30#ifndef __CEXTRACT__
31# include <sproto.h> 33#include <sproto.h>
32#endif
33 34
34/* Want this regardless of rplay. */ 35/* Want this regardless of rplay. */
35#include <sounds.h> 36#include <sounds.h>
36
37/* need math lib for double-precision and pow() in dragon_eat_flesh() */
38#include <math.h>
39 37
40/** 38/**
41 * Check if op should abort moving victim because of it's race or slaying. 39 * Check if op should abort moving victim because of it's race or slaying.
42 * Returns 1 if it should abort, returns 0 if it should continue. 40 * Returns 1 if it should abort, returns 0 if it should continue.
43 */ 41 */
… …
66 { 64 {
67 arch_flag = 1; 65 arch_flag = 1;
68 name_flag = 1; 66 name_flag = 1;
69 race_flag = 1; 67 race_flag = 1;
70 } 68 }
69
71 /* If the director has race set, only affect objects with a arch, 70 /* If the director has race set, only affect objects with a arch,
72 * name or race that matches. 71 * name or race that matches.
73 */ 72 */
74 if ((op->race) && 73 if ((op->race) &&
75 ((!(victim->arch && arch_flag && victim->arch->name) || strcmp (op->race, victim->arch->name))) && 74 ((!(victim->arch && arch_flag && victim->arch->name) || op->race != victim->arch->name)) &&
76 ((!(victim->name && name_flag) || strcmp (op->race, victim->name))) && 75 ((!(victim->name && name_flag) || op->race != victim->name)) &&
77 ((!(victim->race && race_flag) || strcmp (op->race, victim->race)))) 76 ((!(victim->race && race_flag) || op->race != victim->race)))
78 {
79 return 1; 77 return 1;
80 } 78
81 /* If the director has slaying set, only affect objects where none 79 /* If the director has slaying set, only affect objects where none
82 * of arch, name, or race match. 80 * of arch, name, or race match.
83 */ 81 */
84 if ((op->slaying) && (((victim->arch && arch_flag && victim->arch->name && !strcmp (op->slaying, victim->arch->name))) || 82 if ((op->slaying) && (((victim->arch && arch_flag && victim->arch->name && op->slaying == victim->arch->name))) ||
85 ((victim->name && name_flag && !strcmp (op->slaying, victim->name))) || 83 ((victim->name && name_flag && op->slaying == victim->name)) ||
86 ((victim->race && race_flag && !strcmp (op->slaying, victim->race))))) 84 ((victim->race && race_flag && op->slaying == victim->race)))
87 {
88 return 1; 85 return 1;
89 } 86
90 return 0; 87 return 0;
91} 88}
92 89
93/** 90/**
94 * This handles a player dropping money on an altar to identify stuff. 91 * This handles a player dropping money on an altar to identify stuff.
… …
195apply_potion (object *op, object *tmp) 192apply_potion (object *op, object *tmp)
196{ 193{
197 int got_one = 0, i; 194 int got_one = 0, i;
198 object *force = 0, *floor = 0; 195 object *force = 0, *floor = 0;
199 196
200 floor = get_map_ob (op->map, op->x, op->y); 197 floor = GET_MAP_OB (op->map, op->x, op->y);
201 198
202 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 199 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
203 { 200 {
204 if (op->type == PLAYER) 201 if (op->type == PLAYER)
205 new_draw_info (NDI_UNIQUE, 0, op, "Gods prevent you from using this here, it's sacred ground!"); 202 new_draw_info (NDI_UNIQUE, 0, op, "Gods prevent you from using this here, it's sacred ground!");
… …
219 object *depl; 216 object *depl;
220 archetype *at; 217 archetype *at;
221 218
222 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 219 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
223 { 220 {
224 drain_stat (op); 221 op->drain_stat ();
225 fix_player (op); 222 op->update_stats ();
226 decrease_ob (tmp); 223 decrease_ob (tmp);
227 return 1; 224 return 1;
228 } 225 }
229 226
230 if ((at = archetype::find (ARCH_DEPLETION)) == NULL) 227 if (!(at = archetype::find (ARCH_DEPLETION)))
231 { 228 {
232 LOG (llevError, "Could not find archetype depletion\n"); 229 LOG (llevError, "Could not find archetype depletion\n");
233 return 0; 230 return 0;
234 } 231 }
235 depl = present_arch_in_ob (at, op); 232 depl = present_arch_in_ob (at, op);
236 233
237 if (depl != NULL) 234 if (depl)
238 { 235 {
239 for (i = 0; i < NUM_STATS; i++) 236 for (i = 0; i < NUM_STATS; i++)
240 if (get_attr_value (&depl->stats, i)) 237 if (get_attr_value (&depl->stats, i))
241 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]); 238 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]);
242 239
243 depl->destroy (); 240 depl->destroy ();
244 fix_player (op); 241 op->update_stats ();
245 } 242 }
246 else 243 else
247 new_draw_info (NDI_UNIQUE, 0, op, "You potion had no effect."); 244 new_draw_info (NDI_UNIQUE, 0, op, "You potion had no effect.");
248 245
249 decrease_ob (tmp); 246 decrease_ob (tmp);
… …
299 296
300 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)) 297 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))
301 { 298 {
302 if (got_one) 299 if (got_one)
303 { 300 {
304 fix_player (op); 301 op->update_stats ();
305 new_draw_info (NDI_UNIQUE, 0, op, "The Gods smile upon you and remake you"); 302 new_draw_info (NDI_UNIQUE, 0, op, "The Gods smile upon you and remake you");
306 new_draw_info (NDI_UNIQUE, 0, op, "a little more in their image."); 303 new_draw_info (NDI_UNIQUE, 0, op, "a little more in their image.");
307 new_draw_info (NDI_UNIQUE, 0, op, "You feel a little more perfect."); 304 new_draw_info (NDI_UNIQUE, 0, op, "You feel a little more perfect.");
308 } 305 }
309 else 306 else
… …
311 } 308 }
312 else 309 else
313 { /* cursed potion */ 310 { /* cursed potion */
314 if (got_one) 311 if (got_one)
315 { 312 {
316 fix_player (op); 313 op->update_stats ();
317 new_draw_info (NDI_UNIQUE, 0, op, "The Gods are angry and punish you."); 314 new_draw_info (NDI_UNIQUE, 0, op, "The Gods are angry and punish you.");
318 } 315 }
319 else 316 else
320 new_draw_info (NDI_UNIQUE, 0, op, "You are fortunate that you are so pathetic."); 317 new_draw_info (NDI_UNIQUE, 0, op, "You are fortunate that you are so pathetic.");
321 } 318 }
… …
349 cast_spell (op, tmp, op->facing, tmp->inv, NULL); 346 cast_spell (op, tmp, op->facing, tmp->inv, NULL);
350 347
351 decrease_ob (tmp); 348 decrease_ob (tmp);
352 /* if youre dead, no point in doing this... */ 349 /* if youre dead, no point in doing this... */
353 if (!QUERY_FLAG (op, FLAG_REMOVED)) 350 if (!QUERY_FLAG (op, FLAG_REMOVED))
354 fix_player (op); 351 op->update_stats ();
355 return 1; 352 return 1;
356 } 353 }
357 354
358 /* Deal with protection potions */ 355 /* Deal with protection potions */
359 force = NULL; 356 force = NULL;
… …
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->name, item) == 0)
432 { 430 {
… …
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.
… …
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}
… …
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);
… …
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 * propably had something in mind when doing this
1007 */ 1011 */
… …
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 1034
1035 op->contr->last_used = 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 1052 else if (!sack->env)
1045 /* It's on the ground, the problems begin */
1046 if (op->container != sack)
1047 {
1048 /* it's closed OR some player has opened it */
1049 if (QUERY_FLAG (sack, FLAG_APPLIED))
1050 { 1053 {
1051 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
1052 if (tmp)
1053 {
1054 /* some other player have opened it */
1055 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already occupied.", query_name (sack)); 1055 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already occupied.", query_name (sack));
1056 return 1; 1056 return 1;
1057 }
1058 }
1059 }
1060 if (QUERY_FLAG (sack, FLAG_APPLIED))
1061 { 1057 }
1062 if (op->container == NULL)
1063 {
1064 tmp = arch_to_object (sack->other_arch);
1065 /* not good, but insert_ob_in_ob() is too smart */
1066 CLEAR_FLAG (tmp, FLAG_REMOVED);
1067 tmp->x = tmp->y = 0;
1068 tmp->map = NULL;
1069 tmp->env = sack;
1070 if (sack->inv)
1071 sack->inv->above = tmp;
1072 tmp->below = sack->inv;
1073 tmp->above = NULL;
1074 sack->inv = tmp;
1075 sack->move_off = MOVE_ALL; /* trying force closing it */
1076 }
1077 else
1078 {
1079 sack->move_off = 0;
1080 tmp = sack->inv;
1081 1058
1082 if (tmp && tmp->type == CLOSE_CON) 1059 // fall through to opening it (active in inv)
1083 tmp->destroy ();
1084 }
1085 }
1086 }
1087
1088 if (QUERY_FLAG (sack, FLAG_APPLIED))
1089 { 1060 }
1061 else if (sack->env)
1062 {
1063 // it is in our env, so activate it, do not open yet
1090 if (op->container) 1064 op->close_container ();
1091 { 1065 sack->flag [FLAG_APPLIED] = 1;
1092 if (op->container != sack) 1066 esrv_update_item (UPD_FLAGS, op, sack);
1093 { 1067 new_draw_info_format (NDI_UNIQUE, 0, op, "You ready %s.", query_name (sack));
1094 tmp = op->container; 1068 return 1;
1095 apply_container (op, tmp); 1069 }
1096 sprintf (buf, "You close %s and open ", query_name (tmp)); 1070
1097 op->container = sack; 1071 // it's locked?
1098 strcat (buf, query_name (sack)); 1072 if (sack->slaying)
1099 strcat (buf, "."); 1073 {
1100 } 1074 if (object *tmp = find_key (op, op, sack))
1101 else 1075 new_draw_info_format (NDI_UNIQUE, 0, op, "You unlock %s with %s.", query_name (sack), query_name (tmp));
1102 {
1103 CLEAR_FLAG (sack, FLAG_APPLIED);
1104 op->container = NULL;
1105 sprintf (buf, "You close %s.", query_name (sack));
1106 }
1107 }
1108 else 1076 else
1109 { 1077 {
1110 CLEAR_FLAG (sack, FLAG_APPLIED);
1111 sprintf (buf, "You open %s.", query_name (sack));
1112 SET_FLAG (sack, FLAG_APPLIED);
1113 op->container = sack;
1114 }
1115 }
1116 else
1117 { /* not applied */
1118 if (sack->slaying)
1119 { /* it's locked */
1120 tmp = find_key (op, op, sack);
1121 if (tmp)
1122 {
1123 sprintf (buf, "You unlock %s with %s.", query_name (sack), query_name (tmp));
1124 SET_FLAG (sack, FLAG_APPLIED);
1125 if (sack->env == NULL)
1126 { /* if it's on ground,open it also */
1127 new_draw_info (NDI_UNIQUE, 0, op, buf);
1128 apply_container (op, sack);
1129 return 1;
1130 }
1131 }
1132 else
1133 {
1134 sprintf (buf, "You don't have the key to unlock %s.", query_name (sack)); 1078 new_draw_info_format (NDI_UNIQUE, 0, op, "You don't have the key to unlock %s.", query_name (sack));
1135 }
1136 }
1137 else
1138 {
1139 sprintf (buf, "You readied %s.", query_name (sack));
1140 SET_FLAG (sack, FLAG_APPLIED);
1141 if (sack->env == NULL)
1142 { /* if it's on ground,open it also */
1143 new_draw_info (NDI_UNIQUE, 0, op, buf);
1144 apply_container (op, sack);
1145 return 1; 1079 return 1;
1146 } 1080 }
1147 }
1148 } 1081 }
1149 1082
1150 new_draw_info (NDI_UNIQUE, 0, op, buf); 1083 op->open_container (sack);
1151
1152 if (op->contr)
1153 op->contr->socket->floorbox_update ();
1154 1084
1155 return 1; 1085 return 1;
1156} 1086}
1157
1158/**
1159 * Eneq(@csd.uu.se): Handle apply on containers. This is for containers
1160 * the player has in their inventory, eg, sacks, luggages, etc.
1161 *
1162 * Moved to own function and added many features [Tero.Haatanen@lut.fi]
1163 * This version is for client/server mode.
1164 * op is the player, sack is the container the player is opening or closing.
1165 * return 1 if an object is apllied somehow or another, 0 if error/no apply
1166 *
1167 * Reminder - there are three states for any container - closed (non applied),
1168 * applied (not open, but objects that match get tossed into it), and open
1169 * (applied flag set, and op->container points to the open container)
1170 */
1171
1172int
1173esrv_apply_container (object *op, object *sack)
1174{
1175 object *tmp = op->container;
1176
1177 if (op->type != PLAYER)
1178 return 0; /* This might change */
1179
1180 if (sack == NULL || sack->type != CONTAINER)
1181 {
1182 LOG (llevError, "esrv_apply_container: %s is not container!\n", sack ? &sack->name : "[nullobject]");
1183 return 0;
1184 }
1185
1186 /* If we have a currently open container, then it needs to be closed in all cases
1187 * if we are opening this one up. We then fall through if appropriate for
1188 * openening the new container.
1189 */
1190
1191 if (op->container && QUERY_FLAG (sack, FLAG_APPLIED))
1192 {
1193 if (op->container->env != op)
1194 { /* if container is on the ground */
1195 op->container->move_off = 0;
1196 }
1197
1198 if (INVOKE_OBJECT (CLOSE, tmp, ARG_OBJECT (op)))
1199 return 1;
1200
1201 new_draw_info_format (NDI_UNIQUE, 0, op, "You close %s.", query_name (op->container));
1202 CLEAR_FLAG (op->container, FLAG_APPLIED);
1203 op->container = NULL;
1204 esrv_update_item (UPD_FLAGS, op, tmp);
1205 if (tmp == sack)
1206 return 1;
1207 }
1208
1209
1210 /* If the player is trying to open it (which he must be doing if we got here),
1211 * and it is locked, check to see if player has the equipment to open it.
1212 */
1213
1214 if (sack->slaying)
1215 { /* it's locked */
1216 tmp = find_key (op, op, sack);
1217 if (tmp)
1218 {
1219 new_draw_info_format (NDI_UNIQUE, 0, op, "You unlock %s with %s.", query_name (sack), query_name (tmp));
1220 }
1221 else
1222 {
1223 new_draw_info_format (NDI_UNIQUE, 0, op, "You don't have the key to unlock %s.", query_name (sack));
1224 return 0;
1225 }
1226 }
1227
1228 /* By the time we get here, we have made sure any other container has been closed and
1229 * if this is a locked container, the player they key to open it.
1230 */
1231
1232 /* There are really two cases - the sack is either on the ground, or the sack is
1233 * part of the players inventory. If on the ground, we assume that the player is
1234 * opening it, since if it was being closed, that would have been taken care of above.
1235 */
1236
1237
1238 if (sack->env != op)
1239 {
1240 /* Hypothetical case - the player is trying to open a sack that belong to someone
1241 * else. This normally should not happen, but a misbehaving client/player could
1242 * try to do it, so lets handle it gracefully.
1243 */
1244 if (sack->env)
1245 {
1246 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't open %s", query_name (sack));
1247 return 0;
1248 }
1249 /* set these so when the player walks off, we can unapply the sack */
1250 sack->move_off = MOVE_ALL; /* trying force closing it */
1251
1252 CLEAR_FLAG (sack, FLAG_APPLIED);
1253 new_draw_info_format (NDI_UNIQUE, 0, op, "You open %s.", query_name (sack));
1254 SET_FLAG (sack, FLAG_APPLIED);
1255 op->container = sack;
1256 esrv_update_item (UPD_FLAGS, op, sack);
1257 esrv_send_inventory (op, sack);
1258
1259 }
1260 else
1261 { /* sack is in players inventory */
1262 if (QUERY_FLAG (sack, FLAG_APPLIED))
1263 { /* readied sack becoming open */
1264 CLEAR_FLAG (sack, FLAG_APPLIED);
1265 new_draw_info_format (NDI_UNIQUE, 0, op, "You open %s.", query_name (sack));
1266 SET_FLAG (sack, FLAG_APPLIED);
1267 op->container = sack;
1268 esrv_update_item (UPD_FLAGS, op, sack);
1269 esrv_send_inventory (op, sack);
1270 }
1271 else
1272 {
1273 CLEAR_FLAG (sack, FLAG_APPLIED);
1274 new_draw_info_format (NDI_UNIQUE, 0, op, "You readied %s.", query_name (sack));
1275 SET_FLAG (sack, FLAG_APPLIED);
1276 esrv_update_item (UPD_FLAGS, op, sack);
1277 }
1278 }
1279 return 1;
1280}
1281
1282 1087
1283/** 1088/**
1284 * Handles dropping things on altar. 1089 * Handles dropping things on altar.
1285 * Returns true if sacrifice was accepted. 1090 * Returns true if sacrifice was accepted.
1286 */ 1091 */
… …
1629 1434
1630 1435
1631 case CONVERTER: 1436 case CONVERTER:
1632 if (convert_item (victim, trap) < 0) 1437 if (convert_item (victim, trap) < 0)
1633 { 1438 {
1634 object *op;
1635
1636 new_draw_info_format (NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name (trap)); 1439 new_draw_info_format (NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name (trap));
1637 1440 get_archetype ("burnout")->insert_at (trap, trap);
1638 op = get_archetype ("burnout");
1639 if (op != NULL)
1640 {
1641 op->x = trap->x;
1642 op->y = trap->y;
1643 insert_ob_in_map (op, trap->map, trap, 0);
1644 } 1441 }
1645 } 1442
1646 goto leave; 1443 goto leave;
1647 1444
1648 case TRIGGER_BUTTON: 1445 case TRIGGER_BUTTON:
1649 case TRIGGER_PEDESTAL: 1446 case TRIGGER_PEDESTAL:
1650 case TRIGGER_ALTAR: 1447 case TRIGGER_ALTAR:
… …
1679 if (victim->type == PLAYER && EXIT_PATH (trap)) 1476 if (victim->type == PLAYER && EXIT_PATH (trap))
1680 { 1477 {
1681 /* Basically, don't show exits leading to random maps the 1478 /* Basically, don't show exits leading to random maps the
1682 * players output. 1479 * players output.
1683 */ 1480 */
1684 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2) && strncmp (EXIT_PATH (trap), "/random/", 8)) 1481 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2))
1685 new_draw_info (NDI_NAVY, 0, victim, trap->msg); 1482 new_draw_info (NDI_NAVY, 0, victim, trap->msg);
1483
1686 enter_exit (victim, trap); 1484 victim->enter_exit (trap);
1687 } 1485 }
1688 goto leave; 1486 goto leave;
1689 1487
1690 case ENCOUNTER: 1488 case ENCOUNTER:
1691 /* may be some leftovers on this */ 1489 /* may be some leftovers on this */
… …
1706 1504
1707 apply_sign (victim, trap, 1); 1505 apply_sign (victim, trap, 1);
1708 goto leave; 1506 goto leave;
1709 1507
1710 case CONTAINER: 1508 case CONTAINER:
1711 if (victim->type == PLAYER)
1712 (void) esrv_apply_container (victim, trap);
1713 else
1714 (void) apply_container (victim, trap); 1509 apply_container (victim, trap);
1715 goto leave; 1510 goto leave;
1716 1511
1717 case RUNE: 1512 case RUNE:
1718 case TRAP: 1513 case TRAP:
1719 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE)) 1514 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE))
… …
1779 1574
1780 readable_message_type *msgType = get_readable_message_type (tmp); 1575 readable_message_type *msgType = get_readable_message_type (tmp);
1781 1576
1782 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, 1577 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1783 msgType->message_type, msgType->message_subtype, 1578 msgType->message_type, msgType->message_subtype,
1784 "You open the %s and start reading.\n%s", "%s\n%s", long_desc (tmp, op), &tmp->msg); 1579 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1580 long_desc (tmp, op), &tmp->msg);
1785 1581
1786 /* gain xp from reading */ 1582 /* gain xp from reading */
1787 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1583 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1788 { /* only if not read before */ 1584 { /* only if not read before */
1789 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1585 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
… …
1795 1591
1796 /* If in a container, update how it looks */ 1592 /* If in a container, update how it looks */
1797 if (tmp->env) 1593 if (tmp->env)
1798 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1594 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1799 else 1595 else
1800 op->contr->socket->floorbox_update (); 1596 op->contr->ns->floorbox_update ();
1801 } 1597 }
1802 1598
1803 change_exp (op, exp_gain, skill_ob->skill, 0); 1599 change_exp (op, exp_gain, skill_ob->skill, 0);
1804 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */ 1600 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */
1805 } 1601 }
… …
1945 return; 1741 return;
1946 } 1742 }
1947 1743
1948 if (skop->level < int (sqrtf (spell->level) * 1.5f)) 1744 if (skop->level < int (sqrtf (spell->level) * 1.5f))
1949 { 1745 {
1950 new_draw_info (NDI_UNIQUE, 0, op, "It is too hard to read at your level: You are unable to decipher the strange symbols."); 1746 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. [Your literacy level is too low]");
1951 return; 1747 return;
1952 } 1748 }
1953 1749
1954 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name); 1750 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name);
1955 1751
… …
1958 identify (tmp); 1754 identify (tmp);
1959 1755
1960 if (tmp->env) 1756 if (tmp->env)
1961 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1757 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1962 else 1758 else
1963 op->contr->socket->floorbox_update (); 1759 op->contr->ns->floorbox_update ();
1964 } 1760 }
1965 1761
1966 /* I removed the check for special_prayer_mark here - it didn't make 1762 /* I removed the check for special_prayer_mark here - it didn't make
1967 * a lot of sense - special prayers are not found in spellbooks, and 1763 * a lot of sense - special prayers are not found in spellbooks, and
1968 * if the player doesn't know the spell, doesn't make a lot of sense that 1764 * if the player doesn't know the spell, doesn't make a lot of sense that
… …
1978 { 1774 {
1979 spell_skill = find_skill_by_name (op, spell->skill); 1775 spell_skill = find_skill_by_name (op, spell->skill);
1980 1776
1981 if (!spell_skill) 1777 if (!spell_skill)
1982 { 1778 {
1983 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use this spell", &spell->skill); 1779 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use this spell.", &spell->skill);
1984 return; 1780 return;
1985 } 1781 }
1986 1782
1987 if (spell_skill->level < spell->level) 1783 if (spell_skill->level < spell->level)
1988 { 1784 {
… …
2022 else 1818 else
2023 { 1819 {
2024 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1820 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0);
2025 new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell.\n"); 1821 new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell.\n");
2026 } 1822 }
1823
2027 decrease_ob (tmp); 1824 decrease_ob (tmp);
2028} 1825}
2029 1826
2030/** 1827/**
2031 * Handles applying a spell scroll. 1828 * Handles applying a spell scroll.
… …
2227 if (meal->type != FLESH || !is_dragon_pl (op)) 2024 if (meal->type != FLESH || !is_dragon_pl (op))
2228 return 0; 2025 return 0;
2229 2026
2230 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces 2027 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces
2231 from the player's inventory */ 2028 from the player's inventory */
2029 shstr_cmp dragon_ability_force ("dragon_ability_force");
2030 shstr_cmp dragon_skin_force ("dragon_skin_force");
2031
2232 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2032 for (tmp = op->inv; tmp; tmp = tmp->below)
2233 {
2234 if (tmp->type == FORCE) 2033 if (tmp->type == FORCE)
2235 {
2236 if (strcmp (tmp->arch->name, "dragon_skin_force") == 0) 2034 if (tmp->arch->name == dragon_skin_force)
2237 skin = tmp; 2035 skin = tmp;
2238 else if (strcmp (tmp->arch->name, "dragon_ability_force") == 0) 2036 else if (tmp->arch->name == dragon_ability_force)
2239 abil = tmp; 2037 abil = tmp;
2240 }
2241 }
2242 2038
2243 /* if either skin or ability are missing, this is an old player 2039 /* if either skin or ability are missing, this is an old player
2244 which is not to be considered a dragon -> bail out */ 2040 which is not to be considered a dragon -> bail out */
2245 if (skin == NULL || abil == NULL) 2041 if (skin == NULL || abil == NULL)
2246 return 0; 2042 return 0;
… …
2287 /* doubled chance for resistance of ability-focus */ 2083 /* doubled chance for resistance of ability-focus */
2288 if (i == abil->stats.exp) 2084 if (i == abil->stats.exp)
2289 chance = MIN (100., chance * 2.); 2085 chance = MIN (100., chance * 2.);
2290 2086
2291 /* now make the throw and save all winners (Don't insert luck bonus here!) */ 2087 /* now make the throw and save all winners (Don't insert luck bonus here!) */
2292 if (RANDOM () % 10000 < (int) (chance * 100)) 2088 if (rndm (10000) < (unsigned int) (chance * 100))
2293 { 2089 {
2294 atnr_winner[winners] = i; 2090 atnr_winner[winners] = i;
2295 winners++; 2091 winners++;
2296 } 2092 }
2297 2093
… …
2328 2124
2329 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95) 2125 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95)
2330 { 2126 {
2331 /* resistance increased! */ 2127 /* resistance increased! */
2332 skin->resist[i]++; 2128 skin->resist[i]++;
2333 fix_player (op); 2129 op->update_stats ();
2334 2130
2335 sprintf (buf, "Your skin is now more resistant to %s!", change_resist_msg[i]); 2131 sprintf (buf, "Your skin is now more resistant to %s!", change_resist_msg[i]);
2336 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, buf); 2132 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, buf);
2337 } 2133 }
2338 2134
… …
2357 } 2153 }
2358 } 2154 }
2359 return 1; 2155 return 1;
2360} 2156}
2361 2157
2362static void
2363apply_savebed (object *pl)
2364{
2365#ifndef COZY_SERVER
2366 if (!pl->contr->name_changed || !pl->stats.exp)
2367 {
2368 new_draw_info (NDI_UNIQUE, 0, pl, "You don't deserve to save your character yet.");
2369 return;
2370 }
2371#endif
2372 INVOKE_PLAYER (LOGOUT, pl->contr);
2373 /* Need to call terminate_all_pets() before we remove the player ob */
2374 terminate_all_pets (pl);
2375 pl->remove ();
2376 pl->direction = 0;
2377 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, pl, "%s leaves the game.", &pl->name);
2378
2379 /* update respawn position */
2380 strcpy (pl->contr->savebed_map, pl->map->path);
2381 pl->contr->bed_x = pl->x;
2382 pl->contr->bed_y = pl->y;
2383
2384 strcpy (pl->contr->killer, "left");
2385 check_score (pl); /* Always check score */
2386 (void) save_player (pl, 0);
2387 pl->map->players--;
2388#if MAP_MAXTIMEOUT
2389 MAP_SWAP_TIME (pl->map) = MAP_TIMEOUT (pl->map);
2390#endif
2391 play_again (pl);
2392 pl->speed = 0;
2393 update_ob_speed (pl);
2394}
2395
2396/** 2158/**
2397 * Handles applying an improve armor scroll. 2159 * Handles applying an improve armor scroll.
2398 * Does some sanity checks, then calls improve_armour. 2160 * Does some sanity checks, then calls improve_armour.
2399 */ 2161 */
2400static void 2162static void
… …
2405 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) 2167 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC))
2406 { 2168 {
2407 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll."); 2169 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll.");
2408 return; 2170 return;
2409 } 2171 }
2172
2410 armor = find_marked_object (op); 2173 armor = find_marked_object (op);
2174
2411 if (!armor) 2175 if (!armor)
2412 { 2176 {
2413 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark an armor object."); 2177 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark an armor object.");
2414 return; 2178 return;
2415 } 2179 }
2180
2416 if (armor->type != ARMOUR 2181 if (armor->type != ARMOUR
2417 && armor->type != CLOAK 2182 && armor->type != CLOAK
2418 && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET) 2183 && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET)
2419 { 2184 {
2420 new_draw_info (NDI_UNIQUE, 0, op, "Your marked item is not armour!\n"); 2185 new_draw_info (NDI_UNIQUE, 0, op, "Your marked item is not armour!\n");
… …
2423 2188
2424 new_draw_info (NDI_UNIQUE, 0, op, "Applying armour enchantment."); 2189 new_draw_info (NDI_UNIQUE, 0, op, "Applying armour enchantment.");
2425 improve_armour (op, tmp, armor); 2190 improve_armour (op, tmp, armor);
2426} 2191}
2427 2192
2428
2429extern void 2193extern void
2430apply_poison (object *op, object *tmp) 2194apply_poison (object *op, object *tmp)
2431{ 2195{
2432 if (op->type == PLAYER) 2196 if (op->type == PLAYER)
2433 { 2197 {
… …
2444 handle_apply_yield (tmp); 2208 handle_apply_yield (tmp);
2445 decrease_ob (tmp); 2209 decrease_ob (tmp);
2446} 2210}
2447 2211
2448/** 2212/**
2449 * This fonction return true if the exit is not a 2 ways one or it is 2 ways, valid exit. 2213 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit.
2450 * A valid 2 way exit means: 2214 * A valid 2 way exit means:
2451 * -You can come back (there is another exit at the other side) 2215 * -You can come back (there is another exit at the other side)
2452 * -You are 2216 * -You are
2453 * ° the owner of the exit 2217 * ° the owner of the exit
2454 * ° or in the same party as the owner 2218 * ° or in the same party as the owner
2455 * 2219 *
2456 * Note: a owner in a 2 way exit is saved as the owner's name 2220 * Note: a owner in a 2 way exit is saved as the owner's name
2457 * in the field exit->name cause the field exit->owner doesn't 2221 * in the field exit->name cause the field exit->owner doesn't
2458 * survive in the swapping (in fact the whole exit doesn't survive). 2222 * survive in the swapping (in fact the whole exit doesn't survive).
2459 */ 2223 */
2460int 2224int
2461is_legal_2ways_exit (object *op, object *exit) 2225is_legal_2ways_exit (object *op, object *exit)
2462{ 2226{
2463 object *tmp;
2464 object *exit_owner;
2465 player *pp;
2466 maptile *exitmap;
2467
2468 if (exit->stats.exp != 1) 2227 if (exit->stats.exp != 1)
2469 return 1; /*This is not a 2 way, so it is legal */ 2228 return 1; /*This is not a 2 way, so it is legal */
2229
2230#if 0 //TODO
2470 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race) 2231 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race)
2471 return 0; /* This is a reset town portal */ 2232 return 0; /* This is a reset town portal */
2472 /* To know if an exit has a correspondant, we look at 2233#endif
2473 * all the exits in destination and try to find one with same path as 2234
2474 * the current exit's position */ 2235 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map);
2475 if (!strncmp (EXIT_PATH (exit), settings.localdir, strlen (settings.localdir))) 2236
2476 exitmap = ready_map_name (EXIT_PATH (exit), MAP_PLAYER_UNIQUE);
2477 else
2478 exitmap = ready_map_name (EXIT_PATH (exit), 0);
2479 if (exitmap) 2237 if (exitmap)
2480 { 2238 {
2239 exitmap->load_sync ();
2240
2481 tmp = get_map_ob (exitmap, EXIT_X (exit), EXIT_Y (exit)); 2241 object *tmp = exitmap->at (EXIT_X (exit), EXIT_Y (exit)).bot;
2242
2482 if (!tmp) 2243 if (!tmp)
2483 return 0; 2244 return 0;
2484 for ((tmp = get_map_ob (exitmap, EXIT_X (exit), EXIT_Y (exit))); tmp; tmp = tmp->above) 2245
2246 for (; tmp; tmp = tmp->above)
2485 { 2247 {
2486 if (tmp->type != EXIT) 2248 if (tmp->type != EXIT)
2487 continue; /*Not an exit */ 2249 continue; /*Not an exit */
2250
2488 if (!EXIT_PATH (tmp)) 2251 if (!EXIT_PATH (tmp))
2489 continue; /*Not a valid exit */ 2252 continue; /*Not a valid exit */
2253
2490 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y)) 2254 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y))
2491 continue; /*Not in the same place */ 2255 continue; /*Not in the same place */
2256
2492 if (strcmp (exit->map->path, EXIT_PATH (tmp)) != 0) 2257 if (exit->map->path != EXIT_PATH (tmp))
2493 continue; /*Not in the same map */ 2258 continue; /*Not in the same map */
2494 2259
2495 /* From here we have found the exit is valid. However we do 2260 /* From here we have found the exit is valid. However we do
2496 * here the check of the exit owner. It is important for the 2261 * here the check of the exit owner. It is important for the
2497 * town portals to prevent strangers from visiting your appartments 2262 * town portals to prevent strangers from visiting your appartments
2498 */ 2263 */
2499 if (!exit->race) 2264 if (!exit->race)
2500 return 1; /*No owner, free for all! */ 2265 return 1; /*No owner, free for all! */
2266
2501 exit_owner = NULL; 2267 object *exit_owner = 0;
2502 for (pp = first_player; pp; pp = pp->next) 2268
2269 for_all_players (pp)
2503 { 2270 {
2504 if (!pp->ob) 2271 if (!pp->ob)
2505 continue; 2272 continue;
2273
2506 if (pp->ob->name != exit->race) 2274 if (pp->ob->name != exit->race)
2507 continue; 2275 continue;
2276
2508 exit_owner = pp->ob; /*We found a player which correspond to the player name */ 2277 exit_owner = pp->ob; /*We found a player which correspond to the player name */
2509 break; 2278 break;
2510 } 2279 }
2280
2511 if (!exit_owner) 2281 if (!exit_owner)
2512 return 0; /* No more owner */ 2282 return 0; /* No more owner */
2283
2513 if (exit_owner->contr == op->contr) 2284 if (exit_owner->contr == op->contr)
2514 return 1; /*It is your exit */ 2285 return 1; /*It is your exit */
2286
2515 if (exit_owner && /*There is a owner */ 2287 if (exit_owner && /*There is a owner */
2516 (op->contr) && /*A player tries to pass */ 2288 (op->contr) && /*A player tries to pass */
2517 ((exit_owner->contr->party == NULL) || /*No pass if controller has no party */ 2289 ((exit_owner->contr->party == NULL) || /*No pass if controller has no party */
2518 (exit_owner->contr->party != op->contr->party))) /* Or not the same as op */ 2290 (exit_owner->contr->party != op->contr->party))) /* Or not the same as op */
2519 return 0; 2291 return 0;
2292
2520 return 1; 2293 return 1;
2521 } 2294 }
2522 } 2295 }
2296
2523 return 0; 2297 return 0;
2524} 2298}
2525
2526 2299
2527/** 2300/**
2528 * Main apply handler. 2301 * Main apply handler.
2529 * 2302 *
2530 * Checks for unpaid items before applying. 2303 * Checks for unpaid items before applying.
… …
2538 * being applied. 2311 * being applied.
2539 * 2312 *
2540 * aflag is special (always apply/unapply) flags. Nothing is done with 2313 * aflag is special (always apply/unapply) flags. Nothing is done with
2541 * them in this function - they are passed to apply_special 2314 * them in this function - they are passed to apply_special
2542 */ 2315 */
2543
2544int 2316int
2545manual_apply (object *op, object *tmp, int aflag) 2317manual_apply (object *op, object *tmp, int aflag)
2546{ 2318{
2547 if (tmp->head) 2319 if (tmp->head)
2548 tmp = tmp->head; 2320 tmp = tmp->head;
… …
2553 { 2325 {
2554 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first."); 2326 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first.");
2555 return 1; 2327 return 1;
2556 } 2328 }
2557 else 2329 else
2558 {
2559 return 0; /* monsters just skip unpaid items */ 2330 return 0; /* monsters just skip unpaid items */
2560 }
2561 } 2331 }
2562 2332
2563 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op))) 2333 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op)))
2564 return RESULT_INT (0); 2334 return RESULT_INT (0);
2565 2335
2566 switch (tmp->type) 2336 switch (tmp->type)
2567 { 2337 {
2568
2569 case CF_HANDLE: 2338 case CF_HANDLE:
2570 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2339 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle.");
2571 play_sound_map (op->map, op->x, op->y, SOUND_TURN_HANDLE); 2340 play_sound_map (op->map, op->x, op->y, SOUND_TURN_HANDLE);
2572 tmp->value = tmp->value ? 0 : 1; 2341 tmp->value = tmp->value ? 0 : 1;
2573 SET_ANIMATION (tmp, tmp->value); 2342 SET_ANIMATION (tmp, tmp->value);
… …
2580 { 2349 {
2581 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2350 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle.");
2582 play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE); 2351 play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE);
2583 } 2352 }
2584 else 2353 else
2585 {
2586 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move."); 2354 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move.");
2587 } 2355
2588 return 1; 2356 return 1;
2589 2357
2590 case EXIT: 2358 case EXIT:
2591 if (op->type != PLAYER) 2359 if (op->type != PLAYER)
2592 return 0; 2360 return 0;
2361
2593 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2362 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp))
2594 { 2363 {
2595 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp)); 2364 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp));
2596 } 2365 }
2597 else 2366 else
2598 { 2367 {
2599 /* Don't display messages for random maps. */ 2368 /* Don't display messages for random maps. */
2600 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2) && strncmp (EXIT_PATH (tmp), "/random/", 8)) 2369 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2))
2601 new_draw_info (NDI_NAVY, 0, op, tmp->msg); 2370 new_draw_info (NDI_NAVY, 0, op, tmp->msg);
2371
2602 enter_exit (op, tmp); 2372 op->enter_exit (tmp);
2603 } 2373 }
2604 return 1; 2374 return 1;
2605 2375
2606 case SIGN: 2376 case SIGN:
2607 apply_sign (op, tmp, 0); 2377 apply_sign (op, tmp, 0);
… …
2641 case POTION: 2411 case POTION:
2642 (void) apply_potion (op, tmp); 2412 (void) apply_potion (op, tmp);
2643 return 1; 2413 return 1;
2644 2414
2645 /* Eneq(@csd.uu.se): Handle apply on containers. */ 2415 /* Eneq(@csd.uu.se): Handle apply on containers. */
2416 //TODO: remove, as it is unsed?
2646 case CLOSE_CON: 2417 case CLOSE_CON:
2647 if (op->type == PLAYER)
2648 (void) esrv_apply_container (op, tmp->env);
2649 else
2650 (void) apply_container (op, tmp->env); 2418 apply_container (op, tmp->env);
2651 return 1; 2419 return 1;
2652 2420
2653 case CONTAINER: 2421 case CONTAINER:
2654 if (op->type == PLAYER)
2655 (void) esrv_apply_container (op, tmp);
2656 else
2657 (void) apply_container (op, tmp); 2422 apply_container (op, tmp);
2658 return 1; 2423 return 1;
2659 2424
2660 case TREASURE: 2425 case TREASURE:
2661 if (op->type == PLAYER) 2426 if (op->type == PLAYER)
2662 { 2427 {
2663 apply_treasure (op, tmp); 2428 apply_treasure (op, tmp);
2664 return 1; 2429 return 1;
2665 } 2430 }
2666 else 2431 else
2667 {
2668 return 0; 2432 return 0;
2669 }
2670 2433
2671 case WEAPON: 2434 case WEAPON:
2672 case ARMOUR: 2435 case ARMOUR:
2673 case BOOTS: 2436 case BOOTS:
2674 case GLOVES: 2437 case GLOVES:
… …
2687 case LAMP: 2450 case LAMP:
2688 case BUILDER: 2451 case BUILDER:
2689 case SKILL_TOOL: 2452 case SKILL_TOOL:
2690 if (tmp->env != op) 2453 if (tmp->env != op)
2691 return 2; /* not in inventory */ 2454 return 2; /* not in inventory */
2455
2692 (void) apply_special (op, tmp, aflag); 2456 apply_special (op, tmp, aflag);
2693 return 1; 2457 return 1;
2694 2458
2695 case DRINK: 2459 case DRINK:
2696 case FOOD: 2460 case FOOD:
2697 case FLESH: 2461 case FLESH:
… …
2701 case POISON: 2465 case POISON:
2702 apply_poison (op, tmp); 2466 apply_poison (op, tmp);
2703 return 1; 2467 return 1;
2704 2468
2705 case SAVEBED: 2469 case SAVEBED:
2706 if (op->type == PLAYER)
2707 {
2708 apply_savebed (op);
2709 return 1; 2470 return 1;
2710 }
2711 else
2712 {
2713 return 0;
2714 }
2715 2471
2716 case ARMOUR_IMPROVER: 2472 case ARMOUR_IMPROVER:
2717 if (op->type == PLAYER) 2473 if (op->type == PLAYER)
2718 { 2474 {
2719 apply_armour_improver (op, tmp); 2475 apply_armour_improver (op, tmp);
2720 return 1; 2476 return 1;
2721 } 2477 }
2722 else 2478 else
2723 {
2724 return 0; 2479 return 0;
2725 }
2726 2480
2727 case WEAPON_IMPROVER: 2481 case WEAPON_IMPROVER:
2728 (void) check_improve_weapon (op, tmp); 2482 (void) check_improve_weapon (op, tmp);
2729 return 1; 2483 return 1;
2730 2484
… …
2748 } 2502 }
2749 2503
2750 case MENU: 2504 case MENU:
2751 if (op->type == PLAYER) 2505 if (op->type == PLAYER)
2752 { 2506 {
2753 shop_listing (op); 2507 shop_listing (tmp, op);
2754 return 1; 2508 return 1;
2755 } 2509 }
2756 else 2510 else
2757 { 2511 {
2758 return 0; 2512 return 0;
… …
2836 */ 2590 */
2837 2591
2838void 2592void
2839player_apply_below (object *pl) 2593player_apply_below (object *pl)
2840{ 2594{
2841 object *tmp, *next;
2842 int floors; 2595 int floors = 0;
2843 2596
2844 /* 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
2845 * item in the container. Otherwise, use the map. 2598 * item in the container. Otherwise, use the map.
2846 */
2847 tmp = (pl->container != NULL) ? pl->container->inv : pl->below;
2848
2849 /* This is perhaps more complicated. However, I want to make sure that 2599 * This is perhaps more complicated. However, I want to make sure that
2850 * we don't use a corrupt pointer for the next object, so we get the 2600 * we don't use a corrupt pointer for the next object, so we get the
2851 * next object in the stack before applying. This is can only be a 2601 * next object in the stack before applying. This is can only be a
2852 * problem if player_apply() has a bug in that it uses the object but does 2602 * problem if player_apply() has a bug in that it uses the object but does
2853 * not return a proper value. 2603 * not return a proper value.
2854 */ 2604 */
2855 for (floors = 0; tmp != NULL; tmp = next) 2605 for (object *next, *tmp = pl->container ? pl->container->inv : pl->below; tmp; tmp = next)
2856 { 2606 {
2857 next = tmp->below; 2607 next = tmp->below;
2608
2858 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 2609 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
2859 floors++; 2610 floors++;
2860 else if (floors > 0) 2611 else if (floors > 0)
2861 return; /* process only floor objects after first floor object */ 2612 return; /* process only floor objects after first floor object */
2862 2613
… …
2888 return RESULT_INT (0); 2639 return RESULT_INT (0);
2889 2640
2890 object *tmp2; 2641 object *tmp2;
2891 2642
2892 CLEAR_FLAG (op, FLAG_APPLIED); 2643 CLEAR_FLAG (op, FLAG_APPLIED);
2644
2893 switch (op->type) 2645 switch (op->type)
2894 { 2646 {
2895 case WEAPON: 2647 case WEAPON:
2896 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op)); 2648 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op));
2897 2649
2898 (void) change_abil (who, op); 2650 change_abil (who, op);
2899 if (QUERY_FLAG (who, FLAG_READY_WEAPON))
2900 CLEAR_FLAG (who, FLAG_READY_WEAPON); 2651 CLEAR_FLAG (who, FLAG_READY_WEAPON);
2652
2653 if (who->contr)
2654 {
2655 if (who->contr->combat_ob == op)
2656 who->contr->combat_ob = 0;
2657
2658 if (who->current_weapon == op)
2659 who->current_weapon = 0;
2660 }
2661
2901 clear_skill (who); 2662 clear_skill (who);
2902 break; 2663 break;
2903 2664
2904 case SKILL: /* allows objects to impart skills */ 2665 case SKILL: /* allows objects to impart skills */
2905 case SKILL_TOOL: 2666 case SKILL_TOOL:
2906 if (op != who->chosen_skill) 2667 if (op != who->chosen_skill)
2907 {
2908 LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n"); 2668 LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n");
2669
2670 if (who->contr)
2909 } 2671 {
2910 if (who->type == PLAYER)
2911 {
2912 if (who->contr->shoottype == range_skill)
2913 who->contr->shoottype = range_none;
2914 if (!op->invisible) 2672 if (!op->invisible)
2915 {
2916 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op)); 2673 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op));
2917 }
2918 else 2674 else
2919 {
2920 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill); 2675 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill);
2921 } 2676 }
2922 } 2677
2923 (void) change_abil (who, op); 2678 change_abil (who, op);
2924 who->chosen_skill = NULL; 2679 who->chosen_skill = 0;
2925 CLEAR_FLAG (who, FLAG_READY_SKILL); 2680 CLEAR_FLAG (who, FLAG_READY_SKILL);
2926 break; 2681 break;
2927 2682
2928 case ARMOUR: 2683 case ARMOUR:
2929 case HELMET: 2684 case HELMET:
… …
2934 case AMULET: 2689 case AMULET:
2935 case GIRDLE: 2690 case GIRDLE:
2936 case BRACERS: 2691 case BRACERS:
2937 case CLOAK: 2692 case CLOAK:
2938 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op)); 2693 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op));
2939 (void) change_abil (who, op); 2694 change_abil (who, op);
2940 break; 2695 break;
2696
2941 case LAMP: 2697 case LAMP:
2942 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name); 2698 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name);
2943 tmp2 = arch_to_object (op->other_arch); 2699 tmp2 = arch_to_object (op->other_arch);
2944 tmp2->x = op->x; 2700 tmp2->x = op->x;
2945 tmp2->y = op->y; 2701 tmp2->y = op->y;
… …
2950 CLEAR_FLAG (tmp2, FLAG_APPLIED); 2706 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2951 2707
2952 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 2708 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2953 SET_FLAG (tmp2, FLAG_INV_LOCKED); 2709 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2954 2710
2955 if (who->type == PLAYER) 2711 if (who->contr)
2956 esrv_del_item (who->contr, op->count); 2712 esrv_del_item (who->contr, op->count);
2957 2713
2958 op->destroy (); 2714 op->destroy ();
2959 insert_ob_in_ob (tmp2, who); 2715 insert_ob_in_ob (tmp2, who);
2960 fix_player (who); 2716 who->update_stats ();
2717
2961 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 2718 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2962 { 2719 {
2963 if (who->type == PLAYER) 2720 if (who->contr)
2964 { 2721 {
2965 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 2722 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
2966 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 2723 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2967 } 2724 }
2968 } 2725 }
2969 if (who->type == PLAYER) 2726
2727 if (who->contr)
2970 esrv_send_item (who, tmp2); 2728 esrv_send_item (who, tmp2);
2729
2971 return 1; /* otherwise, an attempt to drop causes problems */ 2730 return 1; /* otherwise, an attempt to drop causes problems */
2972 break; 2731
2973 case BOW: 2732 case BOW:
2974 case WAND: 2733 case WAND:
2975 case ROD: 2734 case ROD:
2976 case HORN: 2735 case HORN:
2977 clear_skill (who); 2736 clear_skill (who);
2737
2738 if (who->contr)
2739 {
2978 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2740 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2979 if (who->type == PLAYER) 2741
2980 { 2742 if (who->contr->ranged_ob == op)
2981 who->contr->shoottype = range_none; 2743 who->contr->ranged_ob = 0;
2744
2745 if (who->current_weapon == op)
2746 who->current_weapon = 0;
2982 } 2747 }
2983 else 2748 else
2984 { 2749 {
2985 if (op->type == BOW) 2750 if (op->type == BOW)
2986 CLEAR_FLAG (who, FLAG_READY_BOW); 2751 CLEAR_FLAG (who, FLAG_READY_BOW);
2987 else 2752 else
2988 CLEAR_FLAG (who, FLAG_READY_RANGE); 2753 CLEAR_FLAG (who, FLAG_READY_RANGE);
2989 } 2754 }
2755
2990 break; 2756 break;
2991 2757
2992 case BUILDER: 2758 case BUILDER:
2759 if (who->contr)
2760 {
2993 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2761 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2994 who->contr->shoottype = range_none; 2762
2995 who->contr->ranges[range_builder] = NULL; 2763 if (who->contr->ranged_ob == op)
2764 who->contr->ranged_ob = 0;
2765 }
2996 break; 2766 break;
2997 2767
2998 default: 2768 default:
2999 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op)); 2769 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op));
3000 break; 2770 break;
3001 } 2771 }
3002 2772
3003 fix_player (who); 2773 who->update_stats ();
3004 2774
3005 if (!(aflags & AP_NO_MERGE)) 2775 if (!(aflags & AP_NO_MERGE))
3006 { 2776 {
3007 object *tmp; 2777 object *tmp;
3008 2778
3009 tmp = merge_ob (op, NULL); 2779 tmp = merge_ob (op, NULL);
3010 if (who->type == PLAYER) 2780
2781 if (who->contr)
3011 { 2782 {
3012 if (tmp) 2783 if (tmp)
3013 { /* it was merged */ 2784 { /* it was merged */
3014 esrv_del_item (who->contr, op->count); 2785 esrv_del_item (who->contr, op->count);
3015 op = tmp; 2786 op = tmp;
3016 } 2787 }
3017 2788
3018 esrv_send_item (who, op); 2789 esrv_send_item (who, op);
3019 } 2790 }
3020 } 2791 }
2792
3021 return 0; 2793 return 0;
3022} 2794}
3023 2795
3024/** 2796/**
3025 * Returns the object that is using location 'loc'. 2797 * Returns the object that is using location 'loc'.
… …
3042 2814
3043 if (!start) 2815 if (!start)
3044 return NULL; 2816 return NULL;
3045 2817
3046 for (tmp = start; tmp; tmp = tmp->below) 2818 for (tmp = start; tmp; tmp = tmp->below)
3047 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->body_info[loc] && (!tmp->invisible || tmp->type == SKILL)) 2819 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->slot[loc].info && (!tmp->invisible || tmp->type == SKILL))
3048 return tmp; 2820 return tmp;
3049 2821
3050 return NULL; 2822 return NULL;
3051} 2823}
3052
3053
3054 2824
3055/** 2825/**
3056 * 'op' wants to apply an object, but can't because of other equipment. 2826 * 'op' wants to apply an object, but can't because of other equipment.
3057 * This should only be called when it is known 2827 * This should only be called when it is known
3058 * that there are objects to unapply. This makes pretty heavy 2828 * that there are objects to unapply. This makes pretty heavy
… …
3064 * another function that does just that. 2834 * another function that does just that.
3065 */ 2835 */
3066int 2836int
3067unapply_for_ob (object *who, object *op, int aflags) 2837unapply_for_ob (object *who, object *op, int aflags)
3068{ 2838{
3069 int i;
3070 object *tmp = NULL, *last;
3071
3072 /* If we are applying a shield or weapon, unapply any equipped shield 2839 /* If we are applying a shield or weapon, unapply any equipped shield
3073 * or weapons first - only allowed to use one weapon/shield at a time. 2840 * or weapons first - only allowed to use one weapon/shield at a time.
3074 */ 2841 */
3075 if (op->type == WEAPON || op->type == SHIELD) 2842 if (op->type == WEAPON || op->type == SHIELD)
3076 {
3077 for (tmp = who->inv; tmp; tmp = tmp->below) 2843 for (object *tmp = who->inv; tmp; tmp = tmp->below)
3078 {
3079 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type) 2844 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type)
3080 {
3081 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))) 2845 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)))
3082 { 2846 {
3083 if (aflags & AP_PRINT) 2847 if (aflags & AP_PRINT)
3084 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2848 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp));
3085 else 2849 else
3086 unapply_special (who, tmp, aflags); 2850 unapply_special (who, tmp, aflags);
3087 } 2851 }
3088 else 2852 else
3089 { 2853 {
3090 /* In this case, we want to try and remove a cursed item. 2854 /* In this case, we want to try and remove a cursed item.
3091 * While we know it won't work, we want unapply_special to 2855 * While we know it won't work, we want unapply_special to
3092 * at least generate the message. 2856 * at least generate the message.
3093 */ 2857 */
3094 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (tmp)); 2858 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't remove the %s.", query_name (tmp));
3095 return 1; 2859 return 1;
3096 }
3097
3098 } 2860 }
2861
2862 if (op->is_range ())
2863 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2864 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ())
2865 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)))
2866 {
2867 if (aflags & AP_PRINT)
2868 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp));
2869 else
2870 unapply_special (who, tmp, aflags);
3099 } 2871 }
3100 } 2872 else
2873 {
2874 /* In this case, we want to try and remove a cursed item.
2875 * While we know it won't work, we want unapply_special to
2876 * at least generate the message.
2877 */
2878 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't remove the %s.", query_name (tmp));
2879 return 1;
2880 }
3101 2881
3102 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 2882 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
3103 { 2883 {
3104 /* this used up a slot that we need to free */ 2884 /* this used up a slot that we need to free */
3105 if (op->body_info[i]) 2885 if (op->slot[i].info)
3106 { 2886 {
3107 last = who->inv; 2887 object *last = who->inv;
3108 2888
3109 /* We do a while loop - may need to remove several items in order 2889 /* We do a while loop - may need to remove several items in order
3110 * to free up enough slots. 2890 * to free up enough slots.
3111 */ 2891 */
3112 while ((who->body_used[i] + op->body_info[i]) < 0) 2892 while ((who->slot[i].used + op->slot[i].info) < 0)
3113 { 2893 {
3114 tmp = get_item_from_body_location (last, i); 2894 object *tmp = get_item_from_body_location (last, i);
2895
3115 if (!tmp) 2896 if (!tmp)
3116 { 2897 {
3117#if 0 2898#if 0
3118 /* Not a bug - we'll get this if the player has cursed items 2899 /* Not a bug - we'll get this if the player has cursed items
3119 * equipped. 2900 * equipped.
3120 */ 2901 */
3121 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name); 2902 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name);
3122#endif 2903#endif
3123 return 1; 2904 return 1;
3124 } 2905 }
2906
3125 /* If we are just printing, we don't care about cursed status */ 2907 /* If we are just printing, we don't care about cursed status */
3126 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))) 2908 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))))
3127 { 2909 {
3128 if (aflags & AP_PRINT) 2910 if (aflags & AP_PRINT)
3129 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2911 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp));
… …
3137 * so it may not be critical (eg, putting on a ring and you have 2919 * so it may not be critical (eg, putting on a ring and you have
3138 * one cursed ring.) 2920 * one cursed ring.)
3139 */ 2921 */
3140 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp)); 2922 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp));
3141 } 2923 }
2924
3142 last = tmp->below; 2925 last = tmp->below;
3143 } 2926 }
3144 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the 2927 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the
3145 * return in the !tmp would have kicked in. 2928 * return in the !tmp would have kicked in.
3146 */ 2929 */
3147 } /* if op is using this body location */ 2930 } /* if op is using this body location */
3148 } /* for body lcoations */ 2931 } /* for body lcoations */
2932
3149 return 0; 2933 return 0;
3150} 2934}
3151 2935
3152/** 2936/**
3153 * Checks to see if 'who' can apply object 'op'. 2937 * Checks to see if 'who' can apply object 'op'.
3154 * Returns 0 if apply can be done without anything special. 2938 * Returns 0 if apply can be done without anything special.
3155 * Otherwise returns a bitmask - potentially several of these may be 2939 * Otherwise returns a bitmask - potentially several of these may be
3156 * set, but largely depends on circumstance - in the future, processing 2940 * set, but largely depends on circumstance - in the future, processing
3157 * may be pruned once we know some status (eg, once CAN_APPLY_NEVER 2941 * may be pruned once we know some status (eg, once CAN_APPLY_NEVER
3158 * is set, do we really are what the other flags may be?) 2942 * is set, do we really are what the other flags may be?)
3159 * 2943 *
3160 * See include/define.h for detailed description of the meaning of 2944 * See include/define.h for detailed description of the meaning of
3161 * these return values. 2945 * these return values.
3162 */ 2946 */
… …
3164can_apply_object (object *who, object *op) 2948can_apply_object (object *who, object *op)
3165{ 2949{
3166 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op))) 2950 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op)))
3167 return RESULT_INT (0); 2951 return RESULT_INT (0);
3168 2952
3169 int i, retval = 0; 2953 int retval = 0;
3170 object *tmp = NULL, *ws = NULL; 2954 object *tmp = 0, *ws = 0;
3171 2955
3172 /* Players have 2 'arm's, so they could in theory equip 2 shields or 2956 /* Players have 2 'arm's, so they could in theory equip 2 shields or
3173 * 2 weapons, but we don't want to let them do that. So if they are 2957 * 2 weapons, but we don't want to let them do that. So if they are
3174 * trying to equip a weapon or shield, see if they already have one 2958 * trying to equip a weapon or shield, see if they already have one
3175 * in place and store that way. 2959 * in place and store that way.
3176 */ 2960 */
3177 if (op->type == WEAPON || op->type == SHIELD) 2961 if (op->type == WEAPON || op->type == SHIELD)
3178 {
3179 for (tmp = who->inv; tmp && !ws; tmp = tmp->below) 2962 for (tmp = who->inv; tmp && !ws; tmp = tmp->below)
2963 if (tmp->flag [FLAG_APPLIED] && tmp->type == op->type)
2964 {
2965 retval = CAN_APPLY_UNAPPLY;
2966 ws = tmp;
3180 { 2967 }
3181 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type) 2968
2969 if (op->is_range ())
2970 for (tmp = who->inv; tmp && !ws; tmp = tmp->below)
2971 if (tmp->flag [FLAG_APPLIED] && tmp->is_range ())
2972 {
2973 retval = CAN_APPLY_UNAPPLY;
2974 ws = tmp;
2975 }
2976
2977 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
2978 {
2979 if (op->slot[i].info)
2980 {
2981 /* Item uses more slots than we have */
2982 if (abs (op->slot[i].info) > who->slot[i].info)
3182 { 2983 {
3183 retval = CAN_APPLY_UNAPPLY;
3184 ws = tmp;
3185 }
3186 }
3187 }
3188
3189
3190 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
3191 {
3192 if (op->body_info[i])
3193 {
3194 /* Item uses more slots than we have */
3195 if (FABS (op->body_info[i]) > who->body_info[i])
3196 {
3197 /* Could return now for efficiently - rest of info below isn' 2984 /* Could return now for efficiency - rest of info below isn't
3198 * really needed. 2985 * really needed.
3199 */ 2986 */
3200 retval |= CAN_APPLY_NEVER; 2987 retval |= CAN_APPLY_NEVER;
3201 } 2988 }
3202 else if ((who->body_used[i] + op->body_info[i]) < 0) 2989 else if ((who->slot[i].used + op->slot[i].info) < 0)
3203 { 2990 {
3204 /* in this case, equipping this would use more free spots than 2991 /* in this case, equipping this would use more free spots than
3205 * we have. 2992 * we have.
3206 */ 2993 */
3207 object *tmp1;
3208
3209 2994
3210 /* if we have an applied weapon/shield, and unapply it would free 2995 /* if we have an applied weapon/shield, and unapply it would free
3211 * enough slots to equip the new item, then just set this can 2996 * enough slots to equip the new item, then just set this can
3212 * continue. We don't care about the logic below - if you have 2997 * continue. We don't care about the logic below - if you have
3213 * shield equipped and try to equip another shield, there is only 2998 * shield equipped and try to equip another shield, there is only
… …
3215 * does take into the account cases where what is being applied 3000 * does take into the account cases where what is being applied
3216 * may be two handed for example. 3001 * may be two handed for example.
3217 */ 3002 */
3218 if (ws) 3003 if (ws)
3219 { 3004 {
3220 if ((who->body_used[i] - ws->body_info[i] + op->body_info[i]) >= 0) 3005 if ((who->slot[i].used - ws->slot[i].info + op->slot[i].info) >= 0)
3221 { 3006 {
3222 retval |= CAN_APPLY_UNAPPLY; 3007 retval |= CAN_APPLY_UNAPPLY;
3223 continue; 3008 continue;
3224 } 3009 }
3225 } 3010 }
3226 3011
3227 tmp1 = get_item_from_body_location (who->inv, i); 3012 object *tmp1 = get_item_from_body_location (who->inv, i);
3228 if (!tmp1) 3013 if (!tmp1)
3229 { 3014 {
3230#if 0 3015#if 0
3231 /* This is sort of an error, but happens a lot when old players 3016 /* This is sort of an error, but happens a lot when old players
3232 * join in with more stuff equipped than they are now allowed. 3017 * join in with more stuff equipped than they are now allowed.
… …
3243 */ 3028 */
3244 retval |= CAN_APPLY_UNAPPLY; 3029 retval |= CAN_APPLY_UNAPPLY;
3245 if (!tmp) 3030 if (!tmp)
3246 tmp = tmp1; 3031 tmp = tmp1;
3247 else if (tmp != tmp1) 3032 else if (tmp != tmp1)
3248 {
3249 retval |= CAN_APPLY_UNAPPLY_MULT; 3033 retval |= CAN_APPLY_UNAPPLY_MULT;
3250 } 3034
3251 /* This object isn't using up all the slots, so there must 3035 /* This object isn't using up all the slots, so there must
3252 * be another. If so, and it the new item doesn't need all 3036 * be another. If so, and it the new item doesn't need all
3253 * the slots, the player then has a choice. 3037 * the slots, the player then has a choice.
3254 */ 3038 */
3255 if (((who->body_used[i] - tmp1->body_info[i]) != who->body_info[i]) && (FABS (op->body_info[i]) < who->body_info[i])) 3039 if ((who->slot[i].used - tmp1->slot[i].info != who->slot[i].info)
3040 && abs (op->slot[i].info) < who->slot[i].info)
3256 retval |= CAN_APPLY_UNAPPLY_CHOICE; 3041 retval |= CAN_APPLY_UNAPPLY_CHOICE;
3257 3042
3258 /* Does unequippint 'tmp1' free up enough slots for this to be 3043 /* Does unequippint 'tmp1' free up enough slots for this to be
3259 * equipped? If not, there must be something else to unapply. 3044 * equipped? If not, there must be something else to unapply.
3260 */ 3045 */
3261 if ((who->body_used[i] + op->body_info[i] - tmp1->body_info[i]) < 0) 3046 if (who->slot[i].used + op->slot[i].info < tmp1->slot[i].info)
3262 retval |= CAN_APPLY_UNAPPLY_MULT; 3047 retval |= CAN_APPLY_UNAPPLY_MULT;
3263
3264 } 3048 }
3265 } /* if not enough free slots */ 3049 } /* if not enough free slots */
3266 } /* if this object uses location i */ 3050 } /* if this object uses location i */
3267 } /* for i -> num_body_locations loop */ 3051 } /* for i -> num_body_locations loop */
3268 3052
… …
3273 * and weapons all use the same slot. Similar for horn/rod/wand - they 3057 * and weapons all use the same slot. Similar for horn/rod/wand - they
3274 * all use the same location. 3058 * all use the same location.
3275 */ 3059 */
3276 if (op->type == WEAPON && !QUERY_FLAG (who, FLAG_USE_WEAPON)) 3060 if (op->type == WEAPON && !QUERY_FLAG (who, FLAG_USE_WEAPON))
3277 retval |= CAN_APPLY_RESTRICTION; 3061 retval |= CAN_APPLY_RESTRICTION;
3062
3278 if (op->type == SHIELD && !QUERY_FLAG (who, FLAG_USE_SHIELD)) 3063 if (op->type == SHIELD && !QUERY_FLAG (who, FLAG_USE_SHIELD))
3279 retval |= CAN_APPLY_RESTRICTION; 3064 retval |= CAN_APPLY_RESTRICTION;
3280 3065
3281
3282 if (who->type != PLAYER) 3066 if (who->type != PLAYER)
3283 { 3067 {
3284 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE)) 3068 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE))
3285 retval |= CAN_APPLY_RESTRICTION; 3069 retval |= CAN_APPLY_RESTRICTION;
3070
3286 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3071 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3287 retval |= CAN_APPLY_RESTRICTION; 3072 retval |= CAN_APPLY_RESTRICTION;
3073
3288 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING)) 3074 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING))
3289 retval |= CAN_APPLY_RESTRICTION; 3075 retval |= CAN_APPLY_RESTRICTION;
3076
3290 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3077 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3291 retval |= CAN_APPLY_RESTRICTION; 3078 retval |= CAN_APPLY_RESTRICTION;
3292 } 3079 }
3080
3293 return retval; 3081 return retval;
3294} 3082}
3295
3296
3297 3083
3298/** 3084/**
3299 * who is the object using the object. It can be a monster. 3085 * who is the object using the object. It can be a monster.
3300 * op is the object they are using. op is an equipment type item, 3086 * op is the object they are using. op is an equipment type item,
3301 * eg, one which you put on and keep on for a while, and not something 3087 * eg, one which you put on and keep on for a while, and not something
… …
3320int 3106int
3321apply_special (object *who, object *op, int aflags) 3107apply_special (object *who, object *op, int aflags)
3322{ 3108{
3323 int basic_flag = aflags & AP_BASIC_FLAGS; 3109 int basic_flag = aflags & AP_BASIC_FLAGS;
3324 object *tmp, *tmp2, *skop = NULL; 3110 object *tmp, *tmp2, *skop = NULL;
3325 int i;
3326 3111
3327 if (who == NULL) 3112 if (who == NULL)
3328 { 3113 {
3329 LOG (llevError, "apply_special() from object without environment.\n"); 3114 LOG (llevError, "apply_special() from object without environment.\n");
3330 return 1; 3115 return 1;
… …
3343 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 3128 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
3344 { 3129 {
3345 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (op)); 3130 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (op));
3346 return 1; 3131 return 1;
3347 } 3132 }
3133
3348 return unapply_special (who, op, aflags); 3134 return unapply_special (who, op, aflags);
3349 } 3135 }
3350 3136
3351 if (basic_flag == AP_UNAPPLY) 3137 if (basic_flag == AP_UNAPPLY)
3352 return 0; 3138 return 0;
3353 3139
3354 i = can_apply_object (who, op);
3355
3356 /* Can't just apply this object. Lets see what not and what to do */ 3140 /* Can't just apply this object. Lets see what not and what to do */
3357 if (i) 3141 if (int i = can_apply_object (who, op))
3358 { 3142 {
3359 if (i & CAN_APPLY_NEVER) 3143 if (i & CAN_APPLY_NEVER)
3360 { 3144 {
3361 new_draw_info_format (NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name (op)); 3145 new_draw_info_format (NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name (op));
3362 return 1; 3146 return 1;
… …
3364 else if (i & CAN_APPLY_RESTRICTION) 3148 else if (i & CAN_APPLY_RESTRICTION)
3365 { 3149 {
3366 new_draw_info_format (NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name (op)); 3150 new_draw_info_format (NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name (op));
3367 return 1; 3151 return 1;
3368 } 3152 }
3153
3369 if (who->type != PLAYER) 3154 if (who->type != PLAYER)
3370 { 3155 {
3371 /* Some error, so don't try to equip something more */ 3156 /* Some error, so don't try to equip something more */
3372 if (unapply_for_ob (who, op, aflags)) 3157 if (unapply_for_ob (who, op, aflags))
3373 return 1; 3158 return 1;
3374 } 3159 }
3375 else 3160 else
3376 { 3161 {
3377 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice)) 3162 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice))
3378 { 3163 {
3379 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some item(s):"); 3164 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some of the following item(s) or change your applymode:");
3380 unapply_for_ob (who, op, AP_PRINT); 3165 unapply_for_ob (who, op, AP_PRINT);
3381 return 1; 3166 return 1;
3382 } 3167 }
3383 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE)) 3168 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE))
3384 {
3385 i = unapply_for_ob (who, op, aflags); 3169 if (unapply_for_ob (who, op, aflags))
3386 if (i)
3387 return 1; 3170 return 1;
3388 } 3171 }
3389 }
3390 } 3172 }
3173
3391 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL) 3174 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL)
3392 { 3175 {
3393 skop = find_skill_by_name (who, op->skill); 3176 skop = find_skill_by_name (who, op->skill);
3177
3394 if (!skop) 3178 if (!skop)
3395 { 3179 {
3396 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill); 3180 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill);
3397 return 1; 3181 return 1;
3398 } 3182 }
3399 else 3183 else
3400 {
3401 /* While experience will be credited properly, we want to change the 3184 /* While experience will be credited properly, we want to change the
3402 * skill so that the dam and wc get updated 3185 * skill so that the dam and wc get updated
3403 */ 3186 */
3404 change_skill (who, skop, 0); 3187 change_skill (who, skop, 0);
3405 }
3406 }
3407
3408 if (who->type == PLAYER && op->item_power && (op->item_power + who->contr->item_power) > (settings.item_power_factor * who->level))
3409 { 3188 }
3410 new_draw_info (NDI_UNIQUE, 0, who, "Equipping that combined with other items would consume your soul!"); 3189
3190 if (who->type == PLAYER
3191 && op->item_power
3192 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level)
3193 {
3194 new_draw_info (NDI_UNIQUE, 0, who,
3195 "Equipping that combined with other items would consume your soul! "
3196 "[use the skills command to check your available item power]");
3411 return 1; 3197 return 1;
3412 } 3198 }
3413
3414 3199
3415 /* Ok. We are now at the state where we can apply the new object. 3200 /* Ok. We are now at the state where we can apply the new object.
3416 * Note that we don't have the checks for can_use_... 3201 * Note that we don't have the checks for can_use_...
3417 * below - that is already taken care of by can_apply_object. 3202 * below - that is already taken care of by can_apply_object.
3418 */ 3203 */
3419
3420
3421 if (op->nrof > 1) 3204 if (op->nrof > 1)
3422 tmp = get_split_ob (op, op->nrof - 1); 3205 tmp = get_split_ob (op, op->nrof - 1);
3423 else 3206 else
3424 tmp = NULL; 3207 tmp = 0;
3425 3208
3426 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op))) 3209 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
3427 return RESULT_INT (0); 3210 return RESULT_INT (0);
3428 3211
3429 switch (op->type) 3212 switch (op->type)
3430 { 3213 {
3431 case WEAPON: 3214 case WEAPON:
3432 if (!check_weapon_power (who, op->last_eat)) 3215 if (!check_weapon_power (who, op->last_eat))
3433 { 3216 {
3434 new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use."); 3217 new_draw_info (NDI_UNIQUE, 0, who, "This weapon is too powerful for you to use.");
3435 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3218 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!.");
3219
3436 if (tmp != NULL) 3220 if (tmp)
3437 (void) insert_ob_in_ob (tmp, who); 3221 insert_ob_in_ob (tmp, who);
3222
3438 return 1; 3223 return 1;
3439 } 3224 }
3225
3226 //TODO: this obviously fails for players using a shorter prefix
3227 // i.e. "R" can use Ragnarok's sword.
3440 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3228 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3441 { 3229 {
3442 /* if the weapon does not have the name as the character, can't use it. */ 3230 /* if the weapon does not have the name as the character, can't use it. */
3443 /* (Ragnarok's sword attempted to be used by Foo: won't work) */ 3231 /* (Ragnarok's sword attempted to be used by Foo: won't work) */
3444 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3232 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner.");
3233
3445 if (tmp != NULL) 3234 if (tmp)
3446 (void) insert_ob_in_ob (tmp, who); 3235 insert_ob_in_ob (tmp, who);
3236
3447 return 1; 3237 return 1;
3448 } 3238 }
3239
3240 if (!skop)
3241 {
3242 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO
3243 return 1;
3244 }
3245
3449 SET_FLAG (op, FLAG_APPLIED); 3246 SET_FLAG (op, FLAG_APPLIED);
3450
3451 if (skop)
3452 change_skill (who, skop, 1); 3247 change_skill (who, skop, 1);
3248
3249 if (who->contr)
3250 {
3251 who->contr->combat_ob = op;
3252 who->current_weapon = op;
3253 }
3254
3453 if (!QUERY_FLAG (who, FLAG_READY_WEAPON)) 3255 if (!QUERY_FLAG (who, FLAG_READY_WEAPON))
3454 SET_FLAG (who, FLAG_READY_WEAPON); 3256 SET_FLAG (who, FLAG_READY_WEAPON);
3455 3257
3456 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op)); 3258 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op));
3457 3259
3458 (void) change_abil (who, op); 3260 change_abil (who, op);
3459 break; 3261 break;
3460 3262
3461 case ARMOUR: 3263 case ARMOUR:
3462 case HELMET: 3264 case HELMET:
3463 case SHIELD: 3265 case SHIELD:
… …
3468 case CLOAK: 3270 case CLOAK:
3469 case RING: 3271 case RING:
3470 case AMULET: 3272 case AMULET:
3471 SET_FLAG (op, FLAG_APPLIED); 3273 SET_FLAG (op, FLAG_APPLIED);
3472 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op)); 3274 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op));
3473 (void) change_abil (who, op); 3275 change_abil (who, op);
3474 break; 3276 break;
3277
3475 case LAMP: 3278 case LAMP:
3476 if (op->stats.food < 1) 3279 if (op->stats.food < 1)
3477 { 3280 {
3478 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of" " fuel!", &op->name); 3281 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of fuel!", &op->name);
3479 return 1; 3282 return 1;
3480 } 3283 }
3284
3481 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name); 3285 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name);
3482 tmp2 = arch_to_object (op->other_arch); 3286 tmp2 = arch_to_object (op->other_arch);
3483 tmp2->stats.food = op->stats.food; 3287 tmp2->stats.food = op->stats.food;
3484 SET_FLAG (tmp2, FLAG_APPLIED); 3288 SET_FLAG (tmp2, FLAG_APPLIED);
3289
3485 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 3290 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3486 SET_FLAG (tmp2, FLAG_INV_LOCKED); 3291 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3292
3487 insert_ob_in_ob (tmp2, who); 3293 insert_ob_in_ob (tmp2, who);
3488 3294
3489 /* Remove the old lantern */ 3295 /* Remove the old lantern */
3490 if (who->type == PLAYER) 3296 if (who->type == PLAYER)
3491 esrv_del_item (who->contr, op->count); 3297 esrv_del_item (who->contr, op->count);
3492 3298
3493 op->destroy (); 3299 op->destroy ();
3494 3300
3495 /* insert the portion that was split off */ 3301 /* insert the portion that was split off */
3496 if (tmp != NULL) 3302 if (tmp)
3497 { 3303 {
3498 (void) insert_ob_in_ob (tmp, who); 3304 insert_ob_in_ob (tmp, who);
3499 if (who->type == PLAYER) 3305 if (who->type == PLAYER)
3500 esrv_send_item (who, tmp); 3306 esrv_send_item (who, tmp);
3501 } 3307 }
3502 fix_player (who); 3308
3309 who->update_stats ();
3310
3503 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3311 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3504 {
3505 if (who->type == PLAYER) 3312 if (who->type == PLAYER)
3506 { 3313 {
3507 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3314 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
3508 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 3315 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3509 } 3316 }
3510 } 3317
3511 if (who->type == PLAYER) 3318 if (who->type == PLAYER)
3512 esrv_send_item (who, tmp2); 3319 esrv_send_item (who, tmp2);
3320
3513 return 0; 3321 return 0;
3514 break;
3515 3322
3516 /* this part is needed for skill-tools */ 3323 /* this part is needed for skill-tools */
3517 case SKILL: 3324 case SKILL:
3518 case SKILL_TOOL: 3325 case SKILL_TOOL:
3519 if (who->chosen_skill) 3326 if (who->chosen_skill)
3520 { 3327 {
3521 LOG (llevError, "BUG: apply_special(): can't apply two skills\n"); 3328 LOG (llevError, "BUG: apply_special(): can't apply two skills\n");
3522 return 1; 3329 return 1;
3523 } 3330 }
3524 if (who->type == PLAYER) 3331
3332 if (player *pl = who->contr)
3333 {
3334 if (IS_COMBAT_SKILL (op->subtype))
3525 { 3335 {
3526 who->contr->shoottype = range_skill; 3336 if (skill_flags [op->subtype] & SF_NEED_WEAPON)
3527 who->contr->ranges[range_skill] = op; 3337 {
3338 for (object *item = who->inv; item; item = item->below)
3339 if (item->type == WEAPON && item->flag [FLAG_APPLIED])
3340 {
3341 pl->combat_ob = who->current_weapon = item;
3342 goto found_weapon;
3343 }
3344
3345 new_draw_info (NDI_UNIQUE, 0, who, "You need to apply a melee weapon before readying this skill");
3346 return 1;
3347
3348 found_weapon:;
3349 }
3350 else
3351 {
3352 pl->combat_ob = op;
3353 op->current_weapon = 0;
3354 }
3355 }
3356 else if (IS_RANGED_SKILL (op->subtype))
3357 {
3358 if (skill_flags [op->subtype] & SF_NEED_BOW)
3359 {
3360 for (object *item = who->inv; item; item = item->below)
3361 if (item->type == BOW && item->flag [FLAG_APPLIED])
3362 {
3363 pl->ranged_ob = who->current_weapon = item;
3364 goto found_bow;
3365 }
3366
3367 new_draw_info (NDI_UNIQUE, 0, who, "You need to apply a missile weapon before readying this skill");
3368 return 1;
3369
3370 found_bow:;
3371 }
3372 else if (skill_flags [op->subtype] & SF_NEED_ITEM)
3373 {
3374 for (object *item = who->inv; item; item = item->below)
3375 if (item->flag [FLAG_APPLIED]
3376 && (item->type == WAND || item->type == ROD || item->type == HORN))
3377 {
3378 pl->ranged_ob = who->current_weapon = item;
3379 goto found_item;
3380 }
3381
3382 new_draw_info (NDI_UNIQUE, 0, who, "You need to apply a magic item before readying this skill");
3383 return 1;
3384
3385 found_item:;
3386 }
3387 else
3388 {
3389 pl->ranged_ob = op;
3390 op->current_weapon = 0;
3391 }
3392 }
3393
3528 if (!op->invisible) 3394 if (!op->invisible)
3529 { 3395 {
3530 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3396 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3531 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill); 3397 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill);
3532 } 3398 }
3533 else 3399 else
3534 {
3535 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name); 3400 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name);
3536 } 3401 }
3537 } 3402
3538 SET_FLAG (op, FLAG_APPLIED); 3403 SET_FLAG (op, FLAG_APPLIED);
3539 (void) change_abil (who, op); 3404 change_abil (who, op);
3540 who->chosen_skill = op; 3405 who->chosen_skill = op;
3541 SET_FLAG (who, FLAG_READY_SKILL); 3406 SET_FLAG (who, FLAG_READY_SKILL);
3542 break; 3407 break;
3543 3408
3544 case BOW: 3409 case BOW:
3545 if (!check_weapon_power (who, op->last_eat)) 3410 if (!check_weapon_power (who, op->last_eat))
3546 { 3411 {
3547 new_draw_info (NDI_UNIQUE, 0, who, "That item is too powerful for you to use."); 3412 new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use.");
3548 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3413 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!.");
3414
3549 if (tmp != NULL) 3415 if (tmp)
3550 (void) insert_ob_in_ob (tmp, who); 3416 insert_ob_in_ob (tmp, who);
3417
3551 return 1; 3418 return 1;
3552 } 3419 }
3420
3553 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3421 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3554 { 3422 {
3555 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3423 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner.");
3556 if (tmp != NULL) 3424 if (tmp)
3557 (void) insert_ob_in_ob (tmp, who); 3425 insert_ob_in_ob (tmp, who);
3426
3558 return 1; 3427 return 1;
3559 } 3428 }
3429
3560 /*FALLTHROUGH*/ case WAND: 3430 /*FALLTHROUGH*/
3431 case WAND:
3561 case ROD: 3432 case ROD:
3562 case HORN: 3433 case HORN:
3563 /* check for skill, alter player status */ 3434 /* check for skill, alter player status */
3435
3436 if (!skop)
3437 {
3438 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO
3439 return 1;
3440 }
3441
3564 SET_FLAG (op, FLAG_APPLIED); 3442 SET_FLAG (op, FLAG_APPLIED);
3565 if (skop)
3566 change_skill (who, skop, 0); 3443 change_skill (who, skop, 0);
3444
3445 if (who->contr)
3446 {
3447 who->contr->ranged_ob = op;
3448
3567 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3449 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3568 3450
3569 if (who->type == PLAYER)
3570 {
3571 if (op->type == BOW) 3451 if (op->type == BOW)
3572 { 3452 {
3453 who->current_weapon = op;
3573 (void) change_abil (who, op); 3454 change_abil (who, op);
3574 new_draw_info_format (NDI_UNIQUE, 0, who, 3455 new_draw_info_format (NDI_UNIQUE, 0, who,
3575 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)); 3456 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op));
3576 who->contr->shoottype = range_bow;
3577 }
3578 else
3579 {
3580 who->contr->shoottype = range_misc;
3581 } 3457 }
3582 } 3458 }
3583 else 3459 else
3584 { 3460 {
3585 if (op->type == BOW) 3461 if (op->type == BOW)
3586 SET_FLAG (who, FLAG_READY_BOW); 3462 SET_FLAG (who, FLAG_READY_BOW);
3587 else 3463 else
3588 SET_FLAG (who, FLAG_READY_RANGE); 3464 SET_FLAG (who, FLAG_READY_RANGE);
3589 } 3465 }
3466
3590 break; 3467 break;
3591 3468
3592 case BUILDER: 3469 case BUILDER:
3593 if (who->contr->ranges[range_builder]) 3470 if (who->type == PLAYER)
3471 {
3472 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER)
3594 unapply_special (who, who->contr->ranges[range_builder], 0); 3473 unapply_special (who, who->contr->ranged_ob, 0);
3595 who->contr->shoottype = range_builder; 3474
3596 who->contr->ranges[range_builder] = op;
3597 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op)); 3475 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op));
3476
3477 who->contr->ranged_ob = op;
3478 }
3598 break; 3479 break;
3599 3480
3600 default: 3481 default:
3601 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op)); 3482 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op));
3602 } /* end of switch op->type */ 3483 } /* end of switch op->type */
3603 3484
3604 SET_FLAG (op, FLAG_APPLIED); 3485 SET_FLAG (op, FLAG_APPLIED);
3605 3486
3606 if (tmp != NULL) 3487 if (tmp)
3607 tmp = insert_ob_in_ob (tmp, who); 3488 tmp = insert_ob_in_ob (tmp, who);
3608 3489
3609 fix_player (who); 3490 who->update_stats ();
3610 3491
3611 /* We exclude spell casting objects. The fire code will set the 3492 /* We exclude spell casting objects. The fire code will set the
3612 * been applied flag when they are used - until that point, 3493 * been applied flag when they are used - until that point,
3613 * you don't know anything about them. 3494 * you don't know anything about them.
3614 */ 3495 */
… …
3621 { 3502 {
3622 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3503 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
3623 SET_FLAG (op, FLAG_KNOWN_CURSED); 3504 SET_FLAG (op, FLAG_KNOWN_CURSED);
3624 } 3505 }
3625 } 3506 }
3507
3626 if (who->type == PLAYER) 3508 if (who->type == PLAYER)
3627 { 3509 {
3628 /* if multiple objects were applied, update both slots */ 3510 /* if multiple objects were applied, update both slots */
3629 if (tmp) 3511 if (tmp)
3630 esrv_send_item (who, tmp); 3512 esrv_send_item (who, tmp);
3513
3631 esrv_send_item (who, op); 3514 esrv_send_item (who, op);
3632 } 3515 }
3516
3633 return 0; 3517 return 0;
3634} 3518}
3635
3636 3519
3637int 3520int
3638monster_apply_special (object *who, object *op, int aflags) 3521monster_apply_special (object *who, object *op, int aflags)
3639{ 3522{
3640 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED)) 3523 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
… …
3684 3567
3685 case TREASURE: 3568 case TREASURE:
3686 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 3569 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
3687 return 0; 3570 return 0;
3688 3571
3689 while ((op->stats.hp--) > 0) 3572 while (op->stats.hp-- > 0)
3690 create_treasure (op->randomitems, op, op->map ? GT_ENVIRONMENT : 0, 3573 create_treasure (op->randomitems, op, op->map ? GT_ENVIRONMENT : 0,
3691 op->stats.exp ? (int) op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0); 3574 op->stats.exp ? (int) op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0);
3692 3575
3693 /* If we generated an object and put it in this object inventory, 3576 /* If we generated an object and put it in this object inventory,
3694 * move it to the parent object as the current object is about 3577 * move it to the parent object as the current object is about
… …
3711 } 3594 }
3712 return tmp ? 1 : 0; 3595 return tmp ? 1 : 0;
3713} 3596}
3714 3597
3715/** 3598/**
3716 * fix_auto_apply goes through the entire map (only the first time 3599 * fix_auto_apply goes through the entire map every time a map
3717 * when an original map is loaded) and performs special actions for 3600 * is loaded or swapped in and performs special actions for
3718 * certain objects (most initialization of chests and creation of 3601 * certain objects (most initialization of chests and creation of
3719 * treasures and stuff). Calls auto_apply if appropriate. 3602 * treasures and stuff). Calls auto_apply if appropriate.
3720 */ 3603 */
3721void 3604void
3722fix_auto_apply (maptile *m) 3605maptile::fix_auto_apply ()
3723{ 3606{
3724 object *tmp, *above = NULL; 3607 if (!spaces)
3725 int x, y;
3726
3727 if (m == NULL)
3728 return; 3608 return;
3729 3609
3730 for (x = 0; x < MAP_WIDTH (m); x++) 3610 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3731 for (y = 0; y < MAP_HEIGHT (m); y++) 3611 for (object *tmp = ms->bot; tmp; )
3732 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = above)
3733 { 3612 {
3734 above = tmp->above; 3613 object *above = tmp->above;
3735 3614
3736 if (tmp->inv) 3615 if (tmp->inv)
3737 { 3616 {
3738 object *invtmp, *invnext; 3617 object *invtmp, *invnext;
3739 3618
3740 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext) 3619 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext)
3741 { 3620 {
3742 invnext = invtmp->below; 3621 invnext = invtmp->below;
3743 3622
3744 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY)) 3623 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY))
3745 auto_apply (invtmp); 3624 auto_apply (invtmp);
3746 else if (invtmp->type == TREASURE && invtmp->has_random_items ()) 3625 else if (invtmp->type == TREASURE && invtmp->has_random_items ())
3747 { 3626 {
3748 while ((invtmp->stats.hp--) > 0) 3627 while ((invtmp->stats.hp--) > 0)
3749 create_treasure (invtmp->randomitems, invtmp, 0, m->difficulty, 0); 3628 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3750 3629
3751 invtmp->randomitems = NULL; 3630 invtmp->randomitems = NULL;
3752 } 3631 }
3753 else if (invtmp && invtmp->arch 3632 else if (invtmp && invtmp->arch
3754 && invtmp->type != TREASURE && invtmp->type != SPELL && invtmp->type != CLASS && invtmp->has_random_items ()) 3633 && invtmp->type != TREASURE && invtmp->type != SPELL && invtmp->type != CLASS && invtmp->has_random_items ())
3755 { 3634 {
3756 create_treasure (invtmp->randomitems, invtmp, 0, m->difficulty, 0); 3635 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3757 /* Need to clear this so that we never try to create 3636 /* Need to clear this so that we never try to create
3758 * treasure again for this object 3637 * treasure again for this object
3759 */ 3638 */
3760 invtmp->randomitems = NULL; 3639 invtmp->randomitems = NULL;
3761 } 3640 }
3762 } 3641 }
3763 /* This is really temporary - the code at the bottom will 3642 /* This is really temporary - the code at the bottom will
3764 * also set randomitems to null. The problem is there are bunches 3643 * also set randomitems to null. The problem is there are bunches
3765 * of maps/players already out there with items that have spells 3644 * of maps/players already out there with items that have spells
3766 * which haven't had the randomitems set to null yet. 3645 * which haven't had the randomitems set to null yet.
3767 * MSW 2004-05-13 3646 * MSW 2004-05-13
3768 * 3647 *
3769 * And if it's a spellbook, it's better to set randomitems to NULL too, 3648 * And if it's a spellbook, it's better to set randomitems to NULL too,
3770 * else you get two spells in the book ^_- 3649 * else you get two spells in the book ^_-
3771 * Ryo 2004-08-16 3650 * Ryo 2004-08-16
3772 */ 3651 */
3773 if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL 3652 if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL
3774 || tmp->type == HORN || tmp->type == FIREWALL || tmp->type == POTION || tmp->type == ALTAR || tmp->type == SPELLBOOK) 3653 || tmp->type == HORN || tmp->type == FIREWALL || tmp->type == POTION || tmp->type == ALTAR || tmp->type == SPELLBOOK)
3775 tmp->randomitems = NULL;
3776
3777 }
3778
3779 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY))
3780 auto_apply (tmp);
3781 else if ((tmp->type == TREASURE || (tmp->type == CONTAINER)) && tmp->has_random_items ())
3782 {
3783 while ((tmp->stats.hp--) > 0)
3784 create_treasure (tmp->randomitems, tmp, 0, m->difficulty, 0);
3785 tmp->randomitems = NULL; 3654 tmp->randomitems = NULL;
3655
3786 } 3656 }
3657
3658 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY))
3659 auto_apply (tmp);
3660 else if ((tmp->type == TREASURE || (tmp->type == CONTAINER)) && tmp->has_random_items ())
3661 {
3662 while ((tmp->stats.hp--) > 0)
3663 create_treasure (tmp->randomitems, tmp, 0, difficulty, 0);
3664 tmp->randomitems = NULL;
3665 }
3787 else if (tmp->type == TIMED_GATE) 3666 else if (tmp->type == TIMED_GATE)
3788 { 3667 {
3789 object *head = tmp->head != NULL ? tmp->head : tmp; 3668 object *head = tmp->head != NULL ? tmp->head : tmp;
3790 3669
3791 if (QUERY_FLAG (head, FLAG_IS_LINKED)) 3670 if (QUERY_FLAG (head, FLAG_IS_LINKED))
3792 {
3793 tmp->speed = 0; 3671 tmp->set_speed (0);
3794 update_ob_speed (tmp);
3795 }
3796 } 3672 }
3797 /* This function can be called everytime a map is loaded, even when 3673 /* This function can be called everytime a map is loaded, even when
3798 * swapping back in. As such, we don't want to create the treasure 3674 * swapping back in. As such, we don't want to create the treasure
3799 * over and ove again, so after we generate the treasure, blank out 3675 * over and ove again, so after we generate the treasure, blank out
3800 * randomitems so if it is swapped in again, it won't make anything. 3676 * randomitems so if it is swapped in again, it won't make anything.
3801 * This is a problem for the above objects, because they have counters 3677 * This is a problem for the above objects, because they have counters
3802 * which say how many times to make the treasure. 3678 * which say how many times to make the treasure.
3803 */ 3679 */
3804 else if (tmp && tmp->arch && tmp->type != PLAYER 3680 else if (tmp && tmp->arch && tmp->type != PLAYER
3805 && tmp->type != TREASURE && tmp->type != SPELL 3681 && tmp->type != TREASURE && tmp->type != SPELL
3806 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && tmp->has_random_items ()) 3682 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && tmp->has_random_items ())
3807 { 3683 {
3808 create_treasure (tmp->randomitems, tmp, GT_APPLY, m->difficulty, 0); 3684 create_treasure (tmp->randomitems, tmp, GT_APPLY, difficulty, 0);
3809 tmp->randomitems = NULL; 3685 tmp->randomitems = NULL;
3810 } 3686 }
3687
3688 // close all containers
3689 else if (tmp->type == CONTAINER)
3690 tmp->flag [FLAG_APPLIED] = 0;
3691
3692 tmp = above;
3811 } 3693 }
3812 3694
3813 for (x = 0; x < MAP_WIDTH (m); x++) 3695 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3814 for (y = 0; y < MAP_HEIGHT (m); y++) 3696 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
3815 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above)
3816 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL)) 3697 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL))
3817 check_trigger (tmp, tmp->above); 3698 check_trigger (tmp, tmp->above);
3818} 3699}
3819 3700
3820/** 3701/**
3821 * Handles player eating food that temporarily changes status (resistances, stats). 3702 * Handles player eating food that temporarily changes status (resistances, stats).
3822 * This used to call cast_change_attr(), but 3703 * This used to call cast_change_attr(), but
… …
3850 { 3731 {
3851 force->resist[i] = food->resist[i] / 2; 3732 force->resist[i] = food->resist[i] / 2;
3852 did_one = 1; 3733 did_one = 1;
3853 } 3734 }
3854 } 3735 }
3736
3855 if (did_one) 3737 if (did_one)
3856 { 3738 {
3857 force->speed = 0.1; 3739 force->set_speed (0.1);
3858 update_ob_speed (force);
3859 /* bigger morsel of food = longer effect time */ 3740 /* bigger morsel of food = longer effect time */
3860 force->stats.food = food->stats.food / 5; 3741 force->duration = food->stats.food / 5;
3861 SET_FLAG (force, FLAG_IS_USED_UP);
3862 SET_FLAG (force, FLAG_APPLIED); 3742 SET_FLAG (force, FLAG_APPLIED);
3863 change_abil (who, force); 3743 change_abil (who, force);
3864 insert_ob_in_ob (force, who); 3744 insert_ob_in_ob (force, who);
3865 } 3745 }
3866 else 3746 else
… …
3869 /* check for hp, sp change */ 3749 /* check for hp, sp change */
3870 if (food->stats.hp != 0) 3750 if (food->stats.hp != 0)
3871 { 3751 {
3872 if (QUERY_FLAG (food, FLAG_CURSED)) 3752 if (QUERY_FLAG (food, FLAG_CURSED))
3873 { 3753 {
3874 strcpy (who->contr->killer, food->name); 3754 assign (who->contr->killer, food->name);
3875 hit_player (who, food->stats.hp, food, AT_POISON, 1); 3755 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3876 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!"); 3756 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!");
3877 } 3757 }
3878 else 3758 else
3879 { 3759 {
… …
3898 new_draw_info (NDI_UNIQUE, 0, who, "You feel a rush of magical energy!"); 3778 new_draw_info (NDI_UNIQUE, 0, who, "You feel a rush of magical energy!");
3899 who->stats.sp += food->stats.sp; 3779 who->stats.sp += food->stats.sp;
3900 /* place limit on max sp from food? */ 3780 /* place limit on max sp from food? */
3901 } 3781 }
3902 } 3782 }
3903 fix_player (who); 3783 who->update_stats ();
3904} 3784}
3905
3906 3785
3907/** 3786/**
3908 * Designed primarily to light torches/lanterns/etc. 3787 * Designed primarily to light torches/lanterns/etc.
3909 * Also burns up burnable material too. First object in the inventory is 3788 * Also burns up burnable material too. First object in the inventory is
3910 * the selected object to "burn". -b.t. 3789 * the selected object to "burn". -b.t.
3911 */ 3790 */
3912
3913void 3791void
3914apply_lighter (object *who, object *lighter) 3792apply_lighter (object *who, object *lighter)
3915{ 3793{
3916 object *item; 3794 object *item;
3917 int is_player_env = 0; 3795 int is_player_env = 0;
3918 char item_name[MAX_BUF];
3919 3796
3920 item = find_marked_object (who); 3797 item = find_marked_object (who);
3921 if (item) 3798 if (item)
3922 { 3799 {
3923 if (lighter->last_eat && lighter->stats.food) 3800 if (lighter->last_eat && lighter->stats.food)
… …
3941 else if (lighter->last_eat) 3818 else if (lighter->last_eat)
3942 { /* no charges left in lighter */ 3819 { /* no charges left in lighter */
3943 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with a used up %s.", &item->name, &lighter->name); 3820 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with a used up %s.", &item->name, &lighter->name);
3944 return; 3821 return;
3945 } 3822 }
3823
3946 /* Perhaps we should split what we are trying to light on fire? 3824 /* Perhaps we should split what we are trying to light on fire?
3947 * I can't see many times when you would want to light multiple 3825 * I can't see many times when you would want to light multiple
3948 * objects at once. 3826 * objects at once.
3949 */ 3827 */
3950 /* If the item is destroyed, we don't have a valid pointer to the 3828
3951 * name object, so make a copy so the message we print out makes
3952 * some sense.
3953 */
3954 strcpy (item_name, item->name);
3955 if (who == is_player_inv (item)) 3829 if (who == item->in_player ())
3956 is_player_env = 1; 3830 is_player_env = 1;
3957 3831
3958 save_throw_object (item, AT_FIRE, who); 3832 save_throw_object (item, AT_FIRE, who);
3959 /* Change to check count and not freed, since the object pointer 3833
3960 * may have gotten recycled
3961 */
3962 if (item->destroyed ()) 3834 if (item->destroyed ())
3963 { 3835 {
3964 new_draw_info_format (NDI_UNIQUE, 0, who, "You light the %s with the %s.", &item_name, &lighter->name); 3836 new_draw_info_format (NDI_UNIQUE, 0, who, "You light the %s with the %s.", &item->name, &lighter->name);
3965 /* Need to update the player so that the players glow radius 3837 /* Need to update the player so that the players glow radius
3966 * gets changed. 3838 * gets changed.
3967 */ 3839 */
3968 if (is_player_env) 3840 if (is_player_env)
3969 fix_player (who); 3841 who->update_stats ();
3970 } 3842 }
3971 else 3843 else
3972 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with the %s and fail.", &item->name, &lighter->name); 3844 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with the %s and fail.", &item->name, &lighter->name);
3973 } 3845 }
3974 else /* nothing to light */ 3846 else /* nothing to light */

Diff Legend

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