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.76 by root, Mon Apr 30 04:25:30 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>
… …
64 { 65 {
65 arch_flag = 1; 66 arch_flag = 1;
66 name_flag = 1; 67 name_flag = 1;
67 race_flag = 1; 68 race_flag = 1;
68 } 69 }
70
69 /* 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,
70 * name or race that matches. 72 * name or race that matches.
71 */ 73 */
72 if ((op->race) && 74 if ((op->race) &&
73 ((!(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)) &&
74 ((!(victim->name && name_flag) || strcmp (op->race, victim->name))) && 76 ((!(victim->name && name_flag) || op->race != victim->name)) &&
75 ((!(victim->race && race_flag) || strcmp (op->race, victim->race)))) 77 ((!(victim->race && race_flag) || op->race != victim->race)))
76 {
77 return 1; 78 return 1;
78 } 79
79 /* If the director has slaying set, only affect objects where none 80 /* If the director has slaying set, only affect objects where none
80 * of arch, name, or race match. 81 * of arch, name, or race match.
81 */ 82 */
82 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))) ||
83 ((victim->name && name_flag && !strcmp (op->slaying, victim->name))) || 84 ((victim->name && name_flag && op->slaying == victim->name)) ||
84 ((victim->race && race_flag && !strcmp (op->slaying, victim->race))))) 85 ((victim->race && race_flag && op->slaying == victim->race)))
85 {
86 return 1; 86 return 1;
87 } 87
88 return 0; 88 return 0;
89} 89}
90 90
91/** 91/**
92 * 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.
… …
421 int count = 0; 421 int count = 0;
422 422
423 423
424 if (item == NULL) 424 if (item == NULL)
425 return 0; 425 return 0;
426
426 op = op->below; 427 op = op->below;
427 while (op != NULL) 428 while (op != NULL)
428 { 429 {
429 if (strcmp (op->arch->name, item) == 0) 430 if (strcmp (op->arch->name, item) == 0)
430 { 431 {
… …
435 count++; 436 count++;
436 else 437 else
437 count += op->nrof; 438 count += op->nrof;
438 } 439 }
439 } 440 }
441
440 op = op->below; 442 op = op->below;
441 } 443 }
444
442 return count; 445 return count;
443} 446}
444 447
445/** 448/**
446 * This removes 'nrof' of what item->slaying says to remove. 449 * This removes 'nrof' of what item->slaying says to remove.
… …
978 else 981 else
979 { 982 {
980 if (converter->other_arch == NULL) 983 if (converter->other_arch == NULL)
981 { 984 {
982 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n", 985 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); 986 &converter->name, &converter->map->path, converter->x, converter->y);
984 return -1; 987 return -1;
985 } 988 }
986 989
987 item = object_create_arch (converter->other_arch); 990 item = object_create_arch (converter->other_arch);
988 fix_generated_item (item, converter, 0, 0, GT_MINIMAL); 991 fix_generated_item (item, converter, 0, 0, GT_MINIMAL);
… …
995 if (is_in_shop (converter)) 998 if (is_in_shop (converter))
996 SET_FLAG (item, FLAG_UNPAID); 999 SET_FLAG (item, FLAG_UNPAID);
997 else if (price_in < item->nrof * item->value) 1000 else if (price_in < item->nrof * item->value)
998 { 1001 {
999 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n", 1002 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); 1003 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
1001 1004
1002 /** 1005 /**
1003 * elmex: we are going to let the game continue, as the mapcreator 1006 * elmex: we are going to let the game continue, as the mapcreator
1004 * propably had something in mind when doing this 1007 * propably had something in mind when doing this
1005 */ 1008 */
… …
1012 * Handle apply on containers. 1015 * Handle apply on containers.
1013 * By Eneq(@csd.uu.se). 1016 * By Eneq(@csd.uu.se).
1014 * Moved to own function and added many features [Tero.Haatanen@lut.fi] 1017 * Moved to own function and added many features [Tero.Haatanen@lut.fi]
1015 * added the alchemical cauldron to the code -b.t. 1018 * added the alchemical cauldron to the code -b.t.
1016 */ 1019 */
1017
1018int 1020int
1019apply_container (object *op, object *sack) 1021apply_container (object *op, object *sack)
1020{ 1022{
1021 char buf[MAX_BUF]; 1023 if (op->type != PLAYER || !op->contr->ns)
1022 object *tmp;
1023
1024 if (op->type != PLAYER)
1025 return 0; /* This might change */ 1024 return 0; /* This might change */
1026 1025
1027 if (sack == NULL || sack->type != CONTAINER) 1026 if (!sack || sack->type != CONTAINER)
1028 { 1027 {
1029 LOG (llevError, "apply_container: %s is not container!\n", sack ? &sack->name : "[nullobject]"); 1028 LOG (llevError, "apply_container: %s is not container!\n", sack ? &sack->name : "[nullobject]");
1030 return 0; 1029 return 0;
1031 } 1030 }
1032 1031
1033 op->contr->last_used = 0; 1032 op->contr->last_used = 0;
1034 1033
1035 if (sack->env != op) 1034 if (sack->env && sack->env != op)
1035 {
1036 new_draw_info (NDI_UNIQUE, 0, op, "You must put it onto the floor or into your inventory first.");
1037 return 1;
1036 { 1038 }
1037 if (sack->other_arch == NULL || sack->env != NULL) 1039
1040 // already applied == open on ground, or open in inv, or active in inv
1041 if (sack->flag [FLAG_APPLIED])
1042 {
1043 if (op->container == sack)
1038 { 1044 {
1039 new_draw_info (NDI_UNIQUE, 0, op, "You must get it first."); 1045 // open on ground or inv, so close
1046 op->close_container ();
1040 return 1; 1047 return 1;
1041 } 1048 }
1042 1049 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 { 1050 {
1049 for (tmp = GET_MAP_OB (sack->map, sack->x, sack->y); tmp && tmp->container != sack; tmp = tmp->above); 1051 // 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)); 1052 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already occupied.", query_name (sack));
1054 return 1; 1053 return 1;
1055 }
1056 }
1057 }
1058 if (QUERY_FLAG (sack, FLAG_APPLIED))
1059 { 1054 }
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 1055
1080 if (tmp && tmp->type == CLOSE_CON) 1056 // fall through to opening it (active in inv)
1081 tmp->destroy ();
1082 }
1083 }
1084 }
1085
1086 if (QUERY_FLAG (sack, FLAG_APPLIED))
1087 { 1057 }
1058 else if (sack->env)
1059 {
1060 // it is in our env, so activate it, do not open yet
1088 if (op->container) 1061 op->close_container ();
1089 { 1062 sack->flag [FLAG_APPLIED] = 1;
1090 if (op->container != sack) 1063 esrv_update_item (UPD_FLAGS, op, sack);
1091 { 1064 new_draw_info_format (NDI_UNIQUE, 0, op, "You ready %s.", query_name (sack));
1092 tmp = op->container; 1065 return 1;
1093 apply_container (op, tmp); 1066 }
1094 sprintf (buf, "You close %s and open ", query_name (tmp)); 1067
1095 op->container = sack; 1068 // it's locked?
1096 strcat (buf, query_name (sack)); 1069 if (sack->slaying)
1097 strcat (buf, "."); 1070 {
1098 } 1071 if (object *tmp = find_key (op, op, sack))
1099 else 1072 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 1073 else
1107 { 1074 {
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)); 1075 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; 1076 return 1;
1144 } 1077 }
1145 }
1146 } 1078 }
1147 1079
1148 new_draw_info (NDI_UNIQUE, 0, op, buf); 1080 op->open_container (sack);
1149
1150 if (op->contr)
1151 op->contr->ns->floorbox_update ();
1152 1081
1153 return 1; 1082 return 1;
1154} 1083}
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 1084
1281/** 1085/**
1282 * Handles dropping things on altar. 1086 * Handles dropping things on altar.
1283 * Returns true if sacrifice was accepted. 1087 * Returns true if sacrifice was accepted.
1284 */ 1088 */
… …
1627 1431
1628 1432
1629 case CONVERTER: 1433 case CONVERTER:
1630 if (convert_item (victim, trap) < 0) 1434 if (convert_item (victim, trap) < 0)
1631 { 1435 {
1632 object *op;
1633
1634 new_draw_info_format (NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name (trap)); 1436 new_draw_info_format (NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name (trap));
1635 1437 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 } 1438 }
1643 } 1439
1644 goto leave; 1440 goto leave;
1645 1441
1646 case TRIGGER_BUTTON: 1442 case TRIGGER_BUTTON:
1647 case TRIGGER_PEDESTAL: 1443 case TRIGGER_PEDESTAL:
1648 case TRIGGER_ALTAR: 1444 case TRIGGER_ALTAR:
… …
1677 if (victim->type == PLAYER && EXIT_PATH (trap)) 1473 if (victim->type == PLAYER && EXIT_PATH (trap))
1678 { 1474 {
1679 /* Basically, don't show exits leading to random maps the 1475 /* Basically, don't show exits leading to random maps the
1680 * players output. 1476 * players output.
1681 */ 1477 */
1682 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2) && strncmp (EXIT_PATH (trap), "/random/", 8)) 1478 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2))
1683 new_draw_info (NDI_NAVY, 0, victim, trap->msg); 1479 new_draw_info (NDI_NAVY, 0, victim, trap->msg);
1480
1684 enter_exit (victim, trap); 1481 victim->enter_exit (trap);
1685 } 1482 }
1686 goto leave; 1483 goto leave;
1687 1484
1688 case ENCOUNTER: 1485 case ENCOUNTER:
1689 /* may be some leftovers on this */ 1486 /* may be some leftovers on this */
… …
1704 1501
1705 apply_sign (victim, trap, 1); 1502 apply_sign (victim, trap, 1);
1706 goto leave; 1503 goto leave;
1707 1504
1708 case CONTAINER: 1505 case CONTAINER:
1709 if (victim->type == PLAYER)
1710 (void) esrv_apply_container (victim, trap);
1711 else
1712 (void) apply_container (victim, trap); 1506 apply_container (victim, trap);
1713 goto leave; 1507 goto leave;
1714 1508
1715 case RUNE: 1509 case RUNE:
1716 case TRAP: 1510 case TRAP:
1717 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE)) 1511 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE))
… …
1777 1571
1778 readable_message_type *msgType = get_readable_message_type (tmp); 1572 readable_message_type *msgType = get_readable_message_type (tmp);
1779 1573
1780 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, 1574 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1781 msgType->message_type, msgType->message_subtype, 1575 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); 1576 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1577 long_desc (tmp, op), &tmp->msg);
1783 1578
1784 /* gain xp from reading */ 1579 /* gain xp from reading */
1785 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1580 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1786 { /* only if not read before */ 1581 { /* only if not read before */
1787 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1582 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
… …
1943 return; 1738 return;
1944 } 1739 }
1945 1740
1946 if (skop->level < int (sqrtf (spell->level) * 1.5f)) 1741 if (skop->level < int (sqrtf (spell->level) * 1.5f))
1947 { 1742 {
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."); 1743 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols. [Your literacy level is too low]");
1949 return; 1744 return;
1950 } 1745 }
1951 1746
1952 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name); 1747 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name);
1953 1748
… …
1976 { 1771 {
1977 spell_skill = find_skill_by_name (op, spell->skill); 1772 spell_skill = find_skill_by_name (op, spell->skill);
1978 1773
1979 if (!spell_skill) 1774 if (!spell_skill)
1980 { 1775 {
1981 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use this spell", &spell->skill); 1776 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use this spell.", &spell->skill);
1982 return; 1777 return;
1983 } 1778 }
1984 1779
1985 if (spell_skill->level < spell->level) 1780 if (spell_skill->level < spell->level)
1986 { 1781 {
… …
2020 else 1815 else
2021 { 1816 {
2022 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1817 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"); 1818 new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell.\n");
2024 } 1819 }
1820
2025 decrease_ob (tmp); 1821 decrease_ob (tmp);
2026} 1822}
2027 1823
2028/** 1824/**
2029 * Handles applying a spell scroll. 1825 * Handles applying a spell scroll.
… …
2225 if (meal->type != FLESH || !is_dragon_pl (op)) 2021 if (meal->type != FLESH || !is_dragon_pl (op))
2226 return 0; 2022 return 0;
2227 2023
2228 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces 2024 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces
2229 from the player's inventory */ 2025 from the player's inventory */
2026 shstr_cmp dragon_ability_force ("dragon_ability_force");
2027 shstr_cmp dragon_skin_force ("dragon_skin_force");
2028
2230 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2029 for (tmp = op->inv; tmp; tmp = tmp->below)
2231 {
2232 if (tmp->type == FORCE) 2030 if (tmp->type == FORCE)
2233 {
2234 if (strcmp (tmp->arch->name, "dragon_skin_force") == 0) 2031 if (tmp->arch->name == dragon_skin_force)
2235 skin = tmp; 2032 skin = tmp;
2236 else if (strcmp (tmp->arch->name, "dragon_ability_force") == 0) 2033 else if (tmp->arch->name == dragon_ability_force)
2237 abil = tmp; 2034 abil = tmp;
2238 }
2239 }
2240 2035
2241 /* if either skin or ability are missing, this is an old player 2036 /* if either skin or ability are missing, this is an old player
2242 which is not to be considered a dragon -> bail out */ 2037 which is not to be considered a dragon -> bail out */
2243 if (skin == NULL || abil == NULL) 2038 if (skin == NULL || abil == NULL)
2244 return 0; 2039 return 0;
… …
2285 /* doubled chance for resistance of ability-focus */ 2080 /* doubled chance for resistance of ability-focus */
2286 if (i == abil->stats.exp) 2081 if (i == abil->stats.exp)
2287 chance = MIN (100., chance * 2.); 2082 chance = MIN (100., chance * 2.);
2288 2083
2289 /* now make the throw and save all winners (Don't insert luck bonus here!) */ 2084 /* now make the throw and save all winners (Don't insert luck bonus here!) */
2290 if (RANDOM () % 10000 < (int) (chance * 100)) 2085 if (rndm (10000) < (unsigned int) (chance * 100))
2291 { 2086 {
2292 atnr_winner[winners] = i; 2087 atnr_winner[winners] = i;
2293 winners++; 2088 winners++;
2294 } 2089 }
2295 2090
… …
2410 handle_apply_yield (tmp); 2205 handle_apply_yield (tmp);
2411 decrease_ob (tmp); 2206 decrease_ob (tmp);
2412} 2207}
2413 2208
2414/** 2209/**
2415 * This fonction return true if the exit is not a 2 ways one or it is 2 ways, valid exit. 2210 * 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: 2211 * A valid 2 way exit means:
2417 * -You can come back (there is another exit at the other side) 2212 * -You can come back (there is another exit at the other side)
2418 * -You are 2213 * -You are
2419 * ° the owner of the exit 2214 * ° the owner of the exit
2420 * ° or in the same party as the owner 2215 * ° or in the same party as the owner
… …
2424 * survive in the swapping (in fact the whole exit doesn't survive). 2219 * survive in the swapping (in fact the whole exit doesn't survive).
2425 */ 2220 */
2426int 2221int
2427is_legal_2ways_exit (object *op, object *exit) 2222is_legal_2ways_exit (object *op, object *exit)
2428{ 2223{
2429 object *tmp;
2430 object *exit_owner;
2431 player *pp;
2432 maptile *exitmap;
2433
2434 if (exit->stats.exp != 1) 2224 if (exit->stats.exp != 1)
2435 return 1; /*This is not a 2 way, so it is legal */ 2225 return 1; /*This is not a 2 way, so it is legal */
2226
2227#if 0 //TODO
2436 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race) 2228 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race)
2437 return 0; /* This is a reset town portal */ 2229 return 0; /* This is a reset town portal */
2438 /* To know if an exit has a correspondant, we look at 2230#endif
2439 * all the exits in destination and try to find one with same path as 2231
2440 * the current exit's position */ 2232 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map);
2441 if (!strncmp (EXIT_PATH (exit), settings.localdir, strlen (settings.localdir))) 2233
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) 2234 if (exitmap)
2446 { 2235 {
2236 exitmap->load_sync ();
2237
2447 tmp = GET_MAP_OB (exitmap, EXIT_X (exit), EXIT_Y (exit)); 2238 object *tmp = exitmap->at (EXIT_X (exit), EXIT_Y (exit)).bot;
2239
2448 if (!tmp) 2240 if (!tmp)
2449 return 0; 2241 return 0;
2450 for ((tmp = GET_MAP_OB (exitmap, EXIT_X (exit), EXIT_Y (exit))); tmp; tmp = tmp->above) 2242
2243 for (; tmp; tmp = tmp->above)
2451 { 2244 {
2452 if (tmp->type != EXIT) 2245 if (tmp->type != EXIT)
2453 continue; /*Not an exit */ 2246 continue; /*Not an exit */
2247
2454 if (!EXIT_PATH (tmp)) 2248 if (!EXIT_PATH (tmp))
2455 continue; /*Not a valid exit */ 2249 continue; /*Not a valid exit */
2250
2456 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y)) 2251 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y))
2457 continue; /*Not in the same place */ 2252 continue; /*Not in the same place */
2253
2458 if (strcmp (exit->map->path, EXIT_PATH (tmp)) != 0) 2254 if (exit->map->path != EXIT_PATH (tmp))
2459 continue; /*Not in the same map */ 2255 continue; /*Not in the same map */
2460 2256
2461 /* From here we have found the exit is valid. However we do 2257 /* 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 2258 * here the check of the exit owner. It is important for the
2463 * town portals to prevent strangers from visiting your appartments 2259 * town portals to prevent strangers from visiting your appartments
2464 */ 2260 */
2465 if (!exit->race) 2261 if (!exit->race)
2466 return 1; /*No owner, free for all! */ 2262 return 1; /*No owner, free for all! */
2263
2467 exit_owner = NULL; 2264 object *exit_owner = 0;
2468 for (pp = first_player; pp; pp = pp->next) 2265
2266 for_all_players (pp)
2469 { 2267 {
2470 if (!pp->ob) 2268 if (!pp->ob)
2471 continue; 2269 continue;
2270
2472 if (pp->ob->name != exit->race) 2271 if (pp->ob->name != exit->race)
2473 continue; 2272 continue;
2273
2474 exit_owner = pp->ob; /*We found a player which correspond to the player name */ 2274 exit_owner = pp->ob; /*We found a player which correspond to the player name */
2475 break; 2275 break;
2476 } 2276 }
2277
2477 if (!exit_owner) 2278 if (!exit_owner)
2478 return 0; /* No more owner */ 2279 return 0; /* No more owner */
2280
2479 if (exit_owner->contr == op->contr) 2281 if (exit_owner->contr == op->contr)
2480 return 1; /*It is your exit */ 2282 return 1; /*It is your exit */
2283
2481 if (exit_owner && /*There is a owner */ 2284 if (exit_owner && /*There is a owner */
2482 (op->contr) && /*A player tries to pass */ 2285 (op->contr) && /*A player tries to pass */
2483 ((exit_owner->contr->party == NULL) || /*No pass if controller has no party */ 2286 ((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 */ 2287 (exit_owner->contr->party != op->contr->party))) /* Or not the same as op */
2485 return 0; 2288 return 0;
2289
2486 return 1; 2290 return 1;
2487 } 2291 }
2488 } 2292 }
2293
2489 return 0; 2294 return 0;
2490} 2295}
2491 2296
2492 2297
2493/** 2298/**
… …
2543 { 2348 {
2544 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2349 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle.");
2545 play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE); 2350 play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE);
2546 } 2351 }
2547 else 2352 else
2548 {
2549 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move."); 2353 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move.");
2550 } 2354
2551 return 1; 2355 return 1;
2552 2356
2553 case EXIT: 2357 case EXIT:
2554 if (op->type != PLAYER) 2358 if (op->type != PLAYER)
2555 return 0; 2359 return 0;
2360
2556 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2361 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp))
2557 { 2362 {
2558 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp)); 2363 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp));
2559 } 2364 }
2560 else 2365 else
2561 { 2366 {
2562 /* Don't display messages for random maps. */ 2367 /* Don't display messages for random maps. */
2563 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2) && strncmp (EXIT_PATH (tmp), "/random/", 8)) 2368 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2))
2564 new_draw_info (NDI_NAVY, 0, op, tmp->msg); 2369 new_draw_info (NDI_NAVY, 0, op, tmp->msg);
2370
2565 enter_exit (op, tmp); 2371 op->enter_exit (tmp);
2566 } 2372 }
2567 return 1; 2373 return 1;
2568 2374
2569 case SIGN: 2375 case SIGN:
2570 apply_sign (op, tmp, 0); 2376 apply_sign (op, tmp, 0);
… …
2604 case POTION: 2410 case POTION:
2605 (void) apply_potion (op, tmp); 2411 (void) apply_potion (op, tmp);
2606 return 1; 2412 return 1;
2607 2413
2608 /* Eneq(@csd.uu.se): Handle apply on containers. */ 2414 /* Eneq(@csd.uu.se): Handle apply on containers. */
2415 //TODO: remove, as it is unsed?
2609 case CLOSE_CON: 2416 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); 2417 apply_container (op, tmp->env);
2614 return 1; 2418 return 1;
2615 2419
2616 case CONTAINER: 2420 case CONTAINER:
2617 if (op->type == PLAYER)
2618 (void) esrv_apply_container (op, tmp);
2619 else
2620 (void) apply_container (op, tmp); 2421 apply_container (op, tmp);
2621 return 1; 2422 return 1;
2622 2423
2623 case TREASURE: 2424 case TREASURE:
2624 if (op->type == PLAYER) 2425 if (op->type == PLAYER)
2625 { 2426 {
2626 apply_treasure (op, tmp); 2427 apply_treasure (op, tmp);
2627 return 1; 2428 return 1;
2628 } 2429 }
2629 else 2430 else
2630 {
2631 return 0; 2431 return 0;
2632 }
2633 2432
2634 case WEAPON: 2433 case WEAPON:
2635 case ARMOUR: 2434 case ARMOUR:
2636 case BOOTS: 2435 case BOOTS:
2637 case GLOVES: 2436 case GLOVES:
… …
2701 } 2500 }
2702 2501
2703 case MENU: 2502 case MENU:
2704 if (op->type == PLAYER) 2503 if (op->type == PLAYER)
2705 { 2504 {
2706 shop_listing (op); 2505 shop_listing (tmp, op);
2707 return 1; 2506 return 1;
2708 } 2507 }
2709 else 2508 else
2710 { 2509 {
2711 return 0; 2510 return 0;
… …
2789 */ 2588 */
2790 2589
2791void 2590void
2792player_apply_below (object *pl) 2591player_apply_below (object *pl)
2793{ 2592{
2794 object *tmp, *next;
2795 int floors; 2593 int floors = 0;
2796 2594
2797 /* If using a container, set the starting item to be the top 2595 /* If using a container, set the starting item to be the top
2798 * item in the container. Otherwise, use the map. 2596 * 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 2597 * 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 2598 * 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 2599 * 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 2600 * problem if player_apply() has a bug in that it uses the object but does
2806 * not return a proper value. 2601 * not return a proper value.
2807 */ 2602 */
2808 for (floors = 0; tmp != NULL; tmp = next) 2603 for (object *next, *tmp = pl->container ? pl->container->inv : pl->below; tmp; tmp = next)
2809 { 2604 {
2810 next = tmp->below; 2605 next = tmp->below;
2606
2811 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 2607 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
2812 floors++; 2608 floors++;
2813 else if (floors > 0) 2609 else if (floors > 0)
2814 return; /* process only floor objects after first floor object */ 2610 return; /* process only floor objects after first floor object */
2815 2611
… …
2841 return RESULT_INT (0); 2637 return RESULT_INT (0);
2842 2638
2843 object *tmp2; 2639 object *tmp2;
2844 2640
2845 CLEAR_FLAG (op, FLAG_APPLIED); 2641 CLEAR_FLAG (op, FLAG_APPLIED);
2642
2846 switch (op->type) 2643 switch (op->type)
2847 { 2644 {
2848 case WEAPON: 2645 case WEAPON:
2849 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op)); 2646 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op));
2850 2647
… …
2855 break; 2652 break;
2856 2653
2857 case SKILL: /* allows objects to impart skills */ 2654 case SKILL: /* allows objects to impart skills */
2858 case SKILL_TOOL: 2655 case SKILL_TOOL:
2859 if (op != who->chosen_skill) 2656 if (op != who->chosen_skill)
2860 {
2861 LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n"); 2657 LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n");
2862 } 2658
2863 if (who->type == PLAYER) 2659 if (who->type == PLAYER)
2864 { 2660 {
2865 if (who->contr->shoottype == range_skill) 2661 if (who->contr->ranged_ob == op)
2866 who->contr->shoottype = range_none; 2662 {
2663 who->contr->ranged_skill = 0;
2664 who->contr->ranged_ob = 0;
2665 }
2666
2867 if (!op->invisible) 2667 if (!op->invisible)
2868 {
2869 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op)); 2668 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op));
2870 }
2871 else 2669 else
2872 {
2873 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill); 2670 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill);
2874 } 2671 }
2875 } 2672
2876 (void) change_abil (who, op); 2673 change_abil (who, op);
2877 who->chosen_skill = NULL; 2674 who->chosen_skill = 0;
2878 CLEAR_FLAG (who, FLAG_READY_SKILL); 2675 CLEAR_FLAG (who, FLAG_READY_SKILL);
2879 break; 2676 break;
2880 2677
2881 case ARMOUR: 2678 case ARMOUR:
2882 case HELMET: 2679 case HELMET:
… …
2921 } 2718 }
2922 if (who->type == PLAYER) 2719 if (who->type == PLAYER)
2923 esrv_send_item (who, tmp2); 2720 esrv_send_item (who, tmp2);
2924 return 1; /* otherwise, an attempt to drop causes problems */ 2721 return 1; /* otherwise, an attempt to drop causes problems */
2925 break; 2722 break;
2723
2926 case BOW: 2724 case BOW:
2927 case WAND: 2725 case WAND:
2928 case ROD: 2726 case ROD:
2929 case HORN: 2727 case HORN:
2930 clear_skill (who); 2728 clear_skill (who);
2931 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2932 if (who->type == PLAYER) 2729 if (who->type == PLAYER)
2933 { 2730 {
2934 who->contr->shoottype = range_none; 2731 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2732
2733 who->contr->ranged_skill = 0;
2734 who->contr->ranged_ob = 0;
2935 } 2735 }
2936 else 2736 else
2937 { 2737 {
2938 if (op->type == BOW) 2738 if (op->type == BOW)
2939 CLEAR_FLAG (who, FLAG_READY_BOW); 2739 CLEAR_FLAG (who, FLAG_READY_BOW);
2940 else 2740 else
2941 CLEAR_FLAG (who, FLAG_READY_RANGE); 2741 CLEAR_FLAG (who, FLAG_READY_RANGE);
2942 } 2742 }
2743
2943 break; 2744 break;
2944 2745
2945 case BUILDER: 2746 case BUILDER:
2747 if (who->type == PLAYER)
2748 {
2946 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2749 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2947 who->contr->shoottype = range_none; 2750
2948 who->contr->ranges[range_builder] = NULL; 2751 who->contr->ranged_skill = 0;
2752 who->contr->ranged_ob = 0;
2753 }
2949 break; 2754 break;
2950 2755
2951 default: 2756 default:
2952 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op)); 2757 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op));
2953 break; 2758 break;
… …
3137 ws = tmp; 2942 ws = tmp;
3138 } 2943 }
3139 } 2944 }
3140 } 2945 }
3141 2946
3142
3143 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 2947 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
3144 { 2948 {
3145 if (op->body_info[i]) 2949 if (op->body_info[i])
3146 { 2950 {
3147 /* Item uses more slots than we have */ 2951 /* Item uses more slots than we have */
… …
3226 * and weapons all use the same slot. Similar for horn/rod/wand - they 3030 * and weapons all use the same slot. Similar for horn/rod/wand - they
3227 * all use the same location. 3031 * all use the same location.
3228 */ 3032 */
3229 if (op->type == WEAPON && !QUERY_FLAG (who, FLAG_USE_WEAPON)) 3033 if (op->type == WEAPON && !QUERY_FLAG (who, FLAG_USE_WEAPON))
3230 retval |= CAN_APPLY_RESTRICTION; 3034 retval |= CAN_APPLY_RESTRICTION;
3035
3231 if (op->type == SHIELD && !QUERY_FLAG (who, FLAG_USE_SHIELD)) 3036 if (op->type == SHIELD && !QUERY_FLAG (who, FLAG_USE_SHIELD))
3232 retval |= CAN_APPLY_RESTRICTION; 3037 retval |= CAN_APPLY_RESTRICTION;
3233
3234 3038
3235 if (who->type != PLAYER) 3039 if (who->type != PLAYER)
3236 { 3040 {
3237 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE)) 3041 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE))
3238 retval |= CAN_APPLY_RESTRICTION; 3042 retval |= CAN_APPLY_RESTRICTION;
… …
3241 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING)) 3045 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING))
3242 retval |= CAN_APPLY_RESTRICTION; 3046 retval |= CAN_APPLY_RESTRICTION;
3243 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3047 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3244 retval |= CAN_APPLY_RESTRICTION; 3048 retval |= CAN_APPLY_RESTRICTION;
3245 } 3049 }
3050
3246 return retval; 3051 return retval;
3247} 3052}
3248
3249
3250 3053
3251/** 3054/**
3252 * who is the object using the object. It can be a monster. 3055 * 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, 3056 * 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 3057 * eg, one which you put on and keep on for a while, and not something
… …
3327 } 3130 }
3328 else 3131 else
3329 { 3132 {
3330 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice)) 3133 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice))
3331 { 3134 {
3332 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some item(s):"); 3135 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); 3136 unapply_for_ob (who, op, AP_PRINT);
3334 return 1; 3137 return 1;
3335 } 3138 }
3336 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE)) 3139 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE))
3337 { 3140 {
… …
3339 if (i) 3142 if (i)
3340 return 1; 3143 return 1;
3341 } 3144 }
3342 } 3145 }
3343 } 3146 }
3147
3344 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL) 3148 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL)
3345 { 3149 {
3346 skop = find_skill_by_name (who, op->skill); 3150 skop = find_skill_by_name (who, op->skill);
3347 if (!skop) 3151 if (!skop)
3348 { 3152 {
3349 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill); 3153 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill);
3350 return 1; 3154 return 1;
3351 } 3155 }
3352 else 3156 else
3353 {
3354 /* While experience will be credited properly, we want to change the 3157 /* While experience will be credited properly, we want to change the
3355 * skill so that the dam and wc get updated 3158 * skill so that the dam and wc get updated
3356 */ 3159 */
3357 change_skill (who, skop, 0); 3160 change_skill (who, skop, 0);
3358 }
3359 } 3161 }
3360 3162
3361 if (who->type == PLAYER && op->item_power && (op->item_power + who->contr->item_power) > (settings.item_power_factor * who->level)) 3163 if (who->type == PLAYER && op->item_power && (op->item_power + who->contr->item_power) > (settings.item_power_factor * who->level))
3362 { 3164 {
3363 new_draw_info (NDI_UNIQUE, 0, who, "Equipping that combined with other items would consume your soul!"); 3165 new_draw_info (NDI_UNIQUE, 0, who,
3166 "Equipping that combined with other items would consume your soul! "
3167 "[use the skills command to check your available item power]");
3364 return 1; 3168 return 1;
3365 } 3169 }
3366 3170
3367 3171
3368 /* Ok. We are now at the state where we can apply the new object. 3172 /* 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_... 3173 * Note that we don't have the checks for can_use_...
3370 * below - that is already taken care of by can_apply_object. 3174 * below - that is already taken care of by can_apply_object.
3371 */ 3175 */
3372
3373 3176
3374 if (op->nrof > 1) 3177 if (op->nrof > 1)
3375 tmp = get_split_ob (op, op->nrof - 1); 3178 tmp = get_split_ob (op, op->nrof - 1);
3376 else 3179 else
3377 tmp = NULL; 3180 tmp = NULL;
… …
3388 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3191 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!.");
3389 if (tmp != NULL) 3192 if (tmp != NULL)
3390 (void) insert_ob_in_ob (tmp, who); 3193 (void) insert_ob_in_ob (tmp, who);
3391 return 1; 3194 return 1;
3392 } 3195 }
3196
3197 //TODO: this obviously fails for players using a shiorter prefix
3198 // i.e. "R" can use Ragnarok's swors.
3393 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3199 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3394 { 3200 {
3395 /* if the weapon does not have the name as the character, can't use it. */ 3201 /* 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) */ 3202 /* (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."); 3203 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner.");
3204
3398 if (tmp != NULL) 3205 if (tmp)
3399 (void) insert_ob_in_ob (tmp, who); 3206 insert_ob_in_ob (tmp, who);
3207
3400 return 1; 3208 return 1;
3401 } 3209 }
3210
3402 SET_FLAG (op, FLAG_APPLIED); 3211 SET_FLAG (op, FLAG_APPLIED);
3403 3212
3404 if (skop) 3213 if (skop)
3405 change_skill (who, skop, 1); 3214 change_skill (who, skop, 1);
3215
3406 if (!QUERY_FLAG (who, FLAG_READY_WEAPON)) 3216 if (!QUERY_FLAG (who, FLAG_READY_WEAPON))
3407 SET_FLAG (who, FLAG_READY_WEAPON); 3217 SET_FLAG (who, FLAG_READY_WEAPON);
3408 3218
3409 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op)); 3219 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op));
3410 3220
3411 (void) change_abil (who, op); 3221 change_abil (who, op);
3412 break; 3222 break;
3413 3223
3414 case ARMOUR: 3224 case ARMOUR:
3415 case HELMET: 3225 case HELMET:
3416 case SHIELD: 3226 case SHIELD:
… …
3421 case CLOAK: 3231 case CLOAK:
3422 case RING: 3232 case RING:
3423 case AMULET: 3233 case AMULET:
3424 SET_FLAG (op, FLAG_APPLIED); 3234 SET_FLAG (op, FLAG_APPLIED);
3425 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op)); 3235 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op));
3426 (void) change_abil (who, op); 3236 change_abil (who, op);
3427 break; 3237 break;
3238
3428 case LAMP: 3239 case LAMP:
3429 if (op->stats.food < 1) 3240 if (op->stats.food < 1)
3430 { 3241 {
3431 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of" " fuel!", &op->name); 3242 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of" " fuel!", &op->name);
3432 return 1; 3243 return 1;
3433 } 3244 }
3245
3434 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name); 3246 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name);
3435 tmp2 = arch_to_object (op->other_arch); 3247 tmp2 = arch_to_object (op->other_arch);
3436 tmp2->stats.food = op->stats.food; 3248 tmp2->stats.food = op->stats.food;
3437 SET_FLAG (tmp2, FLAG_APPLIED); 3249 SET_FLAG (tmp2, FLAG_APPLIED);
3250
3438 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 3251 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3439 SET_FLAG (tmp2, FLAG_INV_LOCKED); 3252 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3253
3440 insert_ob_in_ob (tmp2, who); 3254 insert_ob_in_ob (tmp2, who);
3441 3255
3442 /* Remove the old lantern */ 3256 /* Remove the old lantern */
3443 if (who->type == PLAYER) 3257 if (who->type == PLAYER)
3444 esrv_del_item (who->contr, op->count); 3258 esrv_del_item (who->contr, op->count);
3445 3259
3446 op->destroy (); 3260 op->destroy ();
3447 3261
3448 /* insert the portion that was split off */ 3262 /* insert the portion that was split off */
3449 if (tmp != NULL) 3263 if (tmp)
3450 { 3264 {
3451 (void) insert_ob_in_ob (tmp, who); 3265 insert_ob_in_ob (tmp, who);
3452 if (who->type == PLAYER) 3266 if (who->type == PLAYER)
3453 esrv_send_item (who, tmp); 3267 esrv_send_item (who, tmp);
3454 } 3268 }
3269
3455 who->update_stats (); 3270 who->update_stats ();
3271
3456 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3272 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3457 { 3273 {
3458 if (who->type == PLAYER) 3274 if (who->type == PLAYER)
3459 { 3275 {
3460 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3276 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
3461 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 3277 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3462 } 3278 }
3463 } 3279 }
3280
3464 if (who->type == PLAYER) 3281 if (who->type == PLAYER)
3465 esrv_send_item (who, tmp2); 3282 esrv_send_item (who, tmp2);
3283
3466 return 0; 3284 return 0;
3467 break;
3468 3285
3469 /* this part is needed for skill-tools */ 3286 /* this part is needed for skill-tools */
3470 case SKILL: 3287 case SKILL:
3471 case SKILL_TOOL: 3288 case SKILL_TOOL:
3472 if (who->chosen_skill) 3289 if (who->chosen_skill)
3473 { 3290 {
3474 LOG (llevError, "BUG: apply_special(): can't apply two skills\n"); 3291 LOG (llevError, "BUG: apply_special(): can't apply two skills\n");
3475 return 1; 3292 return 1;
3476 } 3293 }
3294
3477 if (who->type == PLAYER) 3295 if (who->type == PLAYER)
3478 { 3296 {
3479 who->contr->shoottype = range_skill;
3480 who->contr->ranges[range_skill] = op; 3297 who->contr->ranged_skill = who;
3298 who->contr->ranged_ob = op;
3299
3481 if (!op->invisible) 3300 if (!op->invisible)
3482 { 3301 {
3483 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3302 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); 3303 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill);
3485 } 3304 }
3486 else 3305 else
3487 {
3488 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name); 3306 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name);
3489 } 3307 }
3490 } 3308
3491 SET_FLAG (op, FLAG_APPLIED); 3309 SET_FLAG (op, FLAG_APPLIED);
3492 (void) change_abil (who, op); 3310 change_abil (who, op);
3493 who->chosen_skill = op; 3311 who->chosen_skill = op;
3494 SET_FLAG (who, FLAG_READY_SKILL); 3312 SET_FLAG (who, FLAG_READY_SKILL);
3495 break; 3313 break;
3496 3314
3497 case BOW: 3315 case BOW:
3498 if (!check_weapon_power (who, op->last_eat)) 3316 if (!check_weapon_power (who, op->last_eat))
3499 { 3317 {
3500 new_draw_info (NDI_UNIQUE, 0, who, "That item is too powerful for you to use."); 3318 new_draw_info (NDI_UNIQUE, 0, who, "That item is too powerful for you to use.");
3501 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3319 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!.");
3320
3502 if (tmp != NULL) 3321 if (tmp)
3503 (void) insert_ob_in_ob (tmp, who); 3322 insert_ob_in_ob (tmp, who);
3323
3504 return 1; 3324 return 1;
3505 } 3325 }
3326
3506 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3327 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3507 { 3328 {
3508 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3329 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner.");
3509 if (tmp != NULL) 3330 if (tmp != NULL)
3510 (void) insert_ob_in_ob (tmp, who); 3331 insert_ob_in_ob (tmp, who);
3332
3511 return 1; 3333 return 1;
3512 } 3334 }
3335
3513 /*FALLTHROUGH*/ case WAND: 3336 /*FALLTHROUGH*/
3337 case WAND:
3514 case ROD: 3338 case ROD:
3515 case HORN: 3339 case HORN:
3516 /* check for skill, alter player status */ 3340 /* check for skill, alter player status */
3517 SET_FLAG (op, FLAG_APPLIED); 3341 SET_FLAG (op, FLAG_APPLIED);
3518 if (skop) 3342 if (skop)
3519 change_skill (who, skop, 0); 3343 change_skill (who, skop, 0);
3520 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3521 3344
3522 if (who->type == PLAYER) 3345 if (who->type == PLAYER)
3523 { 3346 {
3347 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3348
3524 if (op->type == BOW) 3349 if (op->type == BOW)
3525 { 3350 {
3526 (void) change_abil (who, op); 3351 change_abil (who, op);
3527 new_draw_info_format (NDI_UNIQUE, 0, who, 3352 new_draw_info_format (NDI_UNIQUE, 0, who,
3528 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)); 3353 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op));
3529 who->contr->shoottype = range_bow;
3530 } 3354 }
3531 else 3355
3532 { 3356 who->contr->ranged_skill = find_skill_by_name (who, op->skill);//TODO
3533 who->contr->shoottype = range_misc; 3357 who->contr->ranged_ob = op;
3534 }
3535 } 3358 }
3536 else 3359 else
3537 { 3360 {
3538 if (op->type == BOW) 3361 if (op->type == BOW)
3539 SET_FLAG (who, FLAG_READY_BOW); 3362 SET_FLAG (who, FLAG_READY_BOW);
3540 else 3363 else
3541 SET_FLAG (who, FLAG_READY_RANGE); 3364 SET_FLAG (who, FLAG_READY_RANGE);
3542 } 3365 }
3366
3543 break; 3367 break;
3544 3368
3545 case BUILDER: 3369 case BUILDER:
3546 if (who->contr->ranges[range_builder]) 3370 if (who->type == PLAYER)
3371 {
3372 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER)
3547 unapply_special (who, who->contr->ranges[range_builder], 0); 3373 unapply_special (who, who->contr->ranged_ob, 0);
3548 who->contr->shoottype = range_builder; 3374
3549 who->contr->ranges[range_builder] = op;
3550 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op)); 3375 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op));
3376
3377 who->contr->ranged_skill = who;
3378 who->contr->ranged_ob = op;
3379 }
3551 break; 3380 break;
3552 3381
3553 default: 3382 default:
3554 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op)); 3383 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op));
3555 } /* end of switch op->type */ 3384 } /* end of switch op->type */
… …
3574 { 3403 {
3575 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3404 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
3576 SET_FLAG (op, FLAG_KNOWN_CURSED); 3405 SET_FLAG (op, FLAG_KNOWN_CURSED);
3577 } 3406 }
3578 } 3407 }
3408
3579 if (who->type == PLAYER) 3409 if (who->type == PLAYER)
3580 { 3410 {
3581 /* if multiple objects were applied, update both slots */ 3411 /* if multiple objects were applied, update both slots */
3582 if (tmp) 3412 if (tmp)
3583 esrv_send_item (who, tmp); 3413 esrv_send_item (who, tmp);
3414
3584 esrv_send_item (who, op); 3415 esrv_send_item (who, op);
3585 } 3416 }
3417
3586 return 0; 3418 return 0;
3587} 3419}
3588
3589 3420
3590int 3421int
3591monster_apply_special (object *who, object *op, int aflags) 3422monster_apply_special (object *who, object *op, int aflags)
3592{ 3423{
3593 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED)) 3424 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
… …
3637 3468
3638 case TREASURE: 3469 case TREASURE:
3639 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 3470 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
3640 return 0; 3471 return 0;
3641 3472
3642 while ((op->stats.hp--) > 0) 3473 while (op->stats.hp-- > 0)
3643 create_treasure (op->randomitems, op, op->map ? GT_ENVIRONMENT : 0, 3474 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); 3475 op->stats.exp ? (int) op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0);
3645 3476
3646 /* If we generated an object and put it in this object inventory, 3477 /* 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 3478 * move it to the parent object as the current object is about
… …
3664 } 3495 }
3665 return tmp ? 1 : 0; 3496 return tmp ? 1 : 0;
3666} 3497}
3667 3498
3668/** 3499/**
3669 * fix_auto_apply goes through the entire map (only the first time 3500 * fix_auto_apply goes through the entire map every time a map
3670 * when an original map is loaded) and performs special actions for 3501 * is loaded or swapped in and performs special actions for
3671 * certain objects (most initialization of chests and creation of 3502 * certain objects (most initialization of chests and creation of
3672 * treasures and stuff). Calls auto_apply if appropriate. 3503 * treasures and stuff). Calls auto_apply if appropriate.
3673 */ 3504 */
3674void 3505void
3675fix_auto_apply (maptile *m) 3506maptile::fix_auto_apply ()
3676{ 3507{
3677 object *tmp, *above = NULL; 3508 if (!spaces)
3678 int x, y;
3679
3680 if (m == NULL)
3681 return; 3509 return;
3682 3510
3683 for (x = 0; x < MAP_WIDTH (m); x++) 3511 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3684 for (y = 0; y < MAP_HEIGHT (m); y++) 3512 for (object *tmp = ms->bot; tmp; )
3685 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above)
3686 { 3513 {
3687 above = tmp->above; 3514 object *above = tmp->above;
3688 3515
3689 if (tmp->inv) 3516 if (tmp->inv)
3690 { 3517 {
3691 object *invtmp, *invnext; 3518 object *invtmp, *invnext;
3692 3519
3693 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext) 3520 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext)
3694 { 3521 {
3695 invnext = invtmp->below; 3522 invnext = invtmp->below;
3696 3523
3697 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY)) 3524 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY))
3698 auto_apply (invtmp); 3525 auto_apply (invtmp);
3699 else if (invtmp->type == TREASURE && invtmp->has_random_items ()) 3526 else if (invtmp->type == TREASURE && invtmp->has_random_items ())
3700 { 3527 {
3701 while ((invtmp->stats.hp--) > 0) 3528 while ((invtmp->stats.hp--) > 0)
3702 create_treasure (invtmp->randomitems, invtmp, 0, m->difficulty, 0); 3529 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3703 3530
3704 invtmp->randomitems = NULL; 3531 invtmp->randomitems = NULL;
3705 } 3532 }
3706 else if (invtmp && invtmp->arch 3533 else if (invtmp && invtmp->arch
3707 && invtmp->type != TREASURE && invtmp->type != SPELL && invtmp->type != CLASS && invtmp->has_random_items ()) 3534 && invtmp->type != TREASURE && invtmp->type != SPELL && invtmp->type != CLASS && invtmp->has_random_items ())
3708 { 3535 {
3709 create_treasure (invtmp->randomitems, invtmp, 0, m->difficulty, 0); 3536 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3710 /* Need to clear this so that we never try to create 3537 /* Need to clear this so that we never try to create
3711 * treasure again for this object 3538 * treasure again for this object
3712 */ 3539 */
3713 invtmp->randomitems = NULL; 3540 invtmp->randomitems = NULL;
3714 } 3541 }
3715 } 3542 }
3716 /* This is really temporary - the code at the bottom will 3543 /* This is really temporary - the code at the bottom will
3717 * also set randomitems to null. The problem is there are bunches 3544 * also set randomitems to null. The problem is there are bunches
3718 * of maps/players already out there with items that have spells 3545 * of maps/players already out there with items that have spells
3719 * which haven't had the randomitems set to null yet. 3546 * which haven't had the randomitems set to null yet.
3720 * MSW 2004-05-13 3547 * MSW 2004-05-13
3721 * 3548 *
3722 * And if it's a spellbook, it's better to set randomitems to NULL too, 3549 * And if it's a spellbook, it's better to set randomitems to NULL too,
3723 * else you get two spells in the book ^_- 3550 * else you get two spells in the book ^_-
3724 * Ryo 2004-08-16 3551 * Ryo 2004-08-16
3725 */ 3552 */
3726 if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL 3553 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) 3554 || 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; 3555 tmp->randomitems = NULL;
3556
3739 } 3557 }
3558
3559 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY))
3560 auto_apply (tmp);
3561 else if ((tmp->type == TREASURE || (tmp->type == CONTAINER)) && tmp->has_random_items ())
3562 {
3563 while ((tmp->stats.hp--) > 0)
3564 create_treasure (tmp->randomitems, tmp, 0, difficulty, 0);
3565 tmp->randomitems = NULL;
3566 }
3740 else if (tmp->type == TIMED_GATE) 3567 else if (tmp->type == TIMED_GATE)
3741 { 3568 {
3742 object *head = tmp->head != NULL ? tmp->head : tmp; 3569 object *head = tmp->head != NULL ? tmp->head : tmp;
3743 3570
3744 if (QUERY_FLAG (head, FLAG_IS_LINKED)) 3571 if (QUERY_FLAG (head, FLAG_IS_LINKED))
3745 {
3746 tmp->speed = 0; 3572 tmp->set_speed (0);
3747 update_ob_speed (tmp);
3748 }
3749 } 3573 }
3750 /* This function can be called everytime a map is loaded, even when 3574 /* 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 3575 * 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 3576 * 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. 3577 * 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 3578 * This is a problem for the above objects, because they have counters
3755 * which say how many times to make the treasure. 3579 * which say how many times to make the treasure.
3756 */ 3580 */
3757 else if (tmp && tmp->arch && tmp->type != PLAYER 3581 else if (tmp && tmp->arch && tmp->type != PLAYER
3758 && tmp->type != TREASURE && tmp->type != SPELL 3582 && tmp->type != TREASURE && tmp->type != SPELL
3759 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && tmp->has_random_items ()) 3583 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && tmp->has_random_items ())
3760 { 3584 {
3761 create_treasure (tmp->randomitems, tmp, GT_APPLY, m->difficulty, 0); 3585 create_treasure (tmp->randomitems, tmp, GT_APPLY, difficulty, 0);
3762 tmp->randomitems = NULL; 3586 tmp->randomitems = NULL;
3763 } 3587 }
3588 // close all containers
3589 else if (tmp->type == CONTAINER)
3590 tmp->flag [FLAG_APPLIED] = 0;
3591
3592 tmp = above;
3764 } 3593 }
3765 3594
3766 for (x = 0; x < MAP_WIDTH (m); x++) 3595 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3767 for (y = 0; y < MAP_HEIGHT (m); y++) 3596 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)) 3597 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL))
3770 check_trigger (tmp, tmp->above); 3598 check_trigger (tmp, tmp->above);
3771} 3599}
3772 3600
3773/** 3601/**
3774 * Handles player eating food that temporarily changes status (resistances, stats). 3602 * Handles player eating food that temporarily changes status (resistances, stats).
3775 * This used to call cast_change_attr(), but 3603 * This used to call cast_change_attr(), but
… …
3806 } 3634 }
3807 } 3635 }
3808 3636
3809 if (did_one) 3637 if (did_one)
3810 { 3638 {
3811 force->speed = 0.1; 3639 force->set_speed (0.1);
3812 update_ob_speed (force);
3813 /* bigger morsel of food = longer effect time */ 3640 /* bigger morsel of food = longer effect time */
3814 force->duration = food->stats.food / 5; 3641 force->duration = food->stats.food / 5;
3815 SET_FLAG (force, FLAG_APPLIED); 3642 SET_FLAG (force, FLAG_APPLIED);
3816 change_abil (who, force); 3643 change_abil (who, force);
3817 insert_ob_in_ob (force, who); 3644 insert_ob_in_ob (force, who);
… …
3822 /* check for hp, sp change */ 3649 /* check for hp, sp change */
3823 if (food->stats.hp != 0) 3650 if (food->stats.hp != 0)
3824 { 3651 {
3825 if (QUERY_FLAG (food, FLAG_CURSED)) 3652 if (QUERY_FLAG (food, FLAG_CURSED))
3826 { 3653 {
3827 strcpy (who->contr->killer, food->name); 3654 assign (who->contr->killer, food->name);
3828 hit_player (who, food->stats.hp, food, AT_POISON, 1); 3655 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3829 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!"); 3656 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!");
3830 } 3657 }
3831 else 3658 else
3832 { 3659 {

Diff Legend

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