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.27 by root, Thu Sep 14 21:16:12 2006 UTC vs.
Revision 1.92 by root, Sat May 12 18:23:51 2007 UTC

1
2/* 1/*
3 * static char *rcsid_apply_c =
4 * "$Id: apply.C,v 1.27 2006/09/14 21:16:12 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 = archetype::find (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 */
… …
1352 1153
1353 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 1154 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1354 { 1155 {
1355 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);
1356 1157
1357 remove_ob (tmp); 1158 tmp->remove ();
1358 1159
1359 if (i == -1) 1160 if (i == -1)
1360 i = 0; 1161 i = 0;
1361 1162
1362 tmp->map = op->map; 1163 tmp->map = op->map;
… …
1426 { 1227 {
1427 LOG (llevError, "Internal shop-mat problem.\n"); 1228 LOG (llevError, "Internal shop-mat problem.\n");
1428 } 1229 }
1429 else 1230 else
1430 { 1231 {
1431 remove_ob (op); 1232 op->remove ();
1432 op->x += freearr_x[i]; 1233 op->x += freearr_x[i];
1433 op->y += freearr_y[i]; 1234 op->y += freearr_y[i];
1434 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;
1435 } 1236 }
1436 } 1237 }
… …
1634 1435
1635 1436
1636 case CONVERTER: 1437 case CONVERTER:
1637 if (convert_item (victim, trap) < 0) 1438 if (convert_item (victim, trap) < 0)
1638 { 1439 {
1639 object *op;
1640
1641 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));
1642 1441 get_archetype ("burnout")->insert_at (trap, trap);
1643 op = get_archetype ("burnout");
1644 if (op != NULL)
1645 {
1646 op->x = trap->x;
1647 op->y = trap->y;
1648 insert_ob_in_map (op, trap->map, trap, 0);
1649 } 1442 }
1650 } 1443
1651 goto leave; 1444 goto leave;
1652 1445
1653 case TRIGGER_BUTTON: 1446 case TRIGGER_BUTTON:
1654 case TRIGGER_PEDESTAL: 1447 case TRIGGER_PEDESTAL:
1655 case TRIGGER_ALTAR: 1448 case TRIGGER_ALTAR:
… …
1684 if (victim->type == PLAYER && EXIT_PATH (trap)) 1477 if (victim->type == PLAYER && EXIT_PATH (trap))
1685 { 1478 {
1686 /* Basically, don't show exits leading to random maps the 1479 /* Basically, don't show exits leading to random maps the
1687 * players output. 1480 * players output.
1688 */ 1481 */
1689 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2) && strncmp (EXIT_PATH (trap), "/random/", 8)) 1482 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2))
1690 new_draw_info (NDI_NAVY, 0, victim, trap->msg); 1483 new_draw_info (NDI_NAVY, 0, victim, trap->msg);
1484
1691 enter_exit (victim, trap); 1485 victim->enter_exit (trap);
1692 } 1486 }
1693 goto leave; 1487 goto leave;
1694 1488
1695 case ENCOUNTER: 1489 case ENCOUNTER:
1696 /* may be some leftovers on this */ 1490 /* may be some leftovers on this */
… …
1711 1505
1712 apply_sign (victim, trap, 1); 1506 apply_sign (victim, trap, 1);
1713 goto leave; 1507 goto leave;
1714 1508
1715 case CONTAINER: 1509 case CONTAINER:
1716 if (victim->type == PLAYER)
1717 (void) esrv_apply_container (victim, trap);
1718 else
1719 (void) apply_container (victim, trap); 1510 apply_container (victim, trap);
1720 goto leave; 1511 goto leave;
1721 1512
1722 case RUNE: 1513 case RUNE:
1723 case TRAP: 1514 case TRAP:
1724 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE)) 1515 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE))
… …
1784 1575
1785 readable_message_type *msgType = get_readable_message_type (tmp); 1576 readable_message_type *msgType = get_readable_message_type (tmp);
1786 1577
1787 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, 1578 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1788 msgType->message_type, msgType->message_subtype, 1579 msgType->message_type, msgType->message_subtype,
1789 "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);
1790 1582
1791 /* gain xp from reading */ 1583 /* gain xp from reading */
1792 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1584 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1793 { /* only if not read before */ 1585 { /* only if not read before */
1794 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1586 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
1795 1587
1796 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1588 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1797 { 1589 {
1798 /*exp_gain *= 2; because they just identified it too */ 1590 /*exp_gain *= 2; because they just identified it too */
1799 SET_FLAG (tmp, FLAG_IDENTIFIED); 1591 SET_FLAG (tmp, FLAG_IDENTIFIED);
1592
1800 /* If in a container, update how it looks */ 1593 /* If in a container, update how it looks */
1801 if (tmp->env) 1594 if (tmp->env)
1802 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1595 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1803 else 1596 else
1804 op->contr->socket.update_look = 1; 1597 op->contr->ns->floorbox_update ();
1805 } 1598 }
1599
1806 change_exp (op, exp_gain, skill_ob->skill, 0); 1600 change_exp (op, exp_gain, skill_ob->skill, 0);
1807 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 */
1808 } 1602 }
1809} 1603}
1810 1604
… …
1859 } 1653 }
1860 return; 1654 return;
1861 } 1655 }
1862 1656
1863 play_sound_player_only (op->contr, SOUND_LEARN_SPELL, 0, 0); 1657 play_sound_player_only (op->contr, SOUND_LEARN_SPELL, 0, 0);
1864 tmp = get_object (); 1658 tmp = spell->clone ();
1865 copy_object (spell, tmp);
1866 insert_ob_in_ob (tmp, op); 1659 insert_ob_in_ob (tmp, op);
1867 1660
1868 if (special_prayer) 1661 if (special_prayer)
1869 {
1870 SET_FLAG (tmp, FLAG_STARTEQUIP); 1662 SET_FLAG (tmp, FLAG_STARTEQUIP);
1871 }
1872 1663
1873 esrv_add_spells (op->contr, tmp); 1664 esrv_add_spells (op->contr, tmp);
1874} 1665}
1875 1666
1876/** 1667/**
… …
1893 } 1684 }
1894 1685
1895 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);
1896 player_unready_range_ob (op->contr, spob); 1687 player_unready_range_ob (op->contr, spob);
1897 esrv_remove_spell (op->contr, spob); 1688 esrv_remove_spell (op->contr, spob);
1898 remove_ob (spob); 1689 spob->destroy ();
1899 free_object (spob);
1900} 1690}
1901 1691
1902/** 1692/**
1903 * Handles player applying a spellbook. 1693 * Handles player applying a spellbook.
1904 * 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,
… …
1942 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.");
1943 return; 1733 return;
1944 } 1734 }
1945 1735
1946 spell = tmp->inv; 1736 spell = tmp->inv;
1737
1947 if (!spell) 1738 if (!spell)
1948 { 1739 {
1949 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);
1950 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.");
1951 return; 1742 return;
1952 } 1743 }
1953 if (spell->level > (skop->level + 10)) 1744
1745 if (skop->level < int (sqrtf (spell->level) * 1.5f))
1954 { 1746 {
1955 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]");
1956 return; 1748 return;
1957 } 1749 }
1958 1750
1959 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);
1960 1752
1961 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1753 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1962 { 1754 {
1963 identify (tmp); 1755 identify (tmp);
1756
1964 if (tmp->env) 1757 if (tmp->env)
1965 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1758 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1966 else 1759 else
1967 op->contr->socket.update_look = 1; 1760 op->contr->ns->floorbox_update ();
1968 } 1761 }
1969 1762
1970 /* 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
1971 * 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
1972 * 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
… …
1982 { 1775 {
1983 spell_skill = find_skill_by_name (op, spell->skill); 1776 spell_skill = find_skill_by_name (op, spell->skill);
1984 1777
1985 if (!spell_skill) 1778 if (!spell_skill)
1986 { 1779 {
1987 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);
1988 return; 1781 return;
1989 } 1782 }
1990 1783
1991 if (spell_skill->level < spell->level) 1784 if (spell_skill->level < spell->level)
1992 { 1785 {
… …
2026 else 1819 else
2027 { 1820 {
2028 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1821 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0);
2029 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");
2030 } 1823 }
1824
2031 decrease_ob (tmp); 1825 decrease_ob (tmp);
2032} 1826}
2033 1827
2034/** 1828/**
2035 * Handles applying a spell scroll. 1829 * Handles applying a spell scroll.
… …
2088 */ 1882 */
2089static void 1883static void
2090apply_treasure (object *op, object *tmp) 1884apply_treasure (object *op, object *tmp)
2091{ 1885{
2092 object *treas; 1886 object *treas;
2093 tag_t tmp_tag = tmp->count, op_tag = op->count;
2094 1887
2095 1888
2096 /* 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
2097 * 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
2098 * 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
… …
2109 } 1902 }
2110 while (tmp->inv) 1903 while (tmp->inv)
2111 { 1904 {
2112 treas = tmp->inv; 1905 treas = tmp->inv;
2113 1906
2114 remove_ob (treas); 1907 treas->remove ();
2115 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));
2116 1909
2117 treas->x = op->x; 1910 treas->x = op->x;
2118 treas->y = op->y; 1911 treas->y = op->y;
2119 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);
2120 1913
2121 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))
2122 spring_trap (treas, op); 1915 spring_trap (treas, op);
1916
2123 /* If either player or container was destroyed, no need to do 1917 /* If either player or container was destroyed, no need to do
2124 * further processing. I think this should be enclused with 1918 * further processing. I think this should be enclused with
2125 * spring trap above, as I don't think there is otherwise 1919 * spring trap above, as I don't think there is otherwise
2126 * any way for the treasure chest or player to get killed 1920 * any way for the treasure chest or player to get killed
2127 */ 1921 */
2128 if (was_destroyed (op, op_tag) || was_destroyed (tmp, tmp_tag)) 1922 if (op->destroyed () || tmp->destroyed ())
2129 break; 1923 break;
2130 } 1924 }
2131 1925
2132 if (!was_destroyed (tmp, tmp_tag) && tmp->inv == NULL) 1926 if (!tmp->destroyed () && tmp->inv == NULL)
2133 decrease_ob (tmp); 1927 decrease_ob (tmp);
2134 1928
2135} 1929}
2136 1930
2137/** 1931/**
… …
2231 if (meal->type != FLESH || !is_dragon_pl (op)) 2025 if (meal->type != FLESH || !is_dragon_pl (op))
2232 return 0; 2026 return 0;
2233 2027
2234 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces 2028 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces
2235 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
2236 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2033 for (tmp = op->inv; tmp; tmp = tmp->below)
2237 {
2238 if (tmp->type == FORCE) 2034 if (tmp->type == FORCE)
2239 {
2240 if (strcmp (tmp->arch->name, "dragon_skin_force") == 0) 2035 if (tmp->arch->name == dragon_skin_force)
2241 skin = tmp; 2036 skin = tmp;
2242 else if (strcmp (tmp->arch->name, "dragon_ability_force") == 0) 2037 else if (tmp->arch->name == dragon_ability_force)
2243 abil = tmp; 2038 abil = tmp;
2244 }
2245 }
2246 2039
2247 /* 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
2248 which is not to be considered a dragon -> bail out */ 2041 which is not to be considered a dragon -> bail out */
2249 if (skin == NULL || abil == NULL) 2042 if (skin == NULL || abil == NULL)
2250 return 0; 2043 return 0;
… …
2291 /* doubled chance for resistance of ability-focus */ 2084 /* doubled chance for resistance of ability-focus */
2292 if (i == abil->stats.exp) 2085 if (i == abil->stats.exp)
2293 chance = MIN (100., chance * 2.); 2086 chance = MIN (100., chance * 2.);
2294 2087
2295 /* 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!) */
2296 if (RANDOM () % 10000 < (int) (chance * 100)) 2089 if (rndm (10000) < (unsigned int) (chance * 100))
2297 { 2090 {
2298 atnr_winner[winners] = i; 2091 atnr_winner[winners] = i;
2299 winners++; 2092 winners++;
2300 } 2093 }
2301 2094
… …
2332 2125
2333 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95) 2126 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95)
2334 { 2127 {
2335 /* resistance increased! */ 2128 /* resistance increased! */
2336 skin->resist[i]++; 2129 skin->resist[i]++;
2337 fix_player (op); 2130 op->update_stats ();
2338 2131
2339 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]);
2340 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, buf); 2133 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, buf);
2341 } 2134 }
2342 2135
… …
2361 } 2154 }
2362 } 2155 }
2363 return 1; 2156 return 1;
2364} 2157}
2365 2158
2366static void
2367apply_savebed (object *pl)
2368{
2369#ifndef COZY_SERVER
2370 if (!pl->contr->name_changed || !pl->stats.exp)
2371 {
2372 new_draw_info (NDI_UNIQUE, 0, pl, "You don't deserve to save your character yet.");
2373 return;
2374 }
2375#endif
2376 INVOKE_PLAYER (LOGOUT, pl->contr);
2377 /* Need to call terminate_all_pets() before we remove the player ob */
2378 terminate_all_pets (pl);
2379 remove_ob (pl);
2380 pl->direction = 0;
2381 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, pl, "%s leaves the game.", &pl->name);
2382
2383 /* update respawn position */
2384 strcpy (pl->contr->savebed_map, pl->map->path);
2385 pl->contr->bed_x = pl->x;
2386 pl->contr->bed_y = pl->y;
2387
2388 strcpy (pl->contr->killer, "left");
2389 check_score (pl); /* Always check score */
2390 (void) save_player (pl, 0);
2391 pl->map->players--;
2392#if MAP_MAXTIMEOUT
2393 MAP_SWAP_TIME (pl->map) = MAP_TIMEOUT (pl->map);
2394#endif
2395 play_again (pl);
2396 pl->speed = 0;
2397 update_ob_speed (pl);
2398}
2399
2400/** 2159/**
2401 * Handles applying an improve armor scroll. 2160 * Handles applying an improve armor scroll.
2402 * Does some sanity checks, then calls improve_armour. 2161 * Does some sanity checks, then calls improve_armour.
2403 */ 2162 */
2404static void 2163static void
… …
2409 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))
2410 { 2169 {
2411 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.");
2412 return; 2171 return;
2413 } 2172 }
2173
2414 armor = find_marked_object (op); 2174 armor = find_marked_object (op);
2175
2415 if (!armor) 2176 if (!armor)
2416 { 2177 {
2417 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.");
2418 return; 2179 return;
2419 } 2180 }
2181
2420 if (armor->type != ARMOUR 2182 if (armor->type != ARMOUR
2421 && armor->type != CLOAK 2183 && armor->type != CLOAK
2422 && 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)
2423 { 2185 {
2424 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");
… …
2427 2189
2428 new_draw_info (NDI_UNIQUE, 0, op, "Applying armour enchantment."); 2190 new_draw_info (NDI_UNIQUE, 0, op, "Applying armour enchantment.");
2429 improve_armour (op, tmp, armor); 2191 improve_armour (op, tmp, armor);
2430} 2192}
2431 2193
2432
2433extern void 2194extern void
2434apply_poison (object *op, object *tmp) 2195apply_poison (object *op, object *tmp)
2435{ 2196{
2436 if (op->type == PLAYER) 2197 if (op->type == PLAYER)
2437 { 2198 {
… …
2448 handle_apply_yield (tmp); 2209 handle_apply_yield (tmp);
2449 decrease_ob (tmp); 2210 decrease_ob (tmp);
2450} 2211}
2451 2212
2452/** 2213/**
2453 * 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.
2454 * A valid 2 way exit means: 2215 * A valid 2 way exit means:
2455 * -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)
2456 * -You are 2217 * -You are
2457 * ° the owner of the exit 2218 * ° the owner of the exit
2458 * ° or in the same party as the owner 2219 * ° or in the same party as the owner
2459 * 2220 *
2460 * 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
2461 * 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
2462 * 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).
2463 */ 2224 */
2464int 2225int
2465is_legal_2ways_exit (object *op, object *exit) 2226is_legal_2ways_exit (object *op, object *exit)
2466{ 2227{
2467 object *tmp;
2468 object *exit_owner;
2469 player *pp;
2470 mapstruct *exitmap;
2471
2472 if (exit->stats.exp != 1) 2228 if (exit->stats.exp != 1)
2473 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
2474 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race) 2232 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race)
2475 return 0; /* This is a reset town portal */ 2233 return 0; /* This is a reset town portal */
2476 /* To know if an exit has a correspondant, we look at 2234#endif
2477 * all the exits in destination and try to find one with same path as 2235
2478 * the current exit's position */ 2236 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map);
2479 if (!strncmp (EXIT_PATH (exit), settings.localdir, strlen (settings.localdir))) 2237
2480 exitmap = ready_map_name (EXIT_PATH (exit), MAP_PLAYER_UNIQUE);
2481 else
2482 exitmap = ready_map_name (EXIT_PATH (exit), 0);
2483 if (exitmap) 2238 if (exitmap)
2484 { 2239 {
2240 exitmap->load_sync ();
2241
2485 tmp = get_map_ob (exitmap, EXIT_X (exit), EXIT_Y (exit)); 2242 object *tmp = exitmap->at (EXIT_X (exit), EXIT_Y (exit)).bot;
2243
2486 if (!tmp) 2244 if (!tmp)
2487 return 0; 2245 return 0;
2488 for ((tmp = get_map_ob (exitmap, EXIT_X (exit), EXIT_Y (exit))); tmp; tmp = tmp->above) 2246
2247 for (; tmp; tmp = tmp->above)
2489 { 2248 {
2490 if (tmp->type != EXIT) 2249 if (tmp->type != EXIT)
2491 continue; /*Not an exit */ 2250 continue; /*Not an exit */
2251
2492 if (!EXIT_PATH (tmp)) 2252 if (!EXIT_PATH (tmp))
2493 continue; /*Not a valid exit */ 2253 continue; /*Not a valid exit */
2254
2494 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y)) 2255 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y))
2495 continue; /*Not in the same place */ 2256 continue; /*Not in the same place */
2257
2496 if (strcmp (exit->map->path, EXIT_PATH (tmp)) != 0) 2258 if (exit->map->path != EXIT_PATH (tmp))
2497 continue; /*Not in the same map */ 2259 continue; /*Not in the same map */
2498 2260
2499 /* 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
2500 * 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
2501 * town portals to prevent strangers from visiting your appartments 2263 * town portals to prevent strangers from visiting your appartments
2502 */ 2264 */
2503 if (!exit->race) 2265 if (!exit->race)
2504 return 1; /*No owner, free for all! */ 2266 return 1; /*No owner, free for all! */
2267
2505 exit_owner = NULL; 2268 object *exit_owner = 0;
2506 for (pp = first_player; pp; pp = pp->next) 2269
2270 for_all_players (pp)
2507 { 2271 {
2508 if (!pp->ob) 2272 if (!pp->ob)
2509 continue; 2273 continue;
2274
2510 if (pp->ob->name != exit->race) 2275 if (pp->ob->name != exit->race)
2511 continue; 2276 continue;
2277
2512 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 */
2513 break; 2279 break;
2514 } 2280 }
2281
2515 if (!exit_owner) 2282 if (!exit_owner)
2516 return 0; /* No more owner */ 2283 return 0; /* No more owner */
2284
2517 if (exit_owner->contr == op->contr) 2285 if (exit_owner->contr == op->contr)
2518 return 1; /*It is your exit */ 2286 return 1; /*It is your exit */
2287
2519 if (exit_owner && /*There is a owner */ 2288 if (exit_owner && /*There is a owner */
2520 (op->contr) && /*A player tries to pass */ 2289 (op->contr) && /*A player tries to pass */
2521 ((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 */
2522 (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 */
2523 return 0; 2292 return 0;
2293
2524 return 1; 2294 return 1;
2525 } 2295 }
2526 } 2296 }
2297
2527 return 0; 2298 return 0;
2528} 2299}
2529
2530 2300
2531/** 2301/**
2532 * Main apply handler. 2302 * Main apply handler.
2533 * 2303 *
2534 * Checks for unpaid items before applying. 2304 * Checks for unpaid items before applying.
… …
2542 * being applied. 2312 * being applied.
2543 * 2313 *
2544 * aflag is special (always apply/unapply) flags. Nothing is done with 2314 * aflag is special (always apply/unapply) flags. Nothing is done with
2545 * them in this function - they are passed to apply_special 2315 * them in this function - they are passed to apply_special
2546 */ 2316 */
2547
2548int 2317int
2549manual_apply (object *op, object *tmp, int aflag) 2318manual_apply (object *op, object *tmp, int aflag)
2550{ 2319{
2551 if (tmp->head) 2320 if (tmp->head)
2552 tmp = tmp->head; 2321 tmp = tmp->head;
… …
2557 { 2326 {
2558 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.");
2559 return 1; 2328 return 1;
2560 } 2329 }
2561 else 2330 else
2562 {
2563 return 0; /* monsters just skip unpaid items */ 2331 return 0; /* monsters just skip unpaid items */
2564 }
2565 } 2332 }
2566 2333
2567 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op))) 2334 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op)))
2568 return RESULT_INT (0); 2335 return RESULT_INT (0);
2569 2336
2570 switch (tmp->type) 2337 switch (tmp->type)
2571 { 2338 {
2572
2573 case CF_HANDLE: 2339 case CF_HANDLE:
2574 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2340 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle.");
2575 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);
2576 tmp->value = tmp->value ? 0 : 1; 2342 tmp->value = tmp->value ? 0 : 1;
2577 SET_ANIMATION (tmp, tmp->value); 2343 SET_ANIMATION (tmp, tmp->value);
… …
2584 { 2350 {
2585 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2351 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle.");
2586 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);
2587 } 2353 }
2588 else 2354 else
2589 {
2590 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.");
2591 } 2356
2592 return 1; 2357 return 1;
2593 2358
2594 case EXIT: 2359 case EXIT:
2595 if (op->type != PLAYER) 2360 if (op->type != PLAYER)
2596 return 0; 2361 return 0;
2362
2597 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2363 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp))
2598 {
2599 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));
2600 }
2601 else 2365 else
2602 { 2366 {
2603 /* Don't display messages for random maps. */ 2367 /* Don't display messages for random maps. */
2604 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2) && strncmp (EXIT_PATH (tmp), "/random/", 8)) 2368 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2))
2605 new_draw_info (NDI_NAVY, 0, op, tmp->msg); 2369 new_draw_info (NDI_NAVY, 0, op, tmp->msg);
2370
2606 enter_exit (op, tmp); 2371 op->enter_exit (tmp);
2607 } 2372 }
2373
2608 return 1; 2374 return 1;
2609 2375
2610 case SIGN: 2376 case SIGN:
2611 apply_sign (op, tmp, 0); 2377 apply_sign (op, tmp, 0);
2612 return 1; 2378 return 1;
… …
2616 { 2382 {
2617 apply_book (op, tmp); 2383 apply_book (op, tmp);
2618 return 1; 2384 return 1;
2619 } 2385 }
2620 else 2386 else
2621 {
2622 return 0; 2387 return 0;
2623 }
2624 2388
2625 case SKILLSCROLL: 2389 case SKILLSCROLL:
2626 if (op->type == PLAYER) 2390 if (op->type == PLAYER)
2627 { 2391 {
2628 apply_skillscroll (op, tmp); 2392 apply_skillscroll (op, tmp);
2629 return 1; 2393 return 1;
2630 } 2394 }
2395 else
2631 return 0; 2396 return 0;
2632 2397
2633 case SPELLBOOK: 2398 case SPELLBOOK:
2634 if (op->type == PLAYER) 2399 if (op->type == PLAYER)
2635 { 2400 {
2636 apply_spellbook (op, tmp); 2401 apply_spellbook (op, tmp);
2637 return 1; 2402 return 1;
2638 } 2403 }
2404 else
2639 return 0; 2405 return 0;
2640 2406
2641 case SCROLL: 2407 case SCROLL:
2642 apply_scroll (op, tmp, 0); 2408 apply_scroll (op, tmp, 0);
2643 return 1; 2409 return 1;
2644 2410
2645 case POTION: 2411 case POTION:
2646 (void) apply_potion (op, tmp); 2412 apply_potion (op, tmp);
2647 return 1; 2413 return 1;
2648 2414
2649 /* Eneq(@csd.uu.se): Handle apply on containers. */ 2415 /* Eneq(@csd.uu.se): Handle apply on containers. */
2416 //TODO: remove, as it is unsed?
2650 case CLOSE_CON: 2417 case CLOSE_CON:
2651 if (op->type == PLAYER)
2652 (void) esrv_apply_container (op, tmp->env);
2653 else
2654 (void) apply_container (op, tmp->env); 2418 apply_container (op, tmp->env);
2655 return 1; 2419 return 1;
2656 2420
2657 case CONTAINER: 2421 case CONTAINER:
2658 if (op->type == PLAYER)
2659 (void) esrv_apply_container (op, tmp);
2660 else
2661 (void) apply_container (op, tmp); 2422 apply_container (op, tmp);
2662 return 1; 2423 return 1;
2663 2424
2664 case TREASURE: 2425 case TREASURE:
2665 if (op->type == PLAYER) 2426 if (op->type == PLAYER)
2666 { 2427 {
2667 apply_treasure (op, tmp); 2428 apply_treasure (op, tmp);
2668 return 1; 2429 return 1;
2669 } 2430 }
2670 else 2431 else
2671 {
2672 return 0; 2432 return 0;
2673 }
2674 2433
2675 case WEAPON: 2434 case WEAPON:
2676 case ARMOUR: 2435 case ARMOUR:
2677 case BOOTS: 2436 case BOOTS:
2678 case GLOVES: 2437 case GLOVES:
… …
2691 case LAMP: 2450 case LAMP:
2692 case BUILDER: 2451 case BUILDER:
2693 case SKILL_TOOL: 2452 case SKILL_TOOL:
2694 if (tmp->env != op) 2453 if (tmp->env != op)
2695 return 2; /* not in inventory */ 2454 return 2; /* not in inventory */
2455
2696 (void) apply_special (op, tmp, aflag); 2456 apply_special (op, tmp, aflag);
2697 return 1; 2457 return 1;
2698 2458
2699 case DRINK: 2459 case DRINK:
2700 case FOOD: 2460 case FOOD:
2701 case FLESH: 2461 case FLESH:
… …
2705 case POISON: 2465 case POISON:
2706 apply_poison (op, tmp); 2466 apply_poison (op, tmp);
2707 return 1; 2467 return 1;
2708 2468
2709 case SAVEBED: 2469 case SAVEBED:
2710 if (op->type == PLAYER)
2711 {
2712 apply_savebed (op);
2713 return 1; 2470 return 1;
2714 }
2715 else
2716 {
2717 return 0;
2718 }
2719 2471
2720 case ARMOUR_IMPROVER: 2472 case ARMOUR_IMPROVER:
2721 if (op->type == PLAYER) 2473 if (op->type == PLAYER)
2722 { 2474 {
2723 apply_armour_improver (op, tmp); 2475 apply_armour_improver (op, tmp);
2724 return 1; 2476 return 1;
2725 } 2477 }
2726 else 2478 else
2727 {
2728 return 0; 2479 return 0;
2729 }
2730 2480
2731 case WEAPON_IMPROVER: 2481 case WEAPON_IMPROVER:
2732 (void) check_improve_weapon (op, tmp); 2482 check_improve_weapon (op, tmp);
2733 return 1; 2483 return 1;
2734 2484
2735 case CLOCK: 2485 case CLOCK:
2736 if (op->type == PLAYER) 2486 if (op->type == PLAYER)
2737 { 2487 {
… …
2745 play_sound_player_only (op->contr, SOUND_CLOCK, 0, 0); 2495 play_sound_player_only (op->contr, SOUND_CLOCK, 0, 0);
2746 new_draw_info (NDI_UNIQUE, 0, op, buf); 2496 new_draw_info (NDI_UNIQUE, 0, op, buf);
2747 return 1; 2497 return 1;
2748 } 2498 }
2749 else 2499 else
2750 {
2751 return 0; 2500 return 0;
2752 }
2753 2501
2754 case MENU: 2502 case MENU:
2755 if (op->type == PLAYER) 2503 if (op->type == PLAYER)
2756 { 2504 {
2757 shop_listing (op); 2505 shop_listing (tmp, op);
2758 return 1; 2506 return 1;
2759 } 2507 }
2760 else 2508 else
2761 {
2762 return 0; 2509 return 0;
2763 }
2764 2510
2765 case POWER_CRYSTAL: 2511 case POWER_CRYSTAL:
2766 apply_power_crystal (op, tmp); /* see egoitem.c */ 2512 apply_power_crystal (op, tmp); /* see egoitem.c */
2767 return 1; 2513 return 1;
2768 2514
… …
2771 { 2517 {
2772 apply_lighter (op, tmp); 2518 apply_lighter (op, tmp);
2773 return 1; 2519 return 1;
2774 } 2520 }
2775 else 2521 else
2776 {
2777 return 0; 2522 return 0;
2778 }
2779 2523
2780 case ITEM_TRANSFORMER: 2524 case ITEM_TRANSFORMER:
2781 apply_item_transformer (op, tmp); 2525 apply_item_transformer (op, tmp);
2782 return 1; 2526 return 1;
2783 2527
… …
2814 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))
2815 { 2559 {
2816 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);
2817 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!");
2818 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.");
2819 remove_ob (op); 2563 op->destroy ();
2820 free_object (op);
2821 return 1; 2564 return 1;
2822 } 2565 }
2823 2566
2824 pl->contr->last_used = op; 2567 pl->contr->last_used = op;
2825 pl->contr->last_used_id = op->count;
2826 2568
2827 tmp = manual_apply (pl, op, aflag); 2569 tmp = manual_apply (pl, op, aflag);
2828 if (!quiet) 2570 if (!quiet)
2829 { 2571 {
2830 if (tmp == 0) 2572 if (tmp == 0)
… …
2838/** 2580/**
2839 * player_apply_below attempts to apply the object 'below' the player. 2581 * player_apply_below attempts to apply the object 'below' the player.
2840 * 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
2841 * we use the ground. 2583 * we use the ground.
2842 */ 2584 */
2843
2844void 2585void
2845player_apply_below (object *pl) 2586player_apply_below (object *pl)
2846{ 2587{
2847 object *tmp, *next;
2848 int floors; 2588 int floors = 0;
2849 2589
2850 /* 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
2851 * item in the container. Otherwise, use the map. 2591 * item in the container. Otherwise, use the map.
2852 */
2853 tmp = (pl->container != NULL) ? pl->container->inv : pl->below;
2854
2855 /* 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
2856 * 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
2857 * 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
2858 * 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
2859 * not return a proper value. 2596 * not return a proper value.
2860 */ 2597 */
2861 for (floors = 0; tmp != NULL; tmp = next) 2598 for (object *next, *tmp = pl->container ? pl->container->inv : pl->below; tmp; tmp = next)
2862 { 2599 {
2863 next = tmp->below; 2600 next = tmp->below;
2601
2864 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 2602 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
2865 floors++; 2603 floors++;
2866 else if (floors > 0) 2604 else if (floors > 0)
2867 return; /* process only floor objects after first floor object */ 2605 return; /* process only floor objects after first floor object */
2868 2606
… …
2888 * 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.
2889 */ 2627 */
2890static int 2628static int
2891unapply_special (object *who, object *op, int aflags) 2629unapply_special (object *who, object *op, int aflags)
2892{ 2630{
2893 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)))
2894 return RESULT_INT (0); 2633 return RESULT_INT (0);
2895 2634
2896 object *tmp2; 2635 object *tmp2;
2897 2636
2898 CLEAR_FLAG (op, FLAG_APPLIED); 2637 CLEAR_FLAG (op, FLAG_APPLIED);
2638
2899 switch (op->type) 2639 switch (op->type)
2900 { 2640 {
2901 case WEAPON: 2641 case WEAPON:
2902 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op)); 2642 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op));
2903 2643
2904 (void) change_abil (who, op); 2644 change_abil (who, op);
2905 if (QUERY_FLAG (who, FLAG_READY_WEAPON))
2906 CLEAR_FLAG (who, FLAG_READY_WEAPON); 2645 CLEAR_FLAG (who, FLAG_READY_WEAPON);
2646
2647 if (who->contr)
2648 {
2649 if (who->contr->combat_ob == op)
2650 who->contr->combat_ob = 0;
2651
2652 if (who->current_weapon == op)
2653 who->current_weapon = 0;
2654 }
2655
2907 clear_skill (who); 2656 clear_skill (who);
2908 break; 2657 break;
2909 2658
2910 case SKILL: /* allows objects to impart skills */ 2659 case SKILL: /* allows objects to impart skills */
2911 case SKILL_TOOL: 2660 case SKILL_TOOL:
2912 if (op != who->chosen_skill) 2661 if (op != who->chosen_skill)
2913 {
2914 LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n"); 2662 LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n");
2663
2664 if (who->contr)
2915 } 2665 {
2916 if (who->type == PLAYER)
2917 {
2918 if (who->contr->shoottype == range_skill)
2919 who->contr->shoottype = range_none;
2920 if (!op->invisible) 2666 if (!op->invisible)
2921 {
2922 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op)); 2667 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op));
2923 }
2924 else 2668 else
2925 {
2926 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill); 2669 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill);
2927 } 2670 }
2928 } 2671
2929 (void) change_abil (who, op); 2672 change_abil (who, op);
2930 who->chosen_skill = NULL; 2673 who->chosen_skill = 0;
2931 CLEAR_FLAG (who, FLAG_READY_SKILL); 2674 CLEAR_FLAG (who, FLAG_READY_SKILL);
2932 break; 2675 break;
2933 2676
2934 case ARMOUR: 2677 case ARMOUR:
2935 case HELMET: 2678 case HELMET:
… …
2940 case AMULET: 2683 case AMULET:
2941 case GIRDLE: 2684 case GIRDLE:
2942 case BRACERS: 2685 case BRACERS:
2943 case CLOAK: 2686 case CLOAK:
2944 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op)); 2687 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op));
2945 (void) change_abil (who, op); 2688 change_abil (who, op);
2946 break; 2689 break;
2690
2947 case LAMP: 2691 case LAMP:
2948 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name); 2692 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name);
2949 tmp2 = arch_to_object (op->other_arch); 2693 tmp2 = arch_to_object (op->other_arch);
2950 tmp2->x = op->x; 2694 tmp2->x = op->x;
2951 tmp2->y = op->y; 2695 tmp2->y = op->y;
2952 tmp2->map = op->map; 2696 tmp2->map = op->map;
2953 tmp2->below = op->below; 2697 tmp2->below = op->below;
2954 tmp2->above = op->above; 2698 tmp2->above = op->above;
2955 tmp2->stats.food = op->stats.food; 2699 tmp2->stats.food = op->stats.food;
2956 CLEAR_FLAG (tmp2, FLAG_APPLIED); 2700 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2701
2957 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 2702 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2958 SET_FLAG (tmp2, FLAG_INV_LOCKED); 2703 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2959 if (who->type == PLAYER) 2704
2705 if (who->contr)
2960 esrv_del_item (who->contr, (tag_t) op->count); 2706 esrv_del_item (who->contr, op->count);
2961 remove_ob (op); 2707
2962 free_object (op); 2708 op->destroy ();
2963 insert_ob_in_ob (tmp2, who); 2709 insert_ob_in_ob (tmp2, who);
2964 fix_player (who); 2710 who->update_stats ();
2711
2965 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 2712 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2966 { 2713 {
2967 if (who->type == PLAYER) 2714 if (who->contr)
2968 { 2715 {
2969 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 2716 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
2970 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 2717 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2971 } 2718 }
2972 } 2719 }
2973 if (who->type == PLAYER) 2720
2721 if (who->contr)
2974 esrv_send_item (who, tmp2); 2722 esrv_send_item (who, tmp2);
2723
2975 return 1; /* otherwise, an attempt to drop causes problems */ 2724 return 1; /* otherwise, an attempt to drop causes problems */
2976 break; 2725
2977 case BOW: 2726 case BOW:
2978 case WAND: 2727 case WAND:
2979 case ROD: 2728 case ROD:
2980 case HORN: 2729 case HORN:
2981 clear_skill (who); 2730 clear_skill (who);
2731
2732 if (who->contr)
2733 {
2982 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2734 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2983 if (who->type == PLAYER) 2735
2984 { 2736 if (who->contr->ranged_ob == op)
2985 who->contr->shoottype = range_none; 2737 who->contr->ranged_ob = 0;
2738
2739 if (who->current_weapon == op)
2740 who->current_weapon = 0;
2986 } 2741 }
2987 else 2742 else
2988 { 2743 {
2989 if (op->type == BOW) 2744 if (op->type == BOW)
2990 CLEAR_FLAG (who, FLAG_READY_BOW); 2745 CLEAR_FLAG (who, FLAG_READY_BOW);
2991 else 2746 else
2992 CLEAR_FLAG (who, FLAG_READY_RANGE); 2747 CLEAR_FLAG (who, FLAG_READY_RANGE);
2993 } 2748 }
2749
2994 break; 2750 break;
2995 2751
2996 case BUILDER: 2752 case BUILDER:
2753 if (who->contr)
2754 {
2997 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2755 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2998 who->contr->shoottype = range_none; 2756
2999 who->contr->ranges[range_builder] = NULL; 2757 if (who->contr->ranged_ob == op)
2758 who->contr->ranged_ob = 0;
2759 }
3000 break; 2760 break;
3001 2761
3002 default: 2762 default:
3003 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op)); 2763 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op));
3004 break; 2764 break;
3005 } 2765 }
3006 2766
3007 fix_player (who); 2767 who->update_stats ();
3008 2768
3009 if (!(aflags & AP_NO_MERGE)) 2769 if (!(aflags & AP_NO_MERGE))
3010 { 2770 {
3011 object *tmp;
3012
3013 tag_t del_tag = op->count;
3014
3015 tmp = merge_ob (op, NULL); 2771 object *tmp = merge_ob (op, 0);
3016 if (who->type == PLAYER) 2772
2773 if (who->contr)
3017 { 2774 {
3018 if (tmp) 2775 if (tmp)
3019 { /* it was merged */ 2776 { /* it was merged */
3020 esrv_del_item (who->contr, del_tag); 2777 esrv_del_item (who->contr, op->count);
3021 op = tmp; 2778 op = tmp;
3022 } 2779 }
2780
3023 esrv_send_item (who, op); 2781 esrv_send_item (who, op);
3024 } 2782 }
3025 } 2783 }
2784
3026 return 0; 2785 return 0;
3027} 2786}
3028 2787
3029/** 2788/**
3030 * Returns the object that is using location 'loc'. 2789 * Returns the object that is using location 'loc'.
… …
3038 * loc is the index into the array we are looking for a match. 2797 * loc is the index into the array we are looking for a match.
3039 * don't return invisible objects unless they are skill objects 2798 * don't return invisible objects unless they are skill objects
3040 * invisible other objects that use 2799 * invisible other objects that use
3041 * up body locations can be used as restrictions. 2800 * up body locations can be used as restrictions.
3042 */ 2801 */
3043object * 2802static object *
3044get_item_from_body_location (object *start, int loc) 2803get_item_from_body_location (int loc, object *start)
3045{ 2804{
3046 object *tmp;
3047
3048 if (!start) 2805 if (start)
3049 return NULL;
3050
3051 for (tmp = start; tmp; tmp = tmp->below) 2806 for (object *tmp = start; tmp; tmp = tmp->below)
3052 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->body_info[loc] && (!tmp->invisible || tmp->type == SKILL)) 2807 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->slot[loc].info && (!tmp->invisible || tmp->type == SKILL))
3053 return tmp; 2808 return tmp;
3054 2809
3055 return NULL; 2810 return 0;
3056} 2811}
3057
3058
3059 2812
3060/** 2813/**
3061 * 'op' wants to apply an object, but can't because of other equipment. 2814 * 'op' wants to apply an object, but can't because of other equipment.
3062 * This should only be called when it is known 2815 * This should only be called when it is known
3063 * that there are objects to unapply. This makes pretty heavy 2816 * that there are objects to unapply. This makes pretty heavy
… …
3069 * another function that does just that. 2822 * another function that does just that.
3070 */ 2823 */
3071int 2824int
3072unapply_for_ob (object *who, object *op, int aflags) 2825unapply_for_ob (object *who, object *op, int aflags)
3073{ 2826{
3074 int i; 2827 if (op->is_range ())
3075 object *tmp = NULL, *last;
3076
3077 /* If we are applying a shield or weapon, unapply any equipped shield
3078 * or weapons first - only allowed to use one weapon/shield at a time.
3079 */
3080 if (op->type == WEAPON || op->type == SHIELD)
3081 {
3082 for (tmp = who->inv; tmp; tmp = tmp->below) 2828 for (object *tmp = who->inv; tmp; tmp = tmp->below)
3083 {
3084 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type) 2829 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ())
3085 {
3086 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))) 2830 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)))
3087 { 2831 {
3088 if (aflags & AP_PRINT) 2832 if (aflags & AP_PRINT)
3089 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2833 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp));
3090 else 2834 else
3091 unapply_special (who, tmp, aflags); 2835 unapply_special (who, tmp, aflags);
3092 } 2836 }
3093 else 2837 else
3094 { 2838 {
3095 /* In this case, we want to try and remove a cursed item. 2839 /* In this case, we want to try and remove a cursed item.
3096 * While we know it won't work, we want unapply_special to 2840 * While we know it won't work, we want unapply_special to
3097 * at least generate the message. 2841 * at least generate the message.
3098 */ 2842 */
3099 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (tmp)); 2843 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't remove the %s.", query_name (tmp));
3100 return 1; 2844 return 1;
3101 }
3102
3103 } 2845 }
3104 }
3105 }
3106 2846
3107 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 2847 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
3108 { 2848 {
3109 /* this used up a slot that we need to free */ 2849 /* this used up a slot that we need to free */
3110 if (op->body_info[i]) 2850 if (op->slot[i].info)
3111 { 2851 {
3112 last = who->inv; 2852 object *last = who->inv;
3113 2853
3114 /* We do a while loop - may need to remove several items in order 2854 /* We do a while loop - may need to remove several items in order
3115 * to free up enough slots. 2855 * to free up enough slots.
3116 */ 2856 */
3117 while ((who->body_used[i] + op->body_info[i]) < 0) 2857 while ((who->slot[i].used + op->slot[i].info) < 0)
3118 { 2858 {
3119 tmp = get_item_from_body_location (last, i); 2859 object *tmp = get_item_from_body_location (i, last);
2860
3120 if (!tmp) 2861 if (!tmp)
3121 { 2862 {
3122#if 0 2863#if 0
3123 /* Not a bug - we'll get this if the player has cursed items 2864 /* Not a bug - we'll get this if the player has cursed items
3124 * equipped. 2865 * equipped.
3125 */ 2866 */
3126 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name); 2867 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name);
3127#endif 2868#endif
3128 return 1; 2869 return 1;
3129 } 2870 }
2871
3130 /* If we are just printing, we don't care about cursed status */ 2872 /* If we are just printing, we don't care about cursed status */
3131 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))) 2873 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))))
3132 { 2874 {
3133 if (aflags & AP_PRINT) 2875 if (aflags & AP_PRINT)
3134 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2876 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp));
… …
3142 * so it may not be critical (eg, putting on a ring and you have 2884 * so it may not be critical (eg, putting on a ring and you have
3143 * one cursed ring.) 2885 * one cursed ring.)
3144 */ 2886 */
3145 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp)); 2887 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp));
3146 } 2888 }
2889
3147 last = tmp->below; 2890 last = tmp->below;
3148 } 2891 }
3149 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the 2892 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the
3150 * return in the !tmp would have kicked in. 2893 * return in the !tmp would have kicked in.
3151 */ 2894 */
3152 } /* if op is using this body location */ 2895 } /* if op is using this body location */
3153 } /* for body lcoations */ 2896 } /* for body lcoations */
2897
3154 return 0; 2898 return 0;
3155} 2899}
3156 2900
3157/** 2901/**
3158 * Checks to see if 'who' can apply object 'op'. 2902 * Checks to see if 'who' can apply object 'op'.
3159 * Returns 0 if apply can be done without anything special. 2903 * Returns 0 if apply can be done without anything special.
3160 * Otherwise returns a bitmask - potentially several of these may be 2904 * Otherwise returns a bitmask - potentially several of these may be
3161 * set, but largely depends on circumstance - in the future, processing 2905 * set, but largely depends on circumstance - in the future, processing
3162 * may be pruned once we know some status (eg, once CAN_APPLY_NEVER 2906 * may be pruned once we know some status (eg, once CAN_APPLY_NEVER
3163 * is set, do we really are what the other flags may be?) 2907 * is set, do we really are what the other flags may be?)
3164 * 2908 *
3165 * See include/define.h for detailed description of the meaning of 2909 * See include/define.h for detailed description of the meaning of
3166 * these return values. 2910 * these return values.
3167 */ 2911 */
… …
3169can_apply_object (object *who, object *op) 2913can_apply_object (object *who, object *op)
3170{ 2914{
3171 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op))) 2915 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op)))
3172 return RESULT_INT (0); 2916 return RESULT_INT (0);
3173 2917
3174 int i, retval = 0; 2918 int retval = 0;
3175 object *tmp = NULL, *ws = NULL; 2919 object *tmp = 0, *ws = 0;
3176 2920
3177 /* Players have 2 'arm's, so they could in theory equip 2 shields or 2921 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
3178 * 2 weapons, but we don't want to let them do that. So if they are
3179 * trying to equip a weapon or shield, see if they already have one
3180 * in place and store that way.
3181 */
3182 if (op->type == WEAPON || op->type == SHIELD)
3183 { 2922 {
3184 for (tmp = who->inv; tmp && !ws; tmp = tmp->below) 2923 if (op->slot[i].info)
3185 { 2924 {
3186 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type) 2925 /* Item uses more slots than we have */
2926 if (abs (op->slot[i].info) > who->slot[i].info)
3187 { 2927 {
3188 retval = CAN_APPLY_UNAPPLY;
3189 ws = tmp;
3190 }
3191 }
3192 }
3193
3194
3195 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
3196 {
3197 if (op->body_info[i])
3198 {
3199 /* Item uses more slots than we have */
3200 if (FABS (op->body_info[i]) > who->body_info[i])
3201 {
3202 /* Could return now for efficiently - rest of info below isn' 2928 /* Could return now for efficiency - rest of info below isn't
3203 * really needed. 2929 * really needed.
3204 */ 2930 */
3205 retval |= CAN_APPLY_NEVER; 2931 retval |= CAN_APPLY_NEVER;
3206 } 2932 }
3207 else if ((who->body_used[i] + op->body_info[i]) < 0) 2933 else if ((who->slot[i].used + op->slot[i].info) < 0)
3208 { 2934 {
3209 /* in this case, equipping this would use more free spots than 2935 /* in this case, equipping this would use more free spots than
3210 * we have. 2936 * we have.
3211 */ 2937 */
3212 object *tmp1;
3213
3214 2938
3215 /* if we have an applied weapon/shield, and unapply it would free 2939 /* if we have an applied weapon/shield, and unapply it would free
3216 * enough slots to equip the new item, then just set this can 2940 * enough slots to equip the new item, then just set "can
3217 * continue. We don't care about the logic below - if you have 2941 * apply unapply". We don't care about the logic below - if you have a
3218 * shield equipped and try to equip another shield, there is only 2942 * shield equipped and try to equip another shield, there is only
3219 * one choice. However, the check for the number of body locations 2943 * one choice. However, the check for the number of body locations
3220 * does take into the account cases where what is being applied 2944 * does take into the account cases where what is being applied
3221 * may be two handed for example. 2945 * may be two handed for example.
3222 */ 2946 */
3223 if (ws) 2947 if (ws)
3224 { 2948 if ((who->slot[i].used - ws->slot[i].info + op->slot[i].info) >= 0)
3225 if ((who->body_used[i] - ws->body_info[i] + op->body_info[i]) >= 0)
3226 { 2949 {
3227 retval |= CAN_APPLY_UNAPPLY; 2950 retval |= CAN_APPLY_UNAPPLY;
3228 continue; 2951 continue;
3229 } 2952 }
3230 }
3231 2953
3232 tmp1 = get_item_from_body_location (who->inv, i); 2954 object *tmp1 = get_item_from_body_location (i, who->inv);
3233 if (!tmp1) 2955 if (!tmp1)
3234 { 2956 {
3235#if 0 2957#if 0
3236 /* This is sort of an error, but happens a lot when old players 2958 /* This is sort of an error, but happens a lot when old players
3237 * join in with more stuff equipped than they are now allowed. 2959 * join in with more stuff equipped than they are now allowed.
… …
3248 */ 2970 */
3249 retval |= CAN_APPLY_UNAPPLY; 2971 retval |= CAN_APPLY_UNAPPLY;
3250 if (!tmp) 2972 if (!tmp)
3251 tmp = tmp1; 2973 tmp = tmp1;
3252 else if (tmp != tmp1) 2974 else if (tmp != tmp1)
3253 {
3254 retval |= CAN_APPLY_UNAPPLY_MULT; 2975 retval |= CAN_APPLY_UNAPPLY_MULT;
3255 } 2976
3256 /* This object isn't using up all the slots, so there must 2977 /* This object isn't using up all the slots, so there must
3257 * be another. If so, and it the new item doesn't need all 2978 * be another. If so, and it the new item doesn't need all
3258 * the slots, the player then has a choice. 2979 * the slots, the player then has a choice.
3259 */ 2980 */
3260 if (((who->body_used[i] - tmp1->body_info[i]) != who->body_info[i]) && (FABS (op->body_info[i]) < who->body_info[i])) 2981 if ((who->slot[i].used - tmp1->slot[i].info != who->slot[i].info)
2982 && abs (op->slot[i].info) < who->slot[i].info)
3261 retval |= CAN_APPLY_UNAPPLY_CHOICE; 2983 retval |= CAN_APPLY_UNAPPLY_CHOICE;
3262 2984
3263 /* Does unequippint 'tmp1' free up enough slots for this to be 2985 /* Does unequippint 'tmp1' free up enough slots for this to be
3264 * equipped? If not, there must be something else to unapply. 2986 * equipped? If not, there must be something else to unapply.
3265 */ 2987 */
3266 if ((who->body_used[i] + op->body_info[i] - tmp1->body_info[i]) < 0) 2988 if (who->slot[i].used + op->slot[i].info < tmp1->slot[i].info)
3267 retval |= CAN_APPLY_UNAPPLY_MULT; 2989 retval |= CAN_APPLY_UNAPPLY_MULT;
3268
3269 } 2990 }
3270 } /* if not enough free slots */ 2991 } /* if not enough free slots */
3271 } /* if this object uses location i */ 2992 } /* if this object uses location i */
3272 } /* for i -> num_body_locations loop */ 2993 } /* for i -> num_body_locations loop */
3273 2994
… …
3278 * and weapons all use the same slot. Similar for horn/rod/wand - they 2999 * and weapons all use the same slot. Similar for horn/rod/wand - they
3279 * all use the same location. 3000 * all use the same location.
3280 */ 3001 */
3281 if (op->type == WEAPON && !QUERY_FLAG (who, FLAG_USE_WEAPON)) 3002 if (op->type == WEAPON && !QUERY_FLAG (who, FLAG_USE_WEAPON))
3282 retval |= CAN_APPLY_RESTRICTION; 3003 retval |= CAN_APPLY_RESTRICTION;
3004
3283 if (op->type == SHIELD && !QUERY_FLAG (who, FLAG_USE_SHIELD)) 3005 if (op->type == SHIELD && !QUERY_FLAG (who, FLAG_USE_SHIELD))
3284 retval |= CAN_APPLY_RESTRICTION; 3006 retval |= CAN_APPLY_RESTRICTION;
3285 3007
3286
3287 if (who->type != PLAYER) 3008 if (who->type != PLAYER)
3288 { 3009 {
3289 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE)) 3010 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE))
3290 retval |= CAN_APPLY_RESTRICTION; 3011 retval |= CAN_APPLY_RESTRICTION;
3012
3291 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3013 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3292 retval |= CAN_APPLY_RESTRICTION; 3014 retval |= CAN_APPLY_RESTRICTION;
3015
3293 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING)) 3016 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING))
3294 retval |= CAN_APPLY_RESTRICTION; 3017 retval |= CAN_APPLY_RESTRICTION;
3018
3295 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3019 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3296 retval |= CAN_APPLY_RESTRICTION; 3020 retval |= CAN_APPLY_RESTRICTION;
3297 } 3021 }
3022
3298 return retval; 3023 return retval;
3299} 3024}
3300
3301
3302 3025
3303/** 3026/**
3304 * who is the object using the object. It can be a monster. 3027 * who is the object using the object. It can be a monster.
3305 * op is the object they are using. op is an equipment type item, 3028 * op is the object they are using. op is an equipment type item,
3306 * eg, one which you put on and keep on for a while, and not something 3029 * eg, one which you put on and keep on for a while, and not something
… …
3325int 3048int
3326apply_special (object *who, object *op, int aflags) 3049apply_special (object *who, object *op, int aflags)
3327{ 3050{
3328 int basic_flag = aflags & AP_BASIC_FLAGS; 3051 int basic_flag = aflags & AP_BASIC_FLAGS;
3329 object *tmp, *tmp2, *skop = NULL; 3052 object *tmp, *tmp2, *skop = NULL;
3330 int i;
3331 3053
3332 if (who == NULL) 3054 if (who == NULL)
3333 { 3055 {
3334 LOG (llevError, "apply_special() from object without environment.\n"); 3056 LOG (llevError, "apply_special() from object without environment.\n");
3335 return 1; 3057 return 1;
… …
3345 if (basic_flag == AP_APPLY) 3067 if (basic_flag == AP_APPLY)
3346 return 0; 3068 return 0;
3347 3069
3348 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 3070 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
3349 { 3071 {
3350 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (op)); 3072 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't remove %s.", query_name (op));
3351 return 1; 3073 return 1;
3352 } 3074 }
3075
3353 return unapply_special (who, op, aflags); 3076 return unapply_special (who, op, aflags);
3354 } 3077 }
3355 3078
3356 if (basic_flag == AP_UNAPPLY) 3079 if (basic_flag == AP_UNAPPLY)
3357 return 0; 3080 return 0;
3358 3081
3359 i = can_apply_object (who, op); 3082 // if the item is combat/ranged, wield the relevant slot first
3083 // to resolve conflicts.
3084 if (player *pl = who->contr)
3085 switch (op->type)
3086 {
3087 case WEAPON:
3088 who->change_weapon (pl->combat_ob);
3089 break;
3090
3091 case BOW:
3092 case ROD:
3093 case WAND:
3094 case HORN:
3095 case SKILL_TOOL:
3096 who->change_weapon (pl->ranged_ob);
3097 break;
3098
3099 case SKILL:
3100 if (IS_COMBAT_SKILL (op->subtype))
3101 who->change_weapon (pl->combat_ob);
3102 else if (IS_RANGED_SKILL (op->subtype))
3103 who->change_weapon (pl->ranged_ob);
3104 break;
3105 }
3360 3106
3361 /* Can't just apply this object. Lets see what not and what to do */ 3107 /* Can't just apply this object. Lets see what not and what to do */
3362 if (i) 3108 if (int i = can_apply_object (who, op))
3363 { 3109 {
3364 if (i & CAN_APPLY_NEVER) 3110 if (i & CAN_APPLY_NEVER)
3365 { 3111 {
3366 new_draw_info_format (NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name (op)); 3112 new_draw_info_format (NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name (op));
3367 return 1; 3113 return 1;
… …
3369 else if (i & CAN_APPLY_RESTRICTION) 3115 else if (i & CAN_APPLY_RESTRICTION)
3370 { 3116 {
3371 new_draw_info_format (NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name (op)); 3117 new_draw_info_format (NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name (op));
3372 return 1; 3118 return 1;
3373 } 3119 }
3120
3374 if (who->type != PLAYER) 3121 if (who->type != PLAYER)
3375 { 3122 {
3376 /* Some error, so don't try to equip something more */ 3123 /* Some error, so don't try to equip something more */
3377 if (unapply_for_ob (who, op, aflags)) 3124 if (unapply_for_ob (who, op, aflags))
3378 return 1; 3125 return 1;
3379 } 3126 }
3380 else 3127 else
3381 { 3128 {
3382 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice)) 3129 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice))
3383 { 3130 {
3384 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some item(s):"); 3131 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some of the following item(s) or change your applymode:");
3385 unapply_for_ob (who, op, AP_PRINT); 3132 unapply_for_ob (who, op, AP_PRINT);
3386 return 1; 3133 return 1;
3387 } 3134 }
3388 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE)) 3135 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE))
3389 {
3390 i = unapply_for_ob (who, op, aflags); 3136 if (unapply_for_ob (who, op, aflags))
3391 if (i)
3392 return 1; 3137 return 1;
3393 } 3138 }
3394 }
3395 } 3139 }
3140
3396 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL) 3141 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL)
3397 { 3142 {
3398 skop = find_skill_by_name (who, op->skill); 3143 skop = find_skill_by_name (who, op->skill);
3144
3399 if (!skop) 3145 if (!skop)
3400 { 3146 {
3401 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill); 3147 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill);
3402 return 1; 3148 return 1;
3403 } 3149 }
3404 else 3150 else
3405 {
3406 /* While experience will be credited properly, we want to change the 3151 /* While experience will be credited properly, we want to change the
3407 * skill so that the dam and wc get updated 3152 * skill so that the dam and wc get updated
3408 */ 3153 */
3409 change_skill (who, skop, 0); 3154 change_skill (who, skop, 0);
3410 }
3411 }
3412
3413 if (who->type == PLAYER && op->item_power && (op->item_power + who->contr->item_power) > (settings.item_power_factor * who->level))
3414 { 3155 }
3415 new_draw_info (NDI_UNIQUE, 0, who, "Equipping that combined with other items would consume your soul!"); 3156
3157 if (who->type == PLAYER
3158 && op->item_power
3159 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level)
3160 {
3161 new_draw_info (NDI_UNIQUE, 0, who,
3162 "Equipping that combined with other items would consume your soul! "
3163 "[use the skills command to check your available item power]");
3416 return 1; 3164 return 1;
3417 } 3165 }
3418
3419 3166
3420 /* Ok. We are now at the state where we can apply the new object. 3167 /* Ok. We are now at the state where we can apply the new object.
3421 * Note that we don't have the checks for can_use_... 3168 * Note that we don't have the checks for can_use_...
3422 * below - that is already taken care of by can_apply_object. 3169 * below - that is already taken care of by can_apply_object.
3423 */ 3170 */
3424
3425
3426 if (op->nrof > 1) 3171 if (op->nrof > 1)
3427 tmp = get_split_ob (op, op->nrof - 1); 3172 tmp = get_split_ob (op, op->nrof - 1);
3428 else 3173 else
3429 tmp = NULL; 3174 tmp = 0;
3430 3175
3431 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op))) 3176 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
3432 return RESULT_INT (0); 3177 return RESULT_INT (0);
3433 3178
3434 switch (op->type) 3179 switch (op->type)
3435 { 3180 {
3436 case WEAPON: 3181 case WEAPON:
3437 if (!check_weapon_power (who, op->last_eat)) 3182 if (!check_weapon_power (who, op->last_eat))
3438 { 3183 {
3439 new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use."); 3184 new_draw_info (NDI_UNIQUE, 0, who, "This weapon is too powerful for you to use.\n"
3440 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3185 "It would consume your soul!.");
3186
3441 if (tmp != NULL) 3187 if (tmp)
3442 (void) insert_ob_in_ob (tmp, who); 3188 insert_ob_in_ob (tmp, who);
3189
3443 return 1; 3190 return 1;
3444 } 3191 }
3192
3193 //TODO: this obviously fails for players using a shorter prefix
3194 // i.e. "R" can use Ragnarok's sword.
3445 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3195 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3446 { 3196 {
3447 /* if the weapon does not have the name as the character, can't use it. */ 3197 /* if the weapon does not have the name as the character, can't use it. */
3448 /* (Ragnarok's sword attempted to be used by Foo: won't work) */ 3198 /* (Ragnarok's sword attempted to be used by Foo: won't work) */
3449 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3199 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner.");
3200
3450 if (tmp != NULL) 3201 if (tmp)
3451 (void) insert_ob_in_ob (tmp, who); 3202 insert_ob_in_ob (tmp, who);
3203
3452 return 1; 3204 return 1;
3453 } 3205 }
3206
3207 if (!skop)
3208 {
3209 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO
3210 return 1;
3211 }
3212
3454 SET_FLAG (op, FLAG_APPLIED); 3213 SET_FLAG (op, FLAG_APPLIED);
3455
3456 if (skop)
3457 change_skill (who, skop, 1); 3214 change_skill (who, skop, 1);
3215
3216 if (who->contr)
3217 who->change_weapon (who->contr->combat_ob = op);
3218
3458 if (!QUERY_FLAG (who, FLAG_READY_WEAPON)) 3219 if (!QUERY_FLAG (who, FLAG_READY_WEAPON))
3459 SET_FLAG (who, FLAG_READY_WEAPON); 3220 SET_FLAG (who, FLAG_READY_WEAPON);
3460 3221
3461 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op)); 3222 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op));
3462 3223
3463 (void) change_abil (who, op); 3224 change_abil (who, op);
3464 break; 3225 break;
3465 3226
3466 case ARMOUR: 3227 case ARMOUR:
3467 case HELMET: 3228 case HELMET:
3468 case SHIELD: 3229 case SHIELD:
… …
3473 case CLOAK: 3234 case CLOAK:
3474 case RING: 3235 case RING:
3475 case AMULET: 3236 case AMULET:
3476 SET_FLAG (op, FLAG_APPLIED); 3237 SET_FLAG (op, FLAG_APPLIED);
3477 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op)); 3238 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op));
3478 (void) change_abil (who, op); 3239 change_abil (who, op);
3479 break; 3240 break;
3241
3480 case LAMP: 3242 case LAMP:
3481 if (op->stats.food < 1) 3243 if (op->stats.food < 1)
3482 { 3244 {
3483 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of" " fuel!", &op->name); 3245 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of fuel!", &op->name);
3484 return 1; 3246 return 1;
3485 } 3247 }
3248
3486 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name); 3249 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name);
3487 tmp2 = arch_to_object (op->other_arch); 3250 tmp2 = arch_to_object (op->other_arch);
3488 tmp2->stats.food = op->stats.food; 3251 tmp2->stats.food = op->stats.food;
3489 SET_FLAG (tmp2, FLAG_APPLIED); 3252 SET_FLAG (tmp2, FLAG_APPLIED);
3253
3490 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 3254 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3491 SET_FLAG (tmp2, FLAG_INV_LOCKED); 3255 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3256
3492 insert_ob_in_ob (tmp2, who); 3257 insert_ob_in_ob (tmp2, who);
3493 3258
3494 /* Remove the old lantern */ 3259 /* Remove the old lantern */
3495 if (who->type == PLAYER) 3260 if (who->type == PLAYER)
3496 esrv_del_item (who->contr, (tag_t) op->count); 3261 esrv_del_item (who->contr, op->count);
3497 remove_ob (op); 3262
3498 free_object (op); 3263 op->destroy ();
3499 3264
3500 /* insert the portion that was split off */ 3265 /* insert the portion that was split off */
3501 if (tmp != NULL) 3266 if (tmp)
3502 { 3267 {
3503 (void) insert_ob_in_ob (tmp, who); 3268 insert_ob_in_ob (tmp, who);
3504 if (who->type == PLAYER) 3269 if (who->type == PLAYER)
3505 esrv_send_item (who, tmp); 3270 esrv_send_item (who, tmp);
3506 } 3271 }
3507 fix_player (who); 3272
3273 who->update_stats ();
3274
3508 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3275 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3509 {
3510 if (who->type == PLAYER) 3276 if (who->type == PLAYER)
3511 { 3277 {
3512 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3278 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
3513 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 3279 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3514 } 3280 }
3515 } 3281
3516 if (who->type == PLAYER) 3282 if (who->type == PLAYER)
3517 esrv_send_item (who, tmp2); 3283 esrv_send_item (who, tmp2);
3284
3518 return 0; 3285 return 0;
3519 break;
3520 3286
3521 /* this part is needed for skill-tools */ 3287 /* this part is needed for skill-tools */
3522 case SKILL: 3288 case SKILL:
3523 case SKILL_TOOL: 3289 case SKILL_TOOL:
3524 if (who->chosen_skill) 3290 if (who->chosen_skill)
3525 { 3291 {
3526 LOG (llevError, "BUG: apply_special(): can't apply two skills\n"); 3292 LOG (llevError, "BUG: apply_special(): can't apply two skills\n");
3527 return 1; 3293 return 1;
3528 } 3294 }
3529 if (who->type == PLAYER) 3295
3296 if (player *pl = who->contr)
3297 {
3298 if (IS_COMBAT_SKILL (op->subtype))
3530 { 3299 {
3531 who->contr->shoottype = range_skill; 3300 if (skill_flags [op->subtype] & SF_NEED_WEAPON)
3532 who->contr->ranges[range_skill] = op; 3301 {
3302 for (object *item = who->inv; item; item = item->below)
3303 if (item->type == WEAPON && item->flag [FLAG_APPLIED])
3304 {
3305 who->change_weapon (pl->combat_ob = item);
3306 goto found_weapon;
3307 }
3308
3309 new_draw_info (NDI_UNIQUE, 0, who, "You need to apply a melee weapon before readying this skill");
3310 return 1;
3311
3312 found_weapon:;
3313 }
3314 else
3315 who->change_weapon (pl->combat_ob = op);
3316 }
3317 else if (IS_RANGED_SKILL (op->subtype))
3318 {
3319 if (skill_flags [op->subtype] & SF_NEED_BOW)
3320 {
3321 for (object *item = who->inv; item; item = item->below)
3322 if (item->type == BOW && item->flag [FLAG_APPLIED])
3323 {
3324 who->change_weapon (pl->ranged_ob = item);
3325 goto found_bow;
3326 }
3327
3328 new_draw_info (NDI_UNIQUE, 0, who, "You need to apply a missile weapon before readying this skill");
3329 return 1;
3330
3331 found_bow:;
3332 }
3333 else if (skill_flags [op->subtype] & SF_NEED_ITEM)
3334 {
3335 for (object *item = who->inv; item; item = item->below)
3336 if (item->flag [FLAG_APPLIED]
3337 && (item->type == WAND || item->type == ROD || item->type == HORN))
3338 {
3339 who->change_weapon (pl->ranged_ob = item);
3340 goto found_item;
3341 }
3342
3343 new_draw_info (NDI_UNIQUE, 0, who, "You need to apply a magic item before readying this skill");
3344 return 1;
3345
3346 found_item:;
3347 }
3348 else
3349 who->change_weapon (pl->ranged_ob = op);
3350 }
3351
3533 if (!op->invisible) 3352 if (!op->invisible)
3534 { 3353 {
3535 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3354 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3536 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill); 3355 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill);
3537 } 3356 }
3538 else 3357 else
3539 {
3540 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name); 3358 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name);
3541 } 3359 }
3542 } 3360
3543 SET_FLAG (op, FLAG_APPLIED); 3361 SET_FLAG (op, FLAG_APPLIED);
3544 (void) change_abil (who, op); 3362 change_abil (who, op);
3545 who->chosen_skill = op; 3363 who->chosen_skill = op;
3546 SET_FLAG (who, FLAG_READY_SKILL); 3364 SET_FLAG (who, FLAG_READY_SKILL);
3547 break; 3365 break;
3548 3366
3549 case BOW: 3367 case BOW:
3550 if (!check_weapon_power (who, op->last_eat)) 3368 if (!check_weapon_power (who, op->last_eat))
3551 { 3369 {
3552 new_draw_info (NDI_UNIQUE, 0, who, "That item is too powerful for you to use."); 3370 new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use.");
3553 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3371 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!.");
3372
3554 if (tmp != NULL) 3373 if (tmp)
3555 (void) insert_ob_in_ob (tmp, who); 3374 insert_ob_in_ob (tmp, who);
3375
3556 return 1; 3376 return 1;
3557 } 3377 }
3378
3558 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3379 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3559 { 3380 {
3560 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3381 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner.");
3561 if (tmp != NULL) 3382 if (tmp)
3562 (void) insert_ob_in_ob (tmp, who); 3383 insert_ob_in_ob (tmp, who);
3384
3563 return 1; 3385 return 1;
3564 } 3386 }
3387
3565 /*FALLTHROUGH*/ case WAND: 3388 /*FALLTHROUGH*/
3389 case WAND:
3566 case ROD: 3390 case ROD:
3567 case HORN: 3391 case HORN:
3568 /* check for skill, alter player status */ 3392 /* check for skill, alter player status */
3393
3394 if (!skop)
3395 {
3396 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO
3397 return 1;
3398 }
3399
3569 SET_FLAG (op, FLAG_APPLIED); 3400 SET_FLAG (op, FLAG_APPLIED);
3570 if (skop)
3571 change_skill (who, skop, 0); 3401 change_skill (who, skop, 0);
3402
3403 if (who->contr)
3404 {
3405 who->contr->ranged_ob = op;
3406
3572 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3407 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3573 3408
3574 if (who->type == PLAYER)
3575 {
3576 if (op->type == BOW) 3409 if (op->type == BOW)
3577 { 3410 {
3411 who->current_weapon = op;
3578 (void) change_abil (who, op); 3412 change_abil (who, op);
3579 new_draw_info_format (NDI_UNIQUE, 0, who, 3413 new_draw_info_format (NDI_UNIQUE, 0, who,
3580 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)); 3414 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op));
3581 who->contr->shoottype = range_bow;
3582 }
3583 else
3584 {
3585 who->contr->shoottype = range_misc;
3586 } 3415 }
3587 } 3416 }
3588 else 3417 else
3589 { 3418 {
3590 if (op->type == BOW) 3419 if (op->type == BOW)
3591 SET_FLAG (who, FLAG_READY_BOW); 3420 SET_FLAG (who, FLAG_READY_BOW);
3592 else 3421 else
3593 SET_FLAG (who, FLAG_READY_RANGE); 3422 SET_FLAG (who, FLAG_READY_RANGE);
3594 } 3423 }
3424
3595 break; 3425 break;
3596 3426
3597 case BUILDER: 3427 case BUILDER:
3598 if (who->contr->ranges[range_builder]) 3428 if (who->type == PLAYER)
3429 {
3430 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER)
3599 unapply_special (who, who->contr->ranges[range_builder], 0); 3431 unapply_special (who, who->contr->ranged_ob, 0);
3600 who->contr->shoottype = range_builder; 3432
3601 who->contr->ranges[range_builder] = op;
3602 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op)); 3433 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op));
3434
3435 who->contr->ranged_ob = op;
3436 }
3603 break; 3437 break;
3604 3438
3605 default: 3439 default:
3606 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op)); 3440 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op));
3607 } /* end of switch op->type */ 3441 } /* end of switch op->type */
3608 3442
3609 SET_FLAG (op, FLAG_APPLIED); 3443 SET_FLAG (op, FLAG_APPLIED);
3610 3444
3611 if (tmp != NULL) 3445 if (tmp)
3612 tmp = insert_ob_in_ob (tmp, who); 3446 tmp = insert_ob_in_ob (tmp, who);
3613 3447
3614 fix_player (who); 3448 who->update_stats ();
3615 3449
3616 /* We exclude spell casting objects. The fire code will set the 3450 /* We exclude spell casting objects. The fire code will set the
3617 * been applied flag when they are used - until that point, 3451 * been applied flag when they are used - until that point,
3618 * you don't know anything about them. 3452 * you don't know anything about them.
3619 */ 3453 */
… …
3626 { 3460 {
3627 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3461 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
3628 SET_FLAG (op, FLAG_KNOWN_CURSED); 3462 SET_FLAG (op, FLAG_KNOWN_CURSED);
3629 } 3463 }
3630 } 3464 }
3465
3631 if (who->type == PLAYER) 3466 if (who->type == PLAYER)
3632 { 3467 {
3633 /* if multiple objects were applied, update both slots */ 3468 /* if multiple objects were applied, update both slots */
3634 if (tmp) 3469 if (tmp)
3635 esrv_send_item (who, tmp); 3470 esrv_send_item (who, tmp);
3471
3636 esrv_send_item (who, op); 3472 esrv_send_item (who, op);
3637 } 3473 }
3474
3638 return 0; 3475 return 0;
3639} 3476}
3640
3641 3477
3642int 3478int
3643monster_apply_special (object *who, object *op, int aflags) 3479monster_apply_special (object *who, object *op, int aflags)
3644{ 3480{
3645 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED)) 3481 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
… …
3659 int i; 3495 int i;
3660 3496
3661 switch (op->type) 3497 switch (op->type)
3662 { 3498 {
3663 case SHOP_FLOOR: 3499 case SHOP_FLOOR:
3664 if (!HAS_RANDOM_ITEMS (op)) 3500 if (!op->has_random_items ())
3665 return 0; 3501 return 0;
3502
3666 do 3503 do
3667 { 3504 {
3668 i = 10; /* let's give it 10 tries */ 3505 i = 10; /* let's give it 10 tries */
3669 while ((tmp = generate_treasure (op->randomitems, 3506 while ((tmp = generate_treasure (op->randomitems,
3670 op->stats.exp ? (int) op->stats.exp : MAX (op->map->difficulty, 5))) == NULL && --i); 3507 op->stats.exp ? (int) op->stats.exp : MAX (op->map->difficulty, 5))) == NULL && --i);
3671 if (tmp == NULL) 3508 if (tmp == NULL)
3672 return 0; 3509 return 0;
3673 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 3510 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
3674 { 3511 {
3675 free_object (tmp); 3512 tmp->destroy ();
3676 tmp = NULL; 3513 tmp = NULL;
3677 } 3514 }
3678 } 3515 }
3679 while (!tmp); 3516 while (!tmp);
3517
3680 tmp->x = op->x; 3518 tmp->x = op->x;
3681 tmp->y = op->y; 3519 tmp->y = op->y;
3682 SET_FLAG (tmp, FLAG_UNPAID); 3520 SET_FLAG (tmp, FLAG_UNPAID);
3683 insert_ob_in_map (tmp, op->map, NULL, 0); 3521 insert_ob_in_map (tmp, op->map, NULL, 0);
3684 CLEAR_FLAG (op, FLAG_AUTO_APPLY); 3522 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
… …
3686 break; 3524 break;
3687 3525
3688 case TREASURE: 3526 case TREASURE:
3689 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 3527 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
3690 return 0; 3528 return 0;
3529
3691 while ((op->stats.hp--) > 0) 3530 while (op->stats.hp-- > 0)
3692 create_treasure (op->randomitems, op, op->map ? GT_ENVIRONMENT : 0, 3531 create_treasure (op->randomitems, op, op->map ? GT_ENVIRONMENT : 0,
3693 op->stats.exp ? (int) op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0); 3532 op->stats.exp ? (int) op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0);
3694 3533
3695 /* If we generated an object and put it in this object inventory, 3534 /* If we generated an object and put it in this object inventory,
3696 * move it to the parent object as the current object is about 3535 * move it to the parent object as the current object is about
… …
3698 * that is put inside other objects. 3537 * that is put inside other objects.
3699 */ 3538 */
3700 for (tmp = op->inv; tmp; tmp = tmp2) 3539 for (tmp = op->inv; tmp; tmp = tmp2)
3701 { 3540 {
3702 tmp2 = tmp->below; 3541 tmp2 = tmp->below;
3703 remove_ob (tmp); 3542 tmp->remove ();
3543
3704 if (op->env) 3544 if (op->env)
3705 insert_ob_in_ob (tmp, op->env); 3545 insert_ob_in_ob (tmp, op->env);
3706 else 3546 else
3707 free_object (tmp); 3547 tmp->destroy ();
3708 } 3548 }
3709 remove_ob (op); 3549
3710 free_object (op); 3550 op->destroy ();
3711 break; 3551 break;
3712 } 3552 }
3713 return tmp ? 1 : 0; 3553 return tmp ? 1 : 0;
3714} 3554}
3715 3555
3716/** 3556/**
3717 * fix_auto_apply goes through the entire map (only the first time 3557 * fix_auto_apply goes through the entire map every time a map
3718 * when an original map is loaded) and performs special actions for 3558 * is loaded or swapped in and performs special actions for
3719 * certain objects (most initialization of chests and creation of 3559 * certain objects (most initialization of chests and creation of
3720 * treasures and stuff). Calls auto_apply if appropriate. 3560 * treasures and stuff). Calls auto_apply if appropriate.
3721 */ 3561 */
3722void 3562void
3723fix_auto_apply (mapstruct *m) 3563maptile::fix_auto_apply ()
3724{ 3564{
3725 object *tmp, *above = NULL; 3565 if (!spaces)
3726 int x, y;
3727
3728 if (m == NULL)
3729 return; 3566 return;
3730 3567
3731 for (x = 0; x < MAP_WIDTH (m); x++) 3568 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3732 for (y = 0; y < MAP_HEIGHT (m); y++) 3569 for (object *tmp = ms->bot; tmp; )
3733 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = above)
3734 { 3570 {
3735 above = tmp->above; 3571 object *above = tmp->above;
3736 3572
3737 if (tmp->inv) 3573 if (tmp->inv)
3738 { 3574 {
3739 object *invtmp, *invnext; 3575 object *invtmp, *invnext;
3740 3576
3741 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext) 3577 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext)
3742 { 3578 {
3743 invnext = invtmp->below; 3579 invnext = invtmp->below;
3744 3580
3745 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY)) 3581 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY))
3746 auto_apply (invtmp); 3582 auto_apply (invtmp);
3747 else if (invtmp->type == TREASURE && HAS_RANDOM_ITEMS (invtmp)) 3583 else if (invtmp->type == TREASURE && invtmp->has_random_items ())
3748 { 3584 {
3749 while ((invtmp->stats.hp--) > 0) 3585 while ((invtmp->stats.hp--) > 0)
3750 create_treasure (invtmp->randomitems, invtmp, 0, m->difficulty, 0);
3751
3752 invtmp->randomitems = NULL;
3753 }
3754 else if (invtmp && invtmp->arch
3755 && invtmp->type != TREASURE && invtmp->type != SPELL && invtmp->type != CLASS && HAS_RANDOM_ITEMS (invtmp))
3756 {
3757 create_treasure (invtmp->randomitems, invtmp, 0, m->difficulty, 0); 3586 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3587
3588 invtmp->randomitems = NULL;
3589 }
3590 else if (invtmp && invtmp->arch
3591 && invtmp->type != TREASURE && invtmp->type != SPELL && invtmp->type != CLASS && invtmp->has_random_items ())
3592 {
3593 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3758 /* Need to clear this so that we never try to create 3594 /* Need to clear this so that we never try to create
3759 * treasure again for this object 3595 * treasure again for this object
3760 */ 3596 */
3761 invtmp->randomitems = NULL; 3597 invtmp->randomitems = NULL;
3762 } 3598 }
3763 } 3599 }
3764 /* This is really temporary - the code at the bottom will 3600 /* This is really temporary - the code at the bottom will
3765 * also set randomitems to null. The problem is there are bunches 3601 * also set randomitems to null. The problem is there are bunches
3766 * of maps/players already out there with items that have spells 3602 * of maps/players already out there with items that have spells
3767 * which haven't had the randomitems set to null yet. 3603 * which haven't had the randomitems set to null yet.
3768 * MSW 2004-05-13 3604 * MSW 2004-05-13
3769 * 3605 *
3770 * And if it's a spellbook, it's better to set randomitems to NULL too, 3606 * And if it's a spellbook, it's better to set randomitems to NULL too,
3771 * else you get two spells in the book ^_- 3607 * else you get two spells in the book ^_-
3772 * Ryo 2004-08-16 3608 * Ryo 2004-08-16
3773 */ 3609 */
3774 if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL 3610 if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL
3775 || tmp->type == HORN || tmp->type == FIREWALL || tmp->type == POTION || tmp->type == ALTAR || tmp->type == SPELLBOOK) 3611 || tmp->type == HORN || tmp->type == FIREWALL || tmp->type == POTION || tmp->type == ALTAR || tmp->type == SPELLBOOK)
3776 tmp->randomitems = NULL;
3777
3778 }
3779
3780 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY))
3781 auto_apply (tmp);
3782 else if ((tmp->type == TREASURE || (tmp->type == CONTAINER)) && HAS_RANDOM_ITEMS (tmp))
3783 {
3784 while ((tmp->stats.hp--) > 0)
3785 create_treasure (tmp->randomitems, tmp, 0, m->difficulty, 0);
3786 tmp->randomitems = NULL; 3612 tmp->randomitems = NULL;
3613
3787 } 3614 }
3615
3616 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY))
3617 auto_apply (tmp);
3618 else if ((tmp->type == TREASURE || (tmp->type == CONTAINER)) && tmp->has_random_items ())
3619 {
3620 while ((tmp->stats.hp--) > 0)
3621 create_treasure (tmp->randomitems, tmp, 0, difficulty, 0);
3622 tmp->randomitems = NULL;
3623 }
3788 else if (tmp->type == TIMED_GATE) 3624 else if (tmp->type == TIMED_GATE)
3789 { 3625 {
3790 object *head = tmp->head != NULL ? tmp->head : tmp; 3626 object *head = tmp->head != NULL ? tmp->head : tmp;
3791 3627
3792 if (QUERY_FLAG (head, FLAG_IS_LINKED)) 3628 if (QUERY_FLAG (head, FLAG_IS_LINKED))
3793 {
3794 tmp->speed = 0; 3629 tmp->set_speed (0);
3795 update_ob_speed (tmp);
3796 }
3797 } 3630 }
3798 /* This function can be called everytime a map is loaded, even when 3631 /* This function can be called everytime a map is loaded, even when
3799 * swapping back in. As such, we don't want to create the treasure 3632 * swapping back in. As such, we don't want to create the treasure
3800 * over and ove again, so after we generate the treasure, blank out 3633 * over and ove again, so after we generate the treasure, blank out
3801 * randomitems so if it is swapped in again, it won't make anything. 3634 * randomitems so if it is swapped in again, it won't make anything.
3802 * This is a problem for the above objects, because they have counters 3635 * This is a problem for the above objects, because they have counters
3803 * which say how many times to make the treasure. 3636 * which say how many times to make the treasure.
3804 */ 3637 */
3805 else if (tmp && tmp->arch && tmp->type != PLAYER 3638 else if (tmp && tmp->arch && tmp->type != PLAYER
3806 && tmp->type != TREASURE && tmp->type != SPELL 3639 && tmp->type != TREASURE && tmp->type != SPELL
3807 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && HAS_RANDOM_ITEMS (tmp)) 3640 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && tmp->has_random_items ())
3808 { 3641 {
3809 create_treasure (tmp->randomitems, tmp, GT_APPLY, m->difficulty, 0); 3642 create_treasure (tmp->randomitems, tmp, GT_APPLY, difficulty, 0);
3810 tmp->randomitems = NULL; 3643 tmp->randomitems = NULL;
3811 } 3644 }
3645
3646 // close all containers
3647 else if (tmp->type == CONTAINER)
3648 tmp->flag [FLAG_APPLIED] = 0;
3649
3650 tmp = above;
3812 } 3651 }
3813 3652
3814 for (x = 0; x < MAP_WIDTH (m); x++) 3653 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3815 for (y = 0; y < MAP_HEIGHT (m); y++) 3654 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
3816 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above)
3817 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL)) 3655 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL))
3818 check_trigger (tmp, tmp->above); 3656 check_trigger (tmp, tmp->above);
3819} 3657}
3820 3658
3821/** 3659/**
3822 * Handles player eating food that temporarily changes status (resistances, stats). 3660 * Handles player eating food that temporarily changes status (resistances, stats).
3823 * This used to call cast_change_attr(), but 3661 * This used to call cast_change_attr(), but
3824 * that doesn't work with the new spell code. Since we know what 3662 * that doesn't work with the new spell code. Since we know what
3825 * the food changes, just grab a force and use that instead. 3663 * the food changes, just grab a force and use that instead.
3826 */ 3664 */
3827
3828void 3665void
3829eat_special_food (object *who, object *food) 3666eat_special_food (object *who, object *food)
3830{ 3667{
3831 object *force; 3668 object *force;
3832 int i, did_one = 0; 3669 int i, did_one = 0;
3833 sint8 k;
3834 3670
3835 force = get_archetype (FORCE_NAME); 3671 force = get_archetype (FORCE_NAME);
3836 3672
3837 for (i = 0; i < NUM_STATS; i++) 3673 for (i = 0; i < NUM_STATS; i++)
3838 { 3674 if (sint8 k = food->stats.stat (i))
3839 k = get_attr_value (&food->stats, i);
3840 if (k)
3841 { 3675 {
3842 set_attr_value (&force->stats, i, k); 3676 force->stats.stat (i) = k;
3843 did_one = 1; 3677 did_one = 1;
3844 } 3678 }
3845 }
3846 3679
3847 /* check if we can protect the eater */ 3680 /* check if we can protect the eater */
3848 for (i = 0; i < NROFATTACKS; i++) 3681 for (i = 0; i < NROFATTACKS; i++)
3849 { 3682 {
3850 if (food->resist[i] > 0) 3683 if (food->resist[i] > 0)
3851 { 3684 {
3852 force->resist[i] = food->resist[i] / 2; 3685 force->resist[i] = food->resist[i] / 2;
3853 did_one = 1; 3686 did_one = 1;
3854 } 3687 }
3855 } 3688 }
3689
3856 if (did_one) 3690 if (did_one)
3857 { 3691 {
3858 force->speed = 0.1; 3692 force->set_speed (0.1);
3859 update_ob_speed (force);
3860 /* bigger morsel of food = longer effect time */ 3693 /* bigger morsel of food = longer effect time */
3861 force->stats.food = food->stats.food / 5; 3694 force->duration = food->stats.food / 5;
3862 SET_FLAG (force, FLAG_IS_USED_UP);
3863 SET_FLAG (force, FLAG_APPLIED); 3695 SET_FLAG (force, FLAG_APPLIED);
3864 change_abil (who, force); 3696 change_abil (who, force);
3865 insert_ob_in_ob (force, who); 3697 insert_ob_in_ob (force, who);
3866 } 3698 }
3867 else 3699 else
3868 { 3700 force->destroy ();
3869 free_object (force);
3870 }
3871 3701
3872 /* check for hp, sp change */ 3702 /* check for hp, sp change */
3873 if (food->stats.hp != 0) 3703 if (food->stats.hp != 0)
3874 { 3704 {
3875 if (QUERY_FLAG (food, FLAG_CURSED)) 3705 if (QUERY_FLAG (food, FLAG_CURSED))
3876 { 3706 {
3877 strcpy (who->contr->killer, food->name); 3707 assign (who->contr->killer, food->name);
3878 hit_player (who, food->stats.hp, food, AT_POISON, 1); 3708 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3879 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!"); 3709 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!");
3880 } 3710 }
3881 else 3711 else
3882 { 3712 {
… …
3901 new_draw_info (NDI_UNIQUE, 0, who, "You feel a rush of magical energy!"); 3731 new_draw_info (NDI_UNIQUE, 0, who, "You feel a rush of magical energy!");
3902 who->stats.sp += food->stats.sp; 3732 who->stats.sp += food->stats.sp;
3903 /* place limit on max sp from food? */ 3733 /* place limit on max sp from food? */
3904 } 3734 }
3905 } 3735 }
3906 fix_player (who); 3736 who->update_stats ();
3907} 3737}
3908
3909 3738
3910/** 3739/**
3911 * Designed primarily to light torches/lanterns/etc. 3740 * Designed primarily to light torches/lanterns/etc.
3912 * Also burns up burnable material too. First object in the inventory is 3741 * Also burns up burnable material too. First object in the inventory is
3913 * the selected object to "burn". -b.t. 3742 * the selected object to "burn". -b.t.
3914 */ 3743 */
3915
3916void 3744void
3917apply_lighter (object *who, object *lighter) 3745apply_lighter (object *who, object *lighter)
3918{ 3746{
3919 object *item; 3747 object *item;
3920 int is_player_env = 0; 3748 int is_player_env = 0;
3921 uint32 nrof;
3922 tag_t count;
3923 char item_name[MAX_BUF];
3924 3749
3925 item = find_marked_object (who); 3750 item = find_marked_object (who);
3926 if (item) 3751 if (item)
3927 { 3752 {
3928 if (lighter->last_eat && lighter->stats.food) 3753 if (lighter->last_eat && lighter->stats.food)
3929 { /* lighter gets used up */ 3754 { /* lighter gets used up */
3930 /* Split multiple lighters if they're being used up. Otherwise * 3755 /* Split multiple lighters if they're being used up. Otherwise *
3931 * one charge from each would be used up. --DAMN */ 3756 * one charge from each would be used up. --DAMN */
3932 if (lighter->nrof > 1) 3757 if (lighter->nrof > 1)
3933 { 3758 {
3934 object *oneLighter = get_object (); 3759 object *oneLighter = lighter->clone ();
3935 3760
3936 copy_object (lighter, oneLighter);
3937 lighter->nrof -= 1; 3761 lighter->nrof -= 1;
3938 oneLighter->nrof = 1; 3762 oneLighter->nrof = 1;
3939 oneLighter->stats.food--; 3763 oneLighter->stats.food--;
3940 esrv_send_item (who, lighter); 3764 esrv_send_item (who, lighter);
3941 oneLighter = insert_ob_in_ob (oneLighter, who); 3765 oneLighter = insert_ob_in_ob (oneLighter, who);
3942 esrv_send_item (who, oneLighter); 3766 esrv_send_item (who, oneLighter);
3943 } 3767 }
3944 else 3768 else
3945 {
3946 lighter->stats.food--; 3769 lighter->stats.food--;
3947 }
3948
3949 } 3770 }
3950 else if (lighter->last_eat) 3771 else if (lighter->last_eat)
3951 { /* no charges left in lighter */ 3772 { /* no charges left in lighter */
3952 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with a used up %s.", &item->name, &lighter->name); 3773 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with a used up %s.", &item->name, &lighter->name);
3953 return; 3774 return;
3954 } 3775 }
3776
3955 /* Perhaps we should split what we are trying to light on fire? 3777 /* Perhaps we should split what we are trying to light on fire?
3956 * I can't see many times when you would want to light multiple 3778 * I can't see many times when you would want to light multiple
3957 * objects at once. 3779 * objects at once.
3958 */ 3780 */
3959 nrof = item->nrof; 3781
3960 count = item->count;
3961 /* If the item is destroyed, we don't have a valid pointer to the
3962 * name object, so make a copy so the message we print out makes
3963 * some sense.
3964 */
3965 strcpy (item_name, item->name);
3966 if (who == is_player_inv (item)) 3782 if (who == item->in_player ())
3967 is_player_env = 1; 3783 is_player_env = 1;
3968 3784
3969 save_throw_object (item, AT_FIRE, who); 3785 save_throw_object (item, AT_FIRE, who);
3970 /* Change to check count and not freed, since the object pointer 3786
3971 * may have gotten recycled 3787 if (item->destroyed ())
3972 */ 3788 {
3973 if ((nrof != item->nrof) || (count != item->count))
3974 {
3975 new_draw_info_format (NDI_UNIQUE, 0, who, "You light the %s with the %s.", &item_name, &lighter->name); 3789 new_draw_info_format (NDI_UNIQUE, 0, who, "You light the %s with the %s.", &item->name, &lighter->name);
3976 /* Need to update the player so that the players glow radius 3790 /* Need to update the player so that the players glow radius
3977 * gets changed. 3791 * gets changed.
3978 */ 3792 */
3979 if (is_player_env) 3793 if (is_player_env)
3980 fix_player (who); 3794 who->update_stats ();
3981 } 3795 }
3982 else 3796 else
3983 {
3984 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with the %s and fail.", &item->name, &lighter->name); 3797 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with the %s and fail.", &item->name, &lighter->name);
3985 }
3986
3987 } 3798 }
3988 else /* nothing to light */ 3799 else /* nothing to light */
3989 new_draw_info (NDI_UNIQUE, 0, who, "You need to mark a lightable object."); 3800 new_draw_info (NDI_UNIQUE, 0, who, "You need to mark a lightable object.");
3990 3801
3991} 3802}
… …
4005 object *tmp; 3816 object *tmp;
4006 3817
4007 new_draw_info (NDI_UNIQUE, 0, op, "Your spell warps!."); 3818 new_draw_info (NDI_UNIQUE, 0, op, "Your spell warps!.");
4008 tmp = get_archetype (SPELL_WONDER); 3819 tmp = get_archetype (SPELL_WONDER);
4009 cast_wonder (op, op, 0, tmp); 3820 cast_wonder (op, op, 0, tmp);
4010 free_object (tmp); 3821 tmp->destroy ();
4011 } 3822 }
4012 else if (failure <= -15 && failure > -35) 3823 else if (failure <= -15 && failure > -35)
4013 { /* drain mana */ 3824 { /* drain mana */
4014 new_draw_info (NDI_UNIQUE, 0, op, "Your mana is drained!."); 3825 new_draw_info (NDI_UNIQUE, 0, op, "Your mana is drained!.");
4015 op->stats.sp -= random_roll (0, power - 1, op, PREFER_LOW); 3826 op->stats.sp -= random_roll (0, power - 1, op, PREFER_LOW);
… …
4033 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!"); 3844 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!");
4034 blind_player (op, op, power); 3845 blind_player (op, op, power);
4035 } 3846 }
4036 else if (failure <= -80) 3847 else if (failure <= -80)
4037 { /* blast the immediate area */ 3848 { /* blast the immediate area */
4038 object *tmp;
4039
4040 tmp = get_archetype (LOOSE_MANA); 3849 object *tmp = get_archetype (LOOSE_MANA);
4041 cast_magic_storm (op, tmp, power); 3850 cast_magic_storm (op, tmp, power);
4042 new_draw_info (NDI_UNIQUE, 0, op, "You unlease uncontrolled mana!"); 3851 new_draw_info (NDI_UNIQUE, 0, op, "You unleash uncontrolled mana!");
4043 free_object (tmp); 3852 tmp->destroy ();
4044 } 3853 }
4045 } 3854 }
4046} 3855}
4047 3856
4048void 3857void
… …
4067 */ 3876 */
4068 int i, j; 3877 int i, j;
4069 3878
4070 for (i = 0; i < NUM_STATS; i++) 3879 for (i = 0; i < NUM_STATS; i++)
4071 { 3880 {
4072 sint8 stat = get_attr_value (stats, i);
4073 int race_bonus = get_attr_value (&(pl->arch->clone.stats), i); 3881 int race_bonus = pl->arch->clone.stats.stat (i);
3882 sint8 stat = stats->stat (i) + ns->stat (i);
4074 3883
4075 stat += get_attr_value (ns, i);
4076 if (stat > 20 + race_bonus) 3884 if (stat > 20 + race_bonus)
4077 { 3885 {
4078 excess_stat++; 3886 excess_stat++;
4079 stat = 20 + race_bonus; 3887 stat = 20 + race_bonus;
4080 } 3888 }
4081 set_attr_value (stats, i, stat); 3889
3890 stats->stat (i) = stat;
4082 } 3891 }
4083 3892
4084 for (j = 0; excess_stat > 0 && j < 100; j++) 3893 for (j = 0; excess_stat > 0 && j < 100; j++)
4085 { /* try 100 times to assign excess stats */ 3894 { /* try 100 times to assign excess stats */
4086 int i = rndm (0, 6); 3895 int i = rndm (0, 6);
4087 int stat = get_attr_value (stats, i);
4088 int race_bonus = get_attr_value (&(pl->arch->clone.stats), i);
4089 3896
4090 if (i == CHA) 3897 if (i == CHA)
4091 continue; /* exclude cha from this */ 3898 continue; /* exclude cha from this */
3899
3900 int stat = stats->stat (i);
3901 int race_bonus = pl->arch->clone.stats.stat (i);
4092 if (stat < 20 + race_bonus) 3902 if (stat < 20 + race_bonus)
4093 { 3903 {
4094 change_attr_value (stats, i, 1); 3904 change_attr_value (stats, i, 1);
4095 excess_stat--; 3905 excess_stat--;
4096 } 3906 }
… …
4099 /* insert the randomitems from the change's treasurelist into 3909 /* insert the randomitems from the change's treasurelist into
4100 * the player ref: player.c 3910 * the player ref: player.c
4101 */ 3911 */
4102 if (change->randomitems != NULL) 3912 if (change->randomitems != NULL)
4103 give_initial_items (pl, change->randomitems); 3913 give_initial_items (pl, change->randomitems);
4104
4105 3914
4106 /* set up the face, for some races. */ 3915 /* set up the face, for some races. */
4107 3916
4108 /* first, look for the force object banning 3917 /* first, look for the force object banning
4109 * changing the face. Certain races never change face with class. 3918 * changing the face. Certain races never change face with class.
… …
4211 if (!new_item) 4020 if (!new_item)
4212 { 4021 {
4213 new_draw_info_format (NDI_UNIQUE, 0, pl, "This %s is strange, better to not use it.", query_base_name (marked, 0)); 4022 new_draw_info_format (NDI_UNIQUE, 0, pl, "This %s is strange, better to not use it.", query_base_name (marked, 0));
4214 return; 4023 return;
4215 } 4024 }
4025
4216 new_item->nrof = yield; 4026 new_item->nrof = yield;
4217 new_draw_info_format (NDI_UNIQUE, 0, pl, "You %s the %s.", &transformer->slaying, query_base_name (marked, 0)); 4027 new_draw_info_format (NDI_UNIQUE, 0, pl, "You %s the %s.", &transformer->slaying, query_base_name (marked, 0));
4218 insert_ob_in_ob (new_item, pl); 4028 insert_ob_in_ob (new_item, pl);
4219 esrv_send_inventory (pl, pl); 4029 esrv_send_inventory (pl, pl);
4220 /* Eat up one item */ 4030 /* Eat up one item */

Diff Legend

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