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.38 by root, Tue Dec 12 22:37:05 2006 UTC vs.
Revision 1.77 by root, Mon Apr 30 04:43:45 2007 UTC

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

Diff Legend

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