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.31 by root, Sun Dec 3 20:26:35 2006 UTC vs.
Revision 1.92 by root, Sat May 12 18:23:51 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
24
25#include <cmath>
23 26
24#include <global.h> 27#include <global.h>
25#include <living.h> 28#include <living.h>
26#include <spells.h> 29#include <spells.h>
27#include <skills.h> 30#include <skills.h>
28#include <tod.h> 31#include <tod.h>
29 32
30#ifndef __CEXTRACT__
31# include <sproto.h> 33#include <sproto.h>
32#endif
33 34
34/* Want this regardless of rplay. */ 35/* Want this regardless of rplay. */
35#include <sounds.h> 36#include <sounds.h>
36
37/* need math lib for double-precision and pow() in dragon_eat_flesh() */
38#include <math.h>
39 37
40/** 38/**
41 * Check if op should abort moving victim because of it's race or slaying. 39 * Check if op should abort moving victim because of it's race or slaying.
42 * Returns 1 if it should abort, returns 0 if it should continue. 40 * Returns 1 if it should abort, returns 0 if it should continue.
43 */ 41 */
… …
66 { 64 {
67 arch_flag = 1; 65 arch_flag = 1;
68 name_flag = 1; 66 name_flag = 1;
69 race_flag = 1; 67 race_flag = 1;
70 } 68 }
69
71 /* If the director has race set, only affect objects with a arch, 70 /* If the director has race set, only affect objects with a arch,
72 * name or race that matches. 71 * name or race that matches.
73 */ 72 */
74 if ((op->race) && 73 if ((op->race) &&
75 ((!(victim->arch && arch_flag && victim->arch->name) || strcmp (op->race, victim->arch->name))) && 74 ((!(victim->arch && arch_flag && victim->arch->name) || op->race != victim->arch->name)) &&
76 ((!(victim->name && name_flag) || strcmp (op->race, victim->name))) && 75 ((!(victim->name && name_flag) || op->race != victim->name)) &&
77 ((!(victim->race && race_flag) || strcmp (op->race, victim->race)))) 76 ((!(victim->race && race_flag) || op->race != victim->race)))
78 {
79 return 1; 77 return 1;
80 } 78
81 /* If the director has slaying set, only affect objects where none 79 /* If the director has slaying set, only affect objects where none
82 * of arch, name, or race match. 80 * of arch, name, or race match.
83 */ 81 */
84 if ((op->slaying) && (((victim->arch && arch_flag && victim->arch->name && !strcmp (op->slaying, victim->arch->name))) || 82 if ((op->slaying) && (((victim->arch && arch_flag && victim->arch->name && op->slaying == victim->arch->name))) ||
85 ((victim->name && name_flag && !strcmp (op->slaying, victim->name))) || 83 ((victim->name && name_flag && op->slaying == victim->name)) ||
86 ((victim->race && race_flag && !strcmp (op->slaying, victim->race))))) 84 ((victim->race && race_flag && op->slaying == victim->race)))
87 {
88 return 1; 85 return 1;
89 } 86
90 return 0; 87 return 0;
91} 88}
92 89
93/** 90/**
94 * This handles a player dropping money on an altar to identify stuff. 91 * This handles a player dropping money on an altar to identify stuff.
… …
195apply_potion (object *op, object *tmp) 192apply_potion (object *op, object *tmp)
196{ 193{
197 int got_one = 0, i; 194 int got_one = 0, i;
198 object *force = 0, *floor = 0; 195 object *force = 0, *floor = 0;
199 196
200 floor = get_map_ob (op->map, op->x, op->y); 197 floor = GET_MAP_OB (op->map, op->x, op->y);
201 198
202 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 199 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
203 { 200 {
204 if (op->type == PLAYER) 201 if (op->type == PLAYER)
205 new_draw_info (NDI_UNIQUE, 0, op, "Gods prevent you from using this here, it's sacred ground!"); 202 new_draw_info (NDI_UNIQUE, 0, op, "Gods prevent you from using this here, it's sacred ground!");
206 CLEAR_FLAG (tmp, FLAG_APPLIED); 203 CLEAR_FLAG (tmp, FLAG_APPLIED);
207 return 0; 204 return 0;
208 } 205 }
209 206
210 if (op->type == PLAYER) 207 if (op->type == PLAYER)
211 {
212 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 208 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
213 identify (tmp); 209 identify (tmp);
214 }
215 210
216 handle_apply_yield (tmp); 211 handle_apply_yield (tmp);
217 212
218 /* Potion of restoration - only for players */ 213 /* Potion of restoration - only for players */
219 if (op->type == PLAYER && (tmp->attacktype & AT_DEPLETE)) 214 if (op->type == PLAYER && (tmp->attacktype & AT_DEPLETE))
… …
221 object *depl; 216 object *depl;
222 archetype *at; 217 archetype *at;
223 218
224 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 219 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
225 { 220 {
226 drain_stat (op); 221 op->drain_stat ();
227 fix_player (op); 222 op->update_stats ();
228 decrease_ob (tmp); 223 decrease_ob (tmp);
229 return 1; 224 return 1;
230 } 225 }
226
231 if ((at = archetype::find (ARCH_DEPLETION)) == NULL) 227 if (!(at = archetype::find (ARCH_DEPLETION)))
232 { 228 {
233 LOG (llevError, "Could not find archetype depletion\n"); 229 LOG (llevError, "Could not find archetype depletion\n");
234 return 0; 230 return 0;
235 } 231 }
236 depl = present_arch_in_ob (at, op); 232 depl = present_arch_in_ob (at, op);
233
237 if (depl != NULL) 234 if (depl)
238 { 235 {
239 for (i = 0; i < NUM_STATS; i++) 236 for (i = 0; i < NUM_STATS; i++)
240 if (get_attr_value (&depl->stats, i)) 237 if (depl->stats.stat (i))
241 {
242 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]); 238 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]);
243 } 239
244 remove_ob (depl); 240 depl->destroy ();
245 free_object (depl); 241 op->update_stats ();
246 fix_player (op);
247 } 242 }
248 else 243 else
249 new_draw_info (NDI_UNIQUE, 0, op, "You potion had no effect."); 244 new_draw_info (NDI_UNIQUE, 0, op, "You potion had no effect.");
250 245
251 decrease_ob (tmp); 246 decrease_ob (tmp);
… …
253 } 248 }
254 249
255 /* improvement potion - only for players */ 250 /* improvement potion - only for players */
256 if (op->type == PLAYER && tmp->attacktype & AT_GODPOWER) 251 if (op->type == PLAYER && tmp->attacktype & AT_GODPOWER)
257 { 252 {
258
259 for (i = 1; i < MIN (11, op->level); i++) 253 for (i = 1; i < MIN (11, op->level); i++)
260 { 254 {
261 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 255 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
262 { 256 {
263 if (op->contr->levhp[i] != 1) 257 if (op->contr->levhp[i] != 1)
… …
293 op->contr->levgrace[i] = 3; 287 op->contr->levgrace[i] = 3;
294 break; 288 break;
295 } 289 }
296 } 290 }
297 } 291 }
292
298 /* Just makes checking easier */ 293 /* Just makes checking easier */
299 if (i < MIN (11, op->level)) 294 if (i < MIN (11, op->level))
300 got_one = 1; 295 got_one = 1;
296
301 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)) 297 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))
302 { 298 {
303 if (got_one) 299 if (got_one)
304 { 300 {
305 fix_player (op); 301 op->update_stats ();
306 new_draw_info (NDI_UNIQUE, 0, op, "The Gods smile upon you and remake you"); 302 new_draw_info (NDI_UNIQUE, 0, op, "The Gods smile upon you and remake you");
307 new_draw_info (NDI_UNIQUE, 0, op, "a little more in their image."); 303 new_draw_info (NDI_UNIQUE, 0, op, "a little more in their image.");
308 new_draw_info (NDI_UNIQUE, 0, op, "You feel a little more perfect."); 304 new_draw_info (NDI_UNIQUE, 0, op, "You feel a little more perfect.");
309 } 305 }
310 else 306 else
… …
312 } 308 }
313 else 309 else
314 { /* cursed potion */ 310 { /* cursed potion */
315 if (got_one) 311 if (got_one)
316 { 312 {
317 fix_player (op); 313 op->update_stats ();
318 new_draw_info (NDI_UNIQUE, 0, op, "The Gods are angry and punish you."); 314 new_draw_info (NDI_UNIQUE, 0, op, "The Gods are angry and punish you.");
319 } 315 }
320 else 316 else
321 new_draw_info (NDI_UNIQUE, 0, op, "You are fortunate that you are so pathetic."); 317 new_draw_info (NDI_UNIQUE, 0, op, "You are fortunate that you are so pathetic.");
322 } 318 }
319
323 decrease_ob (tmp); 320 decrease_ob (tmp);
324 return 1; 321 return 1;
325 } 322 }
326 323
327 324
… …
349 cast_spell (op, tmp, op->facing, tmp->inv, NULL); 346 cast_spell (op, tmp, op->facing, tmp->inv, NULL);
350 347
351 decrease_ob (tmp); 348 decrease_ob (tmp);
352 /* if youre dead, no point in doing this... */ 349 /* if youre dead, no point in doing this... */
353 if (!QUERY_FLAG (op, FLAG_REMOVED)) 350 if (!QUERY_FLAG (op, FLAG_REMOVED))
354 fix_player (op); 351 op->update_stats ();
355 return 1; 352 return 1;
356 } 353 }
357 354
358 /* Deal with protection potions */ 355 /* Deal with protection potions */
359 force = NULL; 356 force = NULL;
… …
377 force->stats.food *= 10; 374 force->stats.food *= 10;
378 for (i = 0; i < NROFATTACKS; i++) 375 for (i = 0; i < NROFATTACKS; i++)
379 if (force->resist[i] > 0) 376 if (force->resist[i] > 0)
380 force->resist[i] = -force->resist[i]; /* prot => vuln */ 377 force->resist[i] = -force->resist[i]; /* prot => vuln */
381 } 378 }
379
382 force->speed_left = -1; 380 force->speed_left = -1;
383 force = insert_ob_in_ob (force, op); 381 force = insert_ob_in_ob (force, op);
384 CLEAR_FLAG (tmp, FLAG_APPLIED); 382 CLEAR_FLAG (tmp, FLAG_APPLIED);
385 SET_FLAG (force, FLAG_APPLIED); 383 SET_FLAG (force, FLAG_APPLIED);
386 change_abil (op, force); 384 change_abil (op, force);
… …
403 * that were grouped with the one consumed, his 401 * that were grouped with the one consumed, his
404 * stat will not be raised by them. fix_player just clears 402 * stat will not be raised by them. fix_player just clears
405 * up all the stats. 403 * up all the stats.
406 */ 404 */
407 CLEAR_FLAG (tmp, FLAG_APPLIED); 405 CLEAR_FLAG (tmp, FLAG_APPLIED);
408 fix_player (op); 406 op->update_stats ();
409 decrease_ob (tmp); 407 decrease_ob (tmp);
410 return 1; 408 return 1;
411} 409}
412 410
413/**************************************************************************** 411/****************************************************************************
… …
423 int count = 0; 421 int count = 0;
424 422
425 423
426 if (item == NULL) 424 if (item == NULL)
427 return 0; 425 return 0;
426
428 op = op->below; 427 op = op->below;
429 while (op != NULL) 428 while (op != NULL)
430 { 429 {
431 if (strcmp (op->arch->name, item) == 0) 430 if (strcmp (op->arch->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
… …
764{ 765{
765 object *otmp; 766 object *otmp;
766 767
767 if (op->type != PLAYER) 768 if (op->type != PLAYER)
768 return 0; 769 return 0;
770
769 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) 771 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC))
770 { 772 {
771 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll."); 773 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll.");
772 return 0; 774 return 0;
773 } 775 }
776
774 otmp = find_marked_object (op); 777 otmp = find_marked_object (op);
775 if (!otmp) 778 if (!otmp)
776 { 779 {
777 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark a weapon object."); 780 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark a weapon object.");
778 return 0; 781 return 0;
779 } 782 }
783
780 if (otmp->type != WEAPON && otmp->type != BOW) 784 if (otmp->type != WEAPON && otmp->type != BOW)
781 { 785 {
782 new_draw_info (NDI_UNIQUE, 0, op, "Marked item is not a weapon or bow"); 786 new_draw_info (NDI_UNIQUE, 0, op, "Marked item is not a weapon or bow");
783 return 0; 787 return 0;
784 } 788 }
789
785 new_draw_info (NDI_UNIQUE, 0, op, "Applied weapon builder."); 790 new_draw_info (NDI_UNIQUE, 0, op, "Applied weapon builder.");
786 improve_weapon (op, tmp, otmp); 791 improve_weapon (op, tmp, otmp);
787 esrv_send_item (op, otmp); 792 esrv_send_item (op, otmp);
788 return 1; 793 return 1;
789} 794}
… …
883 888
884 if (op->type == PLAYER) 889 if (op->type == PLAYER)
885 { 890 {
886 esrv_send_item (op, armour); 891 esrv_send_item (op, armour);
887 if (QUERY_FLAG (armour, FLAG_APPLIED)) 892 if (QUERY_FLAG (armour, FLAG_APPLIED))
888 fix_player (op); 893 op->update_stats ();
889 } 894 }
890 decrease_ob (improver); 895 decrease_ob (improver);
891 if (tmp) 896 if (tmp)
892 { 897 {
893 insert_ob_in_ob (tmp, op); 898 insert_ob_in_ob (tmp, op);
… …
952 price_in = nr * CONV_NEED (converter) * item->value; 957 price_in = nr * CONV_NEED (converter) * item->value;
953 } 958 }
954 else 959 else
955 { 960 {
956 price_in = item->value; 961 price_in = item->value;
957 remove_ob (item); 962 item->destroy ();
958 free_object (item);
959 } 963 }
960 } 964 }
961 965
962 if (converter->inv != NULL) 966 if (converter->inv != NULL)
963 { 967 {
… …
981 else 985 else
982 { 986 {
983 if (converter->other_arch == NULL) 987 if (converter->other_arch == NULL)
984 { 988 {
985 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n", 989 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n",
986 &converter->name, converter->map->path, converter->x, converter->y); 990 &converter->name, &converter->map->path, converter->x, converter->y);
987 return -1; 991 return -1;
988 } 992 }
989 993
990 item = object_create_arch (converter->other_arch); 994 item = object_create_arch (converter->other_arch);
991 fix_generated_item (item, converter, 0, 0, GT_MINIMAL); 995 fix_generated_item (item, converter, 0, 0, GT_MINIMAL);
… …
998 if (is_in_shop (converter)) 1002 if (is_in_shop (converter))
999 SET_FLAG (item, FLAG_UNPAID); 1003 SET_FLAG (item, FLAG_UNPAID);
1000 else if (price_in < item->nrof * item->value) 1004 else if (price_in < item->nrof * item->value)
1001 { 1005 {
1002 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n", 1006 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n",
1003 &converter->name, converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name); 1007 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
1004 1008
1005 /** 1009 /**
1006 * elmex: we are going to let the game continue, as the mapcreator 1010 * elmex: we are going to let the game continue, as the mapcreator
1007 * propably had something in mind when doing this 1011 * propably had something in mind when doing this
1008 */ 1012 */
… …
1015 * Handle apply on containers. 1019 * Handle apply on containers.
1016 * By Eneq(@csd.uu.se). 1020 * By Eneq(@csd.uu.se).
1017 * Moved to own function and added many features [Tero.Haatanen@lut.fi] 1021 * Moved to own function and added many features [Tero.Haatanen@lut.fi]
1018 * added the alchemical cauldron to the code -b.t. 1022 * added the alchemical cauldron to the code -b.t.
1019 */ 1023 */
1020
1021int 1024int
1022apply_container (object *op, object *sack) 1025apply_container (object *op, object *sack)
1023{ 1026{
1024 char buf[MAX_BUF]; 1027 if (op->type != PLAYER || !op->contr->ns)
1025 object *tmp;
1026
1027 if (op->type != PLAYER)
1028 return 0; /* This might change */ 1028 return 0; /* This might change */
1029 1029
1030 if (sack == NULL || sack->type != CONTAINER) 1030 if (!sack || sack->type != CONTAINER)
1031 { 1031 {
1032 LOG (llevError, "apply_container: %s is not container!\n", &sack->name); 1032 LOG (llevError, "apply_container: %s is not container!\n", sack ? &sack->name : "[nullobject]");
1033 return 0; 1033 return 0;
1034 } 1034 }
1035 op->contr->last_used = NULL; 1035
1036 op->contr->last_used_id = 0; 1036 op->contr->last_used = 0;
1037 1037
1038 if (sack->env != op) 1038 if (sack->env && sack->env != op)
1039 {
1040 new_draw_info (NDI_UNIQUE, 0, op, "You must put it onto the floor or into your inventory first.");
1041 return 1;
1039 { 1042 }
1040 if (sack->other_arch == NULL || sack->env != NULL) 1043
1044 // already applied == open on ground, or open in inv, or active in inv
1045 if (sack->flag [FLAG_APPLIED])
1046 {
1047 if (op->container == sack)
1041 { 1048 {
1042 new_draw_info (NDI_UNIQUE, 0, op, "You must get it first."); 1049 // open on ground or inv, so close
1050 op->close_container ();
1043 return 1; 1051 return 1;
1044 } 1052 }
1045 /* It's on the ground, the problems begin */ 1053 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 { 1054 {
1051 for (tmp = get_map_ob (sack->map, sack->x, sack->y); tmp && tmp->container != sack; tmp = tmp->above); 1055 // active, but not ours: some other player has opened it
1052 if (tmp)
1053 {
1054 /* some other player have opened it */
1055 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already occupied.", query_name (sack)); 1056 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already occupied.", query_name (sack));
1056 return 1; 1057 return 1;
1057 }
1058 }
1059 }
1060 if (QUERY_FLAG (sack, FLAG_APPLIED))
1061 { 1058 }
1062 if (op->container == NULL)
1063 {
1064 tmp = arch_to_object (sack->other_arch);
1065 /* not good, but insert_ob_in_ob() is too smart */
1066 CLEAR_FLAG (tmp, FLAG_REMOVED);
1067 tmp->x = tmp->y = 0;
1068 tmp->map = NULL;
1069 tmp->env = sack;
1070 if (sack->inv)
1071 sack->inv->above = tmp;
1072 tmp->below = sack->inv;
1073 tmp->above = NULL;
1074 sack->inv = tmp;
1075 sack->move_off = MOVE_ALL; /* trying force closing it */
1076 }
1077 else
1078 {
1079 sack->move_off = 0;
1080 tmp = sack->inv;
1081 if (tmp && tmp->type == CLOSE_CON)
1082 {
1083 remove_ob (tmp);
1084 free_object (tmp);
1085 }
1086 }
1087 }
1088 }
1089 1059
1090 if (QUERY_FLAG (sack, FLAG_APPLIED)) 1060 // fall through to opening it (active in inv)
1091 { 1061 }
1062 else if (sack->env)
1063 {
1064 // it is in our env, so activate it, do not open yet
1092 if (op->container) 1065 op->close_container ();
1093 { 1066 sack->flag [FLAG_APPLIED] = 1;
1094 if (op->container != sack) 1067 esrv_update_item (UPD_FLAGS, op, sack);
1095 { 1068 new_draw_info_format (NDI_UNIQUE, 0, op, "You ready %s.", query_name (sack));
1096 tmp = op->container; 1069 return 1;
1097 apply_container (op, tmp); 1070 }
1098 sprintf (buf, "You close %s and open ", query_name (tmp)); 1071
1099 op->container = sack; 1072 // it's locked?
1100 strcat (buf, query_name (sack)); 1073 if (sack->slaying)
1101 strcat (buf, "."); 1074 {
1102 } 1075 if (object *tmp = find_key (op, op, sack))
1103 else 1076 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 1077 else
1111 { 1078 {
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)); 1079 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; 1080 return 1;
1148 } 1081 }
1149 }
1150 } 1082 }
1151 new_draw_info (NDI_UNIQUE, 0, op, buf); 1083
1152 if (op->contr) 1084 op->open_container (sack);
1153 op->contr->socket.update_look = 1; 1085
1154 return 1; 1086 return 1;
1155} 1087}
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 1088
1282/** 1089/**
1283 * Handles dropping things on altar. 1090 * Handles dropping things on altar.
1284 * Returns true if sacrifice was accepted. 1091 * Returns true if sacrifice was accepted.
1285 */ 1092 */
… …
1346 1153
1347 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 1154 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1348 { 1155 {
1349 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9); 1156 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9);
1350 1157
1351 remove_ob (tmp); 1158 tmp->remove ();
1352 1159
1353 if (i == -1) 1160 if (i == -1)
1354 i = 0; 1161 i = 0;
1355 1162
1356 tmp->map = op->map; 1163 tmp->map = op->map;
… …
1420 { 1227 {
1421 LOG (llevError, "Internal shop-mat problem.\n"); 1228 LOG (llevError, "Internal shop-mat problem.\n");
1422 } 1229 }
1423 else 1230 else
1424 { 1231 {
1425 remove_ob (op); 1232 op->remove ();
1426 op->x += freearr_x[i]; 1233 op->x += freearr_x[i];
1427 op->y += freearr_y[i]; 1234 op->y += freearr_y[i];
1428 rv = insert_ob_in_map (op, op->map, shop_mat, 0) == NULL; 1235 rv = insert_ob_in_map (op, op->map, shop_mat, 0) == NULL;
1429 } 1236 }
1430 } 1237 }
… …
1628 1435
1629 1436
1630 case CONVERTER: 1437 case CONVERTER:
1631 if (convert_item (victim, trap) < 0) 1438 if (convert_item (victim, trap) < 0)
1632 { 1439 {
1633 object *op;
1634
1635 new_draw_info_format (NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name (trap)); 1440 new_draw_info_format (NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name (trap));
1636 1441 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 } 1442 }
1644 } 1443
1645 goto leave; 1444 goto leave;
1646 1445
1647 case TRIGGER_BUTTON: 1446 case TRIGGER_BUTTON:
1648 case TRIGGER_PEDESTAL: 1447 case TRIGGER_PEDESTAL:
1649 case TRIGGER_ALTAR: 1448 case TRIGGER_ALTAR:
… …
1678 if (victim->type == PLAYER && EXIT_PATH (trap)) 1477 if (victim->type == PLAYER && EXIT_PATH (trap))
1679 { 1478 {
1680 /* Basically, don't show exits leading to random maps the 1479 /* Basically, don't show exits leading to random maps the
1681 * players output. 1480 * players output.
1682 */ 1481 */
1683 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2) && strncmp (EXIT_PATH (trap), "/random/", 8)) 1482 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2))
1684 new_draw_info (NDI_NAVY, 0, victim, trap->msg); 1483 new_draw_info (NDI_NAVY, 0, victim, trap->msg);
1484
1685 enter_exit (victim, trap); 1485 victim->enter_exit (trap);
1686 } 1486 }
1687 goto leave; 1487 goto leave;
1688 1488
1689 case ENCOUNTER: 1489 case ENCOUNTER:
1690 /* may be some leftovers on this */ 1490 /* may be some leftovers on this */
… …
1705 1505
1706 apply_sign (victim, trap, 1); 1506 apply_sign (victim, trap, 1);
1707 goto leave; 1507 goto leave;
1708 1508
1709 case CONTAINER: 1509 case CONTAINER:
1710 if (victim->type == PLAYER)
1711 (void) esrv_apply_container (victim, trap);
1712 else
1713 (void) apply_container (victim, trap); 1510 apply_container (victim, trap);
1714 goto leave; 1511 goto leave;
1715 1512
1716 case RUNE: 1513 case RUNE:
1717 case TRAP: 1514 case TRAP:
1718 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE)) 1515 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE))
… …
1778 1575
1779 readable_message_type *msgType = get_readable_message_type (tmp); 1576 readable_message_type *msgType = get_readable_message_type (tmp);
1780 1577
1781 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, 1578 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1782 msgType->message_type, msgType->message_subtype, 1579 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); 1580 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1581 long_desc (tmp, op), &tmp->msg);
1784 1582
1785 /* gain xp from reading */ 1583 /* gain xp from reading */
1786 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1584 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1787 { /* only if not read before */ 1585 { /* only if not read before */
1788 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1586 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
1789 1587
1790 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1588 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1791 { 1589 {
1792 /*exp_gain *= 2; because they just identified it too */ 1590 /*exp_gain *= 2; because they just identified it too */
1793 SET_FLAG (tmp, FLAG_IDENTIFIED); 1591 SET_FLAG (tmp, FLAG_IDENTIFIED);
1592
1794 /* If in a container, update how it looks */ 1593 /* If in a container, update how it looks */
1795 if (tmp->env) 1594 if (tmp->env)
1796 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1595 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1797 else 1596 else
1798 op->contr->socket.update_look = 1; 1597 op->contr->ns->floorbox_update ();
1799 } 1598 }
1599
1800 change_exp (op, exp_gain, skill_ob->skill, 0); 1600 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 */ 1601 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */
1802 } 1602 }
1803} 1603}
1804 1604
… …
1853 } 1653 }
1854 return; 1654 return;
1855 } 1655 }
1856 1656
1857 play_sound_player_only (op->contr, SOUND_LEARN_SPELL, 0, 0); 1657 play_sound_player_only (op->contr, SOUND_LEARN_SPELL, 0, 0);
1858 tmp = get_object (); 1658 tmp = spell->clone ();
1859 copy_object (spell, tmp);
1860 insert_ob_in_ob (tmp, op); 1659 insert_ob_in_ob (tmp, op);
1861 1660
1862 if (special_prayer) 1661 if (special_prayer)
1863 {
1864 SET_FLAG (tmp, FLAG_STARTEQUIP); 1662 SET_FLAG (tmp, FLAG_STARTEQUIP);
1865 }
1866 1663
1867 esrv_add_spells (op->contr, tmp); 1664 esrv_add_spells (op->contr, tmp);
1868} 1665}
1869 1666
1870/** 1667/**
… …
1887 } 1684 }
1888 1685
1889 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You lose knowledge of %s.", spell); 1686 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You lose knowledge of %s.", spell);
1890 player_unready_range_ob (op->contr, spob); 1687 player_unready_range_ob (op->contr, spob);
1891 esrv_remove_spell (op->contr, spob); 1688 esrv_remove_spell (op->contr, spob);
1892 remove_ob (spob); 1689 spob->destroy ();
1893 free_object (spob);
1894} 1690}
1895 1691
1896/** 1692/**
1897 * Handles player applying a spellbook. 1693 * Handles player applying a spellbook.
1898 * Checks whether player has knowledge of required skill, doesn't already know the spell, 1694 * 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."); 1732 new_draw_info (NDI_UNIQUE, 0, op, "You can't read! Your attempt fails.");
1937 return; 1733 return;
1938 } 1734 }
1939 1735
1940 spell = tmp->inv; 1736 spell = tmp->inv;
1737
1941 if (!spell) 1738 if (!spell)
1942 { 1739 {
1943 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name); 1740 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."); 1741 new_draw_info (NDI_UNIQUE, 0, op, "The spellbook symbols make no sense.");
1945 return; 1742 return;
1946 } 1743 }
1947 1744
1948 if (spell->level > (skop->level + 10)) 1745 if (skop->level < int (sqrtf (spell->level) * 1.5f))
1949 { 1746 {
1950 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols."); 1747 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. [Your literacy level is too low]");
1951 return; 1748 return;
1952 } 1749 }
1953 1750
1954 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name); 1751 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name);
1955 1752
1956 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1753 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1957 { 1754 {
1958 identify (tmp); 1755 identify (tmp);
1756
1959 if (tmp->env) 1757 if (tmp->env)
1960 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1758 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1961 else 1759 else
1962 op->contr->socket.update_look = 1; 1760 op->contr->ns->floorbox_update ();
1963 } 1761 }
1964 1762
1965 /* I removed the check for special_prayer_mark here - it didn't make 1763 /* I removed the check for special_prayer_mark here - it didn't make
1966 * a lot of sense - special prayers are not found in spellbooks, and 1764 * a lot of sense - special prayers are not found in spellbooks, and
1967 * if the player doesn't know the spell, doesn't make a lot of sense that 1765 * if the player doesn't know the spell, doesn't make a lot of sense that
… …
1977 { 1775 {
1978 spell_skill = find_skill_by_name (op, spell->skill); 1776 spell_skill = find_skill_by_name (op, spell->skill);
1979 1777
1980 if (!spell_skill) 1778 if (!spell_skill)
1981 { 1779 {
1982 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use this spell", &spell->skill); 1780 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use this spell.", &spell->skill);
1983 return; 1781 return;
1984 } 1782 }
1985 1783
1986 if (spell_skill->level < spell->level) 1784 if (spell_skill->level < spell->level)
1987 { 1785 {
… …
2021 else 1819 else
2022 { 1820 {
2023 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1821 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0);
2024 new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell.\n"); 1822 new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell.\n");
2025 } 1823 }
1824
2026 decrease_ob (tmp); 1825 decrease_ob (tmp);
2027} 1826}
2028 1827
2029/** 1828/**
2030 * Handles applying a spell scroll. 1829 * Handles applying a spell scroll.
… …
2103 } 1902 }
2104 while (tmp->inv) 1903 while (tmp->inv)
2105 { 1904 {
2106 treas = tmp->inv; 1905 treas = tmp->inv;
2107 1906
2108 remove_ob (treas); 1907 treas->remove ();
2109 new_draw_info_format (NDI_UNIQUE, 0, op, "You find %s in the chest.", query_name (treas)); 1908 new_draw_info_format (NDI_UNIQUE, 0, op, "You find %s in the chest.", query_name (treas));
2110 1909
2111 treas->x = op->x; 1910 treas->x = op->x;
2112 treas->y = op->y; 1911 treas->y = op->y;
2113 treas = insert_ob_in_map (treas, op->map, op, INS_BELOW_ORIGINATOR); 1912 treas = insert_ob_in_map (treas, op->map, op, INS_BELOW_ORIGINATOR);
2114 1913
2115 if (treas && (treas->type == RUNE || treas->type == TRAP) && treas->level && QUERY_FLAG (op, FLAG_ALIVE)) 1914 if (treas && (treas->type == RUNE || treas->type == TRAP) && treas->level && QUERY_FLAG (op, FLAG_ALIVE))
2116 spring_trap (treas, op); 1915 spring_trap (treas, op);
1916
2117 /* If either player or container was destroyed, no need to do 1917 /* If either player or container was destroyed, no need to do
2118 * further processing. I think this should be enclused with 1918 * further processing. I think this should be enclused with
2119 * spring trap above, as I don't think there is otherwise 1919 * spring trap above, as I don't think there is otherwise
2120 * any way for the treasure chest or player to get killed 1920 * any way for the treasure chest or player to get killed
2121 */ 1921 */
… …
2225 if (meal->type != FLESH || !is_dragon_pl (op)) 2025 if (meal->type != FLESH || !is_dragon_pl (op))
2226 return 0; 2026 return 0;
2227 2027
2228 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces 2028 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces
2229 from the player's inventory */ 2029 from the player's inventory */
2030 shstr_cmp dragon_ability_force ("dragon_ability_force");
2031 shstr_cmp dragon_skin_force ("dragon_skin_force");
2032
2230 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2033 for (tmp = op->inv; tmp; tmp = tmp->below)
2231 {
2232 if (tmp->type == FORCE) 2034 if (tmp->type == FORCE)
2233 {
2234 if (strcmp (tmp->arch->name, "dragon_skin_force") == 0) 2035 if (tmp->arch->name == dragon_skin_force)
2235 skin = tmp; 2036 skin = tmp;
2236 else if (strcmp (tmp->arch->name, "dragon_ability_force") == 0) 2037 else if (tmp->arch->name == dragon_ability_force)
2237 abil = tmp; 2038 abil = tmp;
2238 }
2239 }
2240 2039
2241 /* if either skin or ability are missing, this is an old player 2040 /* if either skin or ability are missing, this is an old player
2242 which is not to be considered a dragon -> bail out */ 2041 which is not to be considered a dragon -> bail out */
2243 if (skin == NULL || abil == NULL) 2042 if (skin == NULL || abil == NULL)
2244 return 0; 2043 return 0;
… …
2285 /* doubled chance for resistance of ability-focus */ 2084 /* doubled chance for resistance of ability-focus */
2286 if (i == abil->stats.exp) 2085 if (i == abil->stats.exp)
2287 chance = MIN (100., chance * 2.); 2086 chance = MIN (100., chance * 2.);
2288 2087
2289 /* now make the throw and save all winners (Don't insert luck bonus here!) */ 2088 /* now make the throw and save all winners (Don't insert luck bonus here!) */
2290 if (RANDOM () % 10000 < (int) (chance * 100)) 2089 if (rndm (10000) < (unsigned int) (chance * 100))
2291 { 2090 {
2292 atnr_winner[winners] = i; 2091 atnr_winner[winners] = i;
2293 winners++; 2092 winners++;
2294 } 2093 }
2295 2094
… …
2326 2125
2327 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95) 2126 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95)
2328 { 2127 {
2329 /* resistance increased! */ 2128 /* resistance increased! */
2330 skin->resist[i]++; 2129 skin->resist[i]++;
2331 fix_player (op); 2130 op->update_stats ();
2332 2131
2333 sprintf (buf, "Your skin is now more resistant to %s!", change_resist_msg[i]); 2132 sprintf (buf, "Your skin is now more resistant to %s!", change_resist_msg[i]);
2334 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, buf); 2133 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, buf);
2335 } 2134 }
2336 2135
… …
2355 } 2154 }
2356 } 2155 }
2357 return 1; 2156 return 1;
2358} 2157}
2359 2158
2360static void
2361apply_savebed (object *pl)
2362{
2363#ifndef COZY_SERVER
2364 if (!pl->contr->name_changed || !pl->stats.exp)
2365 {
2366 new_draw_info (NDI_UNIQUE, 0, pl, "You don't deserve to save your character yet.");
2367 return;
2368 }
2369#endif
2370 INVOKE_PLAYER (LOGOUT, pl->contr);
2371 /* Need to call terminate_all_pets() before we remove the player ob */
2372 terminate_all_pets (pl);
2373 remove_ob (pl);
2374 pl->direction = 0;
2375 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, pl, "%s leaves the game.", &pl->name);
2376
2377 /* update respawn position */
2378 strcpy (pl->contr->savebed_map, pl->map->path);
2379 pl->contr->bed_x = pl->x;
2380 pl->contr->bed_y = pl->y;
2381
2382 strcpy (pl->contr->killer, "left");
2383 check_score (pl); /* Always check score */
2384 (void) save_player (pl, 0);
2385 pl->map->players--;
2386#if MAP_MAXTIMEOUT
2387 MAP_SWAP_TIME (pl->map) = MAP_TIMEOUT (pl->map);
2388#endif
2389 play_again (pl);
2390 pl->speed = 0;
2391 update_ob_speed (pl);
2392}
2393
2394/** 2159/**
2395 * Handles applying an improve armor scroll. 2160 * Handles applying an improve armor scroll.
2396 * Does some sanity checks, then calls improve_armour. 2161 * Does some sanity checks, then calls improve_armour.
2397 */ 2162 */
2398static void 2163static void
… …
2403 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) 2168 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC))
2404 { 2169 {
2405 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll."); 2170 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll.");
2406 return; 2171 return;
2407 } 2172 }
2173
2408 armor = find_marked_object (op); 2174 armor = find_marked_object (op);
2175
2409 if (!armor) 2176 if (!armor)
2410 { 2177 {
2411 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark an armor object."); 2178 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark an armor object.");
2412 return; 2179 return;
2413 } 2180 }
2181
2414 if (armor->type != ARMOUR 2182 if (armor->type != ARMOUR
2415 && armor->type != CLOAK 2183 && armor->type != CLOAK
2416 && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET) 2184 && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET)
2417 { 2185 {
2418 new_draw_info (NDI_UNIQUE, 0, op, "Your marked item is not armour!\n"); 2186 new_draw_info (NDI_UNIQUE, 0, op, "Your marked item is not armour!\n");
… …
2421 2189
2422 new_draw_info (NDI_UNIQUE, 0, op, "Applying armour enchantment."); 2190 new_draw_info (NDI_UNIQUE, 0, op, "Applying armour enchantment.");
2423 improve_armour (op, tmp, armor); 2191 improve_armour (op, tmp, armor);
2424} 2192}
2425 2193
2426
2427extern void 2194extern void
2428apply_poison (object *op, object *tmp) 2195apply_poison (object *op, object *tmp)
2429{ 2196{
2430 if (op->type == PLAYER) 2197 if (op->type == PLAYER)
2431 { 2198 {
… …
2442 handle_apply_yield (tmp); 2209 handle_apply_yield (tmp);
2443 decrease_ob (tmp); 2210 decrease_ob (tmp);
2444} 2211}
2445 2212
2446/** 2213/**
2447 * This fonction return true if the exit is not a 2 ways one or it is 2 ways, valid exit. 2214 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit.
2448 * A valid 2 way exit means: 2215 * A valid 2 way exit means:
2449 * -You can come back (there is another exit at the other side) 2216 * -You can come back (there is another exit at the other side)
2450 * -You are 2217 * -You are
2451 * ° the owner of the exit 2218 * ° the owner of the exit
2452 * ° or in the same party as the owner 2219 * ° or in the same party as the owner
2453 * 2220 *
2454 * Note: a owner in a 2 way exit is saved as the owner's name 2221 * Note: a owner in a 2 way exit is saved as the owner's name
2455 * in the field exit->name cause the field exit->owner doesn't 2222 * in the field exit->name cause the field exit->owner doesn't
2456 * survive in the swapping (in fact the whole exit doesn't survive). 2223 * survive in the swapping (in fact the whole exit doesn't survive).
2457 */ 2224 */
2458int 2225int
2459is_legal_2ways_exit (object *op, object *exit) 2226is_legal_2ways_exit (object *op, object *exit)
2460{ 2227{
2461 object *tmp;
2462 object *exit_owner;
2463 player *pp;
2464 maptile *exitmap;
2465
2466 if (exit->stats.exp != 1) 2228 if (exit->stats.exp != 1)
2467 return 1; /*This is not a 2 way, so it is legal */ 2229 return 1; /*This is not a 2 way, so it is legal */
2230
2231#if 0 //TODO
2468 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race) 2232 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race)
2469 return 0; /* This is a reset town portal */ 2233 return 0; /* This is a reset town portal */
2470 /* To know if an exit has a correspondant, we look at 2234#endif
2471 * all the exits in destination and try to find one with same path as 2235
2472 * the current exit's position */ 2236 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map);
2473 if (!strncmp (EXIT_PATH (exit), settings.localdir, strlen (settings.localdir))) 2237
2474 exitmap = ready_map_name (EXIT_PATH (exit), MAP_PLAYER_UNIQUE);
2475 else
2476 exitmap = ready_map_name (EXIT_PATH (exit), 0);
2477 if (exitmap) 2238 if (exitmap)
2478 { 2239 {
2240 exitmap->load_sync ();
2241
2479 tmp = get_map_ob (exitmap, EXIT_X (exit), EXIT_Y (exit)); 2242 object *tmp = exitmap->at (EXIT_X (exit), EXIT_Y (exit)).bot;
2243
2480 if (!tmp) 2244 if (!tmp)
2481 return 0; 2245 return 0;
2482 for ((tmp = get_map_ob (exitmap, EXIT_X (exit), EXIT_Y (exit))); tmp; tmp = tmp->above) 2246
2247 for (; tmp; tmp = tmp->above)
2483 { 2248 {
2484 if (tmp->type != EXIT) 2249 if (tmp->type != EXIT)
2485 continue; /*Not an exit */ 2250 continue; /*Not an exit */
2251
2486 if (!EXIT_PATH (tmp)) 2252 if (!EXIT_PATH (tmp))
2487 continue; /*Not a valid exit */ 2253 continue; /*Not a valid exit */
2254
2488 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y)) 2255 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y))
2489 continue; /*Not in the same place */ 2256 continue; /*Not in the same place */
2257
2490 if (strcmp (exit->map->path, EXIT_PATH (tmp)) != 0) 2258 if (exit->map->path != EXIT_PATH (tmp))
2491 continue; /*Not in the same map */ 2259 continue; /*Not in the same map */
2492 2260
2493 /* From here we have found the exit is valid. However we do 2261 /* From here we have found the exit is valid. However we do
2494 * here the check of the exit owner. It is important for the 2262 * here the check of the exit owner. It is important for the
2495 * town portals to prevent strangers from visiting your appartments 2263 * town portals to prevent strangers from visiting your appartments
2496 */ 2264 */
2497 if (!exit->race) 2265 if (!exit->race)
2498 return 1; /*No owner, free for all! */ 2266 return 1; /*No owner, free for all! */
2267
2499 exit_owner = NULL; 2268 object *exit_owner = 0;
2500 for (pp = first_player; pp; pp = pp->next) 2269
2270 for_all_players (pp)
2501 { 2271 {
2502 if (!pp->ob) 2272 if (!pp->ob)
2503 continue; 2273 continue;
2274
2504 if (pp->ob->name != exit->race) 2275 if (pp->ob->name != exit->race)
2505 continue; 2276 continue;
2277
2506 exit_owner = pp->ob; /*We found a player which correspond to the player name */ 2278 exit_owner = pp->ob; /*We found a player which correspond to the player name */
2507 break; 2279 break;
2508 } 2280 }
2281
2509 if (!exit_owner) 2282 if (!exit_owner)
2510 return 0; /* No more owner */ 2283 return 0; /* No more owner */
2284
2511 if (exit_owner->contr == op->contr) 2285 if (exit_owner->contr == op->contr)
2512 return 1; /*It is your exit */ 2286 return 1; /*It is your exit */
2287
2513 if (exit_owner && /*There is a owner */ 2288 if (exit_owner && /*There is a owner */
2514 (op->contr) && /*A player tries to pass */ 2289 (op->contr) && /*A player tries to pass */
2515 ((exit_owner->contr->party == NULL) || /*No pass if controller has no party */ 2290 ((exit_owner->contr->party == NULL) || /*No pass if controller has no party */
2516 (exit_owner->contr->party != op->contr->party))) /* Or not the same as op */ 2291 (exit_owner->contr->party != op->contr->party))) /* Or not the same as op */
2517 return 0; 2292 return 0;
2293
2518 return 1; 2294 return 1;
2519 } 2295 }
2520 } 2296 }
2297
2521 return 0; 2298 return 0;
2522} 2299}
2523
2524 2300
2525/** 2301/**
2526 * Main apply handler. 2302 * Main apply handler.
2527 * 2303 *
2528 * Checks for unpaid items before applying. 2304 * Checks for unpaid items before applying.
… …
2536 * being applied. 2312 * being applied.
2537 * 2313 *
2538 * aflag is special (always apply/unapply) flags. Nothing is done with 2314 * aflag is special (always apply/unapply) flags. Nothing is done with
2539 * them in this function - they are passed to apply_special 2315 * them in this function - they are passed to apply_special
2540 */ 2316 */
2541
2542int 2317int
2543manual_apply (object *op, object *tmp, int aflag) 2318manual_apply (object *op, object *tmp, int aflag)
2544{ 2319{
2545 if (tmp->head) 2320 if (tmp->head)
2546 tmp = tmp->head; 2321 tmp = tmp->head;
… …
2551 { 2326 {
2552 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first."); 2327 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first.");
2553 return 1; 2328 return 1;
2554 } 2329 }
2555 else 2330 else
2556 {
2557 return 0; /* monsters just skip unpaid items */ 2331 return 0; /* monsters just skip unpaid items */
2558 }
2559 } 2332 }
2560 2333
2561 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op))) 2334 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op)))
2562 return RESULT_INT (0); 2335 return RESULT_INT (0);
2563 2336
2564 switch (tmp->type) 2337 switch (tmp->type)
2565 { 2338 {
2566
2567 case CF_HANDLE: 2339 case CF_HANDLE:
2568 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2340 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle.");
2569 play_sound_map (op->map, op->x, op->y, SOUND_TURN_HANDLE); 2341 play_sound_map (op->map, op->x, op->y, SOUND_TURN_HANDLE);
2570 tmp->value = tmp->value ? 0 : 1; 2342 tmp->value = tmp->value ? 0 : 1;
2571 SET_ANIMATION (tmp, tmp->value); 2343 SET_ANIMATION (tmp, tmp->value);
… …
2578 { 2350 {
2579 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2351 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle.");
2580 play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE); 2352 play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE);
2581 } 2353 }
2582 else 2354 else
2583 {
2584 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move."); 2355 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move.");
2585 } 2356
2586 return 1; 2357 return 1;
2587 2358
2588 case EXIT: 2359 case EXIT:
2589 if (op->type != PLAYER) 2360 if (op->type != PLAYER)
2590 return 0; 2361 return 0;
2362
2591 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2363 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp))
2592 {
2593 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp)); 2364 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp));
2594 }
2595 else 2365 else
2596 { 2366 {
2597 /* Don't display messages for random maps. */ 2367 /* Don't display messages for random maps. */
2598 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2) && strncmp (EXIT_PATH (tmp), "/random/", 8)) 2368 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2))
2599 new_draw_info (NDI_NAVY, 0, op, tmp->msg); 2369 new_draw_info (NDI_NAVY, 0, op, tmp->msg);
2370
2600 enter_exit (op, tmp); 2371 op->enter_exit (tmp);
2601 } 2372 }
2373
2602 return 1; 2374 return 1;
2603 2375
2604 case SIGN: 2376 case SIGN:
2605 apply_sign (op, tmp, 0); 2377 apply_sign (op, tmp, 0);
2606 return 1; 2378 return 1;
… …
2610 { 2382 {
2611 apply_book (op, tmp); 2383 apply_book (op, tmp);
2612 return 1; 2384 return 1;
2613 } 2385 }
2614 else 2386 else
2615 {
2616 return 0; 2387 return 0;
2617 }
2618 2388
2619 case SKILLSCROLL: 2389 case SKILLSCROLL:
2620 if (op->type == PLAYER) 2390 if (op->type == PLAYER)
2621 { 2391 {
2622 apply_skillscroll (op, tmp); 2392 apply_skillscroll (op, tmp);
2623 return 1; 2393 return 1;
2624 } 2394 }
2395 else
2625 return 0; 2396 return 0;
2626 2397
2627 case SPELLBOOK: 2398 case SPELLBOOK:
2628 if (op->type == PLAYER) 2399 if (op->type == PLAYER)
2629 { 2400 {
2630 apply_spellbook (op, tmp); 2401 apply_spellbook (op, tmp);
2631 return 1; 2402 return 1;
2632 } 2403 }
2404 else
2633 return 0; 2405 return 0;
2634 2406
2635 case SCROLL: 2407 case SCROLL:
2636 apply_scroll (op, tmp, 0); 2408 apply_scroll (op, tmp, 0);
2637 return 1; 2409 return 1;
2638 2410
2639 case POTION: 2411 case POTION:
2640 (void) apply_potion (op, tmp); 2412 apply_potion (op, tmp);
2641 return 1; 2413 return 1;
2642 2414
2643 /* Eneq(@csd.uu.se): Handle apply on containers. */ 2415 /* Eneq(@csd.uu.se): Handle apply on containers. */
2416 //TODO: remove, as it is unsed?
2644 case CLOSE_CON: 2417 case CLOSE_CON:
2645 if (op->type == PLAYER)
2646 (void) esrv_apply_container (op, tmp->env);
2647 else
2648 (void) apply_container (op, tmp->env); 2418 apply_container (op, tmp->env);
2649 return 1; 2419 return 1;
2650 2420
2651 case CONTAINER: 2421 case CONTAINER:
2652 if (op->type == PLAYER)
2653 (void) esrv_apply_container (op, tmp);
2654 else
2655 (void) apply_container (op, tmp); 2422 apply_container (op, tmp);
2656 return 1; 2423 return 1;
2657 2424
2658 case TREASURE: 2425 case TREASURE:
2659 if (op->type == PLAYER) 2426 if (op->type == PLAYER)
2660 { 2427 {
2661 apply_treasure (op, tmp); 2428 apply_treasure (op, tmp);
2662 return 1; 2429 return 1;
2663 } 2430 }
2664 else 2431 else
2665 {
2666 return 0; 2432 return 0;
2667 }
2668 2433
2669 case WEAPON: 2434 case WEAPON:
2670 case ARMOUR: 2435 case ARMOUR:
2671 case BOOTS: 2436 case BOOTS:
2672 case GLOVES: 2437 case GLOVES:
… …
2685 case LAMP: 2450 case LAMP:
2686 case BUILDER: 2451 case BUILDER:
2687 case SKILL_TOOL: 2452 case SKILL_TOOL:
2688 if (tmp->env != op) 2453 if (tmp->env != op)
2689 return 2; /* not in inventory */ 2454 return 2; /* not in inventory */
2455
2690 (void) apply_special (op, tmp, aflag); 2456 apply_special (op, tmp, aflag);
2691 return 1; 2457 return 1;
2692 2458
2693 case DRINK: 2459 case DRINK:
2694 case FOOD: 2460 case FOOD:
2695 case FLESH: 2461 case FLESH:
… …
2699 case POISON: 2465 case POISON:
2700 apply_poison (op, tmp); 2466 apply_poison (op, tmp);
2701 return 1; 2467 return 1;
2702 2468
2703 case SAVEBED: 2469 case SAVEBED:
2704 if (op->type == PLAYER)
2705 {
2706 apply_savebed (op);
2707 return 1; 2470 return 1;
2708 }
2709 else
2710 {
2711 return 0;
2712 }
2713 2471
2714 case ARMOUR_IMPROVER: 2472 case ARMOUR_IMPROVER:
2715 if (op->type == PLAYER) 2473 if (op->type == PLAYER)
2716 { 2474 {
2717 apply_armour_improver (op, tmp); 2475 apply_armour_improver (op, tmp);
2718 return 1; 2476 return 1;
2719 } 2477 }
2720 else 2478 else
2721 {
2722 return 0; 2479 return 0;
2723 }
2724 2480
2725 case WEAPON_IMPROVER: 2481 case WEAPON_IMPROVER:
2726 (void) check_improve_weapon (op, tmp); 2482 check_improve_weapon (op, tmp);
2727 return 1; 2483 return 1;
2728 2484
2729 case CLOCK: 2485 case CLOCK:
2730 if (op->type == PLAYER) 2486 if (op->type == PLAYER)
2731 { 2487 {
… …
2739 play_sound_player_only (op->contr, SOUND_CLOCK, 0, 0); 2495 play_sound_player_only (op->contr, SOUND_CLOCK, 0, 0);
2740 new_draw_info (NDI_UNIQUE, 0, op, buf); 2496 new_draw_info (NDI_UNIQUE, 0, op, buf);
2741 return 1; 2497 return 1;
2742 } 2498 }
2743 else 2499 else
2744 {
2745 return 0; 2500 return 0;
2746 }
2747 2501
2748 case MENU: 2502 case MENU:
2749 if (op->type == PLAYER) 2503 if (op->type == PLAYER)
2750 { 2504 {
2751 shop_listing (op); 2505 shop_listing (tmp, op);
2752 return 1; 2506 return 1;
2753 } 2507 }
2754 else 2508 else
2755 {
2756 return 0; 2509 return 0;
2757 }
2758 2510
2759 case POWER_CRYSTAL: 2511 case POWER_CRYSTAL:
2760 apply_power_crystal (op, tmp); /* see egoitem.c */ 2512 apply_power_crystal (op, tmp); /* see egoitem.c */
2761 return 1; 2513 return 1;
2762 2514
… …
2765 { 2517 {
2766 apply_lighter (op, tmp); 2518 apply_lighter (op, tmp);
2767 return 1; 2519 return 1;
2768 } 2520 }
2769 else 2521 else
2770 {
2771 return 0; 2522 return 0;
2772 }
2773 2523
2774 case ITEM_TRANSFORMER: 2524 case ITEM_TRANSFORMER:
2775 apply_item_transformer (op, tmp); 2525 apply_item_transformer (op, tmp);
2776 return 1; 2526 return 1;
2777 2527
… …
2808 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_WAS_WIZ) && !QUERY_FLAG (pl, FLAG_WAS_WIZ)) 2558 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_WAS_WIZ) && !QUERY_FLAG (pl, FLAG_WAS_WIZ))
2809 { 2559 {
2810 play_sound_map (pl->map, pl->x, pl->y, SOUND_OB_EVAPORATE); 2560 play_sound_map (pl->map, pl->x, pl->y, SOUND_OB_EVAPORATE);
2811 new_draw_info (NDI_UNIQUE, 0, pl, "The object disappears in a puff " "of smoke!"); 2561 new_draw_info (NDI_UNIQUE, 0, pl, "The object disappears in a puff " "of smoke!");
2812 new_draw_info (NDI_UNIQUE, 0, pl, "It must have been an illusion."); 2562 new_draw_info (NDI_UNIQUE, 0, pl, "It must have been an illusion.");
2813 remove_ob (op); 2563 op->destroy ();
2814 free_object (op);
2815 return 1; 2564 return 1;
2816 } 2565 }
2817 2566
2818 pl->contr->last_used = op; 2567 pl->contr->last_used = op;
2819 pl->contr->last_used_id = op->count;
2820 2568
2821 tmp = manual_apply (pl, op, aflag); 2569 tmp = manual_apply (pl, op, aflag);
2822 if (!quiet) 2570 if (!quiet)
2823 { 2571 {
2824 if (tmp == 0) 2572 if (tmp == 0)
… …
2832/** 2580/**
2833 * player_apply_below attempts to apply the object 'below' the player. 2581 * player_apply_below attempts to apply the object 'below' the player.
2834 * If the player has an open container, we use that for below, otherwise 2582 * If the player has an open container, we use that for below, otherwise
2835 * we use the ground. 2583 * we use the ground.
2836 */ 2584 */
2837
2838void 2585void
2839player_apply_below (object *pl) 2586player_apply_below (object *pl)
2840{ 2587{
2841 object *tmp, *next;
2842 int floors; 2588 int floors = 0;
2843 2589
2844 /* If using a container, set the starting item to be the top 2590 /* If using a container, set the starting item to be the top
2845 * item in the container. Otherwise, use the map. 2591 * item in the container. Otherwise, use the map.
2846 */
2847 tmp = (pl->container != NULL) ? pl->container->inv : pl->below;
2848
2849 /* This is perhaps more complicated. However, I want to make sure that 2592 * This is perhaps more complicated. However, I want to make sure that
2850 * we don't use a corrupt pointer for the next object, so we get the 2593 * we don't use a corrupt pointer for the next object, so we get the
2851 * next object in the stack before applying. This is can only be a 2594 * next object in the stack before applying. This is can only be a
2852 * problem if player_apply() has a bug in that it uses the object but does 2595 * problem if player_apply() has a bug in that it uses the object but does
2853 * not return a proper value. 2596 * not return a proper value.
2854 */ 2597 */
2855 for (floors = 0; tmp != NULL; tmp = next) 2598 for (object *next, *tmp = pl->container ? pl->container->inv : pl->below; tmp; tmp = next)
2856 { 2599 {
2857 next = tmp->below; 2600 next = tmp->below;
2601
2858 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 2602 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
2859 floors++; 2603 floors++;
2860 else if (floors > 0) 2604 else if (floors > 0)
2861 return; /* process only floor objects after first floor object */ 2605 return; /* process only floor objects after first floor object */
2862 2606
… …
2882 * to keep the size of apply_special to a more managable size. 2626 * to keep the size of apply_special to a more managable size.
2883 */ 2627 */
2884static int 2628static int
2885unapply_special (object *who, object *op, int aflags) 2629unapply_special (object *who, object *op, int aflags)
2886{ 2630{
2887 if (INVOKE_OBJECT (BE_UNREADY, op, ARG_OBJECT (who), ARG_INT (aflags)) || INVOKE_OBJECT (UNREADY, who, ARG_OBJECT (op), ARG_INT (aflags))) 2631 if (INVOKE_OBJECT (BE_UNREADY, op, ARG_OBJECT (who), ARG_INT (aflags))
2632 || INVOKE_OBJECT (UNREADY, who, ARG_OBJECT (op), ARG_INT (aflags)))
2888 return RESULT_INT (0); 2633 return RESULT_INT (0);
2889 2634
2890 object *tmp2; 2635 object *tmp2;
2891 2636
2892 CLEAR_FLAG (op, FLAG_APPLIED); 2637 CLEAR_FLAG (op, FLAG_APPLIED);
2638
2893 switch (op->type) 2639 switch (op->type)
2894 { 2640 {
2895 case WEAPON: 2641 case WEAPON:
2896 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op)); 2642 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op));
2897 2643
2898 (void) change_abil (who, op); 2644 change_abil (who, op);
2899 if (QUERY_FLAG (who, FLAG_READY_WEAPON))
2900 CLEAR_FLAG (who, FLAG_READY_WEAPON); 2645 CLEAR_FLAG (who, FLAG_READY_WEAPON);
2646
2647 if (who->contr)
2648 {
2649 if (who->contr->combat_ob == op)
2650 who->contr->combat_ob = 0;
2651
2652 if (who->current_weapon == op)
2653 who->current_weapon = 0;
2654 }
2655
2901 clear_skill (who); 2656 clear_skill (who);
2902 break; 2657 break;
2903 2658
2904 case SKILL: /* allows objects to impart skills */ 2659 case SKILL: /* allows objects to impart skills */
2905 case SKILL_TOOL: 2660 case SKILL_TOOL:
2906 if (op != who->chosen_skill) 2661 if (op != who->chosen_skill)
2907 {
2908 LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n"); 2662 LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n");
2663
2664 if (who->contr)
2909 } 2665 {
2910 if (who->type == PLAYER)
2911 {
2912 if (who->contr->shoottype == range_skill)
2913 who->contr->shoottype = range_none;
2914 if (!op->invisible) 2666 if (!op->invisible)
2915 {
2916 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op)); 2667 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op));
2917 }
2918 else 2668 else
2919 {
2920 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill); 2669 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill);
2921 } 2670 }
2922 } 2671
2923 (void) change_abil (who, op); 2672 change_abil (who, op);
2924 who->chosen_skill = NULL; 2673 who->chosen_skill = 0;
2925 CLEAR_FLAG (who, FLAG_READY_SKILL); 2674 CLEAR_FLAG (who, FLAG_READY_SKILL);
2926 break; 2675 break;
2927 2676
2928 case ARMOUR: 2677 case ARMOUR:
2929 case HELMET: 2678 case HELMET:
… …
2934 case AMULET: 2683 case AMULET:
2935 case GIRDLE: 2684 case GIRDLE:
2936 case BRACERS: 2685 case BRACERS:
2937 case CLOAK: 2686 case CLOAK:
2938 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op)); 2687 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op));
2939 (void) change_abil (who, op); 2688 change_abil (who, op);
2940 break; 2689 break;
2690
2941 case LAMP: 2691 case LAMP:
2942 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name); 2692 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name);
2943 tmp2 = arch_to_object (op->other_arch); 2693 tmp2 = arch_to_object (op->other_arch);
2944 tmp2->x = op->x; 2694 tmp2->x = op->x;
2945 tmp2->y = op->y; 2695 tmp2->y = op->y;
… …
2950 CLEAR_FLAG (tmp2, FLAG_APPLIED); 2700 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2951 2701
2952 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 2702 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2953 SET_FLAG (tmp2, FLAG_INV_LOCKED); 2703 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2954 2704
2955 if (who->type == PLAYER) 2705 if (who->contr)
2956 esrv_del_item (who->contr, op->count); 2706 esrv_del_item (who->contr, op->count);
2957 2707
2958 remove_ob (op); 2708 op->destroy ();
2959 free_object (op);
2960 insert_ob_in_ob (tmp2, who); 2709 insert_ob_in_ob (tmp2, who);
2961 fix_player (who); 2710 who->update_stats ();
2711
2962 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 2712 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2963 { 2713 {
2964 if (who->type == PLAYER) 2714 if (who->contr)
2965 { 2715 {
2966 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 2716 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
2967 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 2717 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2968 } 2718 }
2969 } 2719 }
2970 if (who->type == PLAYER) 2720
2721 if (who->contr)
2971 esrv_send_item (who, tmp2); 2722 esrv_send_item (who, tmp2);
2723
2972 return 1; /* otherwise, an attempt to drop causes problems */ 2724 return 1; /* otherwise, an attempt to drop causes problems */
2973 break; 2725
2974 case BOW: 2726 case BOW:
2975 case WAND: 2727 case WAND:
2976 case ROD: 2728 case ROD:
2977 case HORN: 2729 case HORN:
2978 clear_skill (who); 2730 clear_skill (who);
2731
2732 if (who->contr)
2733 {
2979 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2734 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2980 if (who->type == PLAYER) 2735
2981 { 2736 if (who->contr->ranged_ob == op)
2982 who->contr->shoottype = range_none; 2737 who->contr->ranged_ob = 0;
2738
2739 if (who->current_weapon == op)
2740 who->current_weapon = 0;
2983 } 2741 }
2984 else 2742 else
2985 { 2743 {
2986 if (op->type == BOW) 2744 if (op->type == BOW)
2987 CLEAR_FLAG (who, FLAG_READY_BOW); 2745 CLEAR_FLAG (who, FLAG_READY_BOW);
2988 else 2746 else
2989 CLEAR_FLAG (who, FLAG_READY_RANGE); 2747 CLEAR_FLAG (who, FLAG_READY_RANGE);
2990 } 2748 }
2749
2991 break; 2750 break;
2992 2751
2993 case BUILDER: 2752 case BUILDER:
2753 if (who->contr)
2754 {
2994 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2755 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2995 who->contr->shoottype = range_none; 2756
2996 who->contr->ranges[range_builder] = NULL; 2757 if (who->contr->ranged_ob == op)
2758 who->contr->ranged_ob = 0;
2759 }
2997 break; 2760 break;
2998 2761
2999 default: 2762 default:
3000 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op)); 2763 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op));
3001 break; 2764 break;
3002 } 2765 }
3003 2766
3004 fix_player (who); 2767 who->update_stats ();
3005 2768
3006 if (!(aflags & AP_NO_MERGE)) 2769 if (!(aflags & AP_NO_MERGE))
3007 { 2770 {
3008 object *tmp;
3009
3010 tmp = merge_ob (op, NULL); 2771 object *tmp = merge_ob (op, 0);
3011 if (who->type == PLAYER) 2772
2773 if (who->contr)
3012 { 2774 {
3013 if (tmp) 2775 if (tmp)
3014 { /* it was merged */ 2776 { /* it was merged */
3015 esrv_del_item (who->contr, op->count); 2777 esrv_del_item (who->contr, op->count);
3016 op = tmp; 2778 op = tmp;
3017 } 2779 }
3018 2780
3019 esrv_send_item (who, op); 2781 esrv_send_item (who, op);
3020 } 2782 }
3021 } 2783 }
2784
3022 return 0; 2785 return 0;
3023} 2786}
3024 2787
3025/** 2788/**
3026 * Returns the object that is using location 'loc'. 2789 * Returns the object that is using location 'loc'.
… …
3034 * loc is the index into the array we are looking for a match. 2797 * loc is the index into the array we are looking for a match.
3035 * don't return invisible objects unless they are skill objects 2798 * don't return invisible objects unless they are skill objects
3036 * invisible other objects that use 2799 * invisible other objects that use
3037 * up body locations can be used as restrictions. 2800 * up body locations can be used as restrictions.
3038 */ 2801 */
3039object * 2802static object *
3040get_item_from_body_location (object *start, int loc) 2803get_item_from_body_location (int loc, object *start)
3041{ 2804{
3042 object *tmp;
3043
3044 if (!start) 2805 if (start)
3045 return NULL;
3046
3047 for (tmp = start; tmp; tmp = tmp->below) 2806 for (object *tmp = start; tmp; tmp = tmp->below)
3048 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->body_info[loc] && (!tmp->invisible || tmp->type == SKILL)) 2807 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->slot[loc].info && (!tmp->invisible || tmp->type == SKILL))
3049 return tmp; 2808 return tmp;
3050 2809
3051 return NULL; 2810 return 0;
3052} 2811}
3053
3054
3055 2812
3056/** 2813/**
3057 * 'op' wants to apply an object, but can't because of other equipment. 2814 * 'op' wants to apply an object, but can't because of other equipment.
3058 * This should only be called when it is known 2815 * This should only be called when it is known
3059 * that there are objects to unapply. This makes pretty heavy 2816 * that there are objects to unapply. This makes pretty heavy
… …
3065 * another function that does just that. 2822 * another function that does just that.
3066 */ 2823 */
3067int 2824int
3068unapply_for_ob (object *who, object *op, int aflags) 2825unapply_for_ob (object *who, object *op, int aflags)
3069{ 2826{
3070 int i; 2827 if (op->is_range ())
3071 object *tmp = NULL, *last;
3072
3073 /* If we are applying a shield or weapon, unapply any equipped shield
3074 * or weapons first - only allowed to use one weapon/shield at a time.
3075 */
3076 if (op->type == WEAPON || op->type == SHIELD)
3077 {
3078 for (tmp = who->inv; tmp; tmp = tmp->below) 2828 for (object *tmp = who->inv; tmp; tmp = tmp->below)
3079 {
3080 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type) 2829 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ())
3081 {
3082 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))) 2830 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)))
3083 { 2831 {
3084 if (aflags & AP_PRINT) 2832 if (aflags & AP_PRINT)
3085 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2833 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp));
3086 else 2834 else
3087 unapply_special (who, tmp, aflags); 2835 unapply_special (who, tmp, aflags);
3088 } 2836 }
3089 else 2837 else
3090 { 2838 {
3091 /* In this case, we want to try and remove a cursed item. 2839 /* In this case, we want to try and remove a cursed item.
3092 * While we know it won't work, we want unapply_special to 2840 * While we know it won't work, we want unapply_special to
3093 * at least generate the message. 2841 * at least generate the message.
3094 */ 2842 */
3095 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (tmp)); 2843 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't remove the %s.", query_name (tmp));
3096 return 1; 2844 return 1;
3097 }
3098
3099 } 2845 }
3100 }
3101 }
3102 2846
3103 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 2847 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
3104 { 2848 {
3105 /* this used up a slot that we need to free */ 2849 /* this used up a slot that we need to free */
3106 if (op->body_info[i]) 2850 if (op->slot[i].info)
3107 { 2851 {
3108 last = who->inv; 2852 object *last = who->inv;
3109 2853
3110 /* We do a while loop - may need to remove several items in order 2854 /* We do a while loop - may need to remove several items in order
3111 * to free up enough slots. 2855 * to free up enough slots.
3112 */ 2856 */
3113 while ((who->body_used[i] + op->body_info[i]) < 0) 2857 while ((who->slot[i].used + op->slot[i].info) < 0)
3114 { 2858 {
3115 tmp = get_item_from_body_location (last, i); 2859 object *tmp = get_item_from_body_location (i, last);
2860
3116 if (!tmp) 2861 if (!tmp)
3117 { 2862 {
3118#if 0 2863#if 0
3119 /* Not a bug - we'll get this if the player has cursed items 2864 /* Not a bug - we'll get this if the player has cursed items
3120 * equipped. 2865 * equipped.
3121 */ 2866 */
3122 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name); 2867 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name);
3123#endif 2868#endif
3124 return 1; 2869 return 1;
3125 } 2870 }
2871
3126 /* If we are just printing, we don't care about cursed status */ 2872 /* If we are just printing, we don't care about cursed status */
3127 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))) 2873 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))))
3128 { 2874 {
3129 if (aflags & AP_PRINT) 2875 if (aflags & AP_PRINT)
3130 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2876 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp));
… …
3138 * so it may not be critical (eg, putting on a ring and you have 2884 * so it may not be critical (eg, putting on a ring and you have
3139 * one cursed ring.) 2885 * one cursed ring.)
3140 */ 2886 */
3141 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp)); 2887 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp));
3142 } 2888 }
2889
3143 last = tmp->below; 2890 last = tmp->below;
3144 } 2891 }
3145 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the 2892 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the
3146 * return in the !tmp would have kicked in. 2893 * return in the !tmp would have kicked in.
3147 */ 2894 */
3148 } /* if op is using this body location */ 2895 } /* if op is using this body location */
3149 } /* for body lcoations */ 2896 } /* for body lcoations */
2897
3150 return 0; 2898 return 0;
3151} 2899}
3152 2900
3153/** 2901/**
3154 * Checks to see if 'who' can apply object 'op'. 2902 * Checks to see if 'who' can apply object 'op'.
3155 * Returns 0 if apply can be done without anything special. 2903 * Returns 0 if apply can be done without anything special.
3156 * Otherwise returns a bitmask - potentially several of these may be 2904 * Otherwise returns a bitmask - potentially several of these may be
3157 * set, but largely depends on circumstance - in the future, processing 2905 * set, but largely depends on circumstance - in the future, processing
3158 * may be pruned once we know some status (eg, once CAN_APPLY_NEVER 2906 * may be pruned once we know some status (eg, once CAN_APPLY_NEVER
3159 * is set, do we really are what the other flags may be?) 2907 * is set, do we really are what the other flags may be?)
3160 * 2908 *
3161 * See include/define.h for detailed description of the meaning of 2909 * See include/define.h for detailed description of the meaning of
3162 * these return values. 2910 * these return values.
3163 */ 2911 */
… …
3165can_apply_object (object *who, object *op) 2913can_apply_object (object *who, object *op)
3166{ 2914{
3167 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op))) 2915 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op)))
3168 return RESULT_INT (0); 2916 return RESULT_INT (0);
3169 2917
3170 int i, retval = 0; 2918 int retval = 0;
3171 object *tmp = NULL, *ws = NULL; 2919 object *tmp = 0, *ws = 0;
3172 2920
3173 /* Players have 2 'arm's, so they could in theory equip 2 shields or 2921 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
3174 * 2 weapons, but we don't want to let them do that. So if they are
3175 * trying to equip a weapon or shield, see if they already have one
3176 * in place and store that way.
3177 */
3178 if (op->type == WEAPON || op->type == SHIELD)
3179 { 2922 {
3180 for (tmp = who->inv; tmp && !ws; tmp = tmp->below) 2923 if (op->slot[i].info)
3181 { 2924 {
3182 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type) 2925 /* Item uses more slots than we have */
2926 if (abs (op->slot[i].info) > who->slot[i].info)
3183 { 2927 {
3184 retval = CAN_APPLY_UNAPPLY;
3185 ws = tmp;
3186 }
3187 }
3188 }
3189
3190
3191 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
3192 {
3193 if (op->body_info[i])
3194 {
3195 /* Item uses more slots than we have */
3196 if (FABS (op->body_info[i]) > who->body_info[i])
3197 {
3198 /* Could return now for efficiently - rest of info below isn' 2928 /* Could return now for efficiency - rest of info below isn't
3199 * really needed. 2929 * really needed.
3200 */ 2930 */
3201 retval |= CAN_APPLY_NEVER; 2931 retval |= CAN_APPLY_NEVER;
3202 } 2932 }
3203 else if ((who->body_used[i] + op->body_info[i]) < 0) 2933 else if ((who->slot[i].used + op->slot[i].info) < 0)
3204 { 2934 {
3205 /* in this case, equipping this would use more free spots than 2935 /* in this case, equipping this would use more free spots than
3206 * we have. 2936 * we have.
3207 */ 2937 */
3208 object *tmp1;
3209
3210 2938
3211 /* if we have an applied weapon/shield, and unapply it would free 2939 /* if we have an applied weapon/shield, and unapply it would free
3212 * enough slots to equip the new item, then just set this can 2940 * enough slots to equip the new item, then just set "can
3213 * continue. We don't care about the logic below - if you have 2941 * apply unapply". We don't care about the logic below - if you have a
3214 * shield equipped and try to equip another shield, there is only 2942 * shield equipped and try to equip another shield, there is only
3215 * one choice. However, the check for the number of body locations 2943 * one choice. However, the check for the number of body locations
3216 * does take into the account cases where what is being applied 2944 * does take into the account cases where what is being applied
3217 * may be two handed for example. 2945 * may be two handed for example.
3218 */ 2946 */
3219 if (ws) 2947 if (ws)
3220 { 2948 if ((who->slot[i].used - ws->slot[i].info + op->slot[i].info) >= 0)
3221 if ((who->body_used[i] - ws->body_info[i] + op->body_info[i]) >= 0)
3222 { 2949 {
3223 retval |= CAN_APPLY_UNAPPLY; 2950 retval |= CAN_APPLY_UNAPPLY;
3224 continue; 2951 continue;
3225 } 2952 }
3226 }
3227 2953
3228 tmp1 = get_item_from_body_location (who->inv, i); 2954 object *tmp1 = get_item_from_body_location (i, who->inv);
3229 if (!tmp1) 2955 if (!tmp1)
3230 { 2956 {
3231#if 0 2957#if 0
3232 /* This is sort of an error, but happens a lot when old players 2958 /* This is sort of an error, but happens a lot when old players
3233 * join in with more stuff equipped than they are now allowed. 2959 * join in with more stuff equipped than they are now allowed.
… …
3244 */ 2970 */
3245 retval |= CAN_APPLY_UNAPPLY; 2971 retval |= CAN_APPLY_UNAPPLY;
3246 if (!tmp) 2972 if (!tmp)
3247 tmp = tmp1; 2973 tmp = tmp1;
3248 else if (tmp != tmp1) 2974 else if (tmp != tmp1)
3249 {
3250 retval |= CAN_APPLY_UNAPPLY_MULT; 2975 retval |= CAN_APPLY_UNAPPLY_MULT;
3251 } 2976
3252 /* This object isn't using up all the slots, so there must 2977 /* This object isn't using up all the slots, so there must
3253 * be another. If so, and it the new item doesn't need all 2978 * be another. If so, and it the new item doesn't need all
3254 * the slots, the player then has a choice. 2979 * the slots, the player then has a choice.
3255 */ 2980 */
3256 if (((who->body_used[i] - tmp1->body_info[i]) != who->body_info[i]) && (FABS (op->body_info[i]) < who->body_info[i])) 2981 if ((who->slot[i].used - tmp1->slot[i].info != who->slot[i].info)
2982 && abs (op->slot[i].info) < who->slot[i].info)
3257 retval |= CAN_APPLY_UNAPPLY_CHOICE; 2983 retval |= CAN_APPLY_UNAPPLY_CHOICE;
3258 2984
3259 /* Does unequippint 'tmp1' free up enough slots for this to be 2985 /* Does unequippint 'tmp1' free up enough slots for this to be
3260 * equipped? If not, there must be something else to unapply. 2986 * equipped? If not, there must be something else to unapply.
3261 */ 2987 */
3262 if ((who->body_used[i] + op->body_info[i] - tmp1->body_info[i]) < 0) 2988 if (who->slot[i].used + op->slot[i].info < tmp1->slot[i].info)
3263 retval |= CAN_APPLY_UNAPPLY_MULT; 2989 retval |= CAN_APPLY_UNAPPLY_MULT;
3264
3265 } 2990 }
3266 } /* if not enough free slots */ 2991 } /* if not enough free slots */
3267 } /* if this object uses location i */ 2992 } /* if this object uses location i */
3268 } /* for i -> num_body_locations loop */ 2993 } /* for i -> num_body_locations loop */
3269 2994
… …
3274 * and weapons all use the same slot. Similar for horn/rod/wand - they 2999 * and weapons all use the same slot. Similar for horn/rod/wand - they
3275 * all use the same location. 3000 * all use the same location.
3276 */ 3001 */
3277 if (op->type == WEAPON && !QUERY_FLAG (who, FLAG_USE_WEAPON)) 3002 if (op->type == WEAPON && !QUERY_FLAG (who, FLAG_USE_WEAPON))
3278 retval |= CAN_APPLY_RESTRICTION; 3003 retval |= CAN_APPLY_RESTRICTION;
3004
3279 if (op->type == SHIELD && !QUERY_FLAG (who, FLAG_USE_SHIELD)) 3005 if (op->type == SHIELD && !QUERY_FLAG (who, FLAG_USE_SHIELD))
3280 retval |= CAN_APPLY_RESTRICTION; 3006 retval |= CAN_APPLY_RESTRICTION;
3281 3007
3282
3283 if (who->type != PLAYER) 3008 if (who->type != PLAYER)
3284 { 3009 {
3285 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE)) 3010 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE))
3286 retval |= CAN_APPLY_RESTRICTION; 3011 retval |= CAN_APPLY_RESTRICTION;
3012
3287 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3013 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3288 retval |= CAN_APPLY_RESTRICTION; 3014 retval |= CAN_APPLY_RESTRICTION;
3015
3289 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING)) 3016 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING))
3290 retval |= CAN_APPLY_RESTRICTION; 3017 retval |= CAN_APPLY_RESTRICTION;
3018
3291 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3019 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3292 retval |= CAN_APPLY_RESTRICTION; 3020 retval |= CAN_APPLY_RESTRICTION;
3293 } 3021 }
3022
3294 return retval; 3023 return retval;
3295} 3024}
3296
3297
3298 3025
3299/** 3026/**
3300 * who is the object using the object. It can be a monster. 3027 * who is the object using the object. It can be a monster.
3301 * op is the object they are using. op is an equipment type item, 3028 * op is the object they are using. op is an equipment type item,
3302 * eg, one which you put on and keep on for a while, and not something 3029 * eg, one which you put on and keep on for a while, and not something
… …
3321int 3048int
3322apply_special (object *who, object *op, int aflags) 3049apply_special (object *who, object *op, int aflags)
3323{ 3050{
3324 int basic_flag = aflags & AP_BASIC_FLAGS; 3051 int basic_flag = aflags & AP_BASIC_FLAGS;
3325 object *tmp, *tmp2, *skop = NULL; 3052 object *tmp, *tmp2, *skop = NULL;
3326 int i;
3327 3053
3328 if (who == NULL) 3054 if (who == NULL)
3329 { 3055 {
3330 LOG (llevError, "apply_special() from object without environment.\n"); 3056 LOG (llevError, "apply_special() from object without environment.\n");
3331 return 1; 3057 return 1;
… …
3341 if (basic_flag == AP_APPLY) 3067 if (basic_flag == AP_APPLY)
3342 return 0; 3068 return 0;
3343 3069
3344 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 3070 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
3345 { 3071 {
3346 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (op)); 3072 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't remove %s.", query_name (op));
3347 return 1; 3073 return 1;
3348 } 3074 }
3075
3349 return unapply_special (who, op, aflags); 3076 return unapply_special (who, op, aflags);
3350 } 3077 }
3351 3078
3352 if (basic_flag == AP_UNAPPLY) 3079 if (basic_flag == AP_UNAPPLY)
3353 return 0; 3080 return 0;
3354 3081
3355 i = can_apply_object (who, op); 3082 // if the item is combat/ranged, wield the relevant slot first
3083 // to resolve conflicts.
3084 if (player *pl = who->contr)
3085 switch (op->type)
3086 {
3087 case WEAPON:
3088 who->change_weapon (pl->combat_ob);
3089 break;
3090
3091 case BOW:
3092 case ROD:
3093 case WAND:
3094 case HORN:
3095 case SKILL_TOOL:
3096 who->change_weapon (pl->ranged_ob);
3097 break;
3098
3099 case SKILL:
3100 if (IS_COMBAT_SKILL (op->subtype))
3101 who->change_weapon (pl->combat_ob);
3102 else if (IS_RANGED_SKILL (op->subtype))
3103 who->change_weapon (pl->ranged_ob);
3104 break;
3105 }
3356 3106
3357 /* Can't just apply this object. Lets see what not and what to do */ 3107 /* Can't just apply this object. Lets see what not and what to do */
3358 if (i) 3108 if (int i = can_apply_object (who, op))
3359 { 3109 {
3360 if (i & CAN_APPLY_NEVER) 3110 if (i & CAN_APPLY_NEVER)
3361 { 3111 {
3362 new_draw_info_format (NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name (op)); 3112 new_draw_info_format (NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name (op));
3363 return 1; 3113 return 1;
… …
3365 else if (i & CAN_APPLY_RESTRICTION) 3115 else if (i & CAN_APPLY_RESTRICTION)
3366 { 3116 {
3367 new_draw_info_format (NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name (op)); 3117 new_draw_info_format (NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name (op));
3368 return 1; 3118 return 1;
3369 } 3119 }
3120
3370 if (who->type != PLAYER) 3121 if (who->type != PLAYER)
3371 { 3122 {
3372 /* Some error, so don't try to equip something more */ 3123 /* Some error, so don't try to equip something more */
3373 if (unapply_for_ob (who, op, aflags)) 3124 if (unapply_for_ob (who, op, aflags))
3374 return 1; 3125 return 1;
3375 } 3126 }
3376 else 3127 else
3377 { 3128 {
3378 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice)) 3129 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice))
3379 { 3130 {
3380 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some item(s):"); 3131 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some of the following item(s) or change your applymode:");
3381 unapply_for_ob (who, op, AP_PRINT); 3132 unapply_for_ob (who, op, AP_PRINT);
3382 return 1; 3133 return 1;
3383 } 3134 }
3384 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE)) 3135 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE))
3385 {
3386 i = unapply_for_ob (who, op, aflags); 3136 if (unapply_for_ob (who, op, aflags))
3387 if (i)
3388 return 1; 3137 return 1;
3389 } 3138 }
3390 }
3391 } 3139 }
3140
3392 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL) 3141 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL)
3393 { 3142 {
3394 skop = find_skill_by_name (who, op->skill); 3143 skop = find_skill_by_name (who, op->skill);
3144
3395 if (!skop) 3145 if (!skop)
3396 { 3146 {
3397 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill); 3147 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill);
3398 return 1; 3148 return 1;
3399 } 3149 }
3400 else 3150 else
3401 {
3402 /* While experience will be credited properly, we want to change the 3151 /* While experience will be credited properly, we want to change the
3403 * skill so that the dam and wc get updated 3152 * skill so that the dam and wc get updated
3404 */ 3153 */
3405 change_skill (who, skop, 0); 3154 change_skill (who, skop, 0);
3406 }
3407 }
3408
3409 if (who->type == PLAYER && op->item_power && (op->item_power + who->contr->item_power) > (settings.item_power_factor * who->level))
3410 { 3155 }
3411 new_draw_info (NDI_UNIQUE, 0, who, "Equipping that combined with other items would consume your soul!"); 3156
3157 if (who->type == PLAYER
3158 && op->item_power
3159 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level)
3160 {
3161 new_draw_info (NDI_UNIQUE, 0, who,
3162 "Equipping that combined with other items would consume your soul! "
3163 "[use the skills command to check your available item power]");
3412 return 1; 3164 return 1;
3413 } 3165 }
3414
3415 3166
3416 /* Ok. We are now at the state where we can apply the new object. 3167 /* Ok. We are now at the state where we can apply the new object.
3417 * Note that we don't have the checks for can_use_... 3168 * Note that we don't have the checks for can_use_...
3418 * below - that is already taken care of by can_apply_object. 3169 * below - that is already taken care of by can_apply_object.
3419 */ 3170 */
3420
3421
3422 if (op->nrof > 1) 3171 if (op->nrof > 1)
3423 tmp = get_split_ob (op, op->nrof - 1); 3172 tmp = get_split_ob (op, op->nrof - 1);
3424 else 3173 else
3425 tmp = NULL; 3174 tmp = 0;
3426 3175
3427 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op))) 3176 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
3428 return RESULT_INT (0); 3177 return RESULT_INT (0);
3429 3178
3430 switch (op->type) 3179 switch (op->type)
3431 { 3180 {
3432 case WEAPON: 3181 case WEAPON:
3433 if (!check_weapon_power (who, op->last_eat)) 3182 if (!check_weapon_power (who, op->last_eat))
3434 { 3183 {
3435 new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use."); 3184 new_draw_info (NDI_UNIQUE, 0, who, "This weapon is too powerful for you to use.\n"
3436 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3185 "It would consume your soul!.");
3186
3437 if (tmp != NULL) 3187 if (tmp)
3438 (void) insert_ob_in_ob (tmp, who); 3188 insert_ob_in_ob (tmp, who);
3189
3439 return 1; 3190 return 1;
3440 } 3191 }
3192
3193 //TODO: this obviously fails for players using a shorter prefix
3194 // i.e. "R" can use Ragnarok's sword.
3441 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3195 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3442 { 3196 {
3443 /* if the weapon does not have the name as the character, can't use it. */ 3197 /* if the weapon does not have the name as the character, can't use it. */
3444 /* (Ragnarok's sword attempted to be used by Foo: won't work) */ 3198 /* (Ragnarok's sword attempted to be used by Foo: won't work) */
3445 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3199 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner.");
3200
3446 if (tmp != NULL) 3201 if (tmp)
3447 (void) insert_ob_in_ob (tmp, who); 3202 insert_ob_in_ob (tmp, who);
3203
3448 return 1; 3204 return 1;
3449 } 3205 }
3206
3207 if (!skop)
3208 {
3209 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO
3210 return 1;
3211 }
3212
3450 SET_FLAG (op, FLAG_APPLIED); 3213 SET_FLAG (op, FLAG_APPLIED);
3451
3452 if (skop)
3453 change_skill (who, skop, 1); 3214 change_skill (who, skop, 1);
3215
3216 if (who->contr)
3217 who->change_weapon (who->contr->combat_ob = op);
3218
3454 if (!QUERY_FLAG (who, FLAG_READY_WEAPON)) 3219 if (!QUERY_FLAG (who, FLAG_READY_WEAPON))
3455 SET_FLAG (who, FLAG_READY_WEAPON); 3220 SET_FLAG (who, FLAG_READY_WEAPON);
3456 3221
3457 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op)); 3222 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op));
3458 3223
3459 (void) change_abil (who, op); 3224 change_abil (who, op);
3460 break; 3225 break;
3461 3226
3462 case ARMOUR: 3227 case ARMOUR:
3463 case HELMET: 3228 case HELMET:
3464 case SHIELD: 3229 case SHIELD:
… …
3469 case CLOAK: 3234 case CLOAK:
3470 case RING: 3235 case RING:
3471 case AMULET: 3236 case AMULET:
3472 SET_FLAG (op, FLAG_APPLIED); 3237 SET_FLAG (op, FLAG_APPLIED);
3473 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op)); 3238 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op));
3474 (void) change_abil (who, op); 3239 change_abil (who, op);
3475 break; 3240 break;
3241
3476 case LAMP: 3242 case LAMP:
3477 if (op->stats.food < 1) 3243 if (op->stats.food < 1)
3478 { 3244 {
3479 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of" " fuel!", &op->name); 3245 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of fuel!", &op->name);
3480 return 1; 3246 return 1;
3481 } 3247 }
3248
3482 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name); 3249 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name);
3483 tmp2 = arch_to_object (op->other_arch); 3250 tmp2 = arch_to_object (op->other_arch);
3484 tmp2->stats.food = op->stats.food; 3251 tmp2->stats.food = op->stats.food;
3485 SET_FLAG (tmp2, FLAG_APPLIED); 3252 SET_FLAG (tmp2, FLAG_APPLIED);
3253
3486 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 3254 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3487 SET_FLAG (tmp2, FLAG_INV_LOCKED); 3255 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3256
3488 insert_ob_in_ob (tmp2, who); 3257 insert_ob_in_ob (tmp2, who);
3489 3258
3490 /* Remove the old lantern */ 3259 /* Remove the old lantern */
3491 if (who->type == PLAYER) 3260 if (who->type == PLAYER)
3492 esrv_del_item (who->contr, op->count); 3261 esrv_del_item (who->contr, op->count);
3493 3262
3494 remove_ob (op); 3263 op->destroy ();
3495 free_object (op);
3496 3264
3497 /* insert the portion that was split off */ 3265 /* insert the portion that was split off */
3498 if (tmp != NULL) 3266 if (tmp)
3499 { 3267 {
3500 (void) insert_ob_in_ob (tmp, who); 3268 insert_ob_in_ob (tmp, who);
3501 if (who->type == PLAYER) 3269 if (who->type == PLAYER)
3502 esrv_send_item (who, tmp); 3270 esrv_send_item (who, tmp);
3503 } 3271 }
3504 fix_player (who); 3272
3273 who->update_stats ();
3274
3505 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3275 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3506 {
3507 if (who->type == PLAYER) 3276 if (who->type == PLAYER)
3508 { 3277 {
3509 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3278 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
3510 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 3279 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3511 } 3280 }
3512 } 3281
3513 if (who->type == PLAYER) 3282 if (who->type == PLAYER)
3514 esrv_send_item (who, tmp2); 3283 esrv_send_item (who, tmp2);
3284
3515 return 0; 3285 return 0;
3516 break;
3517 3286
3518 /* this part is needed for skill-tools */ 3287 /* this part is needed for skill-tools */
3519 case SKILL: 3288 case SKILL:
3520 case SKILL_TOOL: 3289 case SKILL_TOOL:
3521 if (who->chosen_skill) 3290 if (who->chosen_skill)
3522 { 3291 {
3523 LOG (llevError, "BUG: apply_special(): can't apply two skills\n"); 3292 LOG (llevError, "BUG: apply_special(): can't apply two skills\n");
3524 return 1; 3293 return 1;
3525 } 3294 }
3526 if (who->type == PLAYER) 3295
3296 if (player *pl = who->contr)
3297 {
3298 if (IS_COMBAT_SKILL (op->subtype))
3527 { 3299 {
3528 who->contr->shoottype = range_skill; 3300 if (skill_flags [op->subtype] & SF_NEED_WEAPON)
3529 who->contr->ranges[range_skill] = op; 3301 {
3302 for (object *item = who->inv; item; item = item->below)
3303 if (item->type == WEAPON && item->flag [FLAG_APPLIED])
3304 {
3305 who->change_weapon (pl->combat_ob = item);
3306 goto found_weapon;
3307 }
3308
3309 new_draw_info (NDI_UNIQUE, 0, who, "You need to apply a melee weapon before readying this skill");
3310 return 1;
3311
3312 found_weapon:;
3313 }
3314 else
3315 who->change_weapon (pl->combat_ob = op);
3316 }
3317 else if (IS_RANGED_SKILL (op->subtype))
3318 {
3319 if (skill_flags [op->subtype] & SF_NEED_BOW)
3320 {
3321 for (object *item = who->inv; item; item = item->below)
3322 if (item->type == BOW && item->flag [FLAG_APPLIED])
3323 {
3324 who->change_weapon (pl->ranged_ob = item);
3325 goto found_bow;
3326 }
3327
3328 new_draw_info (NDI_UNIQUE, 0, who, "You need to apply a missile weapon before readying this skill");
3329 return 1;
3330
3331 found_bow:;
3332 }
3333 else if (skill_flags [op->subtype] & SF_NEED_ITEM)
3334 {
3335 for (object *item = who->inv; item; item = item->below)
3336 if (item->flag [FLAG_APPLIED]
3337 && (item->type == WAND || item->type == ROD || item->type == HORN))
3338 {
3339 who->change_weapon (pl->ranged_ob = item);
3340 goto found_item;
3341 }
3342
3343 new_draw_info (NDI_UNIQUE, 0, who, "You need to apply a magic item before readying this skill");
3344 return 1;
3345
3346 found_item:;
3347 }
3348 else
3349 who->change_weapon (pl->ranged_ob = op);
3350 }
3351
3530 if (!op->invisible) 3352 if (!op->invisible)
3531 { 3353 {
3532 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3354 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3533 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill); 3355 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill);
3534 } 3356 }
3535 else 3357 else
3536 {
3537 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name); 3358 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name);
3538 } 3359 }
3539 } 3360
3540 SET_FLAG (op, FLAG_APPLIED); 3361 SET_FLAG (op, FLAG_APPLIED);
3541 (void) change_abil (who, op); 3362 change_abil (who, op);
3542 who->chosen_skill = op; 3363 who->chosen_skill = op;
3543 SET_FLAG (who, FLAG_READY_SKILL); 3364 SET_FLAG (who, FLAG_READY_SKILL);
3544 break; 3365 break;
3545 3366
3546 case BOW: 3367 case BOW:
3547 if (!check_weapon_power (who, op->last_eat)) 3368 if (!check_weapon_power (who, op->last_eat))
3548 { 3369 {
3549 new_draw_info (NDI_UNIQUE, 0, who, "That item is too powerful for you to use."); 3370 new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use.");
3550 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3371 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!.");
3372
3551 if (tmp != NULL) 3373 if (tmp)
3552 (void) insert_ob_in_ob (tmp, who); 3374 insert_ob_in_ob (tmp, who);
3375
3553 return 1; 3376 return 1;
3554 } 3377 }
3378
3555 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3379 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3556 { 3380 {
3557 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3381 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner.");
3558 if (tmp != NULL) 3382 if (tmp)
3559 (void) insert_ob_in_ob (tmp, who); 3383 insert_ob_in_ob (tmp, who);
3384
3560 return 1; 3385 return 1;
3561 } 3386 }
3387
3562 /*FALLTHROUGH*/ case WAND: 3388 /*FALLTHROUGH*/
3389 case WAND:
3563 case ROD: 3390 case ROD:
3564 case HORN: 3391 case HORN:
3565 /* check for skill, alter player status */ 3392 /* check for skill, alter player status */
3393
3394 if (!skop)
3395 {
3396 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO
3397 return 1;
3398 }
3399
3566 SET_FLAG (op, FLAG_APPLIED); 3400 SET_FLAG (op, FLAG_APPLIED);
3567 if (skop)
3568 change_skill (who, skop, 0); 3401 change_skill (who, skop, 0);
3402
3403 if (who->contr)
3404 {
3405 who->contr->ranged_ob = op;
3406
3569 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3407 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3570 3408
3571 if (who->type == PLAYER)
3572 {
3573 if (op->type == BOW) 3409 if (op->type == BOW)
3574 { 3410 {
3411 who->current_weapon = op;
3575 (void) change_abil (who, op); 3412 change_abil (who, op);
3576 new_draw_info_format (NDI_UNIQUE, 0, who, 3413 new_draw_info_format (NDI_UNIQUE, 0, who,
3577 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)); 3414 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op));
3578 who->contr->shoottype = range_bow;
3579 }
3580 else
3581 {
3582 who->contr->shoottype = range_misc;
3583 } 3415 }
3584 } 3416 }
3585 else 3417 else
3586 { 3418 {
3587 if (op->type == BOW) 3419 if (op->type == BOW)
3588 SET_FLAG (who, FLAG_READY_BOW); 3420 SET_FLAG (who, FLAG_READY_BOW);
3589 else 3421 else
3590 SET_FLAG (who, FLAG_READY_RANGE); 3422 SET_FLAG (who, FLAG_READY_RANGE);
3591 } 3423 }
3424
3592 break; 3425 break;
3593 3426
3594 case BUILDER: 3427 case BUILDER:
3595 if (who->contr->ranges[range_builder]) 3428 if (who->type == PLAYER)
3429 {
3430 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER)
3596 unapply_special (who, who->contr->ranges[range_builder], 0); 3431 unapply_special (who, who->contr->ranged_ob, 0);
3597 who->contr->shoottype = range_builder; 3432
3598 who->contr->ranges[range_builder] = op;
3599 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op)); 3433 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op));
3434
3435 who->contr->ranged_ob = op;
3436 }
3600 break; 3437 break;
3601 3438
3602 default: 3439 default:
3603 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op)); 3440 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op));
3604 } /* end of switch op->type */ 3441 } /* end of switch op->type */
3605 3442
3606 SET_FLAG (op, FLAG_APPLIED); 3443 SET_FLAG (op, FLAG_APPLIED);
3607 3444
3608 if (tmp != NULL) 3445 if (tmp)
3609 tmp = insert_ob_in_ob (tmp, who); 3446 tmp = insert_ob_in_ob (tmp, who);
3610 3447
3611 fix_player (who); 3448 who->update_stats ();
3612 3449
3613 /* We exclude spell casting objects. The fire code will set the 3450 /* We exclude spell casting objects. The fire code will set the
3614 * been applied flag when they are used - until that point, 3451 * been applied flag when they are used - until that point,
3615 * you don't know anything about them. 3452 * you don't know anything about them.
3616 */ 3453 */
… …
3623 { 3460 {
3624 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3461 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
3625 SET_FLAG (op, FLAG_KNOWN_CURSED); 3462 SET_FLAG (op, FLAG_KNOWN_CURSED);
3626 } 3463 }
3627 } 3464 }
3465
3628 if (who->type == PLAYER) 3466 if (who->type == PLAYER)
3629 { 3467 {
3630 /* if multiple objects were applied, update both slots */ 3468 /* if multiple objects were applied, update both slots */
3631 if (tmp) 3469 if (tmp)
3632 esrv_send_item (who, tmp); 3470 esrv_send_item (who, tmp);
3471
3633 esrv_send_item (who, op); 3472 esrv_send_item (who, op);
3634 } 3473 }
3474
3635 return 0; 3475 return 0;
3636} 3476}
3637
3638 3477
3639int 3478int
3640monster_apply_special (object *who, object *op, int aflags) 3479monster_apply_special (object *who, object *op, int aflags)
3641{ 3480{
3642 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED)) 3481 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
… …
3656 int i; 3495 int i;
3657 3496
3658 switch (op->type) 3497 switch (op->type)
3659 { 3498 {
3660 case SHOP_FLOOR: 3499 case SHOP_FLOOR:
3661 if (!HAS_RANDOM_ITEMS (op)) 3500 if (!op->has_random_items ())
3662 return 0; 3501 return 0;
3502
3663 do 3503 do
3664 { 3504 {
3665 i = 10; /* let's give it 10 tries */ 3505 i = 10; /* let's give it 10 tries */
3666 while ((tmp = generate_treasure (op->randomitems, 3506 while ((tmp = generate_treasure (op->randomitems,
3667 op->stats.exp ? (int) op->stats.exp : MAX (op->map->difficulty, 5))) == NULL && --i); 3507 op->stats.exp ? (int) op->stats.exp : MAX (op->map->difficulty, 5))) == NULL && --i);
3668 if (tmp == NULL) 3508 if (tmp == NULL)
3669 return 0; 3509 return 0;
3670 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 3510 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
3671 { 3511 {
3672 free_object (tmp); 3512 tmp->destroy ();
3673 tmp = NULL; 3513 tmp = NULL;
3674 } 3514 }
3675 } 3515 }
3676 while (!tmp); 3516 while (!tmp);
3517
3677 tmp->x = op->x; 3518 tmp->x = op->x;
3678 tmp->y = op->y; 3519 tmp->y = op->y;
3679 SET_FLAG (tmp, FLAG_UNPAID); 3520 SET_FLAG (tmp, FLAG_UNPAID);
3680 insert_ob_in_map (tmp, op->map, NULL, 0); 3521 insert_ob_in_map (tmp, op->map, NULL, 0);
3681 CLEAR_FLAG (op, FLAG_AUTO_APPLY); 3522 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
… …
3683 break; 3524 break;
3684 3525
3685 case TREASURE: 3526 case TREASURE:
3686 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 3527 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
3687 return 0; 3528 return 0;
3529
3688 while ((op->stats.hp--) > 0) 3530 while (op->stats.hp-- > 0)
3689 create_treasure (op->randomitems, op, op->map ? GT_ENVIRONMENT : 0, 3531 create_treasure (op->randomitems, op, op->map ? GT_ENVIRONMENT : 0,
3690 op->stats.exp ? (int) op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0); 3532 op->stats.exp ? (int) op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0);
3691 3533
3692 /* If we generated an object and put it in this object inventory, 3534 /* If we generated an object and put it in this object inventory,
3693 * move it to the parent object as the current object is about 3535 * move it to the parent object as the current object is about
… …
3695 * that is put inside other objects. 3537 * that is put inside other objects.
3696 */ 3538 */
3697 for (tmp = op->inv; tmp; tmp = tmp2) 3539 for (tmp = op->inv; tmp; tmp = tmp2)
3698 { 3540 {
3699 tmp2 = tmp->below; 3541 tmp2 = tmp->below;
3700 remove_ob (tmp); 3542 tmp->remove ();
3543
3701 if (op->env) 3544 if (op->env)
3702 insert_ob_in_ob (tmp, op->env); 3545 insert_ob_in_ob (tmp, op->env);
3703 else 3546 else
3704 free_object (tmp); 3547 tmp->destroy ();
3705 } 3548 }
3706 remove_ob (op); 3549
3707 free_object (op); 3550 op->destroy ();
3708 break; 3551 break;
3709 } 3552 }
3710 return tmp ? 1 : 0; 3553 return tmp ? 1 : 0;
3711} 3554}
3712 3555
3713/** 3556/**
3714 * fix_auto_apply goes through the entire map (only the first time 3557 * fix_auto_apply goes through the entire map every time a map
3715 * when an original map is loaded) and performs special actions for 3558 * is loaded or swapped in and performs special actions for
3716 * certain objects (most initialization of chests and creation of 3559 * certain objects (most initialization of chests and creation of
3717 * treasures and stuff). Calls auto_apply if appropriate. 3560 * treasures and stuff). Calls auto_apply if appropriate.
3718 */ 3561 */
3719void 3562void
3720fix_auto_apply (maptile *m) 3563maptile::fix_auto_apply ()
3721{ 3564{
3722 object *tmp, *above = NULL; 3565 if (!spaces)
3723 int x, y;
3724
3725 if (m == NULL)
3726 return; 3566 return;
3727 3567
3728 for (x = 0; x < MAP_WIDTH (m); x++) 3568 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3729 for (y = 0; y < MAP_HEIGHT (m); y++) 3569 for (object *tmp = ms->bot; tmp; )
3730 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = above)
3731 { 3570 {
3732 above = tmp->above; 3571 object *above = tmp->above;
3733 3572
3734 if (tmp->inv) 3573 if (tmp->inv)
3735 { 3574 {
3736 object *invtmp, *invnext; 3575 object *invtmp, *invnext;
3737 3576
3738 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext) 3577 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext)
3739 { 3578 {
3740 invnext = invtmp->below; 3579 invnext = invtmp->below;
3741 3580
3742 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY)) 3581 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY))
3743 auto_apply (invtmp); 3582 auto_apply (invtmp);
3744 else if (invtmp->type == TREASURE && HAS_RANDOM_ITEMS (invtmp)) 3583 else if (invtmp->type == TREASURE && invtmp->has_random_items ())
3745 { 3584 {
3746 while ((invtmp->stats.hp--) > 0) 3585 while ((invtmp->stats.hp--) > 0)
3747 create_treasure (invtmp->randomitems, invtmp, 0, m->difficulty, 0);
3748
3749 invtmp->randomitems = NULL;
3750 }
3751 else if (invtmp && invtmp->arch
3752 && invtmp->type != TREASURE && invtmp->type != SPELL && invtmp->type != CLASS && HAS_RANDOM_ITEMS (invtmp))
3753 {
3754 create_treasure (invtmp->randomitems, invtmp, 0, m->difficulty, 0); 3586 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3587
3588 invtmp->randomitems = NULL;
3589 }
3590 else if (invtmp && invtmp->arch
3591 && invtmp->type != TREASURE && invtmp->type != SPELL && invtmp->type != CLASS && invtmp->has_random_items ())
3592 {
3593 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3755 /* Need to clear this so that we never try to create 3594 /* Need to clear this so that we never try to create
3756 * treasure again for this object 3595 * treasure again for this object
3757 */ 3596 */
3758 invtmp->randomitems = NULL; 3597 invtmp->randomitems = NULL;
3759 } 3598 }
3760 } 3599 }
3761 /* This is really temporary - the code at the bottom will 3600 /* This is really temporary - the code at the bottom will
3762 * also set randomitems to null. The problem is there are bunches 3601 * also set randomitems to null. The problem is there are bunches
3763 * of maps/players already out there with items that have spells 3602 * of maps/players already out there with items that have spells
3764 * which haven't had the randomitems set to null yet. 3603 * which haven't had the randomitems set to null yet.
3765 * MSW 2004-05-13 3604 * MSW 2004-05-13
3766 * 3605 *
3767 * And if it's a spellbook, it's better to set randomitems to NULL too, 3606 * And if it's a spellbook, it's better to set randomitems to NULL too,
3768 * else you get two spells in the book ^_- 3607 * else you get two spells in the book ^_-
3769 * Ryo 2004-08-16 3608 * Ryo 2004-08-16
3770 */ 3609 */
3771 if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL 3610 if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL
3772 || tmp->type == HORN || tmp->type == FIREWALL || tmp->type == POTION || tmp->type == ALTAR || tmp->type == SPELLBOOK) 3611 || tmp->type == HORN || tmp->type == FIREWALL || tmp->type == POTION || tmp->type == ALTAR || tmp->type == SPELLBOOK)
3773 tmp->randomitems = NULL;
3774
3775 }
3776
3777 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY))
3778 auto_apply (tmp);
3779 else if ((tmp->type == TREASURE || (tmp->type == CONTAINER)) && HAS_RANDOM_ITEMS (tmp))
3780 {
3781 while ((tmp->stats.hp--) > 0)
3782 create_treasure (tmp->randomitems, tmp, 0, m->difficulty, 0);
3783 tmp->randomitems = NULL; 3612 tmp->randomitems = NULL;
3613
3784 } 3614 }
3615
3616 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY))
3617 auto_apply (tmp);
3618 else if ((tmp->type == TREASURE || (tmp->type == CONTAINER)) && tmp->has_random_items ())
3619 {
3620 while ((tmp->stats.hp--) > 0)
3621 create_treasure (tmp->randomitems, tmp, 0, difficulty, 0);
3622 tmp->randomitems = NULL;
3623 }
3785 else if (tmp->type == TIMED_GATE) 3624 else if (tmp->type == TIMED_GATE)
3786 { 3625 {
3787 object *head = tmp->head != NULL ? tmp->head : tmp; 3626 object *head = tmp->head != NULL ? tmp->head : tmp;
3788 3627
3789 if (QUERY_FLAG (head, FLAG_IS_LINKED)) 3628 if (QUERY_FLAG (head, FLAG_IS_LINKED))
3790 {
3791 tmp->speed = 0; 3629 tmp->set_speed (0);
3792 update_ob_speed (tmp);
3793 }
3794 } 3630 }
3795 /* This function can be called everytime a map is loaded, even when 3631 /* This function can be called everytime a map is loaded, even when
3796 * swapping back in. As such, we don't want to create the treasure 3632 * swapping back in. As such, we don't want to create the treasure
3797 * over and ove again, so after we generate the treasure, blank out 3633 * over and ove again, so after we generate the treasure, blank out
3798 * randomitems so if it is swapped in again, it won't make anything. 3634 * randomitems so if it is swapped in again, it won't make anything.
3799 * This is a problem for the above objects, because they have counters 3635 * This is a problem for the above objects, because they have counters
3800 * which say how many times to make the treasure. 3636 * which say how many times to make the treasure.
3801 */ 3637 */
3802 else if (tmp && tmp->arch && tmp->type != PLAYER 3638 else if (tmp && tmp->arch && tmp->type != PLAYER
3803 && tmp->type != TREASURE && tmp->type != SPELL 3639 && tmp->type != TREASURE && tmp->type != SPELL
3804 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && HAS_RANDOM_ITEMS (tmp)) 3640 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && tmp->has_random_items ())
3805 { 3641 {
3806 create_treasure (tmp->randomitems, tmp, GT_APPLY, m->difficulty, 0); 3642 create_treasure (tmp->randomitems, tmp, GT_APPLY, difficulty, 0);
3807 tmp->randomitems = NULL; 3643 tmp->randomitems = NULL;
3808 } 3644 }
3645
3646 // close all containers
3647 else if (tmp->type == CONTAINER)
3648 tmp->flag [FLAG_APPLIED] = 0;
3649
3650 tmp = above;
3809 } 3651 }
3810 3652
3811 for (x = 0; x < MAP_WIDTH (m); x++) 3653 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3812 for (y = 0; y < MAP_HEIGHT (m); y++) 3654 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
3813 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above)
3814 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL)) 3655 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL))
3815 check_trigger (tmp, tmp->above); 3656 check_trigger (tmp, tmp->above);
3816} 3657}
3817 3658
3818/** 3659/**
3819 * Handles player eating food that temporarily changes status (resistances, stats). 3660 * Handles player eating food that temporarily changes status (resistances, stats).
3820 * This used to call cast_change_attr(), but 3661 * This used to call cast_change_attr(), but
3821 * that doesn't work with the new spell code. Since we know what 3662 * that doesn't work with the new spell code. Since we know what
3822 * the food changes, just grab a force and use that instead. 3663 * the food changes, just grab a force and use that instead.
3823 */ 3664 */
3824
3825void 3665void
3826eat_special_food (object *who, object *food) 3666eat_special_food (object *who, object *food)
3827{ 3667{
3828 object *force; 3668 object *force;
3829 int i, did_one = 0; 3669 int i, did_one = 0;
3830 sint8 k;
3831 3670
3832 force = get_archetype (FORCE_NAME); 3671 force = get_archetype (FORCE_NAME);
3833 3672
3834 for (i = 0; i < NUM_STATS; i++) 3673 for (i = 0; i < NUM_STATS; i++)
3835 { 3674 if (sint8 k = food->stats.stat (i))
3836 k = get_attr_value (&food->stats, i);
3837 if (k)
3838 { 3675 {
3839 set_attr_value (&force->stats, i, k); 3676 force->stats.stat (i) = k;
3840 did_one = 1; 3677 did_one = 1;
3841 } 3678 }
3842 }
3843 3679
3844 /* check if we can protect the eater */ 3680 /* check if we can protect the eater */
3845 for (i = 0; i < NROFATTACKS; i++) 3681 for (i = 0; i < NROFATTACKS; i++)
3846 { 3682 {
3847 if (food->resist[i] > 0) 3683 if (food->resist[i] > 0)
3848 { 3684 {
3849 force->resist[i] = food->resist[i] / 2; 3685 force->resist[i] = food->resist[i] / 2;
3850 did_one = 1; 3686 did_one = 1;
3851 } 3687 }
3852 } 3688 }
3689
3853 if (did_one) 3690 if (did_one)
3854 { 3691 {
3855 force->speed = 0.1; 3692 force->set_speed (0.1);
3856 update_ob_speed (force);
3857 /* bigger morsel of food = longer effect time */ 3693 /* bigger morsel of food = longer effect time */
3858 force->stats.food = food->stats.food / 5; 3694 force->duration = food->stats.food / 5;
3859 SET_FLAG (force, FLAG_IS_USED_UP);
3860 SET_FLAG (force, FLAG_APPLIED); 3695 SET_FLAG (force, FLAG_APPLIED);
3861 change_abil (who, force); 3696 change_abil (who, force);
3862 insert_ob_in_ob (force, who); 3697 insert_ob_in_ob (force, who);
3863 } 3698 }
3864 else 3699 else
3865 { 3700 force->destroy ();
3866 free_object (force);
3867 }
3868 3701
3869 /* check for hp, sp change */ 3702 /* check for hp, sp change */
3870 if (food->stats.hp != 0) 3703 if (food->stats.hp != 0)
3871 { 3704 {
3872 if (QUERY_FLAG (food, FLAG_CURSED)) 3705 if (QUERY_FLAG (food, FLAG_CURSED))
3873 { 3706 {
3874 strcpy (who->contr->killer, food->name); 3707 assign (who->contr->killer, food->name);
3875 hit_player (who, food->stats.hp, food, AT_POISON, 1); 3708 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3876 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!"); 3709 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!");
3877 } 3710 }
3878 else 3711 else
3879 { 3712 {
… …
3898 new_draw_info (NDI_UNIQUE, 0, who, "You feel a rush of magical energy!"); 3731 new_draw_info (NDI_UNIQUE, 0, who, "You feel a rush of magical energy!");
3899 who->stats.sp += food->stats.sp; 3732 who->stats.sp += food->stats.sp;
3900 /* place limit on max sp from food? */ 3733 /* place limit on max sp from food? */
3901 } 3734 }
3902 } 3735 }
3903 fix_player (who); 3736 who->update_stats ();
3904} 3737}
3905
3906 3738
3907/** 3739/**
3908 * Designed primarily to light torches/lanterns/etc. 3740 * Designed primarily to light torches/lanterns/etc.
3909 * Also burns up burnable material too. First object in the inventory is 3741 * Also burns up burnable material too. First object in the inventory is
3910 * the selected object to "burn". -b.t. 3742 * the selected object to "burn". -b.t.
3911 */ 3743 */
3912
3913void 3744void
3914apply_lighter (object *who, object *lighter) 3745apply_lighter (object *who, object *lighter)
3915{ 3746{
3916 object *item; 3747 object *item;
3917 int is_player_env = 0; 3748 int is_player_env = 0;
3918 char item_name[MAX_BUF];
3919 3749
3920 item = find_marked_object (who); 3750 item = find_marked_object (who);
3921 if (item) 3751 if (item)
3922 { 3752 {
3923 if (lighter->last_eat && lighter->stats.food) 3753 if (lighter->last_eat && lighter->stats.food)
3924 { /* lighter gets used up */ 3754 { /* lighter gets used up */
3925 /* Split multiple lighters if they're being used up. Otherwise * 3755 /* Split multiple lighters if they're being used up. Otherwise *
3926 * one charge from each would be used up. --DAMN */ 3756 * one charge from each would be used up. --DAMN */
3927 if (lighter->nrof > 1) 3757 if (lighter->nrof > 1)
3928 { 3758 {
3929 object *oneLighter = get_object (); 3759 object *oneLighter = lighter->clone ();
3930 3760
3931 copy_object (lighter, oneLighter);
3932 lighter->nrof -= 1; 3761 lighter->nrof -= 1;
3933 oneLighter->nrof = 1; 3762 oneLighter->nrof = 1;
3934 oneLighter->stats.food--; 3763 oneLighter->stats.food--;
3935 esrv_send_item (who, lighter); 3764 esrv_send_item (who, lighter);
3936 oneLighter = insert_ob_in_ob (oneLighter, who); 3765 oneLighter = insert_ob_in_ob (oneLighter, who);
… …
3942 else if (lighter->last_eat) 3771 else if (lighter->last_eat)
3943 { /* no charges left in lighter */ 3772 { /* no charges left in lighter */
3944 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with a used up %s.", &item->name, &lighter->name); 3773 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with a used up %s.", &item->name, &lighter->name);
3945 return; 3774 return;
3946 } 3775 }
3776
3947 /* Perhaps we should split what we are trying to light on fire? 3777 /* Perhaps we should split what we are trying to light on fire?
3948 * I can't see many times when you would want to light multiple 3778 * I can't see many times when you would want to light multiple
3949 * objects at once. 3779 * objects at once.
3950 */ 3780 */
3951 /* If the item is destroyed, we don't have a valid pointer to the 3781
3952 * name object, so make a copy so the message we print out makes
3953 * some sense.
3954 */
3955 strcpy (item_name, item->name);
3956 if (who == is_player_inv (item)) 3782 if (who == item->in_player ())
3957 is_player_env = 1; 3783 is_player_env = 1;
3958 3784
3959 save_throw_object (item, AT_FIRE, who); 3785 save_throw_object (item, AT_FIRE, who);
3960 /* Change to check count and not freed, since the object pointer 3786
3961 * may have gotten recycled
3962 */
3963 if (item->destroyed ()) 3787 if (item->destroyed ())
3964 { 3788 {
3965 new_draw_info_format (NDI_UNIQUE, 0, who, "You light the %s with the %s.", &item_name, &lighter->name); 3789 new_draw_info_format (NDI_UNIQUE, 0, who, "You light the %s with the %s.", &item->name, &lighter->name);
3966 /* Need to update the player so that the players glow radius 3790 /* Need to update the player so that the players glow radius
3967 * gets changed. 3791 * gets changed.
3968 */ 3792 */
3969 if (is_player_env) 3793 if (is_player_env)
3970 fix_player (who); 3794 who->update_stats ();
3971 } 3795 }
3972 else 3796 else
3973 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with the %s and fail.", &item->name, &lighter->name); 3797 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with the %s and fail.", &item->name, &lighter->name);
3974 } 3798 }
3975 else /* nothing to light */ 3799 else /* nothing to light */
… …
3992 object *tmp; 3816 object *tmp;
3993 3817
3994 new_draw_info (NDI_UNIQUE, 0, op, "Your spell warps!."); 3818 new_draw_info (NDI_UNIQUE, 0, op, "Your spell warps!.");
3995 tmp = get_archetype (SPELL_WONDER); 3819 tmp = get_archetype (SPELL_WONDER);
3996 cast_wonder (op, op, 0, tmp); 3820 cast_wonder (op, op, 0, tmp);
3997 free_object (tmp); 3821 tmp->destroy ();
3998 } 3822 }
3999 else if (failure <= -15 && failure > -35) 3823 else if (failure <= -15 && failure > -35)
4000 { /* drain mana */ 3824 { /* drain mana */
4001 new_draw_info (NDI_UNIQUE, 0, op, "Your mana is drained!."); 3825 new_draw_info (NDI_UNIQUE, 0, op, "Your mana is drained!.");
4002 op->stats.sp -= random_roll (0, power - 1, op, PREFER_LOW); 3826 op->stats.sp -= random_roll (0, power - 1, op, PREFER_LOW);
… …
4020 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!"); 3844 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!");
4021 blind_player (op, op, power); 3845 blind_player (op, op, power);
4022 } 3846 }
4023 else if (failure <= -80) 3847 else if (failure <= -80)
4024 { /* blast the immediate area */ 3848 { /* blast the immediate area */
4025 object *tmp;
4026
4027 tmp = get_archetype (LOOSE_MANA); 3849 object *tmp = get_archetype (LOOSE_MANA);
4028 cast_magic_storm (op, tmp, power); 3850 cast_magic_storm (op, tmp, power);
4029 new_draw_info (NDI_UNIQUE, 0, op, "You unlease uncontrolled mana!"); 3851 new_draw_info (NDI_UNIQUE, 0, op, "You unleash uncontrolled mana!");
4030 free_object (tmp); 3852 tmp->destroy ();
4031 } 3853 }
4032 } 3854 }
4033} 3855}
4034 3856
4035void 3857void
… …
4054 */ 3876 */
4055 int i, j; 3877 int i, j;
4056 3878
4057 for (i = 0; i < NUM_STATS; i++) 3879 for (i = 0; i < NUM_STATS; i++)
4058 { 3880 {
4059 sint8 stat = get_attr_value (stats, i);
4060 int race_bonus = get_attr_value (&(pl->arch->clone.stats), i); 3881 int race_bonus = pl->arch->clone.stats.stat (i);
3882 sint8 stat = stats->stat (i) + ns->stat (i);
4061 3883
4062 stat += get_attr_value (ns, i);
4063 if (stat > 20 + race_bonus) 3884 if (stat > 20 + race_bonus)
4064 { 3885 {
4065 excess_stat++; 3886 excess_stat++;
4066 stat = 20 + race_bonus; 3887 stat = 20 + race_bonus;
4067 } 3888 }
4068 set_attr_value (stats, i, stat); 3889
3890 stats->stat (i) = stat;
4069 } 3891 }
4070 3892
4071 for (j = 0; excess_stat > 0 && j < 100; j++) 3893 for (j = 0; excess_stat > 0 && j < 100; j++)
4072 { /* try 100 times to assign excess stats */ 3894 { /* try 100 times to assign excess stats */
4073 int i = rndm (0, 6); 3895 int i = rndm (0, 6);
4074 int stat = get_attr_value (stats, i);
4075 int race_bonus = get_attr_value (&(pl->arch->clone.stats), i);
4076 3896
4077 if (i == CHA) 3897 if (i == CHA)
4078 continue; /* exclude cha from this */ 3898 continue; /* exclude cha from this */
3899
3900 int stat = stats->stat (i);
3901 int race_bonus = pl->arch->clone.stats.stat (i);
4079 if (stat < 20 + race_bonus) 3902 if (stat < 20 + race_bonus)
4080 { 3903 {
4081 change_attr_value (stats, i, 1); 3904 change_attr_value (stats, i, 1);
4082 excess_stat--; 3905 excess_stat--;
4083 } 3906 }
… …
4086 /* insert the randomitems from the change's treasurelist into 3909 /* insert the randomitems from the change's treasurelist into
4087 * the player ref: player.c 3910 * the player ref: player.c
4088 */ 3911 */
4089 if (change->randomitems != NULL) 3912 if (change->randomitems != NULL)
4090 give_initial_items (pl, change->randomitems); 3913 give_initial_items (pl, change->randomitems);
4091
4092 3914
4093 /* set up the face, for some races. */ 3915 /* set up the face, for some races. */
4094 3916
4095 /* first, look for the force object banning 3917 /* first, look for the force object banning
4096 * changing the face. Certain races never change face with class. 3918 * changing the face. Certain races never change face with class.

Diff Legend

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