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.25 by root, Mon Sep 11 23:33:30 2006 UTC vs.
Revision 1.97 by root, Tue May 15 19:07:15 2007 UTC

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

Diff Legend

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