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.30 by root, Sat Sep 16 22:24:13 2006 UTC vs.
Revision 1.76 by root, Mon Apr 30 04:25:30 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
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 */
23 24
24#include <global.h> 25#include <global.h>
25#include <living.h> 26#include <living.h>
26#include <spells.h> 27#include <spells.h>
27#include <skills.h> 28#include <skills.h>
28#include <tod.h> 29#include <tod.h>
29 30
30#ifndef __CEXTRACT__
31# include <sproto.h> 31#include <sproto.h>
32#endif
33 32
34/* Want this regardless of rplay. */ 33/* Want this regardless of rplay. */
35#include <sounds.h> 34#include <sounds.h>
36 35
37/* need math lib for double-precision and pow() in dragon_eat_flesh() */ 36/* need math lib for double-precision and pow() in dragon_eat_flesh() */
… …
66 { 65 {
67 arch_flag = 1; 66 arch_flag = 1;
68 name_flag = 1; 67 name_flag = 1;
69 race_flag = 1; 68 race_flag = 1;
70 } 69 }
70
71 /* If the director has race set, only affect objects with a arch, 71 /* If the director has race set, only affect objects with a arch,
72 * name or race that matches. 72 * name or race that matches.
73 */ 73 */
74 if ((op->race) && 74 if ((op->race) &&
75 ((!(victim->arch && arch_flag && victim->arch->name) || strcmp (op->race, victim->arch->name))) && 75 ((!(victim->arch && arch_flag && victim->arch->name) || op->race != victim->arch->name)) &&
76 ((!(victim->name && name_flag) || strcmp (op->race, victim->name))) && 76 ((!(victim->name && name_flag) || op->race != victim->name)) &&
77 ((!(victim->race && race_flag) || strcmp (op->race, victim->race)))) 77 ((!(victim->race && race_flag) || op->race != victim->race)))
78 {
79 return 1; 78 return 1;
80 } 79
81 /* If the director has slaying set, only affect objects where none 80 /* If the director has slaying set, only affect objects where none
82 * of arch, name, or race match. 81 * of arch, name, or race match.
83 */ 82 */
84 if ((op->slaying) && (((victim->arch && arch_flag && victim->arch->name && !strcmp (op->slaying, victim->arch->name))) || 83 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))) || 84 ((victim->name && name_flag && op->slaying == victim->name)) ||
86 ((victim->race && race_flag && !strcmp (op->slaying, victim->race))))) 85 ((victim->race && race_flag && op->slaying == victim->race)))
87 {
88 return 1; 86 return 1;
89 } 87
90 return 0; 88 return 0;
91} 89}
92 90
93/** 91/**
94 * This handles a player dropping money on an altar to identify stuff. 92 * This handles a player dropping money on an altar to identify stuff.
… …
195apply_potion (object *op, object *tmp) 193apply_potion (object *op, object *tmp)
196{ 194{
197 int got_one = 0, i; 195 int got_one = 0, i;
198 object *force = 0, *floor = 0; 196 object *force = 0, *floor = 0;
199 197
200 floor = get_map_ob (op->map, op->x, op->y); 198 floor = GET_MAP_OB (op->map, op->x, op->y);
201 199
202 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 200 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
203 { 201 {
204 if (op->type == PLAYER) 202 if (op->type == PLAYER)
205 new_draw_info (NDI_UNIQUE, 0, op, "Gods prevent you from using this here, it's sacred ground!"); 203 new_draw_info (NDI_UNIQUE, 0, op, "Gods prevent you from using this here, it's sacred ground!");
206 CLEAR_FLAG (tmp, FLAG_APPLIED); 204 CLEAR_FLAG (tmp, FLAG_APPLIED);
207 return 0; 205 return 0;
208 } 206 }
209 207
210 if (op->type == PLAYER) 208 if (op->type == PLAYER)
211 {
212 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 209 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
213 identify (tmp); 210 identify (tmp);
214 }
215 211
216 handle_apply_yield (tmp); 212 handle_apply_yield (tmp);
217 213
218 /* Potion of restoration - only for players */ 214 /* Potion of restoration - only for players */
219 if (op->type == PLAYER && (tmp->attacktype & AT_DEPLETE)) 215 if (op->type == PLAYER && (tmp->attacktype & AT_DEPLETE))
… …
221 object *depl; 217 object *depl;
222 archetype *at; 218 archetype *at;
223 219
224 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 220 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
225 { 221 {
226 drain_stat (op); 222 op->drain_stat ();
227 fix_player (op); 223 op->update_stats ();
228 decrease_ob (tmp); 224 decrease_ob (tmp);
229 return 1; 225 return 1;
230 } 226 }
227
231 if ((at = archetype::find (ARCH_DEPLETION)) == NULL) 228 if (!(at = archetype::find (ARCH_DEPLETION)))
232 { 229 {
233 LOG (llevError, "Could not find archetype depletion\n"); 230 LOG (llevError, "Could not find archetype depletion\n");
234 return 0; 231 return 0;
235 } 232 }
236 depl = present_arch_in_ob (at, op); 233 depl = present_arch_in_ob (at, op);
234
237 if (depl != NULL) 235 if (depl)
238 { 236 {
239 for (i = 0; i < NUM_STATS; i++) 237 for (i = 0; i < NUM_STATS; i++)
240 if (get_attr_value (&depl->stats, i)) 238 if (get_attr_value (&depl->stats, i))
241 {
242 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]); 239 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]);
243 } 240
244 remove_ob (depl); 241 depl->destroy ();
245 free_object (depl); 242 op->update_stats ();
246 fix_player (op);
247 } 243 }
248 else 244 else
249 new_draw_info (NDI_UNIQUE, 0, op, "You potion had no effect."); 245 new_draw_info (NDI_UNIQUE, 0, op, "You potion had no effect.");
250 246
251 decrease_ob (tmp); 247 decrease_ob (tmp);
… …
253 } 249 }
254 250
255 /* improvement potion - only for players */ 251 /* improvement potion - only for players */
256 if (op->type == PLAYER && tmp->attacktype & AT_GODPOWER) 252 if (op->type == PLAYER && tmp->attacktype & AT_GODPOWER)
257 { 253 {
258
259 for (i = 1; i < MIN (11, op->level); i++) 254 for (i = 1; i < MIN (11, op->level); i++)
260 { 255 {
261 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 256 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
262 { 257 {
263 if (op->contr->levhp[i] != 1) 258 if (op->contr->levhp[i] != 1)
… …
293 op->contr->levgrace[i] = 3; 288 op->contr->levgrace[i] = 3;
294 break; 289 break;
295 } 290 }
296 } 291 }
297 } 292 }
293
298 /* Just makes checking easier */ 294 /* Just makes checking easier */
299 if (i < MIN (11, op->level)) 295 if (i < MIN (11, op->level))
300 got_one = 1; 296 got_one = 1;
297
301 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)) 298 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))
302 { 299 {
303 if (got_one) 300 if (got_one)
304 { 301 {
305 fix_player (op); 302 op->update_stats ();
306 new_draw_info (NDI_UNIQUE, 0, op, "The Gods smile upon you and remake you"); 303 new_draw_info (NDI_UNIQUE, 0, op, "The Gods smile upon you and remake you");
307 new_draw_info (NDI_UNIQUE, 0, op, "a little more in their image."); 304 new_draw_info (NDI_UNIQUE, 0, op, "a little more in their image.");
308 new_draw_info (NDI_UNIQUE, 0, op, "You feel a little more perfect."); 305 new_draw_info (NDI_UNIQUE, 0, op, "You feel a little more perfect.");
309 } 306 }
310 else 307 else
… …
312 } 309 }
313 else 310 else
314 { /* cursed potion */ 311 { /* cursed potion */
315 if (got_one) 312 if (got_one)
316 { 313 {
317 fix_player (op); 314 op->update_stats ();
318 new_draw_info (NDI_UNIQUE, 0, op, "The Gods are angry and punish you."); 315 new_draw_info (NDI_UNIQUE, 0, op, "The Gods are angry and punish you.");
319 } 316 }
320 else 317 else
321 new_draw_info (NDI_UNIQUE, 0, op, "You are fortunate that you are so pathetic."); 318 new_draw_info (NDI_UNIQUE, 0, op, "You are fortunate that you are so pathetic.");
322 } 319 }
320
323 decrease_ob (tmp); 321 decrease_ob (tmp);
324 return 1; 322 return 1;
325 } 323 }
326 324
327 325
… …
349 cast_spell (op, tmp, op->facing, tmp->inv, NULL); 347 cast_spell (op, tmp, op->facing, tmp->inv, NULL);
350 348
351 decrease_ob (tmp); 349 decrease_ob (tmp);
352 /* if youre dead, no point in doing this... */ 350 /* if youre dead, no point in doing this... */
353 if (!QUERY_FLAG (op, FLAG_REMOVED)) 351 if (!QUERY_FLAG (op, FLAG_REMOVED))
354 fix_player (op); 352 op->update_stats ();
355 return 1; 353 return 1;
356 } 354 }
357 355
358 /* Deal with protection potions */ 356 /* Deal with protection potions */
359 force = NULL; 357 force = NULL;
… …
403 * that were grouped with the one consumed, his 401 * that were grouped with the one consumed, his
404 * stat will not be raised by them. fix_player just clears 402 * stat will not be raised by them. fix_player just clears
405 * up all the stats. 403 * up all the stats.
406 */ 404 */
407 CLEAR_FLAG (tmp, FLAG_APPLIED); 405 CLEAR_FLAG (tmp, FLAG_APPLIED);
408 fix_player (op); 406 op->update_stats ();
409 decrease_ob (tmp); 407 decrease_ob (tmp);
410 return 1; 408 return 1;
411} 409}
412 410
413/**************************************************************************** 411/****************************************************************************
… …
423 int count = 0; 421 int count = 0;
424 422
425 423
426 if (item == NULL) 424 if (item == NULL)
427 return 0; 425 return 0;
426
428 op = op->below; 427 op = op->below;
429 while (op != NULL) 428 while (op != NULL)
430 { 429 {
431 if (strcmp (op->arch->name, item) == 0) 430 if (strcmp (op->arch->name, item) == 0)
432 { 431 {
… …
437 count++; 436 count++;
438 else 437 else
439 count += op->nrof; 438 count += op->nrof;
440 } 439 }
441 } 440 }
441
442 op = op->below; 442 op = op->below;
443 } 443 }
444
444 return count; 445 return count;
445} 446}
446 447
447/** 448/**
448 * This removes 'nrof' of what item->slaying says to remove. 449 * This removes 'nrof' of what item->slaying says to remove.
… …
570 weapon->last_eat++; 571 weapon->last_eat++;
571 new_draw_info_format (NDI_UNIQUE, 0, op, "Weapon's bonus to %s improved by %d", statname, sacrifice_count); 572 new_draw_info_format (NDI_UNIQUE, 0, op, "Weapon's bonus to %s improved by %d", statname, sacrifice_count);
572 decrease_ob (improver); 573 decrease_ob (improver);
573 574
574 /* So it updates the players stats and the window */ 575 /* So it updates the players stats and the window */
575 fix_player (op); 576 op->update_stats ();
576 return 1; 577 return 1;
577} 578}
578 579
579/* Types of improvements, hidden in the sp field. */ 580/* Types of improvements, hidden in the sp field. */
580#define IMPROVE_PREPARE 1 581#define IMPROVE_PREPARE 1
… …
883 884
884 if (op->type == PLAYER) 885 if (op->type == PLAYER)
885 { 886 {
886 esrv_send_item (op, armour); 887 esrv_send_item (op, armour);
887 if (QUERY_FLAG (armour, FLAG_APPLIED)) 888 if (QUERY_FLAG (armour, FLAG_APPLIED))
888 fix_player (op); 889 op->update_stats ();
889 } 890 }
890 decrease_ob (improver); 891 decrease_ob (improver);
891 if (tmp) 892 if (tmp)
892 { 893 {
893 insert_ob_in_ob (tmp, op); 894 insert_ob_in_ob (tmp, op);
… …
952 price_in = nr * CONV_NEED (converter) * item->value; 953 price_in = nr * CONV_NEED (converter) * item->value;
953 } 954 }
954 else 955 else
955 { 956 {
956 price_in = item->value; 957 price_in = item->value;
957 remove_ob (item); 958 item->destroy ();
958 free_object (item);
959 } 959 }
960 } 960 }
961 961
962 if (converter->inv != NULL) 962 if (converter->inv != NULL)
963 { 963 {
… …
981 else 981 else
982 { 982 {
983 if (converter->other_arch == NULL) 983 if (converter->other_arch == NULL)
984 { 984 {
985 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n", 985 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n",
986 &converter->name, converter->map->path, converter->x, converter->y); 986 &converter->name, &converter->map->path, converter->x, converter->y);
987 return -1; 987 return -1;
988 } 988 }
989 989
990 item = object_create_arch (converter->other_arch); 990 item = object_create_arch (converter->other_arch);
991 fix_generated_item (item, converter, 0, 0, GT_MINIMAL); 991 fix_generated_item (item, converter, 0, 0, GT_MINIMAL);
… …
998 if (is_in_shop (converter)) 998 if (is_in_shop (converter))
999 SET_FLAG (item, FLAG_UNPAID); 999 SET_FLAG (item, FLAG_UNPAID);
1000 else if (price_in < item->nrof * item->value) 1000 else if (price_in < item->nrof * item->value)
1001 { 1001 {
1002 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n", 1002 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n",
1003 &converter->name, converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name); 1003 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
1004 1004
1005 /** 1005 /**
1006 * elmex: we are going to let the game continue, as the mapcreator 1006 * elmex: we are going to let the game continue, as the mapcreator
1007 * propably had something in mind when doing this 1007 * propably had something in mind when doing this
1008 */ 1008 */
… …
1015 * Handle apply on containers. 1015 * Handle apply on containers.
1016 * By Eneq(@csd.uu.se). 1016 * By Eneq(@csd.uu.se).
1017 * Moved to own function and added many features [Tero.Haatanen@lut.fi] 1017 * Moved to own function and added many features [Tero.Haatanen@lut.fi]
1018 * added the alchemical cauldron to the code -b.t. 1018 * added the alchemical cauldron to the code -b.t.
1019 */ 1019 */
1020
1021int 1020int
1022apply_container (object *op, object *sack) 1021apply_container (object *op, object *sack)
1023{ 1022{
1024 char buf[MAX_BUF]; 1023 if (op->type != PLAYER || !op->contr->ns)
1025 object *tmp;
1026
1027 if (op->type != PLAYER)
1028 return 0; /* This might change */ 1024 return 0; /* This might change */
1029 1025
1030 if (sack == NULL || sack->type != CONTAINER) 1026 if (!sack || sack->type != CONTAINER)
1031 { 1027 {
1032 LOG (llevError, "apply_container: %s is not container!\n", &sack->name); 1028 LOG (llevError, "apply_container: %s is not container!\n", sack ? &sack->name : "[nullobject]");
1033 return 0; 1029 return 0;
1034 } 1030 }
1035 op->contr->last_used = NULL; 1031
1036 op->contr->last_used_id = 0; 1032 op->contr->last_used = 0;
1037 1033
1038 if (sack->env != op) 1034 if (sack->env && sack->env != op)
1035 {
1036 new_draw_info (NDI_UNIQUE, 0, op, "You must put it onto the floor or into your inventory first.");
1037 return 1;
1039 { 1038 }
1040 if (sack->other_arch == NULL || sack->env != NULL) 1039
1040 // already applied == open on ground, or open in inv, or active in inv
1041 if (sack->flag [FLAG_APPLIED])
1042 {
1043 if (op->container == sack)
1041 { 1044 {
1042 new_draw_info (NDI_UNIQUE, 0, op, "You must get it first."); 1045 // open on ground or inv, so close
1046 op->close_container ();
1043 return 1; 1047 return 1;
1044 } 1048 }
1045 /* It's on the ground, the problems begin */ 1049 else if (!sack->env)
1046 if (op->container != sack)
1047 {
1048 /* it's closed OR some player has opened it */
1049 if (QUERY_FLAG (sack, FLAG_APPLIED))
1050 { 1050 {
1051 for (tmp = get_map_ob (sack->map, sack->x, sack->y); tmp && tmp->container != sack; tmp = tmp->above); 1051 // 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)); 1052 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already occupied.", query_name (sack));
1056 return 1; 1053 return 1;
1057 }
1058 }
1059 }
1060 if (QUERY_FLAG (sack, FLAG_APPLIED))
1061 { 1054 }
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 if (tmp && tmp->type == CLOSE_CON)
1082 {
1083 remove_ob (tmp);
1084 free_object (tmp);
1085 }
1086 }
1087 }
1088 }
1089 1055
1090 if (QUERY_FLAG (sack, FLAG_APPLIED)) 1056 // fall through to opening it (active in inv)
1091 { 1057 }
1058 else if (sack->env)
1059 {
1060 // it is in our env, so activate it, do not open yet
1092 if (op->container) 1061 op->close_container ();
1093 { 1062 sack->flag [FLAG_APPLIED] = 1;
1094 if (op->container != sack) 1063 esrv_update_item (UPD_FLAGS, op, sack);
1095 { 1064 new_draw_info_format (NDI_UNIQUE, 0, op, "You ready %s.", query_name (sack));
1096 tmp = op->container; 1065 return 1;
1097 apply_container (op, tmp); 1066 }
1098 sprintf (buf, "You close %s and open ", query_name (tmp)); 1067
1099 op->container = sack; 1068 // it's locked?
1100 strcat (buf, query_name (sack)); 1069 if (sack->slaying)
1101 strcat (buf, "."); 1070 {
1102 } 1071 if (object *tmp = find_key (op, op, sack))
1103 else 1072 new_draw_info_format (NDI_UNIQUE, 0, op, "You unlock %s with %s.", query_name (sack), query_name (tmp));
1104 {
1105 CLEAR_FLAG (sack, FLAG_APPLIED);
1106 op->container = NULL;
1107 sprintf (buf, "You close %s.", query_name (sack));
1108 }
1109 }
1110 else 1073 else
1111 { 1074 {
1112 CLEAR_FLAG (sack, FLAG_APPLIED);
1113 sprintf (buf, "You open %s.", query_name (sack));
1114 SET_FLAG (sack, FLAG_APPLIED);
1115 op->container = sack;
1116 }
1117 }
1118 else
1119 { /* not applied */
1120 if (sack->slaying)
1121 { /* it's locked */
1122 tmp = find_key (op, op, sack);
1123 if (tmp)
1124 {
1125 sprintf (buf, "You unlock %s with %s.", query_name (sack), query_name (tmp));
1126 SET_FLAG (sack, FLAG_APPLIED);
1127 if (sack->env == NULL)
1128 { /* if it's on ground,open it also */
1129 new_draw_info (NDI_UNIQUE, 0, op, buf);
1130 apply_container (op, sack);
1131 return 1;
1132 }
1133 }
1134 else
1135 {
1136 sprintf (buf, "You don't have the key to unlock %s.", query_name (sack)); 1075 new_draw_info_format (NDI_UNIQUE, 0, op, "You don't have the key to unlock %s.", query_name (sack));
1137 }
1138 }
1139 else
1140 {
1141 sprintf (buf, "You readied %s.", query_name (sack));
1142 SET_FLAG (sack, FLAG_APPLIED);
1143 if (sack->env == NULL)
1144 { /* if it's on ground,open it also */
1145 new_draw_info (NDI_UNIQUE, 0, op, buf);
1146 apply_container (op, sack);
1147 return 1; 1076 return 1;
1148 } 1077 }
1149 }
1150 } 1078 }
1151 new_draw_info (NDI_UNIQUE, 0, op, buf); 1079
1152 if (op->contr) 1080 op->open_container (sack);
1153 op->contr->socket.update_look = 1; 1081
1154 return 1; 1082 return 1;
1155} 1083}
1156
1157/**
1158 * Eneq(@csd.uu.se): Handle apply on containers. This is for containers
1159 * the player has in their inventory, eg, sacks, luggages, etc.
1160 *
1161 * Moved to own function and added many features [Tero.Haatanen@lut.fi]
1162 * This version is for client/server mode.
1163 * op is the player, sack is the container the player is opening or closing.
1164 * return 1 if an object is apllied somehow or another, 0 if error/no apply
1165 *
1166 * Reminder - there are three states for any container - closed (non applied),
1167 * applied (not open, but objects that match get tossed into it), and open
1168 * (applied flag set, and op->container points to the open container)
1169 */
1170
1171int
1172esrv_apply_container (object *op, object *sack)
1173{
1174 object *tmp = op->container;
1175
1176 if (op->type != PLAYER)
1177 return 0; /* This might change */
1178
1179 if (sack == NULL || sack->type != CONTAINER)
1180 {
1181 LOG (llevError, "esrv_apply_container: %s is not container!\n", &sack->name);
1182 return 0;
1183 }
1184
1185 /* If we have a currently open container, then it needs to be closed in all cases
1186 * if we are opening this one up. We then fall through if appropriate for
1187 * openening the new container.
1188 */
1189
1190 if (op->container && QUERY_FLAG (sack, FLAG_APPLIED))
1191 {
1192 if (op->container->env != op)
1193 { /* if container is on the ground */
1194 op->container->move_off = 0;
1195 }
1196
1197 if (INVOKE_OBJECT (CLOSE, tmp, ARG_OBJECT (op)))
1198 return 1;
1199
1200 new_draw_info_format (NDI_UNIQUE, 0, op, "You close %s.", query_name (op->container));
1201 CLEAR_FLAG (op->container, FLAG_APPLIED);
1202 op->container = NULL;
1203 esrv_update_item (UPD_FLAGS, op, tmp);
1204 if (tmp == sack)
1205 return 1;
1206 }
1207
1208
1209 /* If the player is trying to open it (which he must be doing if we got here),
1210 * and it is locked, check to see if player has the equipment to open it.
1211 */
1212
1213 if (sack->slaying)
1214 { /* it's locked */
1215 tmp = find_key (op, op, sack);
1216 if (tmp)
1217 {
1218 new_draw_info_format (NDI_UNIQUE, 0, op, "You unlock %s with %s.", query_name (sack), query_name (tmp));
1219 }
1220 else
1221 {
1222 new_draw_info_format (NDI_UNIQUE, 0, op, "You don't have the key to unlock %s.", query_name (sack));
1223 return 0;
1224 }
1225 }
1226
1227 /* By the time we get here, we have made sure any other container has been closed and
1228 * if this is a locked container, the player they key to open it.
1229 */
1230
1231 /* There are really two cases - the sack is either on the ground, or the sack is
1232 * part of the players inventory. If on the ground, we assume that the player is
1233 * opening it, since if it was being closed, that would have been taken care of above.
1234 */
1235
1236
1237 if (sack->env != op)
1238 {
1239 /* Hypothetical case - the player is trying to open a sack that belong to someone
1240 * else. This normally should not happen, but a misbehaving client/player could
1241 * try to do it, so lets handle it gracefully.
1242 */
1243 if (sack->env)
1244 {
1245 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't open %s", query_name (sack));
1246 return 0;
1247 }
1248 /* set these so when the player walks off, we can unapply the sack */
1249 sack->move_off = MOVE_ALL; /* trying force closing it */
1250
1251 CLEAR_FLAG (sack, FLAG_APPLIED);
1252 new_draw_info_format (NDI_UNIQUE, 0, op, "You open %s.", query_name (sack));
1253 SET_FLAG (sack, FLAG_APPLIED);
1254 op->container = sack;
1255 esrv_update_item (UPD_FLAGS, op, sack);
1256 esrv_send_inventory (op, sack);
1257
1258 }
1259 else
1260 { /* sack is in players inventory */
1261 if (QUERY_FLAG (sack, FLAG_APPLIED))
1262 { /* readied sack becoming open */
1263 CLEAR_FLAG (sack, FLAG_APPLIED);
1264 new_draw_info_format (NDI_UNIQUE, 0, op, "You open %s.", query_name (sack));
1265 SET_FLAG (sack, FLAG_APPLIED);
1266 op->container = sack;
1267 esrv_update_item (UPD_FLAGS, op, sack);
1268 esrv_send_inventory (op, sack);
1269 }
1270 else
1271 {
1272 CLEAR_FLAG (sack, FLAG_APPLIED);
1273 new_draw_info_format (NDI_UNIQUE, 0, op, "You readied %s.", query_name (sack));
1274 SET_FLAG (sack, FLAG_APPLIED);
1275 esrv_update_item (UPD_FLAGS, op, sack);
1276 }
1277 }
1278 return 1;
1279}
1280
1281 1084
1282/** 1085/**
1283 * Handles dropping things on altar. 1086 * Handles dropping things on altar.
1284 * Returns true if sacrifice was accepted. 1087 * Returns true if sacrifice was accepted.
1285 */ 1088 */
… …
1346 1149
1347 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 1150 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1348 { 1151 {
1349 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9); 1152 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9);
1350 1153
1351 remove_ob (tmp); 1154 tmp->remove ();
1352 1155
1353 if (i == -1) 1156 if (i == -1)
1354 i = 0; 1157 i = 0;
1355 1158
1356 tmp->map = op->map; 1159 tmp->map = op->map;
… …
1420 { 1223 {
1421 LOG (llevError, "Internal shop-mat problem.\n"); 1224 LOG (llevError, "Internal shop-mat problem.\n");
1422 } 1225 }
1423 else 1226 else
1424 { 1227 {
1425 remove_ob (op); 1228 op->remove ();
1426 op->x += freearr_x[i]; 1229 op->x += freearr_x[i];
1427 op->y += freearr_y[i]; 1230 op->y += freearr_y[i];
1428 rv = insert_ob_in_map (op, op->map, shop_mat, 0) == NULL; 1231 rv = insert_ob_in_map (op, op->map, shop_mat, 0) == NULL;
1429 } 1232 }
1430 } 1233 }
… …
1628 1431
1629 1432
1630 case CONVERTER: 1433 case CONVERTER:
1631 if (convert_item (victim, trap) < 0) 1434 if (convert_item (victim, trap) < 0)
1632 { 1435 {
1633 object *op;
1634
1635 new_draw_info_format (NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name (trap)); 1436 new_draw_info_format (NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name (trap));
1636 1437 get_archetype ("burnout")->insert_at (trap, trap);
1637 op = get_archetype ("burnout");
1638 if (op != NULL)
1639 {
1640 op->x = trap->x;
1641 op->y = trap->y;
1642 insert_ob_in_map (op, trap->map, trap, 0);
1643 } 1438 }
1644 } 1439
1645 goto leave; 1440 goto leave;
1646 1441
1647 case TRIGGER_BUTTON: 1442 case TRIGGER_BUTTON:
1648 case TRIGGER_PEDESTAL: 1443 case TRIGGER_PEDESTAL:
1649 case TRIGGER_ALTAR: 1444 case TRIGGER_ALTAR:
… …
1678 if (victim->type == PLAYER && EXIT_PATH (trap)) 1473 if (victim->type == PLAYER && EXIT_PATH (trap))
1679 { 1474 {
1680 /* Basically, don't show exits leading to random maps the 1475 /* Basically, don't show exits leading to random maps the
1681 * players output. 1476 * players output.
1682 */ 1477 */
1683 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2) && strncmp (EXIT_PATH (trap), "/random/", 8)) 1478 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2))
1684 new_draw_info (NDI_NAVY, 0, victim, trap->msg); 1479 new_draw_info (NDI_NAVY, 0, victim, trap->msg);
1480
1685 enter_exit (victim, trap); 1481 victim->enter_exit (trap);
1686 } 1482 }
1687 goto leave; 1483 goto leave;
1688 1484
1689 case ENCOUNTER: 1485 case ENCOUNTER:
1690 /* may be some leftovers on this */ 1486 /* may be some leftovers on this */
… …
1705 1501
1706 apply_sign (victim, trap, 1); 1502 apply_sign (victim, trap, 1);
1707 goto leave; 1503 goto leave;
1708 1504
1709 case CONTAINER: 1505 case CONTAINER:
1710 if (victim->type == PLAYER)
1711 (void) esrv_apply_container (victim, trap);
1712 else
1713 (void) apply_container (victim, trap); 1506 apply_container (victim, trap);
1714 goto leave; 1507 goto leave;
1715 1508
1716 case RUNE: 1509 case RUNE:
1717 case TRAP: 1510 case TRAP:
1718 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE)) 1511 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE))
… …
1778 1571
1779 readable_message_type *msgType = get_readable_message_type (tmp); 1572 readable_message_type *msgType = get_readable_message_type (tmp);
1780 1573
1781 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, 1574 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1782 msgType->message_type, msgType->message_subtype, 1575 msgType->message_type, msgType->message_subtype,
1783 "You open the %s and start reading.\n%s", "%s\n%s", long_desc (tmp, op), &tmp->msg); 1576 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1577 long_desc (tmp, op), &tmp->msg);
1784 1578
1785 /* gain xp from reading */ 1579 /* gain xp from reading */
1786 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1580 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1787 { /* only if not read before */ 1581 { /* only if not read before */
1788 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1582 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
1789 1583
1790 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1584 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1791 { 1585 {
1792 /*exp_gain *= 2; because they just identified it too */ 1586 /*exp_gain *= 2; because they just identified it too */
1793 SET_FLAG (tmp, FLAG_IDENTIFIED); 1587 SET_FLAG (tmp, FLAG_IDENTIFIED);
1588
1794 /* If in a container, update how it looks */ 1589 /* If in a container, update how it looks */
1795 if (tmp->env) 1590 if (tmp->env)
1796 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1591 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1797 else 1592 else
1798 op->contr->socket.update_look = 1; 1593 op->contr->ns->floorbox_update ();
1799 } 1594 }
1595
1800 change_exp (op, exp_gain, skill_ob->skill, 0); 1596 change_exp (op, exp_gain, skill_ob->skill, 0);
1801 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */ 1597 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */
1802 } 1598 }
1803} 1599}
1804 1600
… …
1853 } 1649 }
1854 return; 1650 return;
1855 } 1651 }
1856 1652
1857 play_sound_player_only (op->contr, SOUND_LEARN_SPELL, 0, 0); 1653 play_sound_player_only (op->contr, SOUND_LEARN_SPELL, 0, 0);
1858 tmp = get_object (); 1654 tmp = spell->clone ();
1859 copy_object (spell, tmp);
1860 insert_ob_in_ob (tmp, op); 1655 insert_ob_in_ob (tmp, op);
1861 1656
1862 if (special_prayer) 1657 if (special_prayer)
1863 {
1864 SET_FLAG (tmp, FLAG_STARTEQUIP); 1658 SET_FLAG (tmp, FLAG_STARTEQUIP);
1865 }
1866 1659
1867 esrv_add_spells (op->contr, tmp); 1660 esrv_add_spells (op->contr, tmp);
1868} 1661}
1869 1662
1870/** 1663/**
… …
1887 } 1680 }
1888 1681
1889 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You lose knowledge of %s.", spell); 1682 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You lose knowledge of %s.", spell);
1890 player_unready_range_ob (op->contr, spob); 1683 player_unready_range_ob (op->contr, spob);
1891 esrv_remove_spell (op->contr, spob); 1684 esrv_remove_spell (op->contr, spob);
1892 remove_ob (spob); 1685 spob->destroy ();
1893 free_object (spob);
1894} 1686}
1895 1687
1896/** 1688/**
1897 * Handles player applying a spellbook. 1689 * Handles player applying a spellbook.
1898 * Checks whether player has knowledge of required skill, doesn't already know the spell, 1690 * Checks whether player has knowledge of required skill, doesn't already know the spell,
… …
1936 new_draw_info (NDI_UNIQUE, 0, op, "You can't read! Your attempt fails."); 1728 new_draw_info (NDI_UNIQUE, 0, op, "You can't read! Your attempt fails.");
1937 return; 1729 return;
1938 } 1730 }
1939 1731
1940 spell = tmp->inv; 1732 spell = tmp->inv;
1733
1941 if (!spell) 1734 if (!spell)
1942 { 1735 {
1943 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name); 1736 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name);
1944 new_draw_info (NDI_UNIQUE, 0, op, "The spellbook symbols make no sense."); 1737 new_draw_info (NDI_UNIQUE, 0, op, "The spellbook symbols make no sense.");
1945 return; 1738 return;
1946 } 1739 }
1947 if (spell->level > (skop->level + 10)) 1740
1741 if (skop->level < int (sqrtf (spell->level) * 1.5f))
1948 { 1742 {
1949 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols."); 1743 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. [Your literacy level is too low]");
1950 return; 1744 return;
1951 } 1745 }
1952 1746
1953 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name); 1747 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name);
1954 1748
1955 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1749 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1956 { 1750 {
1957 identify (tmp); 1751 identify (tmp);
1752
1958 if (tmp->env) 1753 if (tmp->env)
1959 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1754 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1960 else 1755 else
1961 op->contr->socket.update_look = 1; 1756 op->contr->ns->floorbox_update ();
1962 } 1757 }
1963 1758
1964 /* I removed the check for special_prayer_mark here - it didn't make 1759 /* I removed the check for special_prayer_mark here - it didn't make
1965 * a lot of sense - special prayers are not found in spellbooks, and 1760 * a lot of sense - special prayers are not found in spellbooks, and
1966 * if the player doesn't know the spell, doesn't make a lot of sense that 1761 * if the player doesn't know the spell, doesn't make a lot of sense that
… …
1976 { 1771 {
1977 spell_skill = find_skill_by_name (op, spell->skill); 1772 spell_skill = find_skill_by_name (op, spell->skill);
1978 1773
1979 if (!spell_skill) 1774 if (!spell_skill)
1980 { 1775 {
1981 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use this spell", &spell->skill); 1776 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use this spell.", &spell->skill);
1982 return; 1777 return;
1983 } 1778 }
1984 1779
1985 if (spell_skill->level < spell->level) 1780 if (spell_skill->level < spell->level)
1986 { 1781 {
… …
2020 else 1815 else
2021 { 1816 {
2022 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1817 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0);
2023 new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell.\n"); 1818 new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell.\n");
2024 } 1819 }
1820
2025 decrease_ob (tmp); 1821 decrease_ob (tmp);
2026} 1822}
2027 1823
2028/** 1824/**
2029 * Handles applying a spell scroll. 1825 * Handles applying a spell scroll.
… …
2102 } 1898 }
2103 while (tmp->inv) 1899 while (tmp->inv)
2104 { 1900 {
2105 treas = tmp->inv; 1901 treas = tmp->inv;
2106 1902
2107 remove_ob (treas); 1903 treas->remove ();
2108 new_draw_info_format (NDI_UNIQUE, 0, op, "You find %s in the chest.", query_name (treas)); 1904 new_draw_info_format (NDI_UNIQUE, 0, op, "You find %s in the chest.", query_name (treas));
2109 1905
2110 treas->x = op->x; 1906 treas->x = op->x;
2111 treas->y = op->y; 1907 treas->y = op->y;
2112 treas = insert_ob_in_map (treas, op->map, op, INS_BELOW_ORIGINATOR); 1908 treas = insert_ob_in_map (treas, op->map, op, INS_BELOW_ORIGINATOR);
2113 1909
2114 if (treas && (treas->type == RUNE || treas->type == TRAP) && treas->level && QUERY_FLAG (op, FLAG_ALIVE)) 1910 if (treas && (treas->type == RUNE || treas->type == TRAP) && treas->level && QUERY_FLAG (op, FLAG_ALIVE))
2115 spring_trap (treas, op); 1911 spring_trap (treas, op);
1912
2116 /* If either player or container was destroyed, no need to do 1913 /* If either player or container was destroyed, no need to do
2117 * further processing. I think this should be enclused with 1914 * further processing. I think this should be enclused with
2118 * spring trap above, as I don't think there is otherwise 1915 * spring trap above, as I don't think there is otherwise
2119 * any way for the treasure chest or player to get killed 1916 * any way for the treasure chest or player to get killed
2120 */ 1917 */
… …
2224 if (meal->type != FLESH || !is_dragon_pl (op)) 2021 if (meal->type != FLESH || !is_dragon_pl (op))
2225 return 0; 2022 return 0;
2226 2023
2227 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces 2024 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces
2228 from the player's inventory */ 2025 from the player's inventory */
2026 shstr_cmp dragon_ability_force ("dragon_ability_force");
2027 shstr_cmp dragon_skin_force ("dragon_skin_force");
2028
2229 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2029 for (tmp = op->inv; tmp; tmp = tmp->below)
2230 {
2231 if (tmp->type == FORCE) 2030 if (tmp->type == FORCE)
2232 {
2233 if (strcmp (tmp->arch->name, "dragon_skin_force") == 0) 2031 if (tmp->arch->name == dragon_skin_force)
2234 skin = tmp; 2032 skin = tmp;
2235 else if (strcmp (tmp->arch->name, "dragon_ability_force") == 0) 2033 else if (tmp->arch->name == dragon_ability_force)
2236 abil = tmp; 2034 abil = tmp;
2237 }
2238 }
2239 2035
2240 /* if either skin or ability are missing, this is an old player 2036 /* if either skin or ability are missing, this is an old player
2241 which is not to be considered a dragon -> bail out */ 2037 which is not to be considered a dragon -> bail out */
2242 if (skin == NULL || abil == NULL) 2038 if (skin == NULL || abil == NULL)
2243 return 0; 2039 return 0;
… …
2284 /* doubled chance for resistance of ability-focus */ 2080 /* doubled chance for resistance of ability-focus */
2285 if (i == abil->stats.exp) 2081 if (i == abil->stats.exp)
2286 chance = MIN (100., chance * 2.); 2082 chance = MIN (100., chance * 2.);
2287 2083
2288 /* now make the throw and save all winners (Don't insert luck bonus here!) */ 2084 /* now make the throw and save all winners (Don't insert luck bonus here!) */
2289 if (RANDOM () % 10000 < (int) (chance * 100)) 2085 if (rndm (10000) < (unsigned int) (chance * 100))
2290 { 2086 {
2291 atnr_winner[winners] = i; 2087 atnr_winner[winners] = i;
2292 winners++; 2088 winners++;
2293 } 2089 }
2294 2090
… …
2325 2121
2326 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95) 2122 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95)
2327 { 2123 {
2328 /* resistance increased! */ 2124 /* resistance increased! */
2329 skin->resist[i]++; 2125 skin->resist[i]++;
2330 fix_player (op); 2126 op->update_stats ();
2331 2127
2332 sprintf (buf, "Your skin is now more resistant to %s!", change_resist_msg[i]); 2128 sprintf (buf, "Your skin is now more resistant to %s!", change_resist_msg[i]);
2333 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, buf); 2129 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, buf);
2334 } 2130 }
2335 2131
… …
2354 } 2150 }
2355 } 2151 }
2356 return 1; 2152 return 1;
2357} 2153}
2358 2154
2359static void
2360apply_savebed (object *pl)
2361{
2362#ifndef COZY_SERVER
2363 if (!pl->contr->name_changed || !pl->stats.exp)
2364 {
2365 new_draw_info (NDI_UNIQUE, 0, pl, "You don't deserve to save your character yet.");
2366 return;
2367 }
2368#endif
2369 INVOKE_PLAYER (LOGOUT, pl->contr);
2370 /* Need to call terminate_all_pets() before we remove the player ob */
2371 terminate_all_pets (pl);
2372 remove_ob (pl);
2373 pl->direction = 0;
2374 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, pl, "%s leaves the game.", &pl->name);
2375
2376 /* update respawn position */
2377 strcpy (pl->contr->savebed_map, pl->map->path);
2378 pl->contr->bed_x = pl->x;
2379 pl->contr->bed_y = pl->y;
2380
2381 strcpy (pl->contr->killer, "left");
2382 check_score (pl); /* Always check score */
2383 (void) save_player (pl, 0);
2384 pl->map->players--;
2385#if MAP_MAXTIMEOUT
2386 MAP_SWAP_TIME (pl->map) = MAP_TIMEOUT (pl->map);
2387#endif
2388 play_again (pl);
2389 pl->speed = 0;
2390 update_ob_speed (pl);
2391}
2392
2393/** 2155/**
2394 * Handles applying an improve armor scroll. 2156 * Handles applying an improve armor scroll.
2395 * Does some sanity checks, then calls improve_armour. 2157 * Does some sanity checks, then calls improve_armour.
2396 */ 2158 */
2397static void 2159static void
… …
2402 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) 2164 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC))
2403 { 2165 {
2404 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll."); 2166 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll.");
2405 return; 2167 return;
2406 } 2168 }
2169
2407 armor = find_marked_object (op); 2170 armor = find_marked_object (op);
2171
2408 if (!armor) 2172 if (!armor)
2409 { 2173 {
2410 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark an armor object."); 2174 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark an armor object.");
2411 return; 2175 return;
2412 } 2176 }
2177
2413 if (armor->type != ARMOUR 2178 if (armor->type != ARMOUR
2414 && armor->type != CLOAK 2179 && armor->type != CLOAK
2415 && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET) 2180 && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET)
2416 { 2181 {
2417 new_draw_info (NDI_UNIQUE, 0, op, "Your marked item is not armour!\n"); 2182 new_draw_info (NDI_UNIQUE, 0, op, "Your marked item is not armour!\n");
… …
2420 2185
2421 new_draw_info (NDI_UNIQUE, 0, op, "Applying armour enchantment."); 2186 new_draw_info (NDI_UNIQUE, 0, op, "Applying armour enchantment.");
2422 improve_armour (op, tmp, armor); 2187 improve_armour (op, tmp, armor);
2423} 2188}
2424 2189
2425
2426extern void 2190extern void
2427apply_poison (object *op, object *tmp) 2191apply_poison (object *op, object *tmp)
2428{ 2192{
2429 if (op->type == PLAYER) 2193 if (op->type == PLAYER)
2430 { 2194 {
… …
2441 handle_apply_yield (tmp); 2205 handle_apply_yield (tmp);
2442 decrease_ob (tmp); 2206 decrease_ob (tmp);
2443} 2207}
2444 2208
2445/** 2209/**
2446 * This fonction return true if the exit is not a 2 ways one or it is 2 ways, valid exit. 2210 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit.
2447 * A valid 2 way exit means: 2211 * A valid 2 way exit means:
2448 * -You can come back (there is another exit at the other side) 2212 * -You can come back (there is another exit at the other side)
2449 * -You are 2213 * -You are
2450 * ° the owner of the exit 2214 * ° the owner of the exit
2451 * ° or in the same party as the owner 2215 * ° or in the same party as the owner
2452 * 2216 *
2453 * Note: a owner in a 2 way exit is saved as the owner's name 2217 * Note: a owner in a 2 way exit is saved as the owner's name
2454 * in the field exit->name cause the field exit->owner doesn't 2218 * in the field exit->name cause the field exit->owner doesn't
2455 * survive in the swapping (in fact the whole exit doesn't survive). 2219 * survive in the swapping (in fact the whole exit doesn't survive).
2456 */ 2220 */
2457int 2221int
2458is_legal_2ways_exit (object *op, object *exit) 2222is_legal_2ways_exit (object *op, object *exit)
2459{ 2223{
2460 object *tmp;
2461 object *exit_owner;
2462 player *pp;
2463 maptile *exitmap;
2464
2465 if (exit->stats.exp != 1) 2224 if (exit->stats.exp != 1)
2466 return 1; /*This is not a 2 way, so it is legal */ 2225 return 1; /*This is not a 2 way, so it is legal */
2226
2227#if 0 //TODO
2467 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race) 2228 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race)
2468 return 0; /* This is a reset town portal */ 2229 return 0; /* This is a reset town portal */
2469 /* To know if an exit has a correspondant, we look at 2230#endif
2470 * all the exits in destination and try to find one with same path as 2231
2471 * the current exit's position */ 2232 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map);
2472 if (!strncmp (EXIT_PATH (exit), settings.localdir, strlen (settings.localdir))) 2233
2473 exitmap = ready_map_name (EXIT_PATH (exit), MAP_PLAYER_UNIQUE);
2474 else
2475 exitmap = ready_map_name (EXIT_PATH (exit), 0);
2476 if (exitmap) 2234 if (exitmap)
2477 { 2235 {
2236 exitmap->load_sync ();
2237
2478 tmp = get_map_ob (exitmap, EXIT_X (exit), EXIT_Y (exit)); 2238 object *tmp = exitmap->at (EXIT_X (exit), EXIT_Y (exit)).bot;
2239
2479 if (!tmp) 2240 if (!tmp)
2480 return 0; 2241 return 0;
2481 for ((tmp = get_map_ob (exitmap, EXIT_X (exit), EXIT_Y (exit))); tmp; tmp = tmp->above) 2242
2243 for (; tmp; tmp = tmp->above)
2482 { 2244 {
2483 if (tmp->type != EXIT) 2245 if (tmp->type != EXIT)
2484 continue; /*Not an exit */ 2246 continue; /*Not an exit */
2247
2485 if (!EXIT_PATH (tmp)) 2248 if (!EXIT_PATH (tmp))
2486 continue; /*Not a valid exit */ 2249 continue; /*Not a valid exit */
2250
2487 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y)) 2251 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y))
2488 continue; /*Not in the same place */ 2252 continue; /*Not in the same place */
2253
2489 if (strcmp (exit->map->path, EXIT_PATH (tmp)) != 0) 2254 if (exit->map->path != EXIT_PATH (tmp))
2490 continue; /*Not in the same map */ 2255 continue; /*Not in the same map */
2491 2256
2492 /* From here we have found the exit is valid. However we do 2257 /* From here we have found the exit is valid. However we do
2493 * here the check of the exit owner. It is important for the 2258 * here the check of the exit owner. It is important for the
2494 * town portals to prevent strangers from visiting your appartments 2259 * town portals to prevent strangers from visiting your appartments
2495 */ 2260 */
2496 if (!exit->race) 2261 if (!exit->race)
2497 return 1; /*No owner, free for all! */ 2262 return 1; /*No owner, free for all! */
2263
2498 exit_owner = NULL; 2264 object *exit_owner = 0;
2499 for (pp = first_player; pp; pp = pp->next) 2265
2266 for_all_players (pp)
2500 { 2267 {
2501 if (!pp->ob) 2268 if (!pp->ob)
2502 continue; 2269 continue;
2270
2503 if (pp->ob->name != exit->race) 2271 if (pp->ob->name != exit->race)
2504 continue; 2272 continue;
2273
2505 exit_owner = pp->ob; /*We found a player which correspond to the player name */ 2274 exit_owner = pp->ob; /*We found a player which correspond to the player name */
2506 break; 2275 break;
2507 } 2276 }
2277
2508 if (!exit_owner) 2278 if (!exit_owner)
2509 return 0; /* No more owner */ 2279 return 0; /* No more owner */
2280
2510 if (exit_owner->contr == op->contr) 2281 if (exit_owner->contr == op->contr)
2511 return 1; /*It is your exit */ 2282 return 1; /*It is your exit */
2283
2512 if (exit_owner && /*There is a owner */ 2284 if (exit_owner && /*There is a owner */
2513 (op->contr) && /*A player tries to pass */ 2285 (op->contr) && /*A player tries to pass */
2514 ((exit_owner->contr->party == NULL) || /*No pass if controller has no party */ 2286 ((exit_owner->contr->party == NULL) || /*No pass if controller has no party */
2515 (exit_owner->contr->party != op->contr->party))) /* Or not the same as op */ 2287 (exit_owner->contr->party != op->contr->party))) /* Or not the same as op */
2516 return 0; 2288 return 0;
2289
2517 return 1; 2290 return 1;
2518 } 2291 }
2519 } 2292 }
2293
2520 return 0; 2294 return 0;
2521} 2295}
2522 2296
2523 2297
2524/** 2298/**
… …
2550 { 2324 {
2551 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first."); 2325 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first.");
2552 return 1; 2326 return 1;
2553 } 2327 }
2554 else 2328 else
2555 {
2556 return 0; /* monsters just skip unpaid items */ 2329 return 0; /* monsters just skip unpaid items */
2557 }
2558 } 2330 }
2559 2331
2560 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op))) 2332 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op)))
2561 return RESULT_INT (0); 2333 return RESULT_INT (0);
2562 2334
2563 switch (tmp->type) 2335 switch (tmp->type)
2564 { 2336 {
2565
2566 case CF_HANDLE: 2337 case CF_HANDLE:
2567 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2338 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle.");
2568 play_sound_map (op->map, op->x, op->y, SOUND_TURN_HANDLE); 2339 play_sound_map (op->map, op->x, op->y, SOUND_TURN_HANDLE);
2569 tmp->value = tmp->value ? 0 : 1; 2340 tmp->value = tmp->value ? 0 : 1;
2570 SET_ANIMATION (tmp, tmp->value); 2341 SET_ANIMATION (tmp, tmp->value);
… …
2577 { 2348 {
2578 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2349 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle.");
2579 play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE); 2350 play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE);
2580 } 2351 }
2581 else 2352 else
2582 {
2583 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move."); 2353 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move.");
2584 } 2354
2585 return 1; 2355 return 1;
2586 2356
2587 case EXIT: 2357 case EXIT:
2588 if (op->type != PLAYER) 2358 if (op->type != PLAYER)
2589 return 0; 2359 return 0;
2360
2590 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2361 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp))
2591 { 2362 {
2592 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp)); 2363 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp));
2593 } 2364 }
2594 else 2365 else
2595 { 2366 {
2596 /* Don't display messages for random maps. */ 2367 /* Don't display messages for random maps. */
2597 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2) && strncmp (EXIT_PATH (tmp), "/random/", 8)) 2368 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2))
2598 new_draw_info (NDI_NAVY, 0, op, tmp->msg); 2369 new_draw_info (NDI_NAVY, 0, op, tmp->msg);
2370
2599 enter_exit (op, tmp); 2371 op->enter_exit (tmp);
2600 } 2372 }
2601 return 1; 2373 return 1;
2602 2374
2603 case SIGN: 2375 case SIGN:
2604 apply_sign (op, tmp, 0); 2376 apply_sign (op, tmp, 0);
… …
2638 case POTION: 2410 case POTION:
2639 (void) apply_potion (op, tmp); 2411 (void) apply_potion (op, tmp);
2640 return 1; 2412 return 1;
2641 2413
2642 /* Eneq(@csd.uu.se): Handle apply on containers. */ 2414 /* Eneq(@csd.uu.se): Handle apply on containers. */
2415 //TODO: remove, as it is unsed?
2643 case CLOSE_CON: 2416 case CLOSE_CON:
2644 if (op->type == PLAYER)
2645 (void) esrv_apply_container (op, tmp->env);
2646 else
2647 (void) apply_container (op, tmp->env); 2417 apply_container (op, tmp->env);
2648 return 1; 2418 return 1;
2649 2419
2650 case CONTAINER: 2420 case CONTAINER:
2651 if (op->type == PLAYER)
2652 (void) esrv_apply_container (op, tmp);
2653 else
2654 (void) apply_container (op, tmp); 2421 apply_container (op, tmp);
2655 return 1; 2422 return 1;
2656 2423
2657 case TREASURE: 2424 case TREASURE:
2658 if (op->type == PLAYER) 2425 if (op->type == PLAYER)
2659 { 2426 {
2660 apply_treasure (op, tmp); 2427 apply_treasure (op, tmp);
2661 return 1; 2428 return 1;
2662 } 2429 }
2663 else 2430 else
2664 {
2665 return 0; 2431 return 0;
2666 }
2667 2432
2668 case WEAPON: 2433 case WEAPON:
2669 case ARMOUR: 2434 case ARMOUR:
2670 case BOOTS: 2435 case BOOTS:
2671 case GLOVES: 2436 case GLOVES:
… …
2698 case POISON: 2463 case POISON:
2699 apply_poison (op, tmp); 2464 apply_poison (op, tmp);
2700 return 1; 2465 return 1;
2701 2466
2702 case SAVEBED: 2467 case SAVEBED:
2703 if (op->type == PLAYER)
2704 {
2705 apply_savebed (op);
2706 return 1; 2468 return 1;
2707 }
2708 else
2709 {
2710 return 0;
2711 }
2712 2469
2713 case ARMOUR_IMPROVER: 2470 case ARMOUR_IMPROVER:
2714 if (op->type == PLAYER) 2471 if (op->type == PLAYER)
2715 { 2472 {
2716 apply_armour_improver (op, tmp); 2473 apply_armour_improver (op, tmp);
2717 return 1; 2474 return 1;
2718 } 2475 }
2719 else 2476 else
2720 {
2721 return 0; 2477 return 0;
2722 }
2723 2478
2724 case WEAPON_IMPROVER: 2479 case WEAPON_IMPROVER:
2725 (void) check_improve_weapon (op, tmp); 2480 (void) check_improve_weapon (op, tmp);
2726 return 1; 2481 return 1;
2727 2482
… …
2745 } 2500 }
2746 2501
2747 case MENU: 2502 case MENU:
2748 if (op->type == PLAYER) 2503 if (op->type == PLAYER)
2749 { 2504 {
2750 shop_listing (op); 2505 shop_listing (tmp, op);
2751 return 1; 2506 return 1;
2752 } 2507 }
2753 else 2508 else
2754 { 2509 {
2755 return 0; 2510 return 0;
… …
2807 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_WAS_WIZ) && !QUERY_FLAG (pl, FLAG_WAS_WIZ)) 2562 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_WAS_WIZ) && !QUERY_FLAG (pl, FLAG_WAS_WIZ))
2808 { 2563 {
2809 play_sound_map (pl->map, pl->x, pl->y, SOUND_OB_EVAPORATE); 2564 play_sound_map (pl->map, pl->x, pl->y, SOUND_OB_EVAPORATE);
2810 new_draw_info (NDI_UNIQUE, 0, pl, "The object disappears in a puff " "of smoke!"); 2565 new_draw_info (NDI_UNIQUE, 0, pl, "The object disappears in a puff " "of smoke!");
2811 new_draw_info (NDI_UNIQUE, 0, pl, "It must have been an illusion."); 2566 new_draw_info (NDI_UNIQUE, 0, pl, "It must have been an illusion.");
2812 remove_ob (op); 2567 op->destroy ();
2813 free_object (op);
2814 return 1; 2568 return 1;
2815 } 2569 }
2816 2570
2817 pl->contr->last_used = op; 2571 pl->contr->last_used = op;
2818 pl->contr->last_used_id = op->count;
2819 2572
2820 tmp = manual_apply (pl, op, aflag); 2573 tmp = manual_apply (pl, op, aflag);
2821 if (!quiet) 2574 if (!quiet)
2822 { 2575 {
2823 if (tmp == 0) 2576 if (tmp == 0)
… …
2835 */ 2588 */
2836 2589
2837void 2590void
2838player_apply_below (object *pl) 2591player_apply_below (object *pl)
2839{ 2592{
2840 object *tmp, *next;
2841 int floors; 2593 int floors = 0;
2842 2594
2843 /* If using a container, set the starting item to be the top 2595 /* If using a container, set the starting item to be the top
2844 * item in the container. Otherwise, use the map. 2596 * item in the container. Otherwise, use the map.
2845 */
2846 tmp = (pl->container != NULL) ? pl->container->inv : pl->below;
2847
2848 /* This is perhaps more complicated. However, I want to make sure that 2597 * This is perhaps more complicated. However, I want to make sure that
2849 * we don't use a corrupt pointer for the next object, so we get the 2598 * we don't use a corrupt pointer for the next object, so we get the
2850 * next object in the stack before applying. This is can only be a 2599 * next object in the stack before applying. This is can only be a
2851 * problem if player_apply() has a bug in that it uses the object but does 2600 * problem if player_apply() has a bug in that it uses the object but does
2852 * not return a proper value. 2601 * not return a proper value.
2853 */ 2602 */
2854 for (floors = 0; tmp != NULL; tmp = next) 2603 for (object *next, *tmp = pl->container ? pl->container->inv : pl->below; tmp; tmp = next)
2855 { 2604 {
2856 next = tmp->below; 2605 next = tmp->below;
2606
2857 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 2607 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
2858 floors++; 2608 floors++;
2859 else if (floors > 0) 2609 else if (floors > 0)
2860 return; /* process only floor objects after first floor object */ 2610 return; /* process only floor objects after first floor object */
2861 2611
… …
2887 return RESULT_INT (0); 2637 return RESULT_INT (0);
2888 2638
2889 object *tmp2; 2639 object *tmp2;
2890 2640
2891 CLEAR_FLAG (op, FLAG_APPLIED); 2641 CLEAR_FLAG (op, FLAG_APPLIED);
2642
2892 switch (op->type) 2643 switch (op->type)
2893 { 2644 {
2894 case WEAPON: 2645 case WEAPON:
2895 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op)); 2646 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op));
2896 2647
… …
2901 break; 2652 break;
2902 2653
2903 case SKILL: /* allows objects to impart skills */ 2654 case SKILL: /* allows objects to impart skills */
2904 case SKILL_TOOL: 2655 case SKILL_TOOL:
2905 if (op != who->chosen_skill) 2656 if (op != who->chosen_skill)
2906 {
2907 LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n"); 2657 LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n");
2908 } 2658
2909 if (who->type == PLAYER) 2659 if (who->type == PLAYER)
2910 { 2660 {
2911 if (who->contr->shoottype == range_skill) 2661 if (who->contr->ranged_ob == op)
2912 who->contr->shoottype = range_none; 2662 {
2663 who->contr->ranged_skill = 0;
2664 who->contr->ranged_ob = 0;
2665 }
2666
2913 if (!op->invisible) 2667 if (!op->invisible)
2914 {
2915 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op)); 2668 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op));
2916 }
2917 else 2669 else
2918 {
2919 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill); 2670 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill);
2920 } 2671 }
2921 } 2672
2922 (void) change_abil (who, op); 2673 change_abil (who, op);
2923 who->chosen_skill = NULL; 2674 who->chosen_skill = 0;
2924 CLEAR_FLAG (who, FLAG_READY_SKILL); 2675 CLEAR_FLAG (who, FLAG_READY_SKILL);
2925 break; 2676 break;
2926 2677
2927 case ARMOUR: 2678 case ARMOUR:
2928 case HELMET: 2679 case HELMET:
… …
2952 SET_FLAG (tmp2, FLAG_INV_LOCKED); 2703 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2953 2704
2954 if (who->type == PLAYER) 2705 if (who->type == PLAYER)
2955 esrv_del_item (who->contr, op->count); 2706 esrv_del_item (who->contr, op->count);
2956 2707
2957 remove_ob (op); 2708 op->destroy ();
2958 free_object (op);
2959 insert_ob_in_ob (tmp2, who); 2709 insert_ob_in_ob (tmp2, who);
2960 fix_player (who); 2710 who->update_stats ();
2961 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 2711 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2962 { 2712 {
2963 if (who->type == PLAYER) 2713 if (who->type == PLAYER)
2964 { 2714 {
2965 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 2715 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
… …
2968 } 2718 }
2969 if (who->type == PLAYER) 2719 if (who->type == PLAYER)
2970 esrv_send_item (who, tmp2); 2720 esrv_send_item (who, tmp2);
2971 return 1; /* otherwise, an attempt to drop causes problems */ 2721 return 1; /* otherwise, an attempt to drop causes problems */
2972 break; 2722 break;
2723
2973 case BOW: 2724 case BOW:
2974 case WAND: 2725 case WAND:
2975 case ROD: 2726 case ROD:
2976 case HORN: 2727 case HORN:
2977 clear_skill (who); 2728 clear_skill (who);
2978 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2979 if (who->type == PLAYER) 2729 if (who->type == PLAYER)
2980 { 2730 {
2981 who->contr->shoottype = range_none; 2731 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2732
2733 who->contr->ranged_skill = 0;
2734 who->contr->ranged_ob = 0;
2982 } 2735 }
2983 else 2736 else
2984 { 2737 {
2985 if (op->type == BOW) 2738 if (op->type == BOW)
2986 CLEAR_FLAG (who, FLAG_READY_BOW); 2739 CLEAR_FLAG (who, FLAG_READY_BOW);
2987 else 2740 else
2988 CLEAR_FLAG (who, FLAG_READY_RANGE); 2741 CLEAR_FLAG (who, FLAG_READY_RANGE);
2989 } 2742 }
2743
2990 break; 2744 break;
2991 2745
2992 case BUILDER: 2746 case BUILDER:
2747 if (who->type == PLAYER)
2748 {
2993 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2749 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2994 who->contr->shoottype = range_none; 2750
2995 who->contr->ranges[range_builder] = NULL; 2751 who->contr->ranged_skill = 0;
2752 who->contr->ranged_ob = 0;
2753 }
2996 break; 2754 break;
2997 2755
2998 default: 2756 default:
2999 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op)); 2757 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op));
3000 break; 2758 break;
3001 } 2759 }
3002 2760
3003 fix_player (who); 2761 who->update_stats ();
3004 2762
3005 if (!(aflags & AP_NO_MERGE)) 2763 if (!(aflags & AP_NO_MERGE))
3006 { 2764 {
3007 object *tmp; 2765 object *tmp;
3008 2766
… …
3184 ws = tmp; 2942 ws = tmp;
3185 } 2943 }
3186 } 2944 }
3187 } 2945 }
3188 2946
3189
3190 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 2947 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
3191 { 2948 {
3192 if (op->body_info[i]) 2949 if (op->body_info[i])
3193 { 2950 {
3194 /* Item uses more slots than we have */ 2951 /* Item uses more slots than we have */
… …
3273 * and weapons all use the same slot. Similar for horn/rod/wand - they 3030 * and weapons all use the same slot. Similar for horn/rod/wand - they
3274 * all use the same location. 3031 * all use the same location.
3275 */ 3032 */
3276 if (op->type == WEAPON && !QUERY_FLAG (who, FLAG_USE_WEAPON)) 3033 if (op->type == WEAPON && !QUERY_FLAG (who, FLAG_USE_WEAPON))
3277 retval |= CAN_APPLY_RESTRICTION; 3034 retval |= CAN_APPLY_RESTRICTION;
3035
3278 if (op->type == SHIELD && !QUERY_FLAG (who, FLAG_USE_SHIELD)) 3036 if (op->type == SHIELD && !QUERY_FLAG (who, FLAG_USE_SHIELD))
3279 retval |= CAN_APPLY_RESTRICTION; 3037 retval |= CAN_APPLY_RESTRICTION;
3280
3281 3038
3282 if (who->type != PLAYER) 3039 if (who->type != PLAYER)
3283 { 3040 {
3284 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE)) 3041 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE))
3285 retval |= CAN_APPLY_RESTRICTION; 3042 retval |= CAN_APPLY_RESTRICTION;
… …
3288 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING)) 3045 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING))
3289 retval |= CAN_APPLY_RESTRICTION; 3046 retval |= CAN_APPLY_RESTRICTION;
3290 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3047 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3291 retval |= CAN_APPLY_RESTRICTION; 3048 retval |= CAN_APPLY_RESTRICTION;
3292 } 3049 }
3050
3293 return retval; 3051 return retval;
3294} 3052}
3295
3296
3297 3053
3298/** 3054/**
3299 * who is the object using the object. It can be a monster. 3055 * 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, 3056 * 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 3057 * eg, one which you put on and keep on for a while, and not something
… …
3374 } 3130 }
3375 else 3131 else
3376 { 3132 {
3377 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice)) 3133 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice))
3378 { 3134 {
3379 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some item(s):"); 3135 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); 3136 unapply_for_ob (who, op, AP_PRINT);
3381 return 1; 3137 return 1;
3382 } 3138 }
3383 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE)) 3139 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE))
3384 { 3140 {
… …
3386 if (i) 3142 if (i)
3387 return 1; 3143 return 1;
3388 } 3144 }
3389 } 3145 }
3390 } 3146 }
3147
3391 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL) 3148 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL)
3392 { 3149 {
3393 skop = find_skill_by_name (who, op->skill); 3150 skop = find_skill_by_name (who, op->skill);
3394 if (!skop) 3151 if (!skop)
3395 { 3152 {
3396 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill); 3153 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill);
3397 return 1; 3154 return 1;
3398 } 3155 }
3399 else 3156 else
3400 {
3401 /* While experience will be credited properly, we want to change the 3157 /* While experience will be credited properly, we want to change the
3402 * skill so that the dam and wc get updated 3158 * skill so that the dam and wc get updated
3403 */ 3159 */
3404 change_skill (who, skop, 0); 3160 change_skill (who, skop, 0);
3405 }
3406 } 3161 }
3407 3162
3408 if (who->type == PLAYER && op->item_power && (op->item_power + who->contr->item_power) > (settings.item_power_factor * who->level)) 3163 if (who->type == PLAYER && op->item_power && (op->item_power + who->contr->item_power) > (settings.item_power_factor * who->level))
3409 { 3164 {
3410 new_draw_info (NDI_UNIQUE, 0, who, "Equipping that combined with other items would consume your soul!"); 3165 new_draw_info (NDI_UNIQUE, 0, who,
3166 "Equipping that combined with other items would consume your soul! "
3167 "[use the skills command to check your available item power]");
3411 return 1; 3168 return 1;
3412 } 3169 }
3413 3170
3414 3171
3415 /* Ok. We are now at the state where we can apply the new object. 3172 /* 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_... 3173 * Note that we don't have the checks for can_use_...
3417 * below - that is already taken care of by can_apply_object. 3174 * below - that is already taken care of by can_apply_object.
3418 */ 3175 */
3419
3420 3176
3421 if (op->nrof > 1) 3177 if (op->nrof > 1)
3422 tmp = get_split_ob (op, op->nrof - 1); 3178 tmp = get_split_ob (op, op->nrof - 1);
3423 else 3179 else
3424 tmp = NULL; 3180 tmp = NULL;
… …
3435 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3191 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!.");
3436 if (tmp != NULL) 3192 if (tmp != NULL)
3437 (void) insert_ob_in_ob (tmp, who); 3193 (void) insert_ob_in_ob (tmp, who);
3438 return 1; 3194 return 1;
3439 } 3195 }
3196
3197 //TODO: this obviously fails for players using a shiorter prefix
3198 // i.e. "R" can use Ragnarok's swors.
3440 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3199 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3441 { 3200 {
3442 /* if the weapon does not have the name as the character, can't use it. */ 3201 /* 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) */ 3202 /* (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."); 3203 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner.");
3204
3445 if (tmp != NULL) 3205 if (tmp)
3446 (void) insert_ob_in_ob (tmp, who); 3206 insert_ob_in_ob (tmp, who);
3207
3447 return 1; 3208 return 1;
3448 } 3209 }
3210
3449 SET_FLAG (op, FLAG_APPLIED); 3211 SET_FLAG (op, FLAG_APPLIED);
3450 3212
3451 if (skop) 3213 if (skop)
3452 change_skill (who, skop, 1); 3214 change_skill (who, skop, 1);
3215
3453 if (!QUERY_FLAG (who, FLAG_READY_WEAPON)) 3216 if (!QUERY_FLAG (who, FLAG_READY_WEAPON))
3454 SET_FLAG (who, FLAG_READY_WEAPON); 3217 SET_FLAG (who, FLAG_READY_WEAPON);
3455 3218
3456 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op)); 3219 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op));
3457 3220
3458 (void) change_abil (who, op); 3221 change_abil (who, op);
3459 break; 3222 break;
3460 3223
3461 case ARMOUR: 3224 case ARMOUR:
3462 case HELMET: 3225 case HELMET:
3463 case SHIELD: 3226 case SHIELD:
… …
3468 case CLOAK: 3231 case CLOAK:
3469 case RING: 3232 case RING:
3470 case AMULET: 3233 case AMULET:
3471 SET_FLAG (op, FLAG_APPLIED); 3234 SET_FLAG (op, FLAG_APPLIED);
3472 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op)); 3235 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op));
3473 (void) change_abil (who, op); 3236 change_abil (who, op);
3474 break; 3237 break;
3238
3475 case LAMP: 3239 case LAMP:
3476 if (op->stats.food < 1) 3240 if (op->stats.food < 1)
3477 { 3241 {
3478 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of" " fuel!", &op->name); 3242 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of" " fuel!", &op->name);
3479 return 1; 3243 return 1;
3480 } 3244 }
3245
3481 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name); 3246 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name);
3482 tmp2 = arch_to_object (op->other_arch); 3247 tmp2 = arch_to_object (op->other_arch);
3483 tmp2->stats.food = op->stats.food; 3248 tmp2->stats.food = op->stats.food;
3484 SET_FLAG (tmp2, FLAG_APPLIED); 3249 SET_FLAG (tmp2, FLAG_APPLIED);
3250
3485 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 3251 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3486 SET_FLAG (tmp2, FLAG_INV_LOCKED); 3252 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3253
3487 insert_ob_in_ob (tmp2, who); 3254 insert_ob_in_ob (tmp2, who);
3488 3255
3489 /* Remove the old lantern */ 3256 /* Remove the old lantern */
3490 if (who->type == PLAYER) 3257 if (who->type == PLAYER)
3491 esrv_del_item (who->contr, op->count); 3258 esrv_del_item (who->contr, op->count);
3492 3259
3493 remove_ob (op); 3260 op->destroy ();
3494 free_object (op);
3495 3261
3496 /* insert the portion that was split off */ 3262 /* insert the portion that was split off */
3497 if (tmp != NULL) 3263 if (tmp)
3498 { 3264 {
3499 (void) insert_ob_in_ob (tmp, who); 3265 insert_ob_in_ob (tmp, who);
3500 if (who->type == PLAYER) 3266 if (who->type == PLAYER)
3501 esrv_send_item (who, tmp); 3267 esrv_send_item (who, tmp);
3502 } 3268 }
3503 fix_player (who); 3269
3270 who->update_stats ();
3271
3504 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3272 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3505 { 3273 {
3506 if (who->type == PLAYER) 3274 if (who->type == PLAYER)
3507 { 3275 {
3508 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3276 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
3509 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 3277 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3510 } 3278 }
3511 } 3279 }
3280
3512 if (who->type == PLAYER) 3281 if (who->type == PLAYER)
3513 esrv_send_item (who, tmp2); 3282 esrv_send_item (who, tmp2);
3283
3514 return 0; 3284 return 0;
3515 break;
3516 3285
3517 /* this part is needed for skill-tools */ 3286 /* this part is needed for skill-tools */
3518 case SKILL: 3287 case SKILL:
3519 case SKILL_TOOL: 3288 case SKILL_TOOL:
3520 if (who->chosen_skill) 3289 if (who->chosen_skill)
3521 { 3290 {
3522 LOG (llevError, "BUG: apply_special(): can't apply two skills\n"); 3291 LOG (llevError, "BUG: apply_special(): can't apply two skills\n");
3523 return 1; 3292 return 1;
3524 } 3293 }
3294
3525 if (who->type == PLAYER) 3295 if (who->type == PLAYER)
3526 { 3296 {
3527 who->contr->shoottype = range_skill;
3528 who->contr->ranges[range_skill] = op; 3297 who->contr->ranged_skill = who;
3298 who->contr->ranged_ob = op;
3299
3529 if (!op->invisible) 3300 if (!op->invisible)
3530 { 3301 {
3531 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3302 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3532 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill); 3303 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill);
3533 } 3304 }
3534 else 3305 else
3535 {
3536 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name); 3306 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name);
3537 } 3307 }
3538 } 3308
3539 SET_FLAG (op, FLAG_APPLIED); 3309 SET_FLAG (op, FLAG_APPLIED);
3540 (void) change_abil (who, op); 3310 change_abil (who, op);
3541 who->chosen_skill = op; 3311 who->chosen_skill = op;
3542 SET_FLAG (who, FLAG_READY_SKILL); 3312 SET_FLAG (who, FLAG_READY_SKILL);
3543 break; 3313 break;
3544 3314
3545 case BOW: 3315 case BOW:
3546 if (!check_weapon_power (who, op->last_eat)) 3316 if (!check_weapon_power (who, op->last_eat))
3547 { 3317 {
3548 new_draw_info (NDI_UNIQUE, 0, who, "That item is too powerful for you to use."); 3318 new_draw_info (NDI_UNIQUE, 0, who, "That item is too powerful for you to use.");
3549 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3319 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!.");
3320
3550 if (tmp != NULL) 3321 if (tmp)
3551 (void) insert_ob_in_ob (tmp, who); 3322 insert_ob_in_ob (tmp, who);
3323
3552 return 1; 3324 return 1;
3553 } 3325 }
3326
3554 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3327 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3555 { 3328 {
3556 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3329 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner.");
3557 if (tmp != NULL) 3330 if (tmp != NULL)
3558 (void) insert_ob_in_ob (tmp, who); 3331 insert_ob_in_ob (tmp, who);
3332
3559 return 1; 3333 return 1;
3560 } 3334 }
3335
3561 /*FALLTHROUGH*/ case WAND: 3336 /*FALLTHROUGH*/
3337 case WAND:
3562 case ROD: 3338 case ROD:
3563 case HORN: 3339 case HORN:
3564 /* check for skill, alter player status */ 3340 /* check for skill, alter player status */
3565 SET_FLAG (op, FLAG_APPLIED); 3341 SET_FLAG (op, FLAG_APPLIED);
3566 if (skop) 3342 if (skop)
3567 change_skill (who, skop, 0); 3343 change_skill (who, skop, 0);
3568 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3569 3344
3570 if (who->type == PLAYER) 3345 if (who->type == PLAYER)
3571 { 3346 {
3347 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3348
3572 if (op->type == BOW) 3349 if (op->type == BOW)
3573 { 3350 {
3574 (void) change_abil (who, op); 3351 change_abil (who, op);
3575 new_draw_info_format (NDI_UNIQUE, 0, who, 3352 new_draw_info_format (NDI_UNIQUE, 0, who,
3576 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)); 3353 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op));
3577 who->contr->shoottype = range_bow;
3578 } 3354 }
3579 else 3355
3580 { 3356 who->contr->ranged_skill = find_skill_by_name (who, op->skill);//TODO
3581 who->contr->shoottype = range_misc; 3357 who->contr->ranged_ob = op;
3582 }
3583 } 3358 }
3584 else 3359 else
3585 { 3360 {
3586 if (op->type == BOW) 3361 if (op->type == BOW)
3587 SET_FLAG (who, FLAG_READY_BOW); 3362 SET_FLAG (who, FLAG_READY_BOW);
3588 else 3363 else
3589 SET_FLAG (who, FLAG_READY_RANGE); 3364 SET_FLAG (who, FLAG_READY_RANGE);
3590 } 3365 }
3366
3591 break; 3367 break;
3592 3368
3593 case BUILDER: 3369 case BUILDER:
3594 if (who->contr->ranges[range_builder]) 3370 if (who->type == PLAYER)
3371 {
3372 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER)
3595 unapply_special (who, who->contr->ranges[range_builder], 0); 3373 unapply_special (who, who->contr->ranged_ob, 0);
3596 who->contr->shoottype = range_builder; 3374
3597 who->contr->ranges[range_builder] = op;
3598 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op)); 3375 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op));
3376
3377 who->contr->ranged_skill = who;
3378 who->contr->ranged_ob = op;
3379 }
3599 break; 3380 break;
3600 3381
3601 default: 3382 default:
3602 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op)); 3383 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op));
3603 } /* end of switch op->type */ 3384 } /* end of switch op->type */
… …
3605 SET_FLAG (op, FLAG_APPLIED); 3386 SET_FLAG (op, FLAG_APPLIED);
3606 3387
3607 if (tmp != NULL) 3388 if (tmp != NULL)
3608 tmp = insert_ob_in_ob (tmp, who); 3389 tmp = insert_ob_in_ob (tmp, who);
3609 3390
3610 fix_player (who); 3391 who->update_stats ();
3611 3392
3612 /* We exclude spell casting objects. The fire code will set the 3393 /* We exclude spell casting objects. The fire code will set the
3613 * been applied flag when they are used - until that point, 3394 * been applied flag when they are used - until that point,
3614 * you don't know anything about them. 3395 * you don't know anything about them.
3615 */ 3396 */
… …
3622 { 3403 {
3623 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3404 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
3624 SET_FLAG (op, FLAG_KNOWN_CURSED); 3405 SET_FLAG (op, FLAG_KNOWN_CURSED);
3625 } 3406 }
3626 } 3407 }
3408
3627 if (who->type == PLAYER) 3409 if (who->type == PLAYER)
3628 { 3410 {
3629 /* if multiple objects were applied, update both slots */ 3411 /* if multiple objects were applied, update both slots */
3630 if (tmp) 3412 if (tmp)
3631 esrv_send_item (who, tmp); 3413 esrv_send_item (who, tmp);
3414
3632 esrv_send_item (who, op); 3415 esrv_send_item (who, op);
3633 } 3416 }
3417
3634 return 0; 3418 return 0;
3635} 3419}
3636
3637 3420
3638int 3421int
3639monster_apply_special (object *who, object *op, int aflags) 3422monster_apply_special (object *who, object *op, int aflags)
3640{ 3423{
3641 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED)) 3424 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
… …
3655 int i; 3438 int i;
3656 3439
3657 switch (op->type) 3440 switch (op->type)
3658 { 3441 {
3659 case SHOP_FLOOR: 3442 case SHOP_FLOOR:
3660 if (!HAS_RANDOM_ITEMS (op)) 3443 if (!op->has_random_items ())
3661 return 0; 3444 return 0;
3445
3662 do 3446 do
3663 { 3447 {
3664 i = 10; /* let's give it 10 tries */ 3448 i = 10; /* let's give it 10 tries */
3665 while ((tmp = generate_treasure (op->randomitems, 3449 while ((tmp = generate_treasure (op->randomitems,
3666 op->stats.exp ? (int) op->stats.exp : MAX (op->map->difficulty, 5))) == NULL && --i); 3450 op->stats.exp ? (int) op->stats.exp : MAX (op->map->difficulty, 5))) == NULL && --i);
3667 if (tmp == NULL) 3451 if (tmp == NULL)
3668 return 0; 3452 return 0;
3669 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 3453 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
3670 { 3454 {
3671 free_object (tmp); 3455 tmp->destroy ();
3672 tmp = NULL; 3456 tmp = NULL;
3673 } 3457 }
3674 } 3458 }
3675 while (!tmp); 3459 while (!tmp);
3460
3676 tmp->x = op->x; 3461 tmp->x = op->x;
3677 tmp->y = op->y; 3462 tmp->y = op->y;
3678 SET_FLAG (tmp, FLAG_UNPAID); 3463 SET_FLAG (tmp, FLAG_UNPAID);
3679 insert_ob_in_map (tmp, op->map, NULL, 0); 3464 insert_ob_in_map (tmp, op->map, NULL, 0);
3680 CLEAR_FLAG (op, FLAG_AUTO_APPLY); 3465 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
… …
3682 break; 3467 break;
3683 3468
3684 case TREASURE: 3469 case TREASURE:
3685 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 3470 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
3686 return 0; 3471 return 0;
3472
3687 while ((op->stats.hp--) > 0) 3473 while (op->stats.hp-- > 0)
3688 create_treasure (op->randomitems, op, op->map ? GT_ENVIRONMENT : 0, 3474 create_treasure (op->randomitems, op, op->map ? GT_ENVIRONMENT : 0,
3689 op->stats.exp ? (int) op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0); 3475 op->stats.exp ? (int) op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0);
3690 3476
3691 /* If we generated an object and put it in this object inventory, 3477 /* If we generated an object and put it in this object inventory,
3692 * move it to the parent object as the current object is about 3478 * move it to the parent object as the current object is about
… …
3694 * that is put inside other objects. 3480 * that is put inside other objects.
3695 */ 3481 */
3696 for (tmp = op->inv; tmp; tmp = tmp2) 3482 for (tmp = op->inv; tmp; tmp = tmp2)
3697 { 3483 {
3698 tmp2 = tmp->below; 3484 tmp2 = tmp->below;
3699 remove_ob (tmp); 3485 tmp->remove ();
3486
3700 if (op->env) 3487 if (op->env)
3701 insert_ob_in_ob (tmp, op->env); 3488 insert_ob_in_ob (tmp, op->env);
3702 else 3489 else
3703 free_object (tmp); 3490 tmp->destroy ();
3704 } 3491 }
3705 remove_ob (op); 3492
3706 free_object (op); 3493 op->destroy ();
3707 break; 3494 break;
3708 } 3495 }
3709 return tmp ? 1 : 0; 3496 return tmp ? 1 : 0;
3710} 3497}
3711 3498
3712/** 3499/**
3713 * fix_auto_apply goes through the entire map (only the first time 3500 * fix_auto_apply goes through the entire map every time a map
3714 * when an original map is loaded) and performs special actions for 3501 * is loaded or swapped in and performs special actions for
3715 * certain objects (most initialization of chests and creation of 3502 * certain objects (most initialization of chests and creation of
3716 * treasures and stuff). Calls auto_apply if appropriate. 3503 * treasures and stuff). Calls auto_apply if appropriate.
3717 */ 3504 */
3718void 3505void
3719fix_auto_apply (maptile *m) 3506maptile::fix_auto_apply ()
3720{ 3507{
3721 object *tmp, *above = NULL; 3508 if (!spaces)
3722 int x, y;
3723
3724 if (m == NULL)
3725 return; 3509 return;
3726 3510
3727 for (x = 0; x < MAP_WIDTH (m); x++) 3511 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3728 for (y = 0; y < MAP_HEIGHT (m); y++) 3512 for (object *tmp = ms->bot; tmp; )
3729 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = above)
3730 { 3513 {
3731 above = tmp->above; 3514 object *above = tmp->above;
3732 3515
3733 if (tmp->inv) 3516 if (tmp->inv)
3734 { 3517 {
3735 object *invtmp, *invnext; 3518 object *invtmp, *invnext;
3736 3519
3737 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext) 3520 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext)
3738 { 3521 {
3739 invnext = invtmp->below; 3522 invnext = invtmp->below;
3740 3523
3741 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY)) 3524 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY))
3742 auto_apply (invtmp); 3525 auto_apply (invtmp);
3743 else if (invtmp->type == TREASURE && HAS_RANDOM_ITEMS (invtmp)) 3526 else if (invtmp->type == TREASURE && invtmp->has_random_items ())
3744 { 3527 {
3745 while ((invtmp->stats.hp--) > 0) 3528 while ((invtmp->stats.hp--) > 0)
3746 create_treasure (invtmp->randomitems, invtmp, 0, m->difficulty, 0);
3747
3748 invtmp->randomitems = NULL;
3749 }
3750 else if (invtmp && invtmp->arch
3751 && invtmp->type != TREASURE && invtmp->type != SPELL && invtmp->type != CLASS && HAS_RANDOM_ITEMS (invtmp))
3752 {
3753 create_treasure (invtmp->randomitems, invtmp, 0, m->difficulty, 0); 3529 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3530
3531 invtmp->randomitems = NULL;
3532 }
3533 else if (invtmp && invtmp->arch
3534 && invtmp->type != TREASURE && invtmp->type != SPELL && invtmp->type != CLASS && invtmp->has_random_items ())
3535 {
3536 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3754 /* Need to clear this so that we never try to create 3537 /* Need to clear this so that we never try to create
3755 * treasure again for this object 3538 * treasure again for this object
3756 */ 3539 */
3757 invtmp->randomitems = NULL; 3540 invtmp->randomitems = NULL;
3758 } 3541 }
3759 } 3542 }
3760 /* This is really temporary - the code at the bottom will 3543 /* This is really temporary - the code at the bottom will
3761 * also set randomitems to null. The problem is there are bunches 3544 * also set randomitems to null. The problem is there are bunches
3762 * of maps/players already out there with items that have spells 3545 * of maps/players already out there with items that have spells
3763 * which haven't had the randomitems set to null yet. 3546 * which haven't had the randomitems set to null yet.
3764 * MSW 2004-05-13 3547 * MSW 2004-05-13
3765 * 3548 *
3766 * And if it's a spellbook, it's better to set randomitems to NULL too, 3549 * And if it's a spellbook, it's better to set randomitems to NULL too,
3767 * else you get two spells in the book ^_- 3550 * else you get two spells in the book ^_-
3768 * Ryo 2004-08-16 3551 * Ryo 2004-08-16
3769 */ 3552 */
3770 if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL 3553 if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL
3771 || tmp->type == HORN || tmp->type == FIREWALL || tmp->type == POTION || tmp->type == ALTAR || tmp->type == SPELLBOOK) 3554 || tmp->type == HORN || tmp->type == FIREWALL || tmp->type == POTION || tmp->type == ALTAR || tmp->type == SPELLBOOK)
3772 tmp->randomitems = NULL;
3773
3774 }
3775
3776 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY))
3777 auto_apply (tmp);
3778 else if ((tmp->type == TREASURE || (tmp->type == CONTAINER)) && HAS_RANDOM_ITEMS (tmp))
3779 {
3780 while ((tmp->stats.hp--) > 0)
3781 create_treasure (tmp->randomitems, tmp, 0, m->difficulty, 0);
3782 tmp->randomitems = NULL; 3555 tmp->randomitems = NULL;
3556
3783 } 3557 }
3558
3559 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY))
3560 auto_apply (tmp);
3561 else if ((tmp->type == TREASURE || (tmp->type == CONTAINER)) && tmp->has_random_items ())
3562 {
3563 while ((tmp->stats.hp--) > 0)
3564 create_treasure (tmp->randomitems, tmp, 0, difficulty, 0);
3565 tmp->randomitems = NULL;
3566 }
3784 else if (tmp->type == TIMED_GATE) 3567 else if (tmp->type == TIMED_GATE)
3785 { 3568 {
3786 object *head = tmp->head != NULL ? tmp->head : tmp; 3569 object *head = tmp->head != NULL ? tmp->head : tmp;
3787 3570
3788 if (QUERY_FLAG (head, FLAG_IS_LINKED)) 3571 if (QUERY_FLAG (head, FLAG_IS_LINKED))
3789 {
3790 tmp->speed = 0; 3572 tmp->set_speed (0);
3791 update_ob_speed (tmp);
3792 }
3793 } 3573 }
3794 /* This function can be called everytime a map is loaded, even when 3574 /* This function can be called everytime a map is loaded, even when
3795 * swapping back in. As such, we don't want to create the treasure 3575 * swapping back in. As such, we don't want to create the treasure
3796 * over and ove again, so after we generate the treasure, blank out 3576 * over and ove again, so after we generate the treasure, blank out
3797 * randomitems so if it is swapped in again, it won't make anything. 3577 * randomitems so if it is swapped in again, it won't make anything.
3798 * This is a problem for the above objects, because they have counters 3578 * This is a problem for the above objects, because they have counters
3799 * which say how many times to make the treasure. 3579 * which say how many times to make the treasure.
3800 */ 3580 */
3801 else if (tmp && tmp->arch && tmp->type != PLAYER 3581 else if (tmp && tmp->arch && tmp->type != PLAYER
3802 && tmp->type != TREASURE && tmp->type != SPELL 3582 && tmp->type != TREASURE && tmp->type != SPELL
3803 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && HAS_RANDOM_ITEMS (tmp)) 3583 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && tmp->has_random_items ())
3804 { 3584 {
3805 create_treasure (tmp->randomitems, tmp, GT_APPLY, m->difficulty, 0); 3585 create_treasure (tmp->randomitems, tmp, GT_APPLY, difficulty, 0);
3806 tmp->randomitems = NULL; 3586 tmp->randomitems = NULL;
3807 } 3587 }
3588 // close all containers
3589 else if (tmp->type == CONTAINER)
3590 tmp->flag [FLAG_APPLIED] = 0;
3591
3592 tmp = above;
3808 } 3593 }
3809 3594
3810 for (x = 0; x < MAP_WIDTH (m); x++) 3595 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3811 for (y = 0; y < MAP_HEIGHT (m); y++) 3596 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
3812 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above)
3813 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL)) 3597 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL))
3814 check_trigger (tmp, tmp->above); 3598 check_trigger (tmp, tmp->above);
3815} 3599}
3816 3600
3817/** 3601/**
3818 * Handles player eating food that temporarily changes status (resistances, stats). 3602 * Handles player eating food that temporarily changes status (resistances, stats).
3819 * This used to call cast_change_attr(), but 3603 * This used to call cast_change_attr(), but
… …
3847 { 3631 {
3848 force->resist[i] = food->resist[i] / 2; 3632 force->resist[i] = food->resist[i] / 2;
3849 did_one = 1; 3633 did_one = 1;
3850 } 3634 }
3851 } 3635 }
3636
3852 if (did_one) 3637 if (did_one)
3853 { 3638 {
3854 force->speed = 0.1; 3639 force->set_speed (0.1);
3855 update_ob_speed (force);
3856 /* bigger morsel of food = longer effect time */ 3640 /* bigger morsel of food = longer effect time */
3857 force->stats.food = food->stats.food / 5; 3641 force->duration = food->stats.food / 5;
3858 SET_FLAG (force, FLAG_IS_USED_UP);
3859 SET_FLAG (force, FLAG_APPLIED); 3642 SET_FLAG (force, FLAG_APPLIED);
3860 change_abil (who, force); 3643 change_abil (who, force);
3861 insert_ob_in_ob (force, who); 3644 insert_ob_in_ob (force, who);
3862 } 3645 }
3863 else 3646 else
3864 { 3647 force->destroy ();
3865 free_object (force);
3866 }
3867 3648
3868 /* check for hp, sp change */ 3649 /* check for hp, sp change */
3869 if (food->stats.hp != 0) 3650 if (food->stats.hp != 0)
3870 { 3651 {
3871 if (QUERY_FLAG (food, FLAG_CURSED)) 3652 if (QUERY_FLAG (food, FLAG_CURSED))
3872 { 3653 {
3873 strcpy (who->contr->killer, food->name); 3654 assign (who->contr->killer, food->name);
3874 hit_player (who, food->stats.hp, food, AT_POISON, 1); 3655 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3875 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!"); 3656 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!");
3876 } 3657 }
3877 else 3658 else
3878 { 3659 {
… …
3897 new_draw_info (NDI_UNIQUE, 0, who, "You feel a rush of magical energy!"); 3678 new_draw_info (NDI_UNIQUE, 0, who, "You feel a rush of magical energy!");
3898 who->stats.sp += food->stats.sp; 3679 who->stats.sp += food->stats.sp;
3899 /* place limit on max sp from food? */ 3680 /* place limit on max sp from food? */
3900 } 3681 }
3901 } 3682 }
3902 fix_player (who); 3683 who->update_stats ();
3903} 3684}
3904
3905 3685
3906/** 3686/**
3907 * Designed primarily to light torches/lanterns/etc. 3687 * Designed primarily to light torches/lanterns/etc.
3908 * Also burns up burnable material too. First object in the inventory is 3688 * Also burns up burnable material too. First object in the inventory is
3909 * the selected object to "burn". -b.t. 3689 * the selected object to "burn". -b.t.
3910 */ 3690 */
3911
3912void 3691void
3913apply_lighter (object *who, object *lighter) 3692apply_lighter (object *who, object *lighter)
3914{ 3693{
3915 object *item; 3694 object *item;
3916 int is_player_env = 0; 3695 int is_player_env = 0;
3917 char item_name[MAX_BUF];
3918 3696
3919 item = find_marked_object (who); 3697 item = find_marked_object (who);
3920 if (item) 3698 if (item)
3921 { 3699 {
3922 if (lighter->last_eat && lighter->stats.food) 3700 if (lighter->last_eat && lighter->stats.food)
3923 { /* lighter gets used up */ 3701 { /* lighter gets used up */
3924 /* Split multiple lighters if they're being used up. Otherwise * 3702 /* Split multiple lighters if they're being used up. Otherwise *
3925 * one charge from each would be used up. --DAMN */ 3703 * one charge from each would be used up. --DAMN */
3926 if (lighter->nrof > 1) 3704 if (lighter->nrof > 1)
3927 { 3705 {
3928 object *oneLighter = get_object (); 3706 object *oneLighter = lighter->clone ();
3929 3707
3930 copy_object (lighter, oneLighter);
3931 lighter->nrof -= 1; 3708 lighter->nrof -= 1;
3932 oneLighter->nrof = 1; 3709 oneLighter->nrof = 1;
3933 oneLighter->stats.food--; 3710 oneLighter->stats.food--;
3934 esrv_send_item (who, lighter); 3711 esrv_send_item (who, lighter);
3935 oneLighter = insert_ob_in_ob (oneLighter, who); 3712 oneLighter = insert_ob_in_ob (oneLighter, who);
… …
3941 else if (lighter->last_eat) 3718 else if (lighter->last_eat)
3942 { /* no charges left in lighter */ 3719 { /* 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); 3720 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; 3721 return;
3945 } 3722 }
3723
3946 /* Perhaps we should split what we are trying to light on fire? 3724 /* 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 3725 * I can't see many times when you would want to light multiple
3948 * objects at once. 3726 * objects at once.
3949 */ 3727 */
3950 /* If the item is destroyed, we don't have a valid pointer to the 3728
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)) 3729 if (who == item->in_player ())
3956 is_player_env = 1; 3730 is_player_env = 1;
3957 3731
3958 save_throw_object (item, AT_FIRE, who); 3732 save_throw_object (item, AT_FIRE, who);
3959 /* Change to check count and not freed, since the object pointer 3733
3960 * may have gotten recycled
3961 */
3962 if (item->destroyed ()) 3734 if (item->destroyed ())
3963 { 3735 {
3964 new_draw_info_format (NDI_UNIQUE, 0, who, "You light the %s with the %s.", &item_name, &lighter->name); 3736 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 3737 /* Need to update the player so that the players glow radius
3966 * gets changed. 3738 * gets changed.
3967 */ 3739 */
3968 if (is_player_env) 3740 if (is_player_env)
3969 fix_player (who); 3741 who->update_stats ();
3970 } 3742 }
3971 else 3743 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); 3744 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with the %s and fail.", &item->name, &lighter->name);
3973 } 3745 }
3974 else /* nothing to light */ 3746 else /* nothing to light */
… …
3991 object *tmp; 3763 object *tmp;
3992 3764
3993 new_draw_info (NDI_UNIQUE, 0, op, "Your spell warps!."); 3765 new_draw_info (NDI_UNIQUE, 0, op, "Your spell warps!.");
3994 tmp = get_archetype (SPELL_WONDER); 3766 tmp = get_archetype (SPELL_WONDER);
3995 cast_wonder (op, op, 0, tmp); 3767 cast_wonder (op, op, 0, tmp);
3996 free_object (tmp); 3768 tmp->destroy ();
3997 } 3769 }
3998 else if (failure <= -15 && failure > -35) 3770 else if (failure <= -15 && failure > -35)
3999 { /* drain mana */ 3771 { /* drain mana */
4000 new_draw_info (NDI_UNIQUE, 0, op, "Your mana is drained!."); 3772 new_draw_info (NDI_UNIQUE, 0, op, "Your mana is drained!.");
4001 op->stats.sp -= random_roll (0, power - 1, op, PREFER_LOW); 3773 op->stats.sp -= random_roll (0, power - 1, op, PREFER_LOW);
… …
4024 object *tmp; 3796 object *tmp;
4025 3797
4026 tmp = get_archetype (LOOSE_MANA); 3798 tmp = get_archetype (LOOSE_MANA);
4027 cast_magic_storm (op, tmp, power); 3799 cast_magic_storm (op, tmp, power);
4028 new_draw_info (NDI_UNIQUE, 0, op, "You unlease uncontrolled mana!"); 3800 new_draw_info (NDI_UNIQUE, 0, op, "You unlease uncontrolled mana!");
4029 free_object (tmp); 3801 tmp->destroy ();
4030 } 3802 }
4031 } 3803 }
4032} 3804}
4033 3805
4034void 3806void

Diff Legend

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