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.51 by root, Fri Dec 22 16:34:00 2006 UTC vs.
Revision 1.83 by root, Mon May 7 06:01:48 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
24
25#include <cmath>
23 26
24#include <global.h> 27#include <global.h>
25#include <living.h> 28#include <living.h>
26#include <spells.h> 29#include <spells.h>
27#include <skills.h> 30#include <skills.h>
… …
29 32
30#include <sproto.h> 33#include <sproto.h>
31 34
32/* Want this regardless of rplay. */ 35/* Want this regardless of rplay. */
33#include <sounds.h> 36#include <sounds.h>
34
35/* need math lib for double-precision and pow() in dragon_eat_flesh() */
36#include <math.h>
37 37
38/** 38/**
39 * 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.
40 * 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.
41 */ 41 */
… …
64 { 64 {
65 arch_flag = 1; 65 arch_flag = 1;
66 name_flag = 1; 66 name_flag = 1;
67 race_flag = 1; 67 race_flag = 1;
68 } 68 }
69
69 /* 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,
70 * name or race that matches. 71 * name or race that matches.
71 */ 72 */
72 if ((op->race) && 73 if ((op->race) &&
73 ((!(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)) &&
74 ((!(victim->name && name_flag) || strcmp (op->race, victim->name))) && 75 ((!(victim->name && name_flag) || op->race != victim->name)) &&
75 ((!(victim->race && race_flag) || strcmp (op->race, victim->race)))) 76 ((!(victim->race && race_flag) || op->race != victim->race)))
76 {
77 return 1; 77 return 1;
78 } 78
79 /* If the director has slaying set, only affect objects where none 79 /* If the director has slaying set, only affect objects where none
80 * of arch, name, or race match. 80 * of arch, name, or race match.
81 */ 81 */
82 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))) ||
83 ((victim->name && name_flag && !strcmp (op->slaying, victim->name))) || 83 ((victim->name && name_flag && op->slaying == victim->name)) ||
84 ((victim->race && race_flag && !strcmp (op->slaying, victim->race))))) 84 ((victim->race && race_flag && op->slaying == victim->race)))
85 {
86 return 1; 85 return 1;
87 } 86
88 return 0; 87 return 0;
89} 88}
90 89
91/** 90/**
92 * 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.
… …
421 int count = 0; 420 int count = 0;
422 421
423 422
424 if (item == NULL) 423 if (item == NULL)
425 return 0; 424 return 0;
425
426 op = op->below; 426 op = op->below;
427 while (op != NULL) 427 while (op != NULL)
428 { 428 {
429 if (strcmp (op->arch->name, item) == 0) 429 if (strcmp (op->arch->name, item) == 0)
430 { 430 {
… …
435 count++; 435 count++;
436 else 436 else
437 count += op->nrof; 437 count += op->nrof;
438 } 438 }
439 } 439 }
440
440 op = op->below; 441 op = op->below;
441 } 442 }
443
442 return count; 444 return count;
443} 445}
444 446
445/** 447/**
446 * This removes 'nrof' of what item->slaying says to remove. 448 * This removes 'nrof' of what item->slaying says to remove.
… …
762{ 764{
763 object *otmp; 765 object *otmp;
764 766
765 if (op->type != PLAYER) 767 if (op->type != PLAYER)
766 return 0; 768 return 0;
769
767 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) 770 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC))
768 { 771 {
769 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll."); 772 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll.");
770 return 0; 773 return 0;
771 } 774 }
775
772 otmp = find_marked_object (op); 776 otmp = find_marked_object (op);
773 if (!otmp) 777 if (!otmp)
774 { 778 {
775 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark a weapon object."); 779 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark a weapon object.");
776 return 0; 780 return 0;
777 } 781 }
782
778 if (otmp->type != WEAPON && otmp->type != BOW) 783 if (otmp->type != WEAPON && otmp->type != BOW)
779 { 784 {
780 new_draw_info (NDI_UNIQUE, 0, op, "Marked item is not a weapon or bow"); 785 new_draw_info (NDI_UNIQUE, 0, op, "Marked item is not a weapon or bow");
781 return 0; 786 return 0;
782 } 787 }
788
783 new_draw_info (NDI_UNIQUE, 0, op, "Applied weapon builder."); 789 new_draw_info (NDI_UNIQUE, 0, op, "Applied weapon builder.");
784 improve_weapon (op, tmp, otmp); 790 improve_weapon (op, tmp, otmp);
785 esrv_send_item (op, otmp); 791 esrv_send_item (op, otmp);
786 return 1; 792 return 1;
787} 793}
… …
978 else 984 else
979 { 985 {
980 if (converter->other_arch == NULL) 986 if (converter->other_arch == NULL)
981 { 987 {
982 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n", 988 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n",
983 &converter->name, converter->map->path, converter->x, converter->y); 989 &converter->name, &converter->map->path, converter->x, converter->y);
984 return -1; 990 return -1;
985 } 991 }
986 992
987 item = object_create_arch (converter->other_arch); 993 item = object_create_arch (converter->other_arch);
988 fix_generated_item (item, converter, 0, 0, GT_MINIMAL); 994 fix_generated_item (item, converter, 0, 0, GT_MINIMAL);
… …
995 if (is_in_shop (converter)) 1001 if (is_in_shop (converter))
996 SET_FLAG (item, FLAG_UNPAID); 1002 SET_FLAG (item, FLAG_UNPAID);
997 else if (price_in < item->nrof * item->value) 1003 else if (price_in < item->nrof * item->value)
998 { 1004 {
999 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n", 1005 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n",
1000 &converter->name, converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name); 1006 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
1001 1007
1002 /** 1008 /**
1003 * elmex: we are going to let the game continue, as the mapcreator 1009 * elmex: we are going to let the game continue, as the mapcreator
1004 * propably had something in mind when doing this 1010 * propably had something in mind when doing this
1005 */ 1011 */
… …
1012 * Handle apply on containers. 1018 * Handle apply on containers.
1013 * By Eneq(@csd.uu.se). 1019 * By Eneq(@csd.uu.se).
1014 * Moved to own function and added many features [Tero.Haatanen@lut.fi] 1020 * Moved to own function and added many features [Tero.Haatanen@lut.fi]
1015 * added the alchemical cauldron to the code -b.t. 1021 * added the alchemical cauldron to the code -b.t.
1016 */ 1022 */
1017
1018int 1023int
1019apply_container (object *op, object *sack) 1024apply_container (object *op, object *sack)
1020{ 1025{
1021 char buf[MAX_BUF]; 1026 if (op->type != PLAYER || !op->contr->ns)
1022 object *tmp;
1023
1024 if (op->type != PLAYER)
1025 return 0; /* This might change */ 1027 return 0; /* This might change */
1026 1028
1027 if (sack == NULL || sack->type != CONTAINER) 1029 if (!sack || sack->type != CONTAINER)
1028 { 1030 {
1029 LOG (llevError, "apply_container: %s is not container!\n", sack ? &sack->name : "[nullobject]"); 1031 LOG (llevError, "apply_container: %s is not container!\n", sack ? &sack->name : "[nullobject]");
1030 return 0; 1032 return 0;
1031 } 1033 }
1032 1034
1033 op->contr->last_used = 0; 1035 op->contr->last_used = 0;
1034 1036
1035 if (sack->env != op) 1037 if (sack->env && sack->env != op)
1038 {
1039 new_draw_info (NDI_UNIQUE, 0, op, "You must put it onto the floor or into your inventory first.");
1040 return 1;
1036 { 1041 }
1037 if (sack->other_arch == NULL || sack->env != NULL) 1042
1043 // already applied == open on ground, or open in inv, or active in inv
1044 if (sack->flag [FLAG_APPLIED])
1045 {
1046 if (op->container == sack)
1038 { 1047 {
1039 new_draw_info (NDI_UNIQUE, 0, op, "You must get it first."); 1048 // open on ground or inv, so close
1049 op->close_container ();
1040 return 1; 1050 return 1;
1041 } 1051 }
1042 1052 else if (!sack->env)
1043 /* It's on the ground, the problems begin */
1044 if (op->container != sack)
1045 {
1046 /* it's closed OR some player has opened it */
1047 if (QUERY_FLAG (sack, FLAG_APPLIED))
1048 { 1053 {
1049 for (tmp = GET_MAP_OB (sack->map, sack->x, sack->y); tmp && tmp->container != sack; tmp = tmp->above); 1054 // active, but not ours: some other player has opened it
1050 if (tmp)
1051 {
1052 /* some other player have opened it */
1053 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already occupied.", query_name (sack)); 1055 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already occupied.", query_name (sack));
1054 return 1; 1056 return 1;
1055 }
1056 }
1057 }
1058 if (QUERY_FLAG (sack, FLAG_APPLIED))
1059 { 1057 }
1060 if (op->container == NULL)
1061 {
1062 tmp = arch_to_object (sack->other_arch);
1063 /* not good, but insert_ob_in_ob() is too smart */
1064 CLEAR_FLAG (tmp, FLAG_REMOVED);
1065 tmp->x = tmp->y = 0;
1066 tmp->map = NULL;
1067 tmp->env = sack;
1068 if (sack->inv)
1069 sack->inv->above = tmp;
1070 tmp->below = sack->inv;
1071 tmp->above = NULL;
1072 sack->inv = tmp;
1073 sack->move_off = MOVE_ALL; /* trying force closing it */
1074 }
1075 else
1076 {
1077 sack->move_off = 0;
1078 tmp = sack->inv;
1079 1058
1080 if (tmp && tmp->type == CLOSE_CON) 1059 // fall through to opening it (active in inv)
1081 tmp->destroy ();
1082 }
1083 }
1084 }
1085
1086 if (QUERY_FLAG (sack, FLAG_APPLIED))
1087 { 1060 }
1061 else if (sack->env)
1062 {
1063 // it is in our env, so activate it, do not open yet
1088 if (op->container) 1064 op->close_container ();
1089 { 1065 sack->flag [FLAG_APPLIED] = 1;
1090 if (op->container != sack) 1066 esrv_update_item (UPD_FLAGS, op, sack);
1091 { 1067 new_draw_info_format (NDI_UNIQUE, 0, op, "You ready %s.", query_name (sack));
1092 tmp = op->container; 1068 return 1;
1093 apply_container (op, tmp); 1069 }
1094 sprintf (buf, "You close %s and open ", query_name (tmp)); 1070
1095 op->container = sack; 1071 // it's locked?
1096 strcat (buf, query_name (sack)); 1072 if (sack->slaying)
1097 strcat (buf, "."); 1073 {
1098 } 1074 if (object *tmp = find_key (op, op, sack))
1099 else 1075 new_draw_info_format (NDI_UNIQUE, 0, op, "You unlock %s with %s.", query_name (sack), query_name (tmp));
1100 {
1101 CLEAR_FLAG (sack, FLAG_APPLIED);
1102 op->container = NULL;
1103 sprintf (buf, "You close %s.", query_name (sack));
1104 }
1105 }
1106 else 1076 else
1107 { 1077 {
1108 CLEAR_FLAG (sack, FLAG_APPLIED);
1109 sprintf (buf, "You open %s.", query_name (sack));
1110 SET_FLAG (sack, FLAG_APPLIED);
1111 op->container = sack;
1112 }
1113 }
1114 else
1115 { /* not applied */
1116 if (sack->slaying)
1117 { /* it's locked */
1118 tmp = find_key (op, op, sack);
1119 if (tmp)
1120 {
1121 sprintf (buf, "You unlock %s with %s.", query_name (sack), query_name (tmp));
1122 SET_FLAG (sack, FLAG_APPLIED);
1123
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 sprintf (buf, "You don't have the key to unlock %s.", query_name (sack)); 1078 new_draw_info_format (NDI_UNIQUE, 0, op, "You don't have the key to unlock %s.", query_name (sack));
1133 }
1134 else
1135 {
1136 sprintf (buf, "You readied %s.", query_name (sack));
1137 SET_FLAG (sack, FLAG_APPLIED);
1138
1139 if (sack->env == NULL)
1140 { /* if it's on ground,open it also */
1141 new_draw_info (NDI_UNIQUE, 0, op, buf);
1142 apply_container (op, sack);
1143 return 1; 1079 return 1;
1144 } 1080 }
1145 }
1146 } 1081 }
1147 1082
1148 new_draw_info (NDI_UNIQUE, 0, op, buf); 1083 op->open_container (sack);
1149
1150 if (op->contr)
1151 op->contr->ns->floorbox_update ();
1152 1084
1153 return 1; 1085 return 1;
1154} 1086}
1155
1156/**
1157 * Eneq(@csd.uu.se): Handle apply on containers. This is for containers
1158 * the player has in their inventory, eg, sacks, luggages, etc.
1159 *
1160 * Moved to own function and added many features [Tero.Haatanen@lut.fi]
1161 * This version is for client/server mode.
1162 * op is the player, sack is the container the player is opening or closing.
1163 * return 1 if an object is apllied somehow or another, 0 if error/no apply
1164 *
1165 * Reminder - there are three states for any container - closed (non applied),
1166 * applied (not open, but objects that match get tossed into it), and open
1167 * (applied flag set, and op->container points to the open container)
1168 */
1169
1170int
1171esrv_apply_container (object *op, object *sack)
1172{
1173 object *tmp = op->container;
1174
1175 if (op->type != PLAYER)
1176 return 0; /* This might change */
1177
1178 if (sack == NULL || sack->type != CONTAINER)
1179 {
1180 LOG (llevError, "esrv_apply_container: %s is not container!\n", sack ? &sack->name : "[nullobject]");
1181 return 0;
1182 }
1183
1184 /* If we have a currently open container, then it needs to be closed in all cases
1185 * if we are opening this one up. We then fall through if appropriate for
1186 * openening the new container.
1187 */
1188
1189 if (op->container && QUERY_FLAG (sack, FLAG_APPLIED))
1190 {
1191 if (op->container->env != op)
1192 { /* if container is on the ground */
1193 op->container->move_off = 0;
1194 }
1195
1196 if (INVOKE_OBJECT (CLOSE, tmp, ARG_OBJECT (op)))
1197 return 1;
1198
1199 new_draw_info_format (NDI_UNIQUE, 0, op, "You close %s.", query_name (op->container));
1200 CLEAR_FLAG (op->container, FLAG_APPLIED);
1201 op->container = NULL;
1202 esrv_update_item (UPD_FLAGS, op, tmp);
1203 if (tmp == sack)
1204 return 1;
1205 }
1206
1207
1208 /* If the player is trying to open it (which he must be doing if we got here),
1209 * and it is locked, check to see if player has the equipment to open it.
1210 */
1211
1212 if (sack->slaying)
1213 { /* it's locked */
1214 tmp = find_key (op, op, sack);
1215 if (tmp)
1216 {
1217 new_draw_info_format (NDI_UNIQUE, 0, op, "You unlock %s with %s.", query_name (sack), query_name (tmp));
1218 }
1219 else
1220 {
1221 new_draw_info_format (NDI_UNIQUE, 0, op, "You don't have the key to unlock %s.", query_name (sack));
1222 return 0;
1223 }
1224 }
1225
1226 /* By the time we get here, we have made sure any other container has been closed and
1227 * if this is a locked container, the player they key to open it.
1228 */
1229
1230 /* There are really two cases - the sack is either on the ground, or the sack is
1231 * part of the players inventory. If on the ground, we assume that the player is
1232 * opening it, since if it was being closed, that would have been taken care of above.
1233 */
1234
1235
1236 if (sack->env != op)
1237 {
1238 /* Hypothetical case - the player is trying to open a sack that belong to someone
1239 * else. This normally should not happen, but a misbehaving client/player could
1240 * try to do it, so lets handle it gracefully.
1241 */
1242 if (sack->env)
1243 {
1244 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't open %s", query_name (sack));
1245 return 0;
1246 }
1247 /* set these so when the player walks off, we can unapply the sack */
1248 sack->move_off = MOVE_ALL; /* trying force closing it */
1249
1250 CLEAR_FLAG (sack, FLAG_APPLIED);
1251 new_draw_info_format (NDI_UNIQUE, 0, op, "You open %s.", query_name (sack));
1252 SET_FLAG (sack, FLAG_APPLIED);
1253 op->container = sack;
1254 esrv_update_item (UPD_FLAGS, op, sack);
1255 esrv_send_inventory (op, sack);
1256
1257 }
1258 else
1259 { /* sack is in players inventory */
1260 if (QUERY_FLAG (sack, FLAG_APPLIED))
1261 { /* readied sack becoming open */
1262 CLEAR_FLAG (sack, FLAG_APPLIED);
1263 new_draw_info_format (NDI_UNIQUE, 0, op, "You open %s.", query_name (sack));
1264 SET_FLAG (sack, FLAG_APPLIED);
1265 op->container = sack;
1266 esrv_update_item (UPD_FLAGS, op, sack);
1267 esrv_send_inventory (op, sack);
1268 }
1269 else
1270 {
1271 CLEAR_FLAG (sack, FLAG_APPLIED);
1272 new_draw_info_format (NDI_UNIQUE, 0, op, "You readied %s.", query_name (sack));
1273 SET_FLAG (sack, FLAG_APPLIED);
1274 esrv_update_item (UPD_FLAGS, op, sack);
1275 }
1276 }
1277 return 1;
1278}
1279
1280 1087
1281/** 1088/**
1282 * Handles dropping things on altar. 1089 * Handles dropping things on altar.
1283 * Returns true if sacrifice was accepted. 1090 * Returns true if sacrifice was accepted.
1284 */ 1091 */
… …
1627 1434
1628 1435
1629 case CONVERTER: 1436 case CONVERTER:
1630 if (convert_item (victim, trap) < 0) 1437 if (convert_item (victim, trap) < 0)
1631 { 1438 {
1632 object *op;
1633
1634 new_draw_info_format (NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name (trap)); 1439 new_draw_info_format (NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name (trap));
1635 1440 get_archetype ("burnout")->insert_at (trap, trap);
1636 op = get_archetype ("burnout");
1637 if (op != NULL)
1638 {
1639 op->x = trap->x;
1640 op->y = trap->y;
1641 insert_ob_in_map (op, trap->map, trap, 0);
1642 } 1441 }
1643 } 1442
1644 goto leave; 1443 goto leave;
1645 1444
1646 case TRIGGER_BUTTON: 1445 case TRIGGER_BUTTON:
1647 case TRIGGER_PEDESTAL: 1446 case TRIGGER_PEDESTAL:
1648 case TRIGGER_ALTAR: 1447 case TRIGGER_ALTAR:
… …
1677 if (victim->type == PLAYER && EXIT_PATH (trap)) 1476 if (victim->type == PLAYER && EXIT_PATH (trap))
1678 { 1477 {
1679 /* Basically, don't show exits leading to random maps the 1478 /* Basically, don't show exits leading to random maps the
1680 * players output. 1479 * players output.
1681 */ 1480 */
1682 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2) && strncmp (EXIT_PATH (trap), "/random/", 8)) 1481 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2))
1683 new_draw_info (NDI_NAVY, 0, victim, trap->msg); 1482 new_draw_info (NDI_NAVY, 0, victim, trap->msg);
1483
1684 enter_exit (victim, trap); 1484 victim->enter_exit (trap);
1685 } 1485 }
1686 goto leave; 1486 goto leave;
1687 1487
1688 case ENCOUNTER: 1488 case ENCOUNTER:
1689 /* may be some leftovers on this */ 1489 /* may be some leftovers on this */
… …
1704 1504
1705 apply_sign (victim, trap, 1); 1505 apply_sign (victim, trap, 1);
1706 goto leave; 1506 goto leave;
1707 1507
1708 case CONTAINER: 1508 case CONTAINER:
1709 if (victim->type == PLAYER)
1710 (void) esrv_apply_container (victim, trap);
1711 else
1712 (void) apply_container (victim, trap); 1509 apply_container (victim, trap);
1713 goto leave; 1510 goto leave;
1714 1511
1715 case RUNE: 1512 case RUNE:
1716 case TRAP: 1513 case TRAP:
1717 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE)) 1514 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE))
… …
1777 1574
1778 readable_message_type *msgType = get_readable_message_type (tmp); 1575 readable_message_type *msgType = get_readable_message_type (tmp);
1779 1576
1780 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, 1577 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1781 msgType->message_type, msgType->message_subtype, 1578 msgType->message_type, msgType->message_subtype,
1782 "You open the %s and start reading.\n%s", "%s\n%s", long_desc (tmp, op), &tmp->msg); 1579 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1580 long_desc (tmp, op), &tmp->msg);
1783 1581
1784 /* gain xp from reading */ 1582 /* gain xp from reading */
1785 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1583 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1786 { /* only if not read before */ 1584 { /* only if not read before */
1787 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1585 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
… …
1943 return; 1741 return;
1944 } 1742 }
1945 1743
1946 if (skop->level < int (sqrtf (spell->level) * 1.5f)) 1744 if (skop->level < int (sqrtf (spell->level) * 1.5f))
1947 { 1745 {
1948 new_draw_info (NDI_UNIQUE, 0, op, "It is too hard to read at your level: You are unable to decipher the strange symbols."); 1746 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. [Your literacy level is too low]");
1949 return; 1747 return;
1950 } 1748 }
1951 1749
1952 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name); 1750 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name);
1953 1751
… …
1976 { 1774 {
1977 spell_skill = find_skill_by_name (op, spell->skill); 1775 spell_skill = find_skill_by_name (op, spell->skill);
1978 1776
1979 if (!spell_skill) 1777 if (!spell_skill)
1980 { 1778 {
1981 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use this spell", &spell->skill); 1779 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use this spell.", &spell->skill);
1982 return; 1780 return;
1983 } 1781 }
1984 1782
1985 if (spell_skill->level < spell->level) 1783 if (spell_skill->level < spell->level)
1986 { 1784 {
… …
2020 else 1818 else
2021 { 1819 {
2022 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1820 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0);
2023 new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell.\n"); 1821 new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell.\n");
2024 } 1822 }
1823
2025 decrease_ob (tmp); 1824 decrease_ob (tmp);
2026} 1825}
2027 1826
2028/** 1827/**
2029 * Handles applying a spell scroll. 1828 * Handles applying a spell scroll.
… …
2225 if (meal->type != FLESH || !is_dragon_pl (op)) 2024 if (meal->type != FLESH || !is_dragon_pl (op))
2226 return 0; 2025 return 0;
2227 2026
2228 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces 2027 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces
2229 from the player's inventory */ 2028 from the player's inventory */
2029 shstr_cmp dragon_ability_force ("dragon_ability_force");
2030 shstr_cmp dragon_skin_force ("dragon_skin_force");
2031
2230 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2032 for (tmp = op->inv; tmp; tmp = tmp->below)
2231 {
2232 if (tmp->type == FORCE) 2033 if (tmp->type == FORCE)
2233 {
2234 if (strcmp (tmp->arch->name, "dragon_skin_force") == 0) 2034 if (tmp->arch->name == dragon_skin_force)
2235 skin = tmp; 2035 skin = tmp;
2236 else if (strcmp (tmp->arch->name, "dragon_ability_force") == 0) 2036 else if (tmp->arch->name == dragon_ability_force)
2237 abil = tmp; 2037 abil = tmp;
2238 }
2239 }
2240 2038
2241 /* if either skin or ability are missing, this is an old player 2039 /* if either skin or ability are missing, this is an old player
2242 which is not to be considered a dragon -> bail out */ 2040 which is not to be considered a dragon -> bail out */
2243 if (skin == NULL || abil == NULL) 2041 if (skin == NULL || abil == NULL)
2244 return 0; 2042 return 0;
… …
2285 /* doubled chance for resistance of ability-focus */ 2083 /* doubled chance for resistance of ability-focus */
2286 if (i == abil->stats.exp) 2084 if (i == abil->stats.exp)
2287 chance = MIN (100., chance * 2.); 2085 chance = MIN (100., chance * 2.);
2288 2086
2289 /* now make the throw and save all winners (Don't insert luck bonus here!) */ 2087 /* now make the throw and save all winners (Don't insert luck bonus here!) */
2290 if (RANDOM () % 10000 < (int) (chance * 100)) 2088 if (rndm (10000) < (unsigned int) (chance * 100))
2291 { 2089 {
2292 atnr_winner[winners] = i; 2090 atnr_winner[winners] = i;
2293 winners++; 2091 winners++;
2294 } 2092 }
2295 2093
… …
2410 handle_apply_yield (tmp); 2208 handle_apply_yield (tmp);
2411 decrease_ob (tmp); 2209 decrease_ob (tmp);
2412} 2210}
2413 2211
2414/** 2212/**
2415 * This fonction return true if the exit is not a 2 ways one or it is 2 ways, valid exit. 2213 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit.
2416 * A valid 2 way exit means: 2214 * A valid 2 way exit means:
2417 * -You can come back (there is another exit at the other side) 2215 * -You can come back (there is another exit at the other side)
2418 * -You are 2216 * -You are
2419 * ° the owner of the exit 2217 * ° the owner of the exit
2420 * ° or in the same party as the owner 2218 * ° or in the same party as the owner
… …
2424 * survive in the swapping (in fact the whole exit doesn't survive). 2222 * survive in the swapping (in fact the whole exit doesn't survive).
2425 */ 2223 */
2426int 2224int
2427is_legal_2ways_exit (object *op, object *exit) 2225is_legal_2ways_exit (object *op, object *exit)
2428{ 2226{
2429 object *tmp;
2430 object *exit_owner;
2431 player *pp;
2432 maptile *exitmap;
2433
2434 if (exit->stats.exp != 1) 2227 if (exit->stats.exp != 1)
2435 return 1; /*This is not a 2 way, so it is legal */ 2228 return 1; /*This is not a 2 way, so it is legal */
2229
2230#if 0 //TODO
2436 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race) 2231 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race)
2437 return 0; /* This is a reset town portal */ 2232 return 0; /* This is a reset town portal */
2438 /* To know if an exit has a correspondant, we look at 2233#endif
2439 * all the exits in destination and try to find one with same path as 2234
2440 * the current exit's position */ 2235 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map);
2441 if (!strncmp (EXIT_PATH (exit), settings.localdir, strlen (settings.localdir))) 2236
2442 exitmap = ready_map_name (EXIT_PATH (exit), MAP_PLAYER_UNIQUE);
2443 else
2444 exitmap = ready_map_name (EXIT_PATH (exit), 0);
2445 if (exitmap) 2237 if (exitmap)
2446 { 2238 {
2239 exitmap->load_sync ();
2240
2447 tmp = GET_MAP_OB (exitmap, EXIT_X (exit), EXIT_Y (exit)); 2241 object *tmp = exitmap->at (EXIT_X (exit), EXIT_Y (exit)).bot;
2242
2448 if (!tmp) 2243 if (!tmp)
2449 return 0; 2244 return 0;
2450 for ((tmp = GET_MAP_OB (exitmap, EXIT_X (exit), EXIT_Y (exit))); tmp; tmp = tmp->above) 2245
2246 for (; tmp; tmp = tmp->above)
2451 { 2247 {
2452 if (tmp->type != EXIT) 2248 if (tmp->type != EXIT)
2453 continue; /*Not an exit */ 2249 continue; /*Not an exit */
2250
2454 if (!EXIT_PATH (tmp)) 2251 if (!EXIT_PATH (tmp))
2455 continue; /*Not a valid exit */ 2252 continue; /*Not a valid exit */
2253
2456 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y)) 2254 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y))
2457 continue; /*Not in the same place */ 2255 continue; /*Not in the same place */
2256
2458 if (strcmp (exit->map->path, EXIT_PATH (tmp)) != 0) 2257 if (exit->map->path != EXIT_PATH (tmp))
2459 continue; /*Not in the same map */ 2258 continue; /*Not in the same map */
2460 2259
2461 /* From here we have found the exit is valid. However we do 2260 /* From here we have found the exit is valid. However we do
2462 * here the check of the exit owner. It is important for the 2261 * here the check of the exit owner. It is important for the
2463 * town portals to prevent strangers from visiting your appartments 2262 * town portals to prevent strangers from visiting your appartments
2464 */ 2263 */
2465 if (!exit->race) 2264 if (!exit->race)
2466 return 1; /*No owner, free for all! */ 2265 return 1; /*No owner, free for all! */
2266
2467 exit_owner = NULL; 2267 object *exit_owner = 0;
2468 for (pp = first_player; pp; pp = pp->next) 2268
2269 for_all_players (pp)
2469 { 2270 {
2470 if (!pp->ob) 2271 if (!pp->ob)
2471 continue; 2272 continue;
2273
2472 if (pp->ob->name != exit->race) 2274 if (pp->ob->name != exit->race)
2473 continue; 2275 continue;
2276
2474 exit_owner = pp->ob; /*We found a player which correspond to the player name */ 2277 exit_owner = pp->ob; /*We found a player which correspond to the player name */
2475 break; 2278 break;
2476 } 2279 }
2280
2477 if (!exit_owner) 2281 if (!exit_owner)
2478 return 0; /* No more owner */ 2282 return 0; /* No more owner */
2283
2479 if (exit_owner->contr == op->contr) 2284 if (exit_owner->contr == op->contr)
2480 return 1; /*It is your exit */ 2285 return 1; /*It is your exit */
2286
2481 if (exit_owner && /*There is a owner */ 2287 if (exit_owner && /*There is a owner */
2482 (op->contr) && /*A player tries to pass */ 2288 (op->contr) && /*A player tries to pass */
2483 ((exit_owner->contr->party == NULL) || /*No pass if controller has no party */ 2289 ((exit_owner->contr->party == NULL) || /*No pass if controller has no party */
2484 (exit_owner->contr->party != op->contr->party))) /* Or not the same as op */ 2290 (exit_owner->contr->party != op->contr->party))) /* Or not the same as op */
2485 return 0; 2291 return 0;
2292
2486 return 1; 2293 return 1;
2487 } 2294 }
2488 } 2295 }
2296
2489 return 0; 2297 return 0;
2490} 2298}
2491
2492 2299
2493/** 2300/**
2494 * Main apply handler. 2301 * Main apply handler.
2495 * 2302 *
2496 * Checks for unpaid items before applying. 2303 * Checks for unpaid items before applying.
… …
2504 * being applied. 2311 * being applied.
2505 * 2312 *
2506 * aflag is special (always apply/unapply) flags. Nothing is done with 2313 * aflag is special (always apply/unapply) flags. Nothing is done with
2507 * them in this function - they are passed to apply_special 2314 * them in this function - they are passed to apply_special
2508 */ 2315 */
2509
2510int 2316int
2511manual_apply (object *op, object *tmp, int aflag) 2317manual_apply (object *op, object *tmp, int aflag)
2512{ 2318{
2513 if (tmp->head) 2319 if (tmp->head)
2514 tmp = tmp->head; 2320 tmp = tmp->head;
… …
2543 { 2349 {
2544 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2350 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle.");
2545 play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE); 2351 play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE);
2546 } 2352 }
2547 else 2353 else
2548 {
2549 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move."); 2354 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move.");
2550 } 2355
2551 return 1; 2356 return 1;
2552 2357
2553 case EXIT: 2358 case EXIT:
2554 if (op->type != PLAYER) 2359 if (op->type != PLAYER)
2555 return 0; 2360 return 0;
2361
2556 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2362 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp))
2557 { 2363 {
2558 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));
2559 } 2365 }
2560 else 2366 else
2561 { 2367 {
2562 /* Don't display messages for random maps. */ 2368 /* Don't display messages for random maps. */
2563 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2) && strncmp (EXIT_PATH (tmp), "/random/", 8)) 2369 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2))
2564 new_draw_info (NDI_NAVY, 0, op, tmp->msg); 2370 new_draw_info (NDI_NAVY, 0, op, tmp->msg);
2371
2565 enter_exit (op, tmp); 2372 op->enter_exit (tmp);
2566 } 2373 }
2567 return 1; 2374 return 1;
2568 2375
2569 case SIGN: 2376 case SIGN:
2570 apply_sign (op, tmp, 0); 2377 apply_sign (op, tmp, 0);
… …
2604 case POTION: 2411 case POTION:
2605 (void) apply_potion (op, tmp); 2412 (void) apply_potion (op, tmp);
2606 return 1; 2413 return 1;
2607 2414
2608 /* Eneq(@csd.uu.se): Handle apply on containers. */ 2415 /* Eneq(@csd.uu.se): Handle apply on containers. */
2416 //TODO: remove, as it is unsed?
2609 case CLOSE_CON: 2417 case CLOSE_CON:
2610 if (op->type == PLAYER)
2611 (void) esrv_apply_container (op, tmp->env);
2612 else
2613 (void) apply_container (op, tmp->env); 2418 apply_container (op, tmp->env);
2614 return 1; 2419 return 1;
2615 2420
2616 case CONTAINER: 2421 case CONTAINER:
2617 if (op->type == PLAYER)
2618 (void) esrv_apply_container (op, tmp);
2619 else
2620 (void) apply_container (op, tmp); 2422 apply_container (op, tmp);
2621 return 1; 2423 return 1;
2622 2424
2623 case TREASURE: 2425 case TREASURE:
2624 if (op->type == PLAYER) 2426 if (op->type == PLAYER)
2625 { 2427 {
2626 apply_treasure (op, tmp); 2428 apply_treasure (op, tmp);
2627 return 1; 2429 return 1;
2628 } 2430 }
2629 else 2431 else
2630 {
2631 return 0; 2432 return 0;
2632 }
2633 2433
2634 case WEAPON: 2434 case WEAPON:
2635 case ARMOUR: 2435 case ARMOUR:
2636 case BOOTS: 2436 case BOOTS:
2637 case GLOVES: 2437 case GLOVES:
… …
2650 case LAMP: 2450 case LAMP:
2651 case BUILDER: 2451 case BUILDER:
2652 case SKILL_TOOL: 2452 case SKILL_TOOL:
2653 if (tmp->env != op) 2453 if (tmp->env != op)
2654 return 2; /* not in inventory */ 2454 return 2; /* not in inventory */
2455
2655 (void) apply_special (op, tmp, aflag); 2456 apply_special (op, tmp, aflag);
2656 return 1; 2457 return 1;
2657 2458
2658 case DRINK: 2459 case DRINK:
2659 case FOOD: 2460 case FOOD:
2660 case FLESH: 2461 case FLESH:
… …
2701 } 2502 }
2702 2503
2703 case MENU: 2504 case MENU:
2704 if (op->type == PLAYER) 2505 if (op->type == PLAYER)
2705 { 2506 {
2706 shop_listing (op); 2507 shop_listing (tmp, op);
2707 return 1; 2508 return 1;
2708 } 2509 }
2709 else 2510 else
2710 { 2511 {
2711 return 0; 2512 return 0;
… …
2789 */ 2590 */
2790 2591
2791void 2592void
2792player_apply_below (object *pl) 2593player_apply_below (object *pl)
2793{ 2594{
2794 object *tmp, *next;
2795 int floors; 2595 int floors = 0;
2796 2596
2797 /* If using a container, set the starting item to be the top 2597 /* If using a container, set the starting item to be the top
2798 * item in the container. Otherwise, use the map. 2598 * item in the container. Otherwise, use the map.
2799 */
2800 tmp = (pl->container != NULL) ? pl->container->inv : pl->below;
2801
2802 /* This is perhaps more complicated. However, I want to make sure that 2599 * This is perhaps more complicated. However, I want to make sure that
2803 * we don't use a corrupt pointer for the next object, so we get the 2600 * we don't use a corrupt pointer for the next object, so we get the
2804 * next object in the stack before applying. This is can only be a 2601 * next object in the stack before applying. This is can only be a
2805 * problem if player_apply() has a bug in that it uses the object but does 2602 * problem if player_apply() has a bug in that it uses the object but does
2806 * not return a proper value. 2603 * not return a proper value.
2807 */ 2604 */
2808 for (floors = 0; tmp != NULL; tmp = next) 2605 for (object *next, *tmp = pl->container ? pl->container->inv : pl->below; tmp; tmp = next)
2809 { 2606 {
2810 next = tmp->below; 2607 next = tmp->below;
2608
2811 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 2609 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
2812 floors++; 2610 floors++;
2813 else if (floors > 0) 2611 else if (floors > 0)
2814 return; /* process only floor objects after first floor object */ 2612 return; /* process only floor objects after first floor object */
2815 2613
… …
2841 return RESULT_INT (0); 2639 return RESULT_INT (0);
2842 2640
2843 object *tmp2; 2641 object *tmp2;
2844 2642
2845 CLEAR_FLAG (op, FLAG_APPLIED); 2643 CLEAR_FLAG (op, FLAG_APPLIED);
2644
2846 switch (op->type) 2645 switch (op->type)
2847 { 2646 {
2848 case WEAPON: 2647 case WEAPON:
2849 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op)); 2648 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op));
2850 2649
2851 (void) change_abil (who, op); 2650 change_abil (who, op);
2852 if (QUERY_FLAG (who, FLAG_READY_WEAPON))
2853 CLEAR_FLAG (who, FLAG_READY_WEAPON); 2651 CLEAR_FLAG (who, FLAG_READY_WEAPON);
2652
2653 if (who->contr)
2654 {
2655 if (who->contr->combat_ob == op)
2656 who->contr->combat_ob = 0;
2657
2658 if (who->current_weapon == op)
2659 who->current_weapon = 0;
2660 }
2661
2854 clear_skill (who); 2662 clear_skill (who);
2855 break; 2663 break;
2856 2664
2857 case SKILL: /* allows objects to impart skills */ 2665 case SKILL: /* allows objects to impart skills */
2858 case SKILL_TOOL: 2666 case SKILL_TOOL:
2859 if (op != who->chosen_skill) 2667 if (op != who->chosen_skill)
2860 {
2861 LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n"); 2668 LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n");
2669
2670 if (who->contr)
2862 } 2671 {
2863 if (who->type == PLAYER)
2864 {
2865 if (who->contr->shoottype == range_skill)
2866 who->contr->shoottype = range_none;
2867 if (!op->invisible) 2672 if (!op->invisible)
2868 {
2869 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op)); 2673 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op));
2870 }
2871 else 2674 else
2872 {
2873 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill); 2675 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill);
2874 } 2676 }
2875 } 2677
2876 (void) change_abil (who, op); 2678 change_abil (who, op);
2877 who->chosen_skill = NULL; 2679 who->chosen_skill = 0;
2878 CLEAR_FLAG (who, FLAG_READY_SKILL); 2680 CLEAR_FLAG (who, FLAG_READY_SKILL);
2879 break; 2681 break;
2880 2682
2881 case ARMOUR: 2683 case ARMOUR:
2882 case HELMET: 2684 case HELMET:
… …
2887 case AMULET: 2689 case AMULET:
2888 case GIRDLE: 2690 case GIRDLE:
2889 case BRACERS: 2691 case BRACERS:
2890 case CLOAK: 2692 case CLOAK:
2891 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op)); 2693 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op));
2892 (void) change_abil (who, op); 2694 change_abil (who, op);
2893 break; 2695 break;
2696
2894 case LAMP: 2697 case LAMP:
2895 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name); 2698 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name);
2896 tmp2 = arch_to_object (op->other_arch); 2699 tmp2 = arch_to_object (op->other_arch);
2897 tmp2->x = op->x; 2700 tmp2->x = op->x;
2898 tmp2->y = op->y; 2701 tmp2->y = op->y;
… …
2903 CLEAR_FLAG (tmp2, FLAG_APPLIED); 2706 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2904 2707
2905 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 2708 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2906 SET_FLAG (tmp2, FLAG_INV_LOCKED); 2709 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2907 2710
2908 if (who->type == PLAYER) 2711 if (who->contr)
2909 esrv_del_item (who->contr, op->count); 2712 esrv_del_item (who->contr, op->count);
2910 2713
2911 op->destroy (); 2714 op->destroy ();
2912 insert_ob_in_ob (tmp2, who); 2715 insert_ob_in_ob (tmp2, who);
2913 who->update_stats (); 2716 who->update_stats ();
2717
2914 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 2718 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2915 { 2719 {
2916 if (who->type == PLAYER) 2720 if (who->contr)
2917 { 2721 {
2918 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 2722 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
2919 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 2723 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2920 } 2724 }
2921 } 2725 }
2922 if (who->type == PLAYER) 2726
2727 if (who->contr)
2923 esrv_send_item (who, tmp2); 2728 esrv_send_item (who, tmp2);
2729
2924 return 1; /* otherwise, an attempt to drop causes problems */ 2730 return 1; /* otherwise, an attempt to drop causes problems */
2925 break; 2731
2926 case BOW: 2732 case BOW:
2927 case WAND: 2733 case WAND:
2928 case ROD: 2734 case ROD:
2929 case HORN: 2735 case HORN:
2930 clear_skill (who); 2736 clear_skill (who);
2737
2738 if (who->contr)
2739 {
2931 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2740 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2932 if (who->type == PLAYER) 2741
2933 { 2742 if (who->contr->ranged_ob == op)
2934 who->contr->shoottype = range_none; 2743 who->contr->ranged_ob = 0;
2744
2745 if (who->current_weapon == op)
2746 who->current_weapon = 0;
2935 } 2747 }
2936 else 2748 else
2937 { 2749 {
2938 if (op->type == BOW) 2750 if (op->type == BOW)
2939 CLEAR_FLAG (who, FLAG_READY_BOW); 2751 CLEAR_FLAG (who, FLAG_READY_BOW);
2940 else 2752 else
2941 CLEAR_FLAG (who, FLAG_READY_RANGE); 2753 CLEAR_FLAG (who, FLAG_READY_RANGE);
2942 } 2754 }
2755
2943 break; 2756 break;
2944 2757
2945 case BUILDER: 2758 case BUILDER:
2759 if (who->contr)
2760 {
2946 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2761 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2947 who->contr->shoottype = range_none; 2762
2948 who->contr->ranges[range_builder] = NULL; 2763 if (who->contr->ranged_ob == op)
2764 who->contr->ranged_ob = 0;
2765 }
2949 break; 2766 break;
2950 2767
2951 default: 2768 default:
2952 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op)); 2769 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op));
2953 break; 2770 break;
… …
2958 if (!(aflags & AP_NO_MERGE)) 2775 if (!(aflags & AP_NO_MERGE))
2959 { 2776 {
2960 object *tmp; 2777 object *tmp;
2961 2778
2962 tmp = merge_ob (op, NULL); 2779 tmp = merge_ob (op, NULL);
2963 if (who->type == PLAYER) 2780
2781 if (who->contr)
2964 { 2782 {
2965 if (tmp) 2783 if (tmp)
2966 { /* it was merged */ 2784 { /* it was merged */
2967 esrv_del_item (who->contr, op->count); 2785 esrv_del_item (who->contr, op->count);
2968 op = tmp; 2786 op = tmp;
2969 } 2787 }
2970 2788
2971 esrv_send_item (who, op); 2789 esrv_send_item (who, op);
2972 } 2790 }
2973 } 2791 }
2792
2974 return 0; 2793 return 0;
2975} 2794}
2976 2795
2977/** 2796/**
2978 * Returns the object that is using location 'loc'. 2797 * Returns the object that is using location 'loc'.
… …
2995 2814
2996 if (!start) 2815 if (!start)
2997 return NULL; 2816 return NULL;
2998 2817
2999 for (tmp = start; tmp; tmp = tmp->below) 2818 for (tmp = start; tmp; tmp = tmp->below)
3000 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->body_info[loc] && (!tmp->invisible || tmp->type == SKILL)) 2819 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->slot[loc].info && (!tmp->invisible || tmp->type == SKILL))
3001 return tmp; 2820 return tmp;
3002 2821
3003 return NULL; 2822 return NULL;
3004} 2823}
3005
3006
3007 2824
3008/** 2825/**
3009 * 'op' wants to apply an object, but can't because of other equipment. 2826 * 'op' wants to apply an object, but can't because of other equipment.
3010 * This should only be called when it is known 2827 * This should only be called when it is known
3011 * that there are objects to unapply. This makes pretty heavy 2828 * that there are objects to unapply. This makes pretty heavy
… …
3017 * another function that does just that. 2834 * another function that does just that.
3018 */ 2835 */
3019int 2836int
3020unapply_for_ob (object *who, object *op, int aflags) 2837unapply_for_ob (object *who, object *op, int aflags)
3021{ 2838{
3022 int i; 2839 if (op->is_range ())
3023 object *tmp = NULL, *last;
3024
3025 /* If we are applying a shield or weapon, unapply any equipped shield
3026 * or weapons first - only allowed to use one weapon/shield at a time.
3027 */
3028 if (op->type == WEAPON || op->type == SHIELD)
3029 {
3030 for (tmp = who->inv; tmp; tmp = tmp->below) 2840 for (object *tmp = who->inv; tmp; tmp = tmp->below)
3031 {
3032 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type) 2841 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ())
3033 {
3034 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))) 2842 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)))
3035 { 2843 {
3036 if (aflags & AP_PRINT) 2844 if (aflags & AP_PRINT)
3037 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2845 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp));
3038 else 2846 else
3039 unapply_special (who, tmp, aflags); 2847 unapply_special (who, tmp, aflags);
3040 } 2848 }
3041 else 2849 else
3042 { 2850 {
3043 /* In this case, we want to try and remove a cursed item. 2851 /* In this case, we want to try and remove a cursed item.
3044 * While we know it won't work, we want unapply_special to 2852 * While we know it won't work, we want unapply_special to
3045 * at least generate the message. 2853 * at least generate the message.
3046 */ 2854 */
3047 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (tmp)); 2855 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't remove the %s.", query_name (tmp));
3048 return 1; 2856 return 1;
3049 }
3050
3051 } 2857 }
3052 }
3053 }
3054 2858
3055 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 2859 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
3056 { 2860 {
3057 /* this used up a slot that we need to free */ 2861 /* this used up a slot that we need to free */
3058 if (op->body_info[i]) 2862 if (op->slot[i].info)
3059 { 2863 {
3060 last = who->inv; 2864 object *last = who->inv;
3061 2865
3062 /* We do a while loop - may need to remove several items in order 2866 /* We do a while loop - may need to remove several items in order
3063 * to free up enough slots. 2867 * to free up enough slots.
3064 */ 2868 */
3065 while ((who->body_used[i] + op->body_info[i]) < 0) 2869 while ((who->slot[i].used + op->slot[i].info) < 0)
3066 { 2870 {
3067 tmp = get_item_from_body_location (last, i); 2871 object *tmp = get_item_from_body_location (last, i);
2872
3068 if (!tmp) 2873 if (!tmp)
3069 { 2874 {
3070#if 0 2875#if 0
3071 /* Not a bug - we'll get this if the player has cursed items 2876 /* Not a bug - we'll get this if the player has cursed items
3072 * equipped. 2877 * equipped.
3073 */ 2878 */
3074 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name); 2879 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name);
3075#endif 2880#endif
3076 return 1; 2881 return 1;
3077 } 2882 }
2883
3078 /* If we are just printing, we don't care about cursed status */ 2884 /* If we are just printing, we don't care about cursed status */
3079 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))) 2885 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))))
3080 { 2886 {
3081 if (aflags & AP_PRINT) 2887 if (aflags & AP_PRINT)
3082 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2888 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp));
… …
3090 * so it may not be critical (eg, putting on a ring and you have 2896 * so it may not be critical (eg, putting on a ring and you have
3091 * one cursed ring.) 2897 * one cursed ring.)
3092 */ 2898 */
3093 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp)); 2899 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp));
3094 } 2900 }
2901
3095 last = tmp->below; 2902 last = tmp->below;
3096 } 2903 }
3097 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the 2904 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the
3098 * return in the !tmp would have kicked in. 2905 * return in the !tmp would have kicked in.
3099 */ 2906 */
3100 } /* if op is using this body location */ 2907 } /* if op is using this body location */
3101 } /* for body lcoations */ 2908 } /* for body lcoations */
2909
3102 return 0; 2910 return 0;
3103} 2911}
3104 2912
3105/** 2913/**
3106 * Checks to see if 'who' can apply object 'op'. 2914 * Checks to see if 'who' can apply object 'op'.
3107 * Returns 0 if apply can be done without anything special. 2915 * Returns 0 if apply can be done without anything special.
3108 * Otherwise returns a bitmask - potentially several of these may be 2916 * Otherwise returns a bitmask - potentially several of these may be
3109 * set, but largely depends on circumstance - in the future, processing 2917 * set, but largely depends on circumstance - in the future, processing
3110 * may be pruned once we know some status (eg, once CAN_APPLY_NEVER 2918 * may be pruned once we know some status (eg, once CAN_APPLY_NEVER
3111 * is set, do we really are what the other flags may be?) 2919 * is set, do we really are what the other flags may be?)
3112 * 2920 *
3113 * See include/define.h for detailed description of the meaning of 2921 * See include/define.h for detailed description of the meaning of
3114 * these return values. 2922 * these return values.
3115 */ 2923 */
… …
3117can_apply_object (object *who, object *op) 2925can_apply_object (object *who, object *op)
3118{ 2926{
3119 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op))) 2927 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op)))
3120 return RESULT_INT (0); 2928 return RESULT_INT (0);
3121 2929
3122 int i, retval = 0; 2930 int retval = 0;
3123 object *tmp = NULL, *ws = NULL; 2931 object *tmp = 0, *ws = 0;
3124 2932
3125 /* Players have 2 'arm's, so they could in theory equip 2 shields or 2933 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
3126 * 2 weapons, but we don't want to let them do that. So if they are
3127 * trying to equip a weapon or shield, see if they already have one
3128 * in place and store that way.
3129 */
3130 if (op->type == WEAPON || op->type == SHIELD)
3131 { 2934 {
3132 for (tmp = who->inv; tmp && !ws; tmp = tmp->below) 2935 if (op->slot[i].info)
3133 { 2936 {
3134 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type) 2937 /* Item uses more slots than we have */
2938 if (abs (op->slot[i].info) > who->slot[i].info)
3135 { 2939 {
3136 retval = CAN_APPLY_UNAPPLY;
3137 ws = tmp;
3138 }
3139 }
3140 }
3141
3142
3143 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
3144 {
3145 if (op->body_info[i])
3146 {
3147 /* Item uses more slots than we have */
3148 if (FABS (op->body_info[i]) > who->body_info[i])
3149 {
3150 /* Could return now for efficiently - rest of info below isn' 2940 /* Could return now for efficiency - rest of info below isn't
3151 * really needed. 2941 * really needed.
3152 */ 2942 */
3153 retval |= CAN_APPLY_NEVER; 2943 retval |= CAN_APPLY_NEVER;
3154 } 2944 }
3155 else if ((who->body_used[i] + op->body_info[i]) < 0) 2945 else if ((who->slot[i].used + op->slot[i].info) < 0)
3156 { 2946 {
3157 /* in this case, equipping this would use more free spots than 2947 /* in this case, equipping this would use more free spots than
3158 * we have. 2948 * we have.
3159 */ 2949 */
3160 object *tmp1;
3161
3162 2950
3163 /* if we have an applied weapon/shield, and unapply it would free 2951 /* if we have an applied weapon/shield, and unapply it would free
3164 * enough slots to equip the new item, then just set this can 2952 * enough slots to equip the new item, then just set this can
3165 * continue. We don't care about the logic below - if you have 2953 * continue. We don't care about the logic below - if you have
3166 * shield equipped and try to equip another shield, there is only 2954 * shield equipped and try to equip another shield, there is only
… …
3168 * does take into the account cases where what is being applied 2956 * does take into the account cases where what is being applied
3169 * may be two handed for example. 2957 * may be two handed for example.
3170 */ 2958 */
3171 if (ws) 2959 if (ws)
3172 { 2960 {
3173 if ((who->body_used[i] - ws->body_info[i] + op->body_info[i]) >= 0) 2961 if ((who->slot[i].used - ws->slot[i].info + op->slot[i].info) >= 0)
3174 { 2962 {
3175 retval |= CAN_APPLY_UNAPPLY; 2963 retval |= CAN_APPLY_UNAPPLY;
3176 continue; 2964 continue;
3177 } 2965 }
3178 } 2966 }
3179 2967
3180 tmp1 = get_item_from_body_location (who->inv, i); 2968 object *tmp1 = get_item_from_body_location (who->inv, i);
3181 if (!tmp1) 2969 if (!tmp1)
3182 { 2970 {
3183#if 0 2971#if 0
3184 /* This is sort of an error, but happens a lot when old players 2972 /* This is sort of an error, but happens a lot when old players
3185 * join in with more stuff equipped than they are now allowed. 2973 * join in with more stuff equipped than they are now allowed.
… …
3196 */ 2984 */
3197 retval |= CAN_APPLY_UNAPPLY; 2985 retval |= CAN_APPLY_UNAPPLY;
3198 if (!tmp) 2986 if (!tmp)
3199 tmp = tmp1; 2987 tmp = tmp1;
3200 else if (tmp != tmp1) 2988 else if (tmp != tmp1)
3201 {
3202 retval |= CAN_APPLY_UNAPPLY_MULT; 2989 retval |= CAN_APPLY_UNAPPLY_MULT;
3203 } 2990
3204 /* This object isn't using up all the slots, so there must 2991 /* This object isn't using up all the slots, so there must
3205 * be another. If so, and it the new item doesn't need all 2992 * be another. If so, and it the new item doesn't need all
3206 * the slots, the player then has a choice. 2993 * the slots, the player then has a choice.
3207 */ 2994 */
3208 if (((who->body_used[i] - tmp1->body_info[i]) != who->body_info[i]) && (FABS (op->body_info[i]) < who->body_info[i])) 2995 if ((who->slot[i].used - tmp1->slot[i].info != who->slot[i].info)
2996 && abs (op->slot[i].info) < who->slot[i].info)
3209 retval |= CAN_APPLY_UNAPPLY_CHOICE; 2997 retval |= CAN_APPLY_UNAPPLY_CHOICE;
3210 2998
3211 /* Does unequippint 'tmp1' free up enough slots for this to be 2999 /* Does unequippint 'tmp1' free up enough slots for this to be
3212 * equipped? If not, there must be something else to unapply. 3000 * equipped? If not, there must be something else to unapply.
3213 */ 3001 */
3214 if ((who->body_used[i] + op->body_info[i] - tmp1->body_info[i]) < 0) 3002 if (who->slot[i].used + op->slot[i].info < tmp1->slot[i].info)
3215 retval |= CAN_APPLY_UNAPPLY_MULT; 3003 retval |= CAN_APPLY_UNAPPLY_MULT;
3216
3217 } 3004 }
3218 } /* if not enough free slots */ 3005 } /* if not enough free slots */
3219 } /* if this object uses location i */ 3006 } /* if this object uses location i */
3220 } /* for i -> num_body_locations loop */ 3007 } /* for i -> num_body_locations loop */
3221 3008
… …
3226 * and weapons all use the same slot. Similar for horn/rod/wand - they 3013 * and weapons all use the same slot. Similar for horn/rod/wand - they
3227 * all use the same location. 3014 * all use the same location.
3228 */ 3015 */
3229 if (op->type == WEAPON && !QUERY_FLAG (who, FLAG_USE_WEAPON)) 3016 if (op->type == WEAPON && !QUERY_FLAG (who, FLAG_USE_WEAPON))
3230 retval |= CAN_APPLY_RESTRICTION; 3017 retval |= CAN_APPLY_RESTRICTION;
3018
3231 if (op->type == SHIELD && !QUERY_FLAG (who, FLAG_USE_SHIELD)) 3019 if (op->type == SHIELD && !QUERY_FLAG (who, FLAG_USE_SHIELD))
3232 retval |= CAN_APPLY_RESTRICTION; 3020 retval |= CAN_APPLY_RESTRICTION;
3233 3021
3234
3235 if (who->type != PLAYER) 3022 if (who->type != PLAYER)
3236 { 3023 {
3237 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE)) 3024 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE))
3238 retval |= CAN_APPLY_RESTRICTION; 3025 retval |= CAN_APPLY_RESTRICTION;
3026
3239 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3027 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3240 retval |= CAN_APPLY_RESTRICTION; 3028 retval |= CAN_APPLY_RESTRICTION;
3029
3241 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING)) 3030 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING))
3242 retval |= CAN_APPLY_RESTRICTION; 3031 retval |= CAN_APPLY_RESTRICTION;
3032
3243 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3033 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3244 retval |= CAN_APPLY_RESTRICTION; 3034 retval |= CAN_APPLY_RESTRICTION;
3245 } 3035 }
3036
3246 return retval; 3037 return retval;
3247} 3038}
3248
3249
3250 3039
3251/** 3040/**
3252 * who is the object using the object. It can be a monster. 3041 * who is the object using the object. It can be a monster.
3253 * op is the object they are using. op is an equipment type item, 3042 * op is the object they are using. op is an equipment type item,
3254 * eg, one which you put on and keep on for a while, and not something 3043 * eg, one which you put on and keep on for a while, and not something
… …
3273int 3062int
3274apply_special (object *who, object *op, int aflags) 3063apply_special (object *who, object *op, int aflags)
3275{ 3064{
3276 int basic_flag = aflags & AP_BASIC_FLAGS; 3065 int basic_flag = aflags & AP_BASIC_FLAGS;
3277 object *tmp, *tmp2, *skop = NULL; 3066 object *tmp, *tmp2, *skop = NULL;
3278 int i;
3279 3067
3280 if (who == NULL) 3068 if (who == NULL)
3281 { 3069 {
3282 LOG (llevError, "apply_special() from object without environment.\n"); 3070 LOG (llevError, "apply_special() from object without environment.\n");
3283 return 1; 3071 return 1;
… …
3296 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 3084 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
3297 { 3085 {
3298 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (op)); 3086 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (op));
3299 return 1; 3087 return 1;
3300 } 3088 }
3089
3301 return unapply_special (who, op, aflags); 3090 return unapply_special (who, op, aflags);
3302 } 3091 }
3303 3092
3304 if (basic_flag == AP_UNAPPLY) 3093 if (basic_flag == AP_UNAPPLY)
3305 return 0; 3094 return 0;
3306 3095
3307 i = can_apply_object (who, op);
3308
3309 /* Can't just apply this object. Lets see what not and what to do */ 3096 /* Can't just apply this object. Lets see what not and what to do */
3310 if (i) 3097 if (int i = can_apply_object (who, op))
3311 { 3098 {
3312 if (i & CAN_APPLY_NEVER) 3099 if (i & CAN_APPLY_NEVER)
3313 { 3100 {
3314 new_draw_info_format (NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name (op)); 3101 new_draw_info_format (NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name (op));
3315 return 1; 3102 return 1;
… …
3317 else if (i & CAN_APPLY_RESTRICTION) 3104 else if (i & CAN_APPLY_RESTRICTION)
3318 { 3105 {
3319 new_draw_info_format (NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name (op)); 3106 new_draw_info_format (NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name (op));
3320 return 1; 3107 return 1;
3321 } 3108 }
3109
3322 if (who->type != PLAYER) 3110 if (who->type != PLAYER)
3323 { 3111 {
3324 /* Some error, so don't try to equip something more */ 3112 /* Some error, so don't try to equip something more */
3325 if (unapply_for_ob (who, op, aflags)) 3113 if (unapply_for_ob (who, op, aflags))
3326 return 1; 3114 return 1;
3327 } 3115 }
3328 else 3116 else
3329 { 3117 {
3330 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice)) 3118 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice))
3331 { 3119 {
3332 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some item(s):"); 3120 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some of the following item(s) or change your applymode:");
3333 unapply_for_ob (who, op, AP_PRINT); 3121 unapply_for_ob (who, op, AP_PRINT);
3334 return 1; 3122 return 1;
3335 } 3123 }
3336 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE)) 3124 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE))
3337 {
3338 i = unapply_for_ob (who, op, aflags); 3125 if (unapply_for_ob (who, op, aflags))
3339 if (i)
3340 return 1; 3126 return 1;
3341 } 3127 }
3342 }
3343 } 3128 }
3129
3344 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL) 3130 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL)
3345 { 3131 {
3346 skop = find_skill_by_name (who, op->skill); 3132 skop = find_skill_by_name (who, op->skill);
3133
3347 if (!skop) 3134 if (!skop)
3348 { 3135 {
3349 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill); 3136 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill);
3350 return 1; 3137 return 1;
3351 } 3138 }
3352 else 3139 else
3353 {
3354 /* While experience will be credited properly, we want to change the 3140 /* While experience will be credited properly, we want to change the
3355 * skill so that the dam and wc get updated 3141 * skill so that the dam and wc get updated
3356 */ 3142 */
3357 change_skill (who, skop, 0); 3143 change_skill (who, skop, 0);
3358 }
3359 }
3360
3361 if (who->type == PLAYER && op->item_power && (op->item_power + who->contr->item_power) > (settings.item_power_factor * who->level))
3362 { 3144 }
3363 new_draw_info (NDI_UNIQUE, 0, who, "Equipping that combined with other items would consume your soul!"); 3145
3146 if (who->type == PLAYER
3147 && op->item_power
3148 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level)
3149 {
3150 new_draw_info (NDI_UNIQUE, 0, who,
3151 "Equipping that combined with other items would consume your soul! "
3152 "[use the skills command to check your available item power]");
3364 return 1; 3153 return 1;
3365 } 3154 }
3366
3367 3155
3368 /* Ok. We are now at the state where we can apply the new object. 3156 /* Ok. We are now at the state where we can apply the new object.
3369 * Note that we don't have the checks for can_use_... 3157 * Note that we don't have the checks for can_use_...
3370 * below - that is already taken care of by can_apply_object. 3158 * below - that is already taken care of by can_apply_object.
3371 */ 3159 */
3372
3373
3374 if (op->nrof > 1) 3160 if (op->nrof > 1)
3375 tmp = get_split_ob (op, op->nrof - 1); 3161 tmp = get_split_ob (op, op->nrof - 1);
3376 else 3162 else
3377 tmp = NULL; 3163 tmp = 0;
3378 3164
3379 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op))) 3165 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
3380 return RESULT_INT (0); 3166 return RESULT_INT (0);
3381 3167
3382 switch (op->type) 3168 switch (op->type)
3383 { 3169 {
3384 case WEAPON: 3170 case WEAPON:
3385 if (!check_weapon_power (who, op->last_eat)) 3171 if (!check_weapon_power (who, op->last_eat))
3386 { 3172 {
3387 new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use."); 3173 new_draw_info (NDI_UNIQUE, 0, who, "This weapon is too powerful for you to use.");
3388 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3174 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!.");
3175
3389 if (tmp != NULL) 3176 if (tmp)
3390 (void) insert_ob_in_ob (tmp, who); 3177 insert_ob_in_ob (tmp, who);
3178
3391 return 1; 3179 return 1;
3392 } 3180 }
3181
3182 //TODO: this obviously fails for players using a shorter prefix
3183 // i.e. "R" can use Ragnarok's sword.
3393 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3184 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3394 { 3185 {
3395 /* if the weapon does not have the name as the character, can't use it. */ 3186 /* if the weapon does not have the name as the character, can't use it. */
3396 /* (Ragnarok's sword attempted to be used by Foo: won't work) */ 3187 /* (Ragnarok's sword attempted to be used by Foo: won't work) */
3397 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3188 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner.");
3189
3398 if (tmp != NULL) 3190 if (tmp)
3399 (void) insert_ob_in_ob (tmp, who); 3191 insert_ob_in_ob (tmp, who);
3192
3400 return 1; 3193 return 1;
3401 } 3194 }
3195
3196 if (!skop)
3197 {
3198 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO
3199 return 1;
3200 }
3201
3402 SET_FLAG (op, FLAG_APPLIED); 3202 SET_FLAG (op, FLAG_APPLIED);
3403
3404 if (skop)
3405 change_skill (who, skop, 1); 3203 change_skill (who, skop, 1);
3204
3205 if (who->contr)
3206 {
3207 who->contr->combat_ob = op;
3208 who->current_weapon = op;
3209 }
3210
3406 if (!QUERY_FLAG (who, FLAG_READY_WEAPON)) 3211 if (!QUERY_FLAG (who, FLAG_READY_WEAPON))
3407 SET_FLAG (who, FLAG_READY_WEAPON); 3212 SET_FLAG (who, FLAG_READY_WEAPON);
3408 3213
3409 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op)); 3214 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op));
3410 3215
3411 (void) change_abil (who, op); 3216 change_abil (who, op);
3412 break; 3217 break;
3413 3218
3414 case ARMOUR: 3219 case ARMOUR:
3415 case HELMET: 3220 case HELMET:
3416 case SHIELD: 3221 case SHIELD:
… …
3421 case CLOAK: 3226 case CLOAK:
3422 case RING: 3227 case RING:
3423 case AMULET: 3228 case AMULET:
3424 SET_FLAG (op, FLAG_APPLIED); 3229 SET_FLAG (op, FLAG_APPLIED);
3425 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op)); 3230 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op));
3426 (void) change_abil (who, op); 3231 change_abil (who, op);
3427 break; 3232 break;
3233
3428 case LAMP: 3234 case LAMP:
3429 if (op->stats.food < 1) 3235 if (op->stats.food < 1)
3430 { 3236 {
3431 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of" " fuel!", &op->name); 3237 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of fuel!", &op->name);
3432 return 1; 3238 return 1;
3433 } 3239 }
3240
3434 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name); 3241 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name);
3435 tmp2 = arch_to_object (op->other_arch); 3242 tmp2 = arch_to_object (op->other_arch);
3436 tmp2->stats.food = op->stats.food; 3243 tmp2->stats.food = op->stats.food;
3437 SET_FLAG (tmp2, FLAG_APPLIED); 3244 SET_FLAG (tmp2, FLAG_APPLIED);
3245
3438 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 3246 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3439 SET_FLAG (tmp2, FLAG_INV_LOCKED); 3247 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3248
3440 insert_ob_in_ob (tmp2, who); 3249 insert_ob_in_ob (tmp2, who);
3441 3250
3442 /* Remove the old lantern */ 3251 /* Remove the old lantern */
3443 if (who->type == PLAYER) 3252 if (who->type == PLAYER)
3444 esrv_del_item (who->contr, op->count); 3253 esrv_del_item (who->contr, op->count);
3445 3254
3446 op->destroy (); 3255 op->destroy ();
3447 3256
3448 /* insert the portion that was split off */ 3257 /* insert the portion that was split off */
3449 if (tmp != NULL) 3258 if (tmp)
3450 { 3259 {
3451 (void) insert_ob_in_ob (tmp, who); 3260 insert_ob_in_ob (tmp, who);
3452 if (who->type == PLAYER) 3261 if (who->type == PLAYER)
3453 esrv_send_item (who, tmp); 3262 esrv_send_item (who, tmp);
3454 } 3263 }
3264
3455 who->update_stats (); 3265 who->update_stats ();
3266
3456 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3267 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3457 {
3458 if (who->type == PLAYER) 3268 if (who->type == PLAYER)
3459 { 3269 {
3460 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3270 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
3461 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 3271 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3462 } 3272 }
3463 } 3273
3464 if (who->type == PLAYER) 3274 if (who->type == PLAYER)
3465 esrv_send_item (who, tmp2); 3275 esrv_send_item (who, tmp2);
3276
3466 return 0; 3277 return 0;
3467 break;
3468 3278
3469 /* this part is needed for skill-tools */ 3279 /* this part is needed for skill-tools */
3470 case SKILL: 3280 case SKILL:
3471 case SKILL_TOOL: 3281 case SKILL_TOOL:
3472 if (who->chosen_skill) 3282 if (who->chosen_skill)
3473 { 3283 {
3474 LOG (llevError, "BUG: apply_special(): can't apply two skills\n"); 3284 LOG (llevError, "BUG: apply_special(): can't apply two skills\n");
3475 return 1; 3285 return 1;
3476 } 3286 }
3477 if (who->type == PLAYER) 3287
3288 if (player *pl = who->contr)
3289 {
3290 if (IS_COMBAT_SKILL (op->subtype))
3478 { 3291 {
3479 who->contr->shoottype = range_skill; 3292 if (skill_flags [op->subtype] & SF_NEED_WEAPON)
3480 who->contr->ranges[range_skill] = op; 3293 {
3294 for (object *item = who->inv; item; item = item->below)
3295 if (item->type == WEAPON && item->flag [FLAG_APPLIED])
3296 {
3297 pl->combat_ob = who->current_weapon = item;
3298 goto found_weapon;
3299 }
3300
3301 new_draw_info (NDI_UNIQUE, 0, who, "You need to apply a melee weapon before readying this skill");
3302 return 1;
3303
3304 found_weapon:;
3305 }
3306 else
3307 {
3308 pl->combat_ob = op;
3309 op->current_weapon = 0;
3310 }
3311 }
3312 else if (IS_RANGED_SKILL (op->subtype))
3313 {
3314 if (skill_flags [op->subtype] & SF_NEED_BOW)
3315 {
3316 for (object *item = who->inv; item; item = item->below)
3317 if (item->type == BOW && item->flag [FLAG_APPLIED])
3318 {
3319 pl->ranged_ob = who->current_weapon = item;
3320 goto found_bow;
3321 }
3322
3323 new_draw_info (NDI_UNIQUE, 0, who, "You need to apply a missile weapon before readying this skill");
3324 return 1;
3325
3326 found_bow:;
3327 }
3328 else if (skill_flags [op->subtype] & SF_NEED_ITEM)
3329 {
3330 for (object *item = who->inv; item; item = item->below)
3331 if (item->flag [FLAG_APPLIED]
3332 && (item->type == WAND || item->type == ROD || item->type == HORN))
3333 {
3334 pl->ranged_ob = who->current_weapon = item;
3335 goto found_item;
3336 }
3337
3338 new_draw_info (NDI_UNIQUE, 0, who, "You need to apply a magic item before readying this skill");
3339 return 1;
3340
3341 found_item:;
3342 }
3343 else
3344 {
3345 pl->ranged_ob = op;
3346 op->current_weapon = 0;
3347 }
3348 }
3349
3481 if (!op->invisible) 3350 if (!op->invisible)
3482 { 3351 {
3483 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3352 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3484 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill); 3353 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill);
3485 } 3354 }
3486 else 3355 else
3487 {
3488 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name); 3356 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name);
3489 } 3357 }
3490 } 3358
3491 SET_FLAG (op, FLAG_APPLIED); 3359 SET_FLAG (op, FLAG_APPLIED);
3492 (void) change_abil (who, op); 3360 change_abil (who, op);
3493 who->chosen_skill = op; 3361 who->chosen_skill = op;
3494 SET_FLAG (who, FLAG_READY_SKILL); 3362 SET_FLAG (who, FLAG_READY_SKILL);
3495 break; 3363 break;
3496 3364
3497 case BOW: 3365 case BOW:
3498 if (!check_weapon_power (who, op->last_eat)) 3366 if (!check_weapon_power (who, op->last_eat))
3499 { 3367 {
3500 new_draw_info (NDI_UNIQUE, 0, who, "That item is too powerful for you to use."); 3368 new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use.");
3501 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3369 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!.");
3370
3502 if (tmp != NULL) 3371 if (tmp)
3503 (void) insert_ob_in_ob (tmp, who); 3372 insert_ob_in_ob (tmp, who);
3373
3504 return 1; 3374 return 1;
3505 } 3375 }
3376
3506 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3377 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3507 { 3378 {
3508 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3379 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner.");
3509 if (tmp != NULL) 3380 if (tmp)
3510 (void) insert_ob_in_ob (tmp, who); 3381 insert_ob_in_ob (tmp, who);
3382
3511 return 1; 3383 return 1;
3512 } 3384 }
3385
3513 /*FALLTHROUGH*/ case WAND: 3386 /*FALLTHROUGH*/
3387 case WAND:
3514 case ROD: 3388 case ROD:
3515 case HORN: 3389 case HORN:
3516 /* check for skill, alter player status */ 3390 /* check for skill, alter player status */
3391
3392 if (!skop)
3393 {
3394 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s is broken, please report this to the dungeon master!", query_name (op));//TODO
3395 return 1;
3396 }
3397
3517 SET_FLAG (op, FLAG_APPLIED); 3398 SET_FLAG (op, FLAG_APPLIED);
3518 if (skop)
3519 change_skill (who, skop, 0); 3399 change_skill (who, skop, 0);
3400
3401 if (who->contr)
3402 {
3403 who->contr->ranged_ob = op;
3404
3520 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3405 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3521 3406
3522 if (who->type == PLAYER)
3523 {
3524 if (op->type == BOW) 3407 if (op->type == BOW)
3525 { 3408 {
3409 who->current_weapon = op;
3526 (void) change_abil (who, op); 3410 change_abil (who, op);
3527 new_draw_info_format (NDI_UNIQUE, 0, who, 3411 new_draw_info_format (NDI_UNIQUE, 0, who,
3528 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)); 3412 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op));
3529 who->contr->shoottype = range_bow;
3530 }
3531 else
3532 {
3533 who->contr->shoottype = range_misc;
3534 } 3413 }
3535 } 3414 }
3536 else 3415 else
3537 { 3416 {
3538 if (op->type == BOW) 3417 if (op->type == BOW)
3539 SET_FLAG (who, FLAG_READY_BOW); 3418 SET_FLAG (who, FLAG_READY_BOW);
3540 else 3419 else
3541 SET_FLAG (who, FLAG_READY_RANGE); 3420 SET_FLAG (who, FLAG_READY_RANGE);
3542 } 3421 }
3422
3543 break; 3423 break;
3544 3424
3545 case BUILDER: 3425 case BUILDER:
3546 if (who->contr->ranges[range_builder]) 3426 if (who->type == PLAYER)
3427 {
3428 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER)
3547 unapply_special (who, who->contr->ranges[range_builder], 0); 3429 unapply_special (who, who->contr->ranged_ob, 0);
3548 who->contr->shoottype = range_builder; 3430
3549 who->contr->ranges[range_builder] = op;
3550 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op)); 3431 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op));
3432
3433 who->contr->ranged_ob = op;
3434 }
3551 break; 3435 break;
3552 3436
3553 default: 3437 default:
3554 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op)); 3438 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op));
3555 } /* end of switch op->type */ 3439 } /* end of switch op->type */
3556 3440
3557 SET_FLAG (op, FLAG_APPLIED); 3441 SET_FLAG (op, FLAG_APPLIED);
3558 3442
3559 if (tmp != NULL) 3443 if (tmp)
3560 tmp = insert_ob_in_ob (tmp, who); 3444 tmp = insert_ob_in_ob (tmp, who);
3561 3445
3562 who->update_stats (); 3446 who->update_stats ();
3563 3447
3564 /* We exclude spell casting objects. The fire code will set the 3448 /* We exclude spell casting objects. The fire code will set the
… …
3574 { 3458 {
3575 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3459 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
3576 SET_FLAG (op, FLAG_KNOWN_CURSED); 3460 SET_FLAG (op, FLAG_KNOWN_CURSED);
3577 } 3461 }
3578 } 3462 }
3463
3579 if (who->type == PLAYER) 3464 if (who->type == PLAYER)
3580 { 3465 {
3581 /* if multiple objects were applied, update both slots */ 3466 /* if multiple objects were applied, update both slots */
3582 if (tmp) 3467 if (tmp)
3583 esrv_send_item (who, tmp); 3468 esrv_send_item (who, tmp);
3469
3584 esrv_send_item (who, op); 3470 esrv_send_item (who, op);
3585 } 3471 }
3472
3586 return 0; 3473 return 0;
3587} 3474}
3588
3589 3475
3590int 3476int
3591monster_apply_special (object *who, object *op, int aflags) 3477monster_apply_special (object *who, object *op, int aflags)
3592{ 3478{
3593 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED)) 3479 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
… …
3637 3523
3638 case TREASURE: 3524 case TREASURE:
3639 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 3525 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
3640 return 0; 3526 return 0;
3641 3527
3642 while ((op->stats.hp--) > 0) 3528 while (op->stats.hp-- > 0)
3643 create_treasure (op->randomitems, op, op->map ? GT_ENVIRONMENT : 0, 3529 create_treasure (op->randomitems, op, op->map ? GT_ENVIRONMENT : 0,
3644 op->stats.exp ? (int) op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0); 3530 op->stats.exp ? (int) op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0);
3645 3531
3646 /* If we generated an object and put it in this object inventory, 3532 /* If we generated an object and put it in this object inventory,
3647 * move it to the parent object as the current object is about 3533 * move it to the parent object as the current object is about
… …
3664 } 3550 }
3665 return tmp ? 1 : 0; 3551 return tmp ? 1 : 0;
3666} 3552}
3667 3553
3668/** 3554/**
3669 * fix_auto_apply goes through the entire map (only the first time 3555 * fix_auto_apply goes through the entire map every time a map
3670 * when an original map is loaded) and performs special actions for 3556 * is loaded or swapped in and performs special actions for
3671 * certain objects (most initialization of chests and creation of 3557 * certain objects (most initialization of chests and creation of
3672 * treasures and stuff). Calls auto_apply if appropriate. 3558 * treasures and stuff). Calls auto_apply if appropriate.
3673 */ 3559 */
3674void 3560void
3675fix_auto_apply (maptile *m) 3561maptile::fix_auto_apply ()
3676{ 3562{
3677 object *tmp, *above = NULL; 3563 if (!spaces)
3678 int x, y;
3679
3680 if (m == NULL)
3681 return; 3564 return;
3682 3565
3683 for (x = 0; x < MAP_WIDTH (m); x++) 3566 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3684 for (y = 0; y < MAP_HEIGHT (m); y++) 3567 for (object *tmp = ms->bot; tmp; )
3685 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above)
3686 { 3568 {
3687 above = tmp->above; 3569 object *above = tmp->above;
3688 3570
3689 if (tmp->inv) 3571 if (tmp->inv)
3690 { 3572 {
3691 object *invtmp, *invnext; 3573 object *invtmp, *invnext;
3692 3574
3693 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext) 3575 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext)
3694 { 3576 {
3695 invnext = invtmp->below; 3577 invnext = invtmp->below;
3696 3578
3697 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY)) 3579 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY))
3698 auto_apply (invtmp); 3580 auto_apply (invtmp);
3699 else if (invtmp->type == TREASURE && invtmp->has_random_items ()) 3581 else if (invtmp->type == TREASURE && invtmp->has_random_items ())
3700 { 3582 {
3701 while ((invtmp->stats.hp--) > 0) 3583 while ((invtmp->stats.hp--) > 0)
3702 create_treasure (invtmp->randomitems, invtmp, 0, m->difficulty, 0); 3584 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3703 3585
3704 invtmp->randomitems = NULL; 3586 invtmp->randomitems = NULL;
3705 } 3587 }
3706 else if (invtmp && invtmp->arch 3588 else if (invtmp && invtmp->arch
3707 && invtmp->type != TREASURE && invtmp->type != SPELL && invtmp->type != CLASS && invtmp->has_random_items ()) 3589 && invtmp->type != TREASURE && invtmp->type != SPELL && invtmp->type != CLASS && invtmp->has_random_items ())
3708 { 3590 {
3709 create_treasure (invtmp->randomitems, invtmp, 0, m->difficulty, 0); 3591 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3710 /* Need to clear this so that we never try to create 3592 /* Need to clear this so that we never try to create
3711 * treasure again for this object 3593 * treasure again for this object
3712 */ 3594 */
3713 invtmp->randomitems = NULL; 3595 invtmp->randomitems = NULL;
3714 } 3596 }
3715 } 3597 }
3716 /* This is really temporary - the code at the bottom will 3598 /* This is really temporary - the code at the bottom will
3717 * also set randomitems to null. The problem is there are bunches 3599 * also set randomitems to null. The problem is there are bunches
3718 * of maps/players already out there with items that have spells 3600 * of maps/players already out there with items that have spells
3719 * which haven't had the randomitems set to null yet. 3601 * which haven't had the randomitems set to null yet.
3720 * MSW 2004-05-13 3602 * MSW 2004-05-13
3721 * 3603 *
3722 * And if it's a spellbook, it's better to set randomitems to NULL too, 3604 * And if it's a spellbook, it's better to set randomitems to NULL too,
3723 * else you get two spells in the book ^_- 3605 * else you get two spells in the book ^_-
3724 * Ryo 2004-08-16 3606 * Ryo 2004-08-16
3725 */ 3607 */
3726 if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL 3608 if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL
3727 || tmp->type == HORN || tmp->type == FIREWALL || tmp->type == POTION || tmp->type == ALTAR || tmp->type == SPELLBOOK) 3609 || tmp->type == HORN || tmp->type == FIREWALL || tmp->type == POTION || tmp->type == ALTAR || tmp->type == SPELLBOOK)
3728 tmp->randomitems = NULL;
3729
3730 }
3731
3732 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY))
3733 auto_apply (tmp);
3734 else if ((tmp->type == TREASURE || (tmp->type == CONTAINER)) && tmp->has_random_items ())
3735 {
3736 while ((tmp->stats.hp--) > 0)
3737 create_treasure (tmp->randomitems, tmp, 0, m->difficulty, 0);
3738 tmp->randomitems = NULL; 3610 tmp->randomitems = NULL;
3611
3739 } 3612 }
3613
3614 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY))
3615 auto_apply (tmp);
3616 else if ((tmp->type == TREASURE || (tmp->type == CONTAINER)) && tmp->has_random_items ())
3617 {
3618 while ((tmp->stats.hp--) > 0)
3619 create_treasure (tmp->randomitems, tmp, 0, difficulty, 0);
3620 tmp->randomitems = NULL;
3621 }
3740 else if (tmp->type == TIMED_GATE) 3622 else if (tmp->type == TIMED_GATE)
3741 { 3623 {
3742 object *head = tmp->head != NULL ? tmp->head : tmp; 3624 object *head = tmp->head != NULL ? tmp->head : tmp;
3743 3625
3744 if (QUERY_FLAG (head, FLAG_IS_LINKED)) 3626 if (QUERY_FLAG (head, FLAG_IS_LINKED))
3745 {
3746 tmp->speed = 0; 3627 tmp->set_speed (0);
3747 update_ob_speed (tmp);
3748 }
3749 } 3628 }
3750 /* This function can be called everytime a map is loaded, even when 3629 /* This function can be called everytime a map is loaded, even when
3751 * swapping back in. As such, we don't want to create the treasure 3630 * swapping back in. As such, we don't want to create the treasure
3752 * over and ove again, so after we generate the treasure, blank out 3631 * over and ove again, so after we generate the treasure, blank out
3753 * randomitems so if it is swapped in again, it won't make anything. 3632 * randomitems so if it is swapped in again, it won't make anything.
3754 * This is a problem for the above objects, because they have counters 3633 * This is a problem for the above objects, because they have counters
3755 * which say how many times to make the treasure. 3634 * which say how many times to make the treasure.
3756 */ 3635 */
3757 else if (tmp && tmp->arch && tmp->type != PLAYER 3636 else if (tmp && tmp->arch && tmp->type != PLAYER
3758 && tmp->type != TREASURE && tmp->type != SPELL 3637 && tmp->type != TREASURE && tmp->type != SPELL
3759 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && tmp->has_random_items ()) 3638 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && tmp->has_random_items ())
3760 { 3639 {
3761 create_treasure (tmp->randomitems, tmp, GT_APPLY, m->difficulty, 0); 3640 create_treasure (tmp->randomitems, tmp, GT_APPLY, difficulty, 0);
3762 tmp->randomitems = NULL; 3641 tmp->randomitems = NULL;
3763 } 3642 }
3643
3644 // close all containers
3645 else if (tmp->type == CONTAINER)
3646 tmp->flag [FLAG_APPLIED] = 0;
3647
3648 tmp = above;
3764 } 3649 }
3765 3650
3766 for (x = 0; x < MAP_WIDTH (m); x++) 3651 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3767 for (y = 0; y < MAP_HEIGHT (m); y++) 3652 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
3768 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
3769 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL)) 3653 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL))
3770 check_trigger (tmp, tmp->above); 3654 check_trigger (tmp, tmp->above);
3771} 3655}
3772 3656
3773/** 3657/**
3774 * Handles player eating food that temporarily changes status (resistances, stats). 3658 * Handles player eating food that temporarily changes status (resistances, stats).
3775 * This used to call cast_change_attr(), but 3659 * This used to call cast_change_attr(), but
… …
3806 } 3690 }
3807 } 3691 }
3808 3692
3809 if (did_one) 3693 if (did_one)
3810 { 3694 {
3811 force->speed = 0.1; 3695 force->set_speed (0.1);
3812 update_ob_speed (force);
3813 /* bigger morsel of food = longer effect time */ 3696 /* bigger morsel of food = longer effect time */
3814 force->duration = food->stats.food / 5; 3697 force->duration = food->stats.food / 5;
3815 SET_FLAG (force, FLAG_APPLIED); 3698 SET_FLAG (force, FLAG_APPLIED);
3816 change_abil (who, force); 3699 change_abil (who, force);
3817 insert_ob_in_ob (force, who); 3700 insert_ob_in_ob (force, who);
… …
3822 /* check for hp, sp change */ 3705 /* check for hp, sp change */
3823 if (food->stats.hp != 0) 3706 if (food->stats.hp != 0)
3824 { 3707 {
3825 if (QUERY_FLAG (food, FLAG_CURSED)) 3708 if (QUERY_FLAG (food, FLAG_CURSED))
3826 { 3709 {
3827 strcpy (who->contr->killer, food->name); 3710 assign (who->contr->killer, food->name);
3828 hit_player (who, food->stats.hp, food, AT_POISON, 1); 3711 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3829 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!"); 3712 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!");
3830 } 3713 }
3831 else 3714 else
3832 { 3715 {

Diff Legend

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