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.31 by root, Sun Dec 3 20:26:35 2006 UTC vs.
Revision 1.151 by root, Wed Apr 30 06:40:28 2008 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra 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 3 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, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23
24#include <cmath>
23 25
24#include <global.h> 26#include <global.h>
25#include <living.h> 27#include <living.h>
26#include <spells.h> 28#include <spells.h>
27#include <skills.h> 29#include <skills.h>
28#include <tod.h> 30#include <tod.h>
29 31
30#ifndef __CEXTRACT__
31# include <sproto.h> 32#include <sproto.h>
32#endif
33 33
34/* Want this regardless of rplay. */ 34/* Want this regardless of rplay. */
35#include <sounds.h> 35#include <sounds.h>
36
37/* need math lib for double-precision and pow() in dragon_eat_flesh() */
38#include <math.h>
39 36
40/** 37/**
41 * Check if op should abort moving victim because of it's race or slaying. 38 * Check if op should abort moving victim because of it's race or slaying.
42 * Returns 1 if it should abort, returns 0 if it should continue. 39 * Returns 1 if it should abort, returns 0 if it should continue.
43 */ 40 */
… …
66 { 63 {
67 arch_flag = 1; 64 arch_flag = 1;
68 name_flag = 1; 65 name_flag = 1;
69 race_flag = 1; 66 race_flag = 1;
70 } 67 }
68
71 /* If the director has race set, only affect objects with a arch, 69 /* If the director has race set, only affect objects with a arch,
72 * name or race that matches. 70 * name or race that matches.
73 */ 71 */
74 if ((op->race) && 72 if ((op->race) &&
75 ((!(victim->arch && arch_flag && victim->arch->name) || strcmp (op->race, victim->arch->name))) && 73 ((!(victim->arch && arch_flag && victim->arch->archname) || op->race != victim->arch->archname)) &&
76 ((!(victim->name && name_flag) || strcmp (op->race, victim->name))) && 74 ((!(victim->name && name_flag) || op->race != victim->name)) &&
77 ((!(victim->race && race_flag) || strcmp (op->race, victim->race)))) 75 ((!(victim->race && race_flag) || op->race != victim->race)))
78 {
79 return 1; 76 return 1;
80 } 77
81 /* If the director has slaying set, only affect objects where none 78 /* If the director has slaying set, only affect objects where none
82 * of arch, name, or race match. 79 * of arch, name, or race match.
83 */ 80 */
84 if ((op->slaying) && (((victim->arch && arch_flag && victim->arch->name && !strcmp (op->slaying, victim->arch->name))) || 81 if ((op->slaying) && (((victim->arch && arch_flag && victim->arch->archname && op->slaying == victim->arch->archname))) ||
85 ((victim->name && name_flag && !strcmp (op->slaying, victim->name))) || 82 ((victim->name && name_flag && op->slaying == victim->name)) ||
86 ((victim->race && race_flag && !strcmp (op->slaying, victim->race))))) 83 ((victim->race && race_flag && op->slaying == victim->race)))
87 {
88 return 1; 84 return 1;
89 } 85
90 return 0; 86 return 0;
91} 87}
92 88
93/** 89/**
94 * This handles a player dropping money on an altar to identify stuff. 90 * This handles a player dropping money on an altar to identify stuff.
… …
96 * Return value: 1 if money was destroyed, 0 if not. 92 * Return value: 1 if money was destroyed, 0 if not.
97 */ 93 */
98static int 94static int
99apply_id_altar (object *money, object *altar, object *pl) 95apply_id_altar (object *money, object *altar, object *pl)
100{ 96{
101 object *id, *marked; 97 dynbuf_text buf;
102 int success = 0;
103 98
104 if (pl == NULL || pl->type != PLAYER) 99 if (!pl || pl->type != PLAYER)
105 return 0; 100 return 0;
106 101
107 /* Check for MONEY type is a special hack - it prevents 'nothing needs 102 /* Check for MONEY type is a special hack - it prevents 'nothing needs
108 * identifying' from being printed out more than it needs to be. 103 * identifying' from being printed out more than it needs to be.
109 */ 104 */
110 if (!check_altar_sacrifice (altar, money) || money->type != MONEY) 105 if (!check_altar_sacrifice (altar, money) || money->type != MONEY)
111 return 0; 106 return 0;
112 107
113 marked = find_marked_object (pl);
114 /* if the player has a marked item, identify that if it needs to be 108 /* if the player has a marked item, identify that if it needs to be
115 * identified. IF it doesn't, then go through the player inventory. 109 * identified. If it doesn't, then go through the player inventory.
116 */ 110 */
111 if (object *marked = find_marked_object (pl))
117 if (marked && !QUERY_FLAG (marked, FLAG_IDENTIFIED) && need_identify (marked)) 112 if (!QUERY_FLAG (marked, FLAG_IDENTIFIED) && need_identify (marked))
118 { 113 {
119 if (operate_altar (altar, &money)) 114 if (operate_altar (altar, &money))
120 { 115 {
121 identify (marked); 116 identify (marked);
122 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have %s.", long_desc (marked, pl)); 117
118 buf.printf ("You have %s.\n\n", long_desc (marked, pl));
123 if (marked->msg) 119 if (marked->msg)
124 { 120 buf << "The item has a story:\n\n" << marked->msg << "\n\n";
125 new_draw_info (NDI_UNIQUE, 0, pl, "The item has a story:"); 121
126 new_draw_info (NDI_UNIQUE, 0, pl, marked->msg); 122 return !money;
127 } 123 }
128 return money == NULL;
129 } 124 }
130 }
131 125
132 for (id = pl->inv; id; id = id->below) 126 for (object *id = pl->inv; id; id = id->below)
133 { 127 {
134 if (!QUERY_FLAG (id, FLAG_IDENTIFIED) && !id->invisible && need_identify (id)) 128 if (!QUERY_FLAG (id, FLAG_IDENTIFIED) && !id->invisible && need_identify (id))
135 { 129 {
136 if (operate_altar (altar, &money)) 130 if (operate_altar (altar, &money))
137 { 131 {
138 identify (id); 132 identify (id);
139 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have %s.", long_desc (id, pl)); 133
134 buf.printf ("You have %s.\n\n", long_desc (id, pl));
140 if (id->msg) 135 if (id->msg)
141 { 136 buf << "The item has a story:\n\n" << id->msg << "\n\n";
142 new_draw_info (NDI_UNIQUE, 0, pl, "The item has a story:"); 137
143 new_draw_info (NDI_UNIQUE, 0, pl, id->msg);
144 }
145 success = 1;
146 /* If no more money, might as well quit now */ 138 /* If no more money, might as well quit now */
147 if (money == NULL || !check_altar_sacrifice (altar, money)) 139 if (!money || !check_altar_sacrifice (altar, money))
148 break; 140 break;
149 } 141 }
150 else 142 else
151 { 143 {
152 LOG (llevError, "check_id_altar: Couldn't do sacrifice when we should have been able to\n"); 144 LOG (llevError, "check_id_altar: Couldn't do sacrifice when we should have been able to\n");
153 break; 145 break;
154 } 146 }
155 } 147 }
156 } 148 }
157 if (!success) 149
158 new_draw_info (NDI_UNIQUE, 0, pl, "You have nothing that needs identifying"); 150 if (buf.empty ())
151 pl->failmsg ("You have nothing that needs identifying");
152 else
153 pl->contr->infobox (MSG_CHANNEL ("identify"), buf);
154
159 return money == NULL; 155 return !money;
160} 156}
161 157
162/** 158/**
163 * This checks whether the object has a "on_use_yield" field, and if so generated and drops 159 * This checks whether the object has a "on_use_yield" field, and if so generated and drops
164 * matching item. 160 * matching item.
165 **/ 161 **/
166static void 162void
167handle_apply_yield (object *tmp) 163handle_apply_yield (object *tmp)
168{ 164{
169 const char *yield; 165 const char *yield;
170 166
171 yield = get_ob_key_value (tmp, "on_use_yield"); 167 yield = get_ob_key_value (tmp, "on_use_yield");
168
172 if (yield != NULL) 169 if (yield)
173 { 170 get_archetype (yield)->insert_at (tmp, tmp, INS_BELOW_ORIGINATOR);
174 object *drop = get_archetype (yield);
175
176 if (tmp->env)
177 {
178 drop = insert_ob_in_ob (drop, tmp->env);
179 if (tmp->env->type == PLAYER)
180 esrv_send_item (tmp->env, drop);
181 }
182 else
183 {
184 drop->x = tmp->x;
185 drop->y = tmp->y;
186 insert_ob_in_map (drop, tmp->map, tmp, INS_BELOW_ORIGINATOR);
187 }
188 }
189} 171}
190 172
191/** 173/**
192 * Handles applying a potion. 174 * Handles applying a potion.
193 */ 175 */
… …
195apply_potion (object *op, object *tmp) 177apply_potion (object *op, object *tmp)
196{ 178{
197 int got_one = 0, i; 179 int got_one = 0, i;
198 object *force = 0, *floor = 0; 180 object *force = 0, *floor = 0;
199 181
200 floor = get_map_ob (op->map, op->x, op->y); 182 floor = GET_MAP_OB (op->map, op->x, op->y);
201 183
202 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 184 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
203 { 185 {
204 if (op->type == PLAYER)
205 new_draw_info (NDI_UNIQUE, 0, op, "Gods prevent you from using this here, it's sacred ground!"); 186 op->failmsg ("Gods prevent you from using this here, it's sacred ground!");
187
206 CLEAR_FLAG (tmp, FLAG_APPLIED); 188 CLEAR_FLAG (tmp, FLAG_APPLIED);
207 return 0; 189 return 0;
208 } 190 }
209 191
210 if (op->type == PLAYER) 192 if (op->type == PLAYER)
211 {
212 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 193 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
213 identify (tmp); 194 identify (tmp);
214 }
215 195
216 handle_apply_yield (tmp); 196 handle_apply_yield (tmp);
217 197
218 /* Potion of restoration - only for players */ 198 /* Potion of restoration - only for players */
219 if (op->type == PLAYER && (tmp->attacktype & AT_DEPLETE)) 199 if (op->type == PLAYER && (tmp->attacktype & AT_DEPLETE))
… …
221 object *depl; 201 object *depl;
222 archetype *at; 202 archetype *at;
223 203
224 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 204 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
225 { 205 {
226 drain_stat (op); 206 op->drain_stat ();
227 fix_player (op); 207 op->update_stats ();
228 decrease_ob (tmp); 208 tmp->decrease ();
229 return 1; 209 return 1;
230 } 210 }
211
231 if ((at = archetype::find (ARCH_DEPLETION)) == NULL) 212 if (!(at = archetype::find (ARCH_DEPLETION)))
232 { 213 {
233 LOG (llevError, "Could not find archetype depletion\n"); 214 LOG (llevError, "Could not find archetype depletion\n");
234 return 0; 215 return 0;
235 } 216 }
217
236 depl = present_arch_in_ob (at, op); 218 depl = present_arch_in_ob (at, op);
219
237 if (depl != NULL) 220 if (depl)
238 { 221 {
239 for (i = 0; i < NUM_STATS; i++) 222 for (i = 0; i < NUM_STATS; i++)
240 if (get_attr_value (&depl->stats, i)) 223 if (depl->stats.stat (i))
241 { 224 op->statusmsg (restore_msg[i]);
242 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]); 225
243 } 226 depl->destroy ();
244 remove_ob (depl); 227 op->update_stats ();
245 free_object (depl);
246 fix_player (op);
247 } 228 }
248 else 229 else
249 new_draw_info (NDI_UNIQUE, 0, op, "You potion had no effect."); 230 op->statusmsg ("Your potion had no effect.");
250 231
251 decrease_ob (tmp); 232 tmp->decrease ();
252 return 1; 233 return 1;
253 } 234 }
254 235
255 /* improvement potion - only for players */ 236 /* improvement potion - only for players */
256 if (op->type == PLAYER && tmp->attacktype & AT_GODPOWER) 237 if (op->type == PLAYER && (tmp->attacktype & AT_GODPOWER))
257 { 238 {
258
259 for (i = 1; i < MIN (11, op->level); i++) 239 for (i = 1; i < MIN (11, op->level); i++)
260 { 240 {
261 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 241 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
262 { 242 {
263 if (op->contr->levhp[i] != 1) 243 if (op->contr->levhp[i] != 1)
264 { 244 {
265 op->contr->levhp[i] = 1; 245 op->contr->levhp[i] = 1;
266 break; 246 break;
267 } 247 }
248
268 if (op->contr->levsp[i] != 1) 249 if (op->contr->levsp[i] != 1)
269 { 250 {
270 op->contr->levsp[i] = 1; 251 op->contr->levsp[i] = 1;
271 break; 252 break;
272 } 253 }
254
273 if (op->contr->levgrace[i] != 1) 255 if (op->contr->levgrace[i] != 1)
274 { 256 {
275 op->contr->levgrace[i] = 1; 257 op->contr->levgrace[i] = 1;
276 break; 258 break;
277 } 259 }
… …
281 if (op->contr->levhp[i] < 9) 263 if (op->contr->levhp[i] < 9)
282 { 264 {
283 op->contr->levhp[i] = 9; 265 op->contr->levhp[i] = 9;
284 break; 266 break;
285 } 267 }
268
286 if (op->contr->levsp[i] < 6) 269 if (op->contr->levsp[i] < 6)
287 { 270 {
288 op->contr->levsp[i] = 6; 271 op->contr->levsp[i] = 6;
289 break; 272 break;
290 } 273 }
274
291 if (op->contr->levgrace[i] < 3) 275 if (op->contr->levgrace[i] < 3)
292 { 276 {
293 op->contr->levgrace[i] = 3; 277 op->contr->levgrace[i] = 3;
294 break; 278 break;
295 } 279 }
296 } 280 }
297 } 281 }
282
298 /* Just makes checking easier */ 283 /* Just makes checking easier */
299 if (i < MIN (11, op->level)) 284 if (i < MIN (11, op->level))
300 got_one = 1; 285 got_one = 1;
286
301 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)) 287 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))
302 { 288 {
303 if (got_one) 289 if (got_one)
304 { 290 {
305 fix_player (op); 291 op->update_stats ();
306 new_draw_info (NDI_UNIQUE, 0, op, "The Gods smile upon you and remake you"); 292 op->statusmsg ("The Gods smile upon you and remake you "
307 new_draw_info (NDI_UNIQUE, 0, op, "a little more in their image."); 293 "a little more in their image. "
308 new_draw_info (NDI_UNIQUE, 0, op, "You feel a little more perfect."); 294 "You feel a little more perfect.", NDI_GREEN);
309 } 295 }
310 else 296 else
311 new_draw_info (NDI_UNIQUE, 0, op, "The potion had no effect - you are already perfect"); 297 op->statusmsg ("The potion had no effect - you are already perfect.");
312 } 298 }
313 else 299 else
314 { /* cursed potion */ 300 { /* cursed potion */
315 if (got_one) 301 if (got_one)
316 { 302 {
317 fix_player (op); 303 op->update_stats ();
318 new_draw_info (NDI_UNIQUE, 0, op, "The Gods are angry and punish you."); 304 op->failmsg ("The Gods are angry and punish you.");
319 } 305 }
320 else 306 else
321 new_draw_info (NDI_UNIQUE, 0, op, "You are fortunate that you are so pathetic."); 307 op->statusmsg ("You are fortunate that you are so pathetic.", NDI_DK_ORANGE);
322 } 308 }
309
323 decrease_ob (tmp); 310 tmp->decrease ();
324 return 1; 311 return 1;
325 } 312 }
326 313
327 314
328 /* A potion that casts a spell. Healing, restore spellpoint (power potion) 315 /* A potion that casts a spell. Healing, restore spellpoint (power potion)
… …
334 { 321 {
335 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 322 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
336 { 323 {
337 object *fball; 324 object *fball;
338 325
339 new_draw_info (NDI_UNIQUE, 0, op, "Yech! Your lungs are on fire!"); 326 op->failmsg ("Yech! Your lungs are on fire!");
327
340 /* Explodes a fireball centered at player */ 328 /* Explodes a fireball centered at player */
341 fball = get_archetype (EXPLODING_FIREBALL); 329 fball = get_archetype (EXPLODING_FIREBALL);
342 fball->dam_modifier = random_roll (1, op->level, op, PREFER_LOW) / 5 + 1; 330 fball->dam_modifier = random_roll (1, op->level, op, PREFER_LOW) / 5 + 1;
343 fball->stats.maxhp = random_roll (1, op->level, op, PREFER_LOW) / 10 + 2; 331 fball->stats.maxhp = random_roll (1, op->level, op, PREFER_LOW) / 10 + 2;
344 fball->x = op->x; 332 fball->x = op->x;
… …
346 insert_ob_in_map (fball, op->map, NULL, 0); 334 insert_ob_in_map (fball, op->map, NULL, 0);
347 } 335 }
348 else 336 else
349 cast_spell (op, tmp, op->facing, tmp->inv, NULL); 337 cast_spell (op, tmp, op->facing, tmp->inv, NULL);
350 338
351 decrease_ob (tmp); 339 tmp->decrease ();
340
352 /* if youre dead, no point in doing this... */ 341 /* if youre dead, no point in doing this... */
353 if (!QUERY_FLAG (op, FLAG_REMOVED)) 342 if (!QUERY_FLAG (op, FLAG_REMOVED))
354 fix_player (op); 343 op->update_stats ();
344
355 return 1; 345 return 1;
356 } 346 }
357 347
358 /* Deal with protection potions */ 348 /* Deal with protection potions */
359 force = NULL; 349 force = NULL;
… …
361 { 351 {
362 if (tmp->resist[i]) 352 if (tmp->resist[i])
363 { 353 {
364 if (!force) 354 if (!force)
365 force = get_archetype (FORCE_NAME); 355 force = get_archetype (FORCE_NAME);
356
366 memcpy (force->resist, tmp->resist, sizeof (tmp->resist)); 357 memcpy (force->resist, tmp->resist, sizeof (tmp->resist));
367 force->type = POTION_EFFECT; 358 force->type = POTION_EFFECT;
368 break; /* Only need to find one protection since we copy entire batch */ 359 break; /* Only need to find one protection since we copy entire batch */
369 } 360 }
370 } 361 }
362
371 /* This is a protection potion */ 363 /* This is a protection potion */
372 if (force) 364 if (force)
373 { 365 {
374 /* cursed items last longer */ 366 /* cursed items last longer */
375 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 367 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
… …
377 force->stats.food *= 10; 369 force->stats.food *= 10;
378 for (i = 0; i < NROFATTACKS; i++) 370 for (i = 0; i < NROFATTACKS; i++)
379 if (force->resist[i] > 0) 371 if (force->resist[i] > 0)
380 force->resist[i] = -force->resist[i]; /* prot => vuln */ 372 force->resist[i] = -force->resist[i]; /* prot => vuln */
381 } 373 }
374
382 force->speed_left = -1; 375 force->speed_left = -1;
383 force = insert_ob_in_ob (force, op); 376 force = insert_ob_in_ob (force, op);
384 CLEAR_FLAG (tmp, FLAG_APPLIED); 377 CLEAR_FLAG (tmp, FLAG_APPLIED);
385 SET_FLAG (force, FLAG_APPLIED); 378 SET_FLAG (force, FLAG_APPLIED);
386 change_abil (op, force); 379 change_abil (op, force);
387 decrease_ob (tmp); 380 tmp->decrease ();
388 return 1; 381 return 1;
389 } 382 }
390 383
391 /* Only thing left are the stat potions */ 384 /* Only thing left are the stat potions */
392 if (op->type == PLAYER) 385 if (op->type == PLAYER)
393 { /* only for players */ 386 { /* only for players */
394 if ((QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) && tmp->value != 0) 387 if ((QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) && tmp->value != 0)
395 CLEAR_FLAG (tmp, FLAG_APPLIED); 388 CLEAR_FLAG (tmp, FLAG_APPLIED);
396 else 389 else
397 SET_FLAG (tmp, FLAG_APPLIED); 390 SET_FLAG (tmp, FLAG_APPLIED);
391
398 if (!change_abil (op, tmp)) 392 if (!change_abil (op, tmp))
399 new_draw_info (NDI_UNIQUE, 0, op, "Nothing happened."); 393 op->statusmsg ("Nothing happened.");
400 } 394 }
401 395
402 /* CLEAR_FLAG is so that if the character has other potions 396 /* CLEAR_FLAG is so that if the character has other potions
403 * that were grouped with the one consumed, his 397 * that were grouped with the one consumed, his
404 * stat will not be raised by them. fix_player just clears 398 * stat will not be raised by them. fix_player just clears
405 * up all the stats. 399 * up all the stats.
406 */ 400 */
407 CLEAR_FLAG (tmp, FLAG_APPLIED); 401 CLEAR_FLAG (tmp, FLAG_APPLIED);
408 fix_player (op); 402 op->update_stats ();
409 decrease_ob (tmp); 403 tmp->decrease ();
410 return 1; 404 return 1;
411} 405}
412 406
413/**************************************************************************** 407/****************************************************************************
414 * Weapon improvement code follows 408 * Weapon improvement code follows
… …
420static int 414static int
421check_item (object *op, const char *item) 415check_item (object *op, const char *item)
422{ 416{
423 int count = 0; 417 int count = 0;
424 418
425 419 if (!item)
426 if (item == NULL)
427 return 0; 420 return 0;
428 op = op->below; 421
429 while (op != NULL) 422 for (op = op->below; op; op = op->below)
430 { 423 {
431 if (strcmp (op->arch->name, item) == 0) 424 if (strcmp (op->arch->archname, item) == 0)
432 { 425 {
433 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED) 426 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED)
434 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID)) 427 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID))
435 { 428 {
436 if (op->nrof == 0) /* this is necessary for artifact sacrifices --FD-- */ 429 if (op->nrof == 0) /* this is necessary for artifact sacrifices --FD-- */
437 count++; 430 count++;
438 else 431 else
439 count += op->nrof; 432 count += op->nrof;
440 } 433 }
441 } 434 }
442 op = op->below;
443 } 435 }
436
444 return count; 437 return count;
445} 438}
446 439
447/** 440/**
448 * This removes 'nrof' of what item->slaying says to remove. 441 * This removes 'nrof' of what item->slaying says to remove.
… …
456 object *prev; 449 object *prev;
457 450
458 prev = op; 451 prev = op;
459 op = op->below; 452 op = op->below;
460 453
461 while (op != NULL) 454 while (op)
462 { 455 {
463 if (strcmp (op->arch->name, item) == 0) 456 if (strcmp (op->arch->archname, item) == 0)
464 { 457 {
465 if (op->nrof >= nrof) 458 if (op->nrof >= nrof)
466 { 459 {
467 decrease_ob_nr (op, nrof); 460 op->decrease (nrof);
468 return; 461 return;
469 } 462 }
470 else 463 else
471 { 464 {
472 decrease_ob_nr (op, op->nrof); 465 op->decrease (nrof);
473 nrof -= op->nrof; 466 nrof -= op->nrof;
474 } 467 }
468
475 op = prev; 469 op = prev;
476 } 470 }
471
477 prev = op; 472 prev = op;
478 op = op->below; 473 op = op->below;
479 } 474 }
480} 475}
481 476
… …
487 * we return 1 (true) if the player can use the weapon. 482 * we return 1 (true) if the player can use the weapon.
488 */ 483 */
489static int 484static int
490check_weapon_power (const object *who, int improvs) 485check_weapon_power (const object *who, int improvs)
491{ 486{
492
493/* Old code is below (commented out). Basically, since weapons are the only 487/* Old code is below (commented out). Basically, since weapons are the only
494 * object players really have any control to improve, it's a bit harsh to 488 * object players really have any control to improve, it's a bit harsh to
495 * require high level in some combat skill, so we just use overall level. 489 * require high level in some combat skill, so we just use overall level.
496 */ 490 */
497#if 1 491#if 1
… …
538static int 532static int
539check_sacrifice (object *op, const object *improver) 533check_sacrifice (object *op, const object *improver)
540{ 534{
541 int count = 0; 535 int count = 0;
542 536
543 if (improver->slaying != NULL) 537 if (improver->slaying)
544 { 538 {
545 count = check_item (op, improver->slaying); 539 count = check_item (op, improver->slaying);
546 if (count < 1) 540 if (count < 1)
547 { 541 {
548 char buf[200];
549
550 sprintf (buf, "The gods want more %ss", &improver->slaying); 542 op->failmsg (format ("The gods want more %ss", &improver->slaying));
551 new_draw_info (NDI_UNIQUE, 0, op, buf);
552 return 0; 543 return 0;
553 } 544 }
554 } 545 }
555 else 546 else
556 count = 1; 547 count = 1;
… …
559} 550}
560 551
561/** 552/**
562 * Actually improves the weapon, and tells user. 553 * Actually improves the weapon, and tells user.
563 */ 554 */
564int 555static int
565improve_weapon_stat (object *op, object *improver, object *weapon, signed char *stat, int sacrifice_count, const char *statname) 556improve_weapon_stat (object *op, object *improver, object *weapon, sint8 &stat, int sacrifice_count, const char *statname)
566{ 557{
567
568 new_draw_info (NDI_UNIQUE, 0, op, "Your sacrifice was accepted.");
569 *stat += sacrifice_count; 558 stat += sacrifice_count;
570 weapon->last_eat++; 559 weapon->last_eat++;
571 new_draw_info_format (NDI_UNIQUE, 0, op, "Weapon's bonus to %s improved by %d", statname, sacrifice_count); 560 improver->decrease ();
572 decrease_ob (improver);
573 561
574 /* So it updates the players stats and the window */ 562 /* So it updates the players stats and the window */
575 fix_player (op); 563 op->update_stats ();
564
565 op->statusmsg (format (
566 "Your sacrifice was accepted.\n"
567 "Weapon's bonus to %s improved by %d.",
568 statname, sacrifice_count
569 ));
570
576 return 1; 571 return 1;
577} 572}
578 573
579/* Types of improvements, hidden in the sp field. */ 574/* Types of improvements, hidden in the sp field. */
580#define IMPROVE_PREPARE 1 575#define IMPROVE_PREPARE 1
581#define IMPROVE_DAMAGE 2 576#define IMPROVE_DAMAGE 2
582#define IMPROVE_WEIGHT 3 577#define IMPROVE_WEIGHT 3
583#define IMPROVE_ENCHANT 4 578#define IMPROVE_ENCHANT 4
584#define IMPROVE_STR 5 579#define IMPROVE_STR 5
585#define IMPROVE_DEX 6 580#define IMPROVE_DEX 6
586#define IMPROVE_CON 7 581#define IMPROVE_CON 7
587#define IMPROVE_WIS 8 582#define IMPROVE_WIS 8
588#define IMPROVE_CHA 9 583#define IMPROVE_CHA 9
589#define IMPROVE_INT 10 584#define IMPROVE_INT 10
590#define IMPROVE_POW 11 585#define IMPROVE_POW 11
591
592 586
593/** 587/**
594 * This does the prepare weapon scroll. 588 * This does the prepare weapon scroll.
595 * Checks for sacrifice, and so on. 589 * Checks for sacrifice, and so on.
596 */ 590 */
597
598int 591int
599prepare_weapon (object *op, object *improver, object *weapon) 592prepare_weapon (object *op, object *improver, object *weapon)
600{ 593{
601 int sacrifice_count, i; 594 int sacrifice_count, i;
602 char buf[MAX_BUF]; 595 char buf[MAX_BUF];
603 596
604 if (weapon->level != 0) 597 if (weapon->level != 0)
605 { 598 {
606 new_draw_info (NDI_UNIQUE, 0, op, "Weapon already prepared."); 599 op->failmsg ("Weapon is already prepared!");
607 return 0; 600 return 0;
608 } 601 }
602
609 for (i = 0; i < NROFATTACKS; i++) 603 for (i = 0; i < NROFATTACKS; i++)
610 if (weapon->resist[i]) 604 if (weapon->resist[i])
611 break; 605 break;
612 606
613 /* If we break out, i will be less than nrofattacks, preventing 607 /* If we break out, i will be less than nrofattacks, preventing
… …
616 if (i < NROFATTACKS || weapon->stats.hp || /* regeneration */ 610 if (i < NROFATTACKS || weapon->stats.hp || /* regeneration */
617 (weapon->stats.sp && weapon->type == WEAPON) || /* sp regeneration */ 611 (weapon->stats.sp && weapon->type == WEAPON) || /* sp regeneration */
618 weapon->stats.exp || /* speed */ 612 weapon->stats.exp || /* speed */
619 weapon->stats.ac) /* AC - only taifu's I think */ 613 weapon->stats.ac) /* AC - only taifu's I think */
620 { 614 {
621 new_draw_info (NDI_UNIQUE, 0, op, "Cannot prepare magic weapons."); 615 op->failmsg ("You cannot prepare magic weapons. "
616 "H<A weapon is considered magical if it changes regeneration, "
617 "speed or ac.>");
622 return 0; 618 return 0;
623 } 619 }
620
624 sacrifice_count = check_sacrifice (op, improver); 621 sacrifice_count = check_sacrifice (op, improver);
625 if (sacrifice_count <= 0) 622 if (sacrifice_count <= 0)
626 return 0; 623 return 0;
624
627 weapon->level = isqrt (sacrifice_count); 625 weapon->level = isqrt (sacrifice_count);
628 new_draw_info (NDI_UNIQUE, 0, op, "Your sacrifice was accepted.");
629 eat_item (op, improver->slaying, sacrifice_count); 626 eat_item (op, improver->slaying, sacrifice_count);
630 627
631 new_draw_info_format (NDI_UNIQUE, 0, op, "Your *%s may be improved %d times.", &weapon->name, weapon->level); 628 op->statusmsg (format (
629 "Your sacrifice was accepted."
630 "Your *%s may be improved %d times.",
631 &weapon->name, weapon->level
632 ));
632 633
633 sprintf (buf, "%s's %s", &op->name, &weapon->name); 634 sprintf (buf, "%s's %s", &op->name, &weapon->name);
634 weapon->name = weapon->name_pl = buf; 635 weapon->name = weapon->name_pl = buf;
635 weapon->nrof = 0; /* prevents preparing n weapons in the same 636 weapon->nrof = 0; /* prevents preparing n weapons in the same
636 slot at once! */ 637 slot at once! */
637 decrease_ob (improver); 638 improver->decrease ();
638 weapon->last_eat = 0; 639 weapon->last_eat = 0;
639 return 1; 640 return 1;
640} 641}
641
642 642
643/** 643/**
644 * Does the dirty job for 'improve weapon' scroll, prepare or add something. 644 * Does the dirty job for 'improve weapon' scroll, prepare or add something.
645 * This is the new improve weapon code. 645 * This is the new improve weapon code.
646 * Returns 0 if it was not able to work for some reason. 646 * Returns 0 if it was not able to work for some reason.
… …
655improve_weapon (object *op, object *improver, object *weapon) 655improve_weapon (object *op, object *improver, object *weapon)
656{ 656{
657 int sacrifice_count, sacrifice_needed = 0; 657 int sacrifice_count, sacrifice_needed = 0;
658 658
659 if (improver->stats.sp == IMPROVE_PREPARE) 659 if (improver->stats.sp == IMPROVE_PREPARE)
660 {
661 return prepare_weapon (op, improver, weapon); 660 return prepare_weapon (op, improver, weapon);
662 } 661
663 if (weapon->level == 0) 662 if (weapon->level == 0)
664 { 663 {
665 new_draw_info (NDI_UNIQUE, 0, op, "This weapon has not been prepared."); 664 op->failmsg ("This weapon has not been prepared. H<You first ahve to prepare a weapon with a prepare weapon scroll.>");
666 return 0; 665 return 0;
667 } 666 }
667
668 if (weapon->level == weapon->last_eat && weapon->item_power >= 100) 668 if (weapon->level == weapon->last_eat && weapon->item_power >= 100)
669 { 669 {
670 new_draw_info (NDI_UNIQUE, 0, op, "This weapon cannot be improved any more."); 670 op->failmsg ("This weapon cannot be improved any more.");
671 return 0; 671 return 0;
672 } 672 }
673
673 if (QUERY_FLAG (weapon, FLAG_APPLIED) && !check_weapon_power (op, weapon->last_eat + 1)) 674 if (QUERY_FLAG (weapon, FLAG_APPLIED) && !check_weapon_power (op, weapon->last_eat + 1))
674 { 675 {
675 new_draw_info (NDI_UNIQUE, 0, op, "Improving the weapon will make it too"); 676 op->failmsg ("Improving the weapon will make it too "
676 new_draw_info (NDI_UNIQUE, 0, op, "powerful for you to use. Unready it if you"); 677 "powerful for you to use. Unready it if you "
677 new_draw_info (NDI_UNIQUE, 0, op, "really want to improve it."); 678 "really want to improve it.");
678 return 0; 679 return 0;
679 } 680 }
681
680 /* This just increases damage by 5 points, no matter what. No sacrifice 682 /* This just increases damage by 5 points, no matter what. No sacrifice
681 * is needed. Since stats.dam is now a 16 bit value and not 8 bit, 683 * is needed. Since stats.dam is now a 16 bit value and not 8 bit,
682 * don't put any maximum value on damage - the limit is how much the 684 * don't put any maximum value on damage - the limit is how much the
683 * weapon can be improved. 685 * weapon can be improved.
684 */ 686 */
685 if (improver->stats.sp == IMPROVE_DAMAGE) 687 if (improver->stats.sp == IMPROVE_DAMAGE)
686 { 688 {
687 weapon->stats.dam += 5; 689 weapon->stats.dam += 5;
688 weapon->weight += 5000; /* 5 KG's */ 690 weapon->weight += 5000; /* 5 KG's */
689 new_draw_info_format (NDI_UNIQUE, 0, op, "Damage has been increased by 5 to %d", weapon->stats.dam); 691 op->statusmsg (format ("Damage has been increased by 5 to %d.", weapon->stats.dam));
690 weapon->last_eat++; 692 weapon->last_eat++;
691 693
692 weapon->item_power++; 694 weapon->item_power++;
693 decrease_ob (improver); 695 improver->decrease ();
694 return 1; 696 return 1;
695 } 697 }
698
696 if (improver->stats.sp == IMPROVE_WEIGHT) 699 if (improver->stats.sp == IMPROVE_WEIGHT)
697 { 700 {
698 /* Reduce weight by 20% */ 701 /* Reduce weight by 20% */
699 weapon->weight = (weapon->weight * 8) / 10; 702 weapon->weight = (weapon->weight * 8) / 10;
700 if (weapon->weight < 1) 703 if (weapon->weight < 1)
701 weapon->weight = 1; 704 weapon->weight = 1;
705
702 new_draw_info_format (NDI_UNIQUE, 0, op, "Weapon weight reduced to %6.1f kg", (float) weapon->weight / 1000.0); 706 op->statusmsg (format ("Weapon weight reduced to %6.1fkg.", (float) weapon->weight / 1000.0));
703 weapon->last_eat++; 707 weapon->last_eat++;
704 weapon->item_power++; 708 weapon->item_power++;
705 decrease_ob (improver); 709 improver->decrease ();
706 return 1; 710 return 1;
707 } 711 }
708 if (improver->stats.sp == IMPROVE_ENCHANT) 712 if (improver->stats.sp == IMPROVE_ENCHANT)
709 { 713 {
710 weapon->magic++; 714 weapon->magic++;
711 weapon->last_eat++; 715 weapon->last_eat++;
712 new_draw_info_format (NDI_UNIQUE, 0, op, "Weapon magic increased to %d", weapon->magic); 716 op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic));
713 decrease_ob (improver); 717 improver->decrease ();
714 weapon->item_power++; 718 weapon->item_power++;
715 return 1; 719 return 1;
716 } 720 }
717 721
718 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex + 722 sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex +
… …
723 sacrifice_needed *= 2; 727 sacrifice_needed *= 2;
724 728
725 sacrifice_count = check_sacrifice (op, improver); 729 sacrifice_count = check_sacrifice (op, improver);
726 if (sacrifice_count < sacrifice_needed) 730 if (sacrifice_count < sacrifice_needed)
727 { 731 {
728 new_draw_info_format (NDI_UNIQUE, 0, op, "You need at least %d %s", sacrifice_needed, &improver->slaying); 732 op->failmsg (format ("You need at least %d %s.", sacrifice_needed, &improver->slaying));
729 return 0; 733 return 0;
730 } 734 }
735
731 eat_item (op, improver->slaying, sacrifice_needed); 736 eat_item (op, improver->slaying, sacrifice_needed);
732 weapon->item_power++; 737 weapon->item_power++;
733 738
734 switch (improver->stats.sp) 739 switch (improver->stats.sp)
735 { 740 {
736 case IMPROVE_STR:
737 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Str), 1, "strength"); 741 case IMPROVE_STR: return improve_weapon_stat (op, improver, weapon, weapon->stats.Str, 1, "strength");
738 case IMPROVE_DEX:
739 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Dex), 1, "dexterity"); 742 case IMPROVE_DEX: return improve_weapon_stat (op, improver, weapon, weapon->stats.Dex, 1, "dexterity");
740 case IMPROVE_CON:
741 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Con), 1, "constitution"); 743 case IMPROVE_CON: return improve_weapon_stat (op, improver, weapon, weapon->stats.Con, 1, "constitution");
742 case IMPROVE_WIS:
743 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Wis), 1, "wisdom"); 744 case IMPROVE_WIS: return improve_weapon_stat (op, improver, weapon, weapon->stats.Wis, 1, "wisdom");
744 case IMPROVE_CHA:
745 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Cha), 1, "charisma"); 745 case IMPROVE_CHA: return improve_weapon_stat (op, improver, weapon, weapon->stats.Cha, 1, "charisma");
746 case IMPROVE_INT:
747 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Int), 1, "intelligence"); 746 case IMPROVE_INT: return improve_weapon_stat (op, improver, weapon, weapon->stats.Int, 1, "intelligence");
748 case IMPROVE_POW:
749 return improve_weapon_stat (op, improver, weapon, (signed char *) &(weapon->stats.Pow), 1, "power"); 747 case IMPROVE_POW: return improve_weapon_stat (op, improver, weapon, weapon->stats.Pow, 1, "power");
750 default: 748 default:
751 new_draw_info (NDI_UNIQUE, 0, op, "Unknown improvement type."); 749 op->failmsg ("Unknown improvement type.");
752 } 750 }
751
753 LOG (llevError, "improve_weapon: Got to end of function\n"); 752 LOG (llevError, "improve_weapon: Got to end of function\n");
754 return 0; 753 return 0;
755} 754}
756 755
757/** 756/**
… …
764{ 763{
765 object *otmp; 764 object *otmp;
766 765
767 if (op->type != PLAYER) 766 if (op->type != PLAYER)
768 return 0; 767 return 0;
768
769 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) 769 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC))
770 { 770 {
771 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll."); 771 op->failmsg ("Something blocks the magic of the scroll!");
772 return 0; 772 return 0;
773 } 773 }
774
774 otmp = find_marked_object (op); 775 otmp = find_marked_object (op);
775 if (!otmp) 776 if (!otmp)
776 { 777 {
777 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark a weapon object."); 778 op->failmsg ("You need to mark a weapon object. H<Use the mark command or the mark option from the item popup menu.>");
778 return 0; 779 return 0;
779 } 780 }
781
780 if (otmp->type != WEAPON && otmp->type != BOW) 782 if (otmp->type != WEAPON && otmp->type != BOW)
781 { 783 {
782 new_draw_info (NDI_UNIQUE, 0, op, "Marked item is not a weapon or bow"); 784 op->failmsg ("Marked item is not a weapon or bow!");
783 return 0; 785 return 0;
784 } 786 }
785 new_draw_info (NDI_UNIQUE, 0, op, "Applied weapon builder."); 787
788 op->statusmsg ("Applied weapon builder.");
789
786 improve_weapon (op, tmp, otmp); 790 improve_weapon (op, tmp, otmp);
787 esrv_send_item (op, otmp); 791 esrv_send_item (op, otmp);
788 return 1; 792 return 1;
789} 793}
790 794
… …
815{ 819{
816 object *tmp; 820 object *tmp;
817 821
818 if (armour->magic >= settings.armor_max_enchant) 822 if (armour->magic >= settings.armor_max_enchant)
819 { 823 {
820 new_draw_info (NDI_UNIQUE, 0, op, "This armour can not be enchanted any further."); 824 op->failmsg ("This armour can not be enchanted any further!");
821 return 0; 825 return 0;
822 } 826 }
827
823 /* Dealing with random artifact armor is a lot trickier (in terms of value, weight, 828 /* Dealing with random artifact armor is a lot trickier (in terms of value, weight,
824 * etc), so take the easy way out and don't worry about it. 829 * etc), so take the easy way out and don't worry about it.
825 * Note - maybe add scrolls which make the random artifact versions (eg, armour 830 * Note - maybe add scrolls which make the random artifact versions (eg, armour
826 * of gnarg and what not?) 831 * of gnarg and what not?)
827 */ 832 */
828 if (armour->title) 833 if (armour->title)
829 { 834 {
830 new_draw_info (NDI_UNIQUE, 0, op, "This armour will not accept further enchantment."); 835 op->failmsg ("This armour will not accept further enchantment.");
831 return 0; 836 return 0;
832 } 837 }
833 838
834 /* Split objects if needed. Can't insert tmp until the 839 /* Split objects if needed. Can't insert tmp until the
835 * end of this function - otherwise it will just re-merge. 840 * end of this function - otherwise it will just re-merge.
836 */ 841 */
837 if (armour->nrof > 1) 842 tmp = armour->nrof > 1 ? armour->split (armour->nrof - 1) : 0;
838 tmp = get_split_ob (armour, armour->nrof - 1);
839 else
840 tmp = NULL;
841 843
842 armour->magic++; 844 armour->magic++;
843 845
844 if (!settings.armor_speed_linear) 846 if (!settings.armor_speed_linear)
845 { 847 {
… …
850 { 852 {
851 base = base - (base * settings.armor_speed_improvement) / 100; 853 base = base - (base * settings.armor_speed_improvement) / 100;
852 pow++; 854 pow++;
853 } 855 }
854 856
855 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (&armour->arch->clone) * base) / 100; 857 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (armour->arch) * base) / 100;
856 } 858 }
857 else 859 else
858 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (&armour->arch->clone) * (100 + armour->magic * settings.armor_speed_improvement)) / 100; 860 ARMOUR_SPEED (armour) = (ARMOUR_SPEED (armour->arch) * (100 + armour->magic * settings.armor_speed_improvement)) / 100;
859 861
860 if (!settings.armor_weight_linear) 862 if (!settings.armor_weight_linear)
861 { 863 {
862 int base = 100; 864 int base = 100;
863 int pow = 0; 865 int pow = 0;
… …
866 { 868 {
867 base = base - (base * settings.armor_weight_reduction) / 100; 869 base = base - (base * settings.armor_weight_reduction) / 100;
868 pow++; 870 pow++;
869 } 871 }
870 872
871 armour->weight = (armour->arch->clone.weight * base) / 100; 873 armour->weight = (armour->arch->weight * base) / 100;
872 } 874 }
873 else 875 else
874 armour->weight = (armour->arch->clone.weight * (100 - armour->magic * settings.armor_weight_reduction)) / 100; 876 armour->weight = (armour->arch->weight * (100 - armour->magic * settings.armor_weight_reduction)) / 100;
875 877
876 if (armour->weight <= 0) 878 if (armour->weight <= 0)
877 { 879 {
878 LOG (llevInfo, "Warning: enchanted armours can have negative weight\n."); 880 LOG (llevInfo, "Warning: enchanted armours can have negative weight\n.");
879 armour->weight = 1; 881 armour->weight = 1;
880 } 882 }
881 883
882 armour->item_power = get_power_from_ench (armour->arch->clone.item_power + armour->magic); 884 armour->item_power = get_power_from_ench (armour->arch->item_power + armour->magic);
883 885
884 if (op->type == PLAYER) 886 if (op->type == PLAYER)
885 { 887 {
886 esrv_send_item (op, armour); 888 esrv_send_item (op, armour);
889
887 if (QUERY_FLAG (armour, FLAG_APPLIED)) 890 if (QUERY_FLAG (armour, FLAG_APPLIED))
888 fix_player (op); 891 op->update_stats ();
889 } 892 }
890 decrease_ob (improver); 893
894 improver->decrease ();
895
891 if (tmp) 896 if (tmp)
892 { 897 op->insert (tmp);
893 insert_ob_in_ob (tmp, op); 898
894 esrv_send_item (op, tmp);
895 }
896 return 1; 899 return 1;
897} 900}
898
899 901
900/* 902/*
901 * convert_item() returns 1 if anything was converted, 0 if the item was not 903 * convert_item() returns 1 if anything was converted, 0 if the item was not
902 * what the converter wants, -1 if the converter is broken. 904 * what the converter wants, -1 if the converter is broken.
903 */ 905 *
904#define CONV_FROM(xyz) xyz->slaying
905#define CONV_TO(xyz) xyz->other_arch
906#define CONV_NR(xyz) xyz->stats.sp
907#define CONV_NEED(xyz) xyz->stats.food
908
909/* Takes one items and makes another. 906 * Takes one type of items and makes another.
910 * converter is the object that is doing the conversion. 907 * converter is the object that is doing the conversion.
911 * item is the object that triggered the converter - if it is not 908 * item is the object that triggered the converter - if it is not
912 * what the converter wants, this will not do anything. 909 * what the converter wants, this will not do anything.
913 */ 910 */
914int 911static int
915convert_item (object *item, object *converter) 912convert_item (object *item, object *converter)
916{ 913{
917 int nr = 0;
918 uint32 price_in; 914 sint64 nr, price_in;
915
916 if (item->flag [FLAG_UNPAID])
917 return 0;
918
919 shstr conv_from = converter->slaying;
920 archetype *conv_to = converter->other_arch;
921 sint64 need = converter->stats.food;
922 sint64 give = converter->stats.sp;
919 923
920 /* We make some assumptions - we assume if it takes money as it type, 924 /* We make some assumptions - we assume if it takes money as it type,
921 * it wants some amount. We don't make change (ie, if something costs 925 * it wants some amount. We don't make change (ie, if something costs
922 * 3 gp and player drops a platinum, tough luck) 926 * 3 gp and player drops a platinum, tough luck)
923 */ 927 */
924 if (!strcmp (CONV_FROM (converter), "money")) 928 if (conv_from == shstr_money)
925 { 929 {
926 int cost;
927
928 if (item->type != MONEY) 930 if (item->type != MONEY)
929 return 0; 931 return 0;
930 932
931 nr = (item->nrof * item->value) / CONV_NEED (converter); 933 nr = sint64 (item->nrof) * item->value / need;
932 if (!nr) 934 if (!nr)
933 return 0; 935 return 0;
934 cost = nr * CONV_NEED (converter) / item->value; 936
935 /* take into account rounding errors */ 937 converter->play_sound (sound_find ("shop_buy"));
936 if (nr * CONV_NEED (converter) % item->value) 938
937 cost++; 939 sint64 cost = (nr * need + item->value - 1) / item->value;
938 decrease_ob_nr (item, cost); 940
941 item->decrease (cost);
939 942
940 price_in = cost * item->value; 943 price_in = cost * item->value;
941 } 944 }
942 else 945 else
943 { 946 {
944 if (item->type == PLAYER || CONV_FROM (converter) != item->arch->name || 947 if (item->type == PLAYER
945 (CONV_NEED (converter) && CONV_NEED (converter) > (uint16) item->nrof)) 948 || conv_from != item->arch->archname
949 || (need && need > (uint16) item->nrof))
946 return 0; 950 return 0;
947 951
948 if (CONV_NEED (converter)) 952 converter->play_sound (sound_find ("convert_item"));
953
954 if (need)
949 { 955 {
950 nr = item->nrof / CONV_NEED (converter); 956 nr = sint64 (item->nrof) / need;
951 decrease_ob_nr (item, nr * CONV_NEED (converter)); 957 item->decrease (nr * need);
952 price_in = nr * CONV_NEED (converter) * item->value; 958 price_in = nr * need * item->value;
953 } 959 }
954 else 960 else
955 { 961 {
956 price_in = item->value; 962 price_in = item->value;
957 remove_ob (item); 963 item->destroy ();
958 free_object (item);
959 } 964 }
960 } 965 }
961 966
962 if (converter->inv != NULL) 967 if (converter->inv)
963 { 968 {
964 object *ob; 969 object *ob;
965 int i; 970 int i;
966 object *ob_to_copy; 971 object *ob_to_copy;
967 972
968 /* select random object from inventory to copy */ 973 /* select random object from inventory to copy */
969 ob_to_copy = converter->inv; 974 ob_to_copy = converter->inv;
970 for (ob = converter->inv->below, i = 1; ob != NULL; ob = ob->below, i++) 975 for (ob = converter->inv->below, i = 1; ob; ob = ob->below, i++)
971 {
972 if (rndm (0, i) == 0) 976 if (rndm (0, i) == 0)
973 {
974 ob_to_copy = ob; 977 ob_to_copy = ob;
975 } 978
976 }
977 item = object_create_clone (ob_to_copy); 979 item = object_create_clone (ob_to_copy);
978 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE); 980 CLEAR_FLAG (item, FLAG_IS_A_TEMPLATE);
979 unflag_inv (item, FLAG_IS_A_TEMPLATE); 981 unflag_inv (item, FLAG_IS_A_TEMPLATE);
980 } 982 }
981 else 983 else
982 { 984 {
983 if (converter->other_arch == NULL) 985 if (!conv_to)
984 { 986 {
985 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n", 987 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n",
986 &converter->name, converter->map->path, converter->x, converter->y); 988 &converter->name, &converter->map->path, converter->x, converter->y);
987 return -1; 989 return -1;
988 } 990 }
989 991
990 item = object_create_arch (converter->other_arch); 992 item = object_create_arch (conv_to);
991 fix_generated_item (item, converter, 0, 0, GT_MINIMAL); 993 fix_generated_item (item, converter, 0, 0, GT_MINIMAL);
992 } 994 }
993 995
994 if (CONV_NR (converter)) 996 if (give)
995 item->nrof = CONV_NR (converter); 997 item->nrof = give;
998
996 if (nr) 999 if (nr)
997 item->nrof *= nr; 1000 item->nrof *= nr;
1001
998 if (is_in_shop (converter)) 1002 if (is_in_shop (converter))
999 SET_FLAG (item, FLAG_UNPAID); 1003 SET_FLAG (item, FLAG_UNPAID);
1000 else if (price_in < item->nrof * item->value) 1004 else if (price_in < sint64 (item->nrof) * item->value)
1001 { 1005 {
1002 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n", 1006 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n",
1003 &converter->name, converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name); 1007 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
1004
1005 /** 1008 /**
1006 * 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
1007 * propably had something in mind when doing this 1010 * hopefully had something in mind when doing this.
1008 */ 1011 */
1009 } 1012 }
1013
1014 SET_FLAG (item, FLAG_IDENTIFIED);
1010 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y); 1015 insert_ob_in_map_at (item, converter->map, converter, 0, converter->x, converter->y);
1011 return 1; 1016 return 1;
1012} 1017}
1013 1018
1014/** 1019/**
1015 * Handle apply on containers. 1020 * Handle apply on containers.
1016 * By Eneq(@csd.uu.se). 1021 * By Eneq(@csd.uu.se).
1017 * Moved to own function and added many features [Tero.Haatanen@lut.fi] 1022 * Moved to own function and added many features [Tero.Haatanen@lut.fi]
1018 * added the alchemical cauldron to the code -b.t. 1023 * added the alchemical cauldron to the code -b.t.
1019 */ 1024 */
1020
1021int 1025int
1022apply_container (object *op, object *sack) 1026apply_container (object *op, object *sack)
1023{ 1027{
1024 char buf[MAX_BUF]; 1028 if (op->type != PLAYER || !op->contr->ns)
1025 object *tmp;
1026
1027 if (op->type != PLAYER)
1028 return 0; /* This might change */ 1029 return 0; /* This might change */
1029 1030
1030 if (sack == NULL || sack->type != CONTAINER) 1031 if (!sack || sack->type != CONTAINER)
1031 { 1032 {
1032 LOG (llevError, "apply_container: %s is not container!\n", &sack->name); 1033 LOG (llevError, "apply_container: %s is not container!\n", sack ? &sack->name : "[nullobject]");
1033 return 0; 1034 return 0;
1034 } 1035 }
1035 op->contr->last_used = NULL; 1036
1036 op->contr->last_used_id = 0; 1037 op->contr->last_used = 0;
1037 1038
1038 if (sack->env != op) 1039 if (sack->env && sack->env != op)
1040 {
1041 op->failmsg ("You must put it onto the floor or into your inventory first.");
1042 return 1;
1039 { 1043 }
1040 if (sack->other_arch == NULL || sack->env != NULL) 1044
1045 // already applied == open on ground, or open in inv, or active in inv
1046 if (sack->flag [FLAG_APPLIED])
1047 {
1048 if (op->container == sack)
1041 { 1049 {
1042 new_draw_info (NDI_UNIQUE, 0, op, "You must get it first."); 1050 // open on ground or inv, so close
1051 op->close_container ();
1043 return 1; 1052 return 1;
1044 } 1053 }
1045 /* It's on the ground, the problems begin */ 1054 else if (!sack->env)
1046 if (op->container != sack)
1047 {
1048 /* it's closed OR some player has opened it */
1049 if (QUERY_FLAG (sack, FLAG_APPLIED))
1050 {
1051 for (tmp = get_map_ob (sack->map, sack->x, sack->y); tmp && tmp->container != sack; tmp = tmp->above);
1052 if (tmp)
1053 {
1054 /* some other player have opened it */
1055 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already occupied.", query_name (sack));
1056 return 1;
1057 }
1058 }
1059 } 1055 {
1060 if (QUERY_FLAG (sack, FLAG_APPLIED)) 1056 // active, but not ours: some other player has opened it
1057 op->failmsg (format ("Somebody else is using the %s already.", query_name (sack)));
1058 return 1;
1061 { 1059 }
1062 if (op->container == NULL)
1063 {
1064 tmp = arch_to_object (sack->other_arch);
1065 /* not good, but insert_ob_in_ob() is too smart */
1066 CLEAR_FLAG (tmp, FLAG_REMOVED);
1067 tmp->x = tmp->y = 0;
1068 tmp->map = NULL;
1069 tmp->env = sack;
1070 if (sack->inv)
1071 sack->inv->above = tmp;
1072 tmp->below = sack->inv;
1073 tmp->above = NULL;
1074 sack->inv = tmp;
1075 sack->move_off = MOVE_ALL; /* trying force closing it */
1076 }
1077 else
1078 {
1079 sack->move_off = 0;
1080 tmp = sack->inv;
1081 if (tmp && tmp->type == CLOSE_CON)
1082 {
1083 remove_ob (tmp);
1084 free_object (tmp);
1085 }
1086 }
1087 }
1088 }
1089 1060
1090 if (QUERY_FLAG (sack, FLAG_APPLIED)) 1061 // fall through to opening it (active in inv)
1091 { 1062 }
1063 else if (sack->env)
1064 {
1065 // it is in our env, so activate it, do not open yet
1092 if (op->container) 1066 op->close_container ();
1093 { 1067 sack->flag [FLAG_APPLIED] = 1;
1094 if (op->container != sack) 1068 esrv_update_item (UPD_FLAGS, op, sack);
1095 { 1069 op->statusmsg (format ("You ready %s.", query_name (sack)));
1096 tmp = op->container; 1070 return 1;
1097 apply_container (op, tmp); 1071 }
1098 sprintf (buf, "You close %s and open ", query_name (tmp)); 1072
1099 op->container = sack; 1073 // it's locked?
1100 strcat (buf, query_name (sack)); 1074 if (sack->slaying)
1101 strcat (buf, "."); 1075 {
1102 } 1076 if (object *tmp = find_key (op, op, sack))
1103 else 1077 op->statusmsg (format ("You unlock %s with %s.", query_name (sack), query_name (tmp)));
1104 {
1105 CLEAR_FLAG (sack, FLAG_APPLIED);
1106 op->container = NULL;
1107 sprintf (buf, "You close %s.", query_name (sack));
1108 }
1109 }
1110 else 1078 else
1111 { 1079 {
1112 CLEAR_FLAG (sack, FLAG_APPLIED);
1113 sprintf (buf, "You open %s.", query_name (sack));
1114 SET_FLAG (sack, FLAG_APPLIED);
1115 op->container = sack;
1116 }
1117 }
1118 else
1119 { /* not applied */
1120 if (sack->slaying)
1121 { /* it's locked */
1122 tmp = find_key (op, op, sack);
1123 if (tmp)
1124 {
1125 sprintf (buf, "You unlock %s with %s.", query_name (sack), query_name (tmp));
1126 SET_FLAG (sack, FLAG_APPLIED);
1127 if (sack->env == NULL)
1128 { /* if it's on ground,open it also */
1129 new_draw_info (NDI_UNIQUE, 0, op, buf);
1130 apply_container (op, sack);
1131 return 1;
1132 }
1133 }
1134 else
1135 {
1136 sprintf (buf, "You don't have the key to unlock %s.", query_name (sack)); 1080 op->statusmsg (format ("You don't have the key to unlock %s.", query_name (sack)));
1137 }
1138 }
1139 else
1140 {
1141 sprintf (buf, "You readied %s.", query_name (sack));
1142 SET_FLAG (sack, FLAG_APPLIED);
1143 if (sack->env == NULL)
1144 { /* if it's on ground,open it also */
1145 new_draw_info (NDI_UNIQUE, 0, op, buf);
1146 apply_container (op, sack);
1147 return 1; 1081 return 1;
1148 } 1082 }
1149 }
1150 } 1083 }
1151 new_draw_info (NDI_UNIQUE, 0, op, buf); 1084
1152 if (op->contr) 1085 op->open_container (sack);
1153 op->contr->socket.update_look = 1; 1086
1154 return 1; 1087 return 1;
1155} 1088}
1156
1157/**
1158 * Eneq(@csd.uu.se): Handle apply on containers. This is for containers
1159 * the player has in their inventory, eg, sacks, luggages, etc.
1160 *
1161 * Moved to own function and added many features [Tero.Haatanen@lut.fi]
1162 * This version is for client/server mode.
1163 * op is the player, sack is the container the player is opening or closing.
1164 * return 1 if an object is apllied somehow or another, 0 if error/no apply
1165 *
1166 * Reminder - there are three states for any container - closed (non applied),
1167 * applied (not open, but objects that match get tossed into it), and open
1168 * (applied flag set, and op->container points to the open container)
1169 */
1170
1171int
1172esrv_apply_container (object *op, object *sack)
1173{
1174 object *tmp = op->container;
1175
1176 if (op->type != PLAYER)
1177 return 0; /* This might change */
1178
1179 if (sack == NULL || sack->type != CONTAINER)
1180 {
1181 LOG (llevError, "esrv_apply_container: %s is not container!\n", &sack->name);
1182 return 0;
1183 }
1184
1185 /* If we have a currently open container, then it needs to be closed in all cases
1186 * if we are opening this one up. We then fall through if appropriate for
1187 * openening the new container.
1188 */
1189
1190 if (op->container && QUERY_FLAG (sack, FLAG_APPLIED))
1191 {
1192 if (op->container->env != op)
1193 { /* if container is on the ground */
1194 op->container->move_off = 0;
1195 }
1196
1197 if (INVOKE_OBJECT (CLOSE, tmp, ARG_OBJECT (op)))
1198 return 1;
1199
1200 new_draw_info_format (NDI_UNIQUE, 0, op, "You close %s.", query_name (op->container));
1201 CLEAR_FLAG (op->container, FLAG_APPLIED);
1202 op->container = NULL;
1203 esrv_update_item (UPD_FLAGS, op, tmp);
1204 if (tmp == sack)
1205 return 1;
1206 }
1207
1208
1209 /* If the player is trying to open it (which he must be doing if we got here),
1210 * and it is locked, check to see if player has the equipment to open it.
1211 */
1212
1213 if (sack->slaying)
1214 { /* it's locked */
1215 tmp = find_key (op, op, sack);
1216 if (tmp)
1217 {
1218 new_draw_info_format (NDI_UNIQUE, 0, op, "You unlock %s with %s.", query_name (sack), query_name (tmp));
1219 }
1220 else
1221 {
1222 new_draw_info_format (NDI_UNIQUE, 0, op, "You don't have the key to unlock %s.", query_name (sack));
1223 return 0;
1224 }
1225 }
1226
1227 /* By the time we get here, we have made sure any other container has been closed and
1228 * if this is a locked container, the player they key to open it.
1229 */
1230
1231 /* There are really two cases - the sack is either on the ground, or the sack is
1232 * part of the players inventory. If on the ground, we assume that the player is
1233 * opening it, since if it was being closed, that would have been taken care of above.
1234 */
1235
1236
1237 if (sack->env != op)
1238 {
1239 /* Hypothetical case - the player is trying to open a sack that belong to someone
1240 * else. This normally should not happen, but a misbehaving client/player could
1241 * try to do it, so lets handle it gracefully.
1242 */
1243 if (sack->env)
1244 {
1245 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't open %s", query_name (sack));
1246 return 0;
1247 }
1248 /* set these so when the player walks off, we can unapply the sack */
1249 sack->move_off = MOVE_ALL; /* trying force closing it */
1250
1251 CLEAR_FLAG (sack, FLAG_APPLIED);
1252 new_draw_info_format (NDI_UNIQUE, 0, op, "You open %s.", query_name (sack));
1253 SET_FLAG (sack, FLAG_APPLIED);
1254 op->container = sack;
1255 esrv_update_item (UPD_FLAGS, op, sack);
1256 esrv_send_inventory (op, sack);
1257
1258 }
1259 else
1260 { /* sack is in players inventory */
1261 if (QUERY_FLAG (sack, FLAG_APPLIED))
1262 { /* readied sack becoming open */
1263 CLEAR_FLAG (sack, FLAG_APPLIED);
1264 new_draw_info_format (NDI_UNIQUE, 0, op, "You open %s.", query_name (sack));
1265 SET_FLAG (sack, FLAG_APPLIED);
1266 op->container = sack;
1267 esrv_update_item (UPD_FLAGS, op, sack);
1268 esrv_send_inventory (op, sack);
1269 }
1270 else
1271 {
1272 CLEAR_FLAG (sack, FLAG_APPLIED);
1273 new_draw_info_format (NDI_UNIQUE, 0, op, "You readied %s.", query_name (sack));
1274 SET_FLAG (sack, FLAG_APPLIED);
1275 esrv_update_item (UPD_FLAGS, op, sack);
1276 }
1277 }
1278 return 1;
1279}
1280
1281 1089
1282/** 1090/**
1283 * Handles dropping things on altar. 1091 * Handles dropping things on altar.
1284 * Returns true if sacrifice was accepted. 1092 * Returns true if sacrifice was accepted.
1285 */ 1093 */
… …
1296 * with an altar. We call it a Potion - altars are stationary - it 1104 * with an altar. We call it a Potion - altars are stationary - it
1297 * is up to map designers to use them properly. 1105 * is up to map designers to use them properly.
1298 */ 1106 */
1299 if (altar->inv && altar->inv->type == SPELL) 1107 if (altar->inv && altar->inv->type == SPELL)
1300 { 1108 {
1301 new_draw_info_format (NDI_BLACK, 0, originator, "The altar casts %s.", &altar->inv->name); 1109 originator->statusmsg (format ("The altar casts %s.", &altar->inv->name));
1302 cast_spell (originator, altar, 0, altar->inv, NULL); 1110 cast_spell (originator, altar, 0, altar->inv, NULL);
1303 /* If it is connected, push the button. Fixes some problems with 1111 /* If it is connected, push the button. Fixes some problems with
1304 * old maps. 1112 * old maps.
1305 */ 1113 */
1306 1114
1307/* push_button (altar);*/ 1115/* push_button (altar);*/
1308 } 1116 }
… …
1332 double opinion; 1140 double opinion;
1333 object *tmp, *next; 1141 object *tmp, *next;
1334 1142
1335 SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */ 1143 SET_FLAG (op, FLAG_NO_APPLY); /* prevent loops */
1336 1144
1145 bool has_unpaid = false;
1146
1147 // quite inefficient to do this here twice, but the api doesn'T lend itself to
1148 // a quick and small change :(
1149 for (object::depth_iterator item = op->begin (); item != op->end (); ++item)
1150 if (item->flag [FLAG_UNPAID])
1151 {
1152 has_unpaid = true;
1153 break;
1154 }
1155
1337 if (op->type != PLAYER) 1156 if (op->type != PLAYER)
1338 { 1157 {
1339 /* Remove all the unpaid objects that may be carried here. 1158 /* Remove all the unpaid objects that may be carried here.
1340 * This could be pets or monsters that are somehow in 1159 * This could be pets or monsters that are somehow in
1341 * the shop. 1160 * the shop.
… …
1346 1165
1347 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 1166 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1348 { 1167 {
1349 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9); 1168 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9);
1350 1169
1351 remove_ob (tmp); 1170 tmp->remove ();
1352 1171
1353 if (i == -1) 1172 if (i == -1)
1354 i = 0; 1173 i = 0;
1355 1174
1356 tmp->map = op->map; 1175 tmp->map = op->map;
… …
1367 /* unpaid objects, or non living objects, can't transfer by 1186 /* unpaid objects, or non living objects, can't transfer by
1368 * shop mats. Instead, put it on a nearby space. 1187 * shop mats. Instead, put it on a nearby space.
1369 */ 1188 */
1370 if (QUERY_FLAG (op, FLAG_UNPAID) || !QUERY_FLAG (op, FLAG_ALIVE)) 1189 if (QUERY_FLAG (op, FLAG_UNPAID) || !QUERY_FLAG (op, FLAG_ALIVE))
1371 { 1190 {
1372
1373 /* Somebody dropped an unpaid item, just move to an adjacent place. */ 1191 /* Somebody dropped an unpaid item, just move to an adjacent place. */
1374 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9); 1192 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9);
1375 1193
1376 if (i != -1) 1194 if (i != -1)
1377 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat); 1195 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat);
… …
1386 else if (can_pay (op) && get_payment (op)) 1204 else if (can_pay (op) && get_payment (op))
1387 { 1205 {
1388 /* this is only used for players */ 1206 /* this is only used for players */
1389 rv = teleport (shop_mat, SHOP_MAT, op); 1207 rv = teleport (shop_mat, SHOP_MAT, op);
1390 1208
1209 if (has_unpaid)
1210 op->contr->play_sound (sound_find ("shop_buy"));
1211 else if (is_in_shop (op))
1212 op->contr->play_sound (sound_find ("shop_enter"));
1213 else
1214 op->contr->play_sound (sound_find ("shop_leave"));
1215
1391 if (shop_mat->msg) 1216 if (shop_mat->msg)
1392 new_draw_info (NDI_UNIQUE, 0, op, shop_mat->msg); 1217 op->statusmsg (shop_mat->msg);
1393 /* This check below is a bit simplistic - generally it should be correct, 1218 /* This check below is a bit simplistic - generally it should be correct,
1394 * but there is never a guarantee that the bottom space on the map is 1219 * but there is never a guarantee that the bottom space on the map is
1395 * actually the shop floor. 1220 * actually the shop floor.
1396 */ 1221 */
1397 else if (!rv && !is_in_shop (op)) 1222 else if (!rv && !is_in_shop (op))
1398 { 1223 {
1399 opinion = shopkeeper_approval (op->map, op); 1224 opinion = shopkeeper_approval (op->map, op);
1400 1225
1401 if (opinion > 0.9) 1226 op->statusmsg (
1402 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper gives you a friendly wave."); 1227 opinion >= 0.90 ? "The shopkeeper gives you a friendly wave."
1403 else if (opinion > 0.75) 1228 : opinion >= 0.75 ? "The shopkeeper waves to you."
1404 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper waves to you."); 1229 : opinion >= 0.50 ? "The shopkeeper ignores you."
1405 else if (opinion > 0.5) 1230 : "The shopkeeper glares at you with contempt."
1406 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper ignores you.");
1407 else 1231 );
1408 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper glares at you with contempt.");
1409 } 1232 }
1410 } 1233 }
1411 else 1234 else
1412 { 1235 {
1413 /* if we get here, a player tried to leave a shop but was not able 1236 /* if we get here, a player tried to leave a shop but was not able
1414 * to afford the items he has. We try to move the player so that 1237 * to afford the items he has. We try to move the player so that
1415 * they are not on the mat anymore 1238 * they are not on the mat anymore
1416 */ 1239 */
1417 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9); 1240 int i = find_free_spot (op, op->map, op->x, op->y, 1, 9);
1418 1241
1419 if (i == -1) 1242 if (i == -1)
1420 {
1421 LOG (llevError, "Internal shop-mat problem.\n"); 1243 LOG (llevError, "Internal shop-mat problem.\n");
1422 }
1423 else 1244 else
1424 { 1245 {
1425 remove_ob (op); 1246 op->remove ();
1426 op->x += freearr_x[i]; 1247 op->x += freearr_x[i];
1427 op->y += freearr_y[i]; 1248 op->y += freearr_y[i];
1428 rv = insert_ob_in_map (op, op->map, shop_mat, 0) == NULL; 1249 rv = insert_ob_in_map (op, op->map, shop_mat, 0) == NULL;
1429 } 1250 }
1430 } 1251 }
… …
1438 */ 1259 */
1439static void 1260static void
1440apply_sign (object *op, object *sign, int autoapply) 1261apply_sign (object *op, object *sign, int autoapply)
1441{ 1262{
1442 readable_message_type *msgType; 1263 readable_message_type *msgType;
1443 char newbuf[HUGE_BUF];
1444 1264
1445 if (sign->msg == NULL) 1265 if (!sign->msg)
1446 { 1266 {
1447 new_draw_info (NDI_UNIQUE, 0, op, "Nothing is written on it."); 1267 op->statusmsg ("Nothing is written on it.");
1448 return; 1268 return;
1449 } 1269 }
1450 1270
1451 if (sign->stats.food) 1271 if (sign->stats.food)
1452 { 1272 {
1453 if (sign->last_eat >= sign->stats.food) 1273 if (sign->last_eat >= sign->stats.food)
1454 { 1274 {
1455 if (!sign->move_on) 1275 if (!sign->move_on)
1456 new_draw_info (NDI_UNIQUE, 0, op, "You cannot read it anymore."); 1276 op->statusmsg ("You cannot read it anymore.");
1277
1457 return; 1278 return;
1458 } 1279 }
1459 1280
1460 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1281 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1461 sign->last_eat++; 1282 sign->last_eat++;
… …
1466 * move_on is zero, it needs to be manually applied (doesn't talk 1287 * move_on is zero, it needs to be manually applied (doesn't talk
1467 * to us). 1288 * to us).
1468 */ 1289 */
1469 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ) && !sign->move_on) 1290 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ) && !sign->move_on)
1470 { 1291 {
1471 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1292 op->failmsg ("You are unable to read while blind!");
1472 return; 1293 return;
1473 } 1294 }
1295
1296 if (op->contr)
1297 if (client *ns = op->contr->ns)
1298 {
1299 if (sign->sound)
1300 ns->play_sound (sign->sound);
1301 else if (autoapply)
1302 ns->play_sound (sound_find ("msg_voice"));
1303
1304 if (ns->can_msg)
1305 op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n\n\n%s", &sign->name, &sign->msg));
1306 else
1307 {
1474 msgType = get_readable_message_type (sign); 1308 msgType = get_readable_message_type (sign);
1475 snprintf (newbuf, sizeof (newbuf), "%hhu %s", autoapply ? 1 : 0, &sign->msg); 1309 const char *somemsg = format ("%u %s", autoapply ? 1 : 0, &sign->msg);
1476 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, newbuf, &sign->msg); 1310 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, somemsg, &sign->msg);
1311 }
1312 }
1477} 1313}
1478 1314
1479/** 1315/**
1480 * 'victim' moves onto 'trap' 1316 * 'victim' moves onto 'trap'
1481 * 'victim' leaves 'trap' 1317 * 'victim' leaves 'trap'
… …
1504 * proper. This code was causing needless crashes. 1340 * proper. This code was causing needless crashes.
1505 */ 1341 */
1506 if (recursion_depth >= 500) 1342 if (recursion_depth >= 500)
1507 { 1343 {
1508 LOG (llevDebug, "WARNING: move_apply(): aborting recursion " 1344 LOG (llevDebug, "WARNING: move_apply(): aborting recursion "
1509 "[trap arch %s, name %s; victim arch %s, name %s]\n", &trap->arch->name, &trap->name, &victim->arch->name, &victim->name); 1345 "[trap arch %s, name %s; victim arch %s, name %s]\n", &trap->arch->archname, &trap->name, &victim->arch->archname, &victim->name);
1510 return; 1346 return;
1511 } 1347 }
1348
1512 recursion_depth++; 1349 recursion_depth++;
1513 if (trap->head) 1350 if (trap->head)
1514 trap = trap->head; 1351 trap = trap->head;
1515 1352
1516 if (INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator))) 1353 if (INVOKE_OBJECT (MOVE_TRIGGER, trap, ARG_OBJECT (victim), ARG_OBJECT (originator)))
… …
1531 1368
1532 /* Just put in some sanity check. I think there is a bug in the 1369 /* Just put in some sanity check. I think there is a bug in the
1533 * above with some objects have zero speed, and thus the player 1370 * above with some objects have zero speed, and thus the player
1534 * getting permanently paralyzed. 1371 * getting permanently paralyzed.
1535 */ 1372 */
1536 if (victim->speed_left < -50.0) 1373 if (victim->speed_left < -50.f)
1537 victim->speed_left = -50.0; 1374 victim->speed_left = -50.f;
1538 /* LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left); */ 1375 /* LOG(llevDebug, "apply, playermove, player speed_left=%f\n", victim->speed_left); */
1539 } 1376 }
1540 goto leave; 1377 goto leave;
1541 1378
1542 case SPINNER: 1379 case SPINNER:
… …
1592 1429
1593 if (!trap->value) 1430 if (!trap->value)
1594 { 1431 {
1595 int tot; 1432 int tot;
1596 1433
1597 for (ab = trap->above, tot = 0; ab != NULL; ab = ab->above) 1434 for (ab = trap->above, tot = 0; ab; ab = ab->above)
1598 if ((ab->move_type && trap->move_on) || ab->move_type == 0) 1435 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1599 tot += (ab->nrof ? ab->nrof : 1) * ab->weight + ab->carrying; 1436 tot += ab->head_ ()->total_weight ();
1600 1437
1601 if (!(trap->value = (tot > trap->weight) ? 1 : 0)) 1438 if (!(trap->value = (tot > trap->weight) ? 1 : 0))
1602 goto leave; 1439 goto leave;
1603 1440
1604 SET_ANIMATION (trap, trap->value); 1441 SET_ANIMATION (trap, trap->value);
… …
1614 1451
1615 if ((ab->move_type && trap->move_on) || ab->move_type == 0) 1452 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
1616 { 1453 {
1617 if (!sound_was_played) 1454 if (!sound_was_played)
1618 { 1455 {
1619 play_sound_map (trap->map, trap->x, trap->y, SOUND_FALL_HOLE); 1456 trap->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1620 sound_was_played = 1; 1457 sound_was_played = 1;
1621 } 1458 }
1622 new_draw_info (NDI_UNIQUE, 0, ab, "You fall into a trapdoor!"); 1459
1460 ab->statusmsg ("You fall into a trapdoor!", NDI_RED);
1623 transfer_ob (ab, (int) EXIT_X (trap), (int) EXIT_Y (trap), 0, ab); 1461 transfer_ob (ab, EXIT_X (trap), EXIT_Y (trap), 0, ab);
1624 } 1462 }
1625 } 1463 }
1626 goto leave; 1464 goto leave;
1627 } 1465 }
1628 1466
1629
1630 case CONVERTER: 1467 case CONVERTER:
1631 if (convert_item (victim, trap) < 0) 1468 if (convert_item (victim, trap) < 0)
1632 { 1469 {
1633 object *op; 1470 originator->failmsg (format ("The %s seems to be broken!", query_name (trap)));
1634 1471 get_archetype ("burnout")->insert_at (trap, trap);
1635 new_draw_info_format (NDI_UNIQUE, 0, originator, "The %s seems to be broken!", query_name (trap));
1636
1637 op = get_archetype ("burnout");
1638 if (op != NULL)
1639 {
1640 op->x = trap->x;
1641 op->y = trap->y;
1642 insert_ob_in_map (op, trap->map, trap, 0);
1643 }
1644 } 1472 }
1473
1645 goto leave; 1474 goto leave;
1646 1475
1647 case TRIGGER_BUTTON: 1476 case TRIGGER_BUTTON:
1648 case TRIGGER_PEDESTAL: 1477 case TRIGGER_PEDESTAL:
1649 case TRIGGER_ALTAR: 1478 case TRIGGER_ALTAR:
… …
1667 * Processing will happen if the head runs into the pit 1496 * Processing will happen if the head runs into the pit
1668 */ 1497 */
1669 if (victim->head) 1498 if (victim->head)
1670 goto leave; 1499 goto leave;
1671 1500
1672 play_sound_map (victim->map, victim->x, victim->y, SOUND_FALL_HOLE); 1501 victim->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
1673 new_draw_info (NDI_UNIQUE, 0, victim, "You fall through the hole!\n"); 1502 victim->statusmsg ("You fall through the hole!", NDI_RED);
1674 transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim); 1503 transfer_ob (victim, EXIT_X (trap), EXIT_Y (trap), 1, victim);
1675 goto leave; 1504 goto leave;
1676 1505
1677 case EXIT: 1506 case EXIT:
1678 if (victim->type == PLAYER && EXIT_PATH (trap)) 1507 if (victim->type == PLAYER && EXIT_PATH (trap))
1679 { 1508 {
1680 /* Basically, don't show exits leading to random maps the 1509 /* Basically, don't show exits leading to random maps the
1681 * players output. 1510 * players output.
1682 */ 1511 */
1683 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2) && strncmp (EXIT_PATH (trap), "/random/", 8)) 1512 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2))
1684 new_draw_info (NDI_NAVY, 0, victim, trap->msg); 1513 victim->statusmsg (trap->msg, NDI_NAVY);
1514
1515 trap->play_sound (trap->sound);
1685 enter_exit (victim, trap); 1516 victim->enter_exit (trap);
1686 } 1517 }
1687 goto leave; 1518 goto leave;
1688 1519
1689 case ENCOUNTER: 1520 case ENCOUNTER:
1690 /* may be some leftovers on this */ 1521 /* may be some leftovers on this */
… …
1705 1536
1706 apply_sign (victim, trap, 1); 1537 apply_sign (victim, trap, 1);
1707 goto leave; 1538 goto leave;
1708 1539
1709 case CONTAINER: 1540 case CONTAINER:
1710 if (victim->type == PLAYER)
1711 (void) esrv_apply_container (victim, trap);
1712 else
1713 (void) apply_container (victim, trap); 1541 apply_container (victim, trap);
1714 goto leave; 1542 goto leave;
1715 1543
1716 case RUNE: 1544 case RUNE:
1717 case TRAP: 1545 case TRAP:
1718 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE)) 1546 if (trap->level && QUERY_FLAG (victim, FLAG_ALIVE))
1719 {
1720 spring_trap (trap, victim); 1547 spring_trap (trap, victim);
1721 }
1722 goto leave; 1548 goto leave;
1723 1549
1724 default: 1550 default:
1725 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not " 1551 LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not "
1726 "handled in move_apply()\n", &trap->name, &trap->arch->name, trap->type); 1552 "handled in move_apply()\n", &trap->name, &trap->arch->archname, trap->type);
1727 goto leave; 1553 goto leave;
1728 } 1554 }
1729 1555
1730leave: 1556leave:
1731 recursion_depth--; 1557 recursion_depth--;
… …
1740 int lev_diff; 1566 int lev_diff;
1741 object *skill_ob; 1567 object *skill_ob;
1742 1568
1743 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ)) 1569 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
1744 { 1570 {
1745 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1571 op->failmsg ("You are unable to read while blind!");
1746 return; 1572 return;
1747 } 1573 }
1574
1748 if (tmp->msg == NULL) 1575 if (!tmp->msg)
1749 { 1576 {
1750 new_draw_info_format (NDI_UNIQUE, 0, op, "You open the %s and find it empty.", &tmp->name); 1577 op->failmsg (format ("You open the %s and find it empty.", &tmp->name));
1751 return; 1578 return;
1752 } 1579 }
1753 1580
1754 /* need a literacy skill to read stuff! */ 1581 /* need a literacy skill to read stuff! */
1755 skill_ob = find_skill_by_name (op, tmp->skill); 1582 skill_ob = find_skill_by_name (op, tmp->skill);
1756 if (!skill_ob) 1583 if (!skill_ob)
1757 { 1584 {
1758 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols."); 1585 op->failmsg (format ("You are unable to decipher the strange symbols. H<You lack the %s skill to read this.>", &tmp->skill));
1759 return; 1586 return;
1760 } 1587 }
1588
1761 lev_diff = tmp->level - (skill_ob->level + 5); 1589 lev_diff = tmp->level - (skill_ob->level + 5);
1762 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0) 1590 if (!QUERY_FLAG (op, FLAG_WIZ) && lev_diff > 0)
1763 { 1591 {
1764 if (lev_diff < 2) 1592 op->failmsg (lev_diff < 2 ? "This book is just barely beyond your comprehension."
1765 new_draw_info (NDI_UNIQUE, 0, op, "This book is just barely beyond your comprehension."); 1593 : lev_diff < 3 ? "This book is slightly beyond your comprehension."
1766 else if (lev_diff < 3) 1594 : lev_diff < 5 ? "This book is beyond your comprehension."
1767 new_draw_info (NDI_UNIQUE, 0, op, "This book is slightly beyond your comprehension."); 1595 : lev_diff < 8 ? "This book is quite a bit beyond your comprehension."
1768 else if (lev_diff < 5) 1596 : lev_diff < 15 ? "This book is way beyond your comprehension."
1769 new_draw_info (NDI_UNIQUE, 0, op, "This book is beyond your comprehension."); 1597 : "This book is totally beyond your comprehension.");
1770 else if (lev_diff < 8) 1598 return;
1771 new_draw_info (NDI_UNIQUE, 0, op, "This book is quite a bit beyond your comprehension."); 1599 }
1772 else if (lev_diff < 15) 1600
1773 new_draw_info (NDI_UNIQUE, 0, op, "This book is way beyond your comprehension."); 1601 readable_message_type *msgType = get_readable_message_type (tmp);
1602
1603 if (player *pl = op->contr)
1604 if (client *ns = pl->ns)
1605 if (ns->can_msg)
1606 pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n\n\n%s", (char *)long_desc (tmp, op), &tmp->msg));
1774 else 1607 else
1775 new_draw_info (NDI_UNIQUE, 0, op, "This book is totally beyond your comprehension.");
1776 return;
1777 }
1778
1779 readable_message_type *msgType = get_readable_message_type (tmp);
1780
1781 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, 1608 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1782 msgType->message_type, msgType->message_subtype, 1609 msgType->message_type, msgType->message_subtype,
1783 "You open the %s and start reading.\n%s", "%s\n%s", long_desc (tmp, op), &tmp->msg); 1610 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1611 long_desc (tmp, op), &tmp->msg);
1784 1612
1785 /* gain xp from reading */ 1613 /* gain xp from reading */
1786 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1614 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1787 { /* only if not read before */ 1615 { /* only if not read before */
1788 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1616 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
1789 1617
1790 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1618 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1791 { 1619 {
1792 /*exp_gain *= 2; because they just identified it too */ 1620 /*exp_gain *= 2; because they just identified it too */
1793 SET_FLAG (tmp, FLAG_IDENTIFIED); 1621 SET_FLAG (tmp, FLAG_IDENTIFIED);
1794 /* If in a container, update how it looks */ 1622
1795 if (tmp->env) 1623 if (object *pl = tmp->visible_to ())
1796 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1624 esrv_update_item (UPD_FLAGS | UPD_NAME, pl, tmp);
1797 else
1798 op->contr->socket.update_look = 1;
1799 } 1625 }
1626
1800 change_exp (op, exp_gain, skill_ob->skill, 0); 1627 change_exp (op, exp_gain, skill_ob->skill, 0);
1801 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */ 1628 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */
1802 } 1629 }
1803} 1630}
1804 1631
… …
1807 * op is the person learning the skill, tmp is the skill scroll object 1634 * op is the person learning the skill, tmp is the skill scroll object
1808 */ 1635 */
1809static void 1636static void
1810apply_skillscroll (object *op, object *tmp) 1637apply_skillscroll (object *op, object *tmp)
1811{ 1638{
1812 switch ((int) learn_skill (op, tmp)) 1639 switch (learn_skill (op, tmp))
1813 { 1640 {
1814 case 0: 1641 case 0:
1815 new_draw_info (NDI_UNIQUE, 0, op, "You already possess the knowledge "); 1642 op->play_sound (sound_find ("generic_fail"));
1816 new_draw_info_format (NDI_UNIQUE, 0, op, "held within the %s.\n", query_name (tmp)); 1643 op->failmsg (format ("You already possess the knowledge held within the %s.", query_name (tmp)));
1817 return; 1644 break;
1818 1645
1819 case 1: 1646 case 1:
1820 new_draw_info_format (NDI_UNIQUE, 0, op, "You succeed in learning %s", &tmp->skill);
1821 decrease_ob (tmp); 1647 tmp->decrease ();
1648 op->play_sound (sound_find ("skill_learn"));
1649 op->statusmsg (format ("You succeed in learning %s", &tmp->skill));
1822 return; 1650 break;
1823 1651
1824 default: 1652 default:
1653 tmp->decrease ();
1654 op->play_sound (sound_find ("generic_fail"));
1825 new_draw_info_format (NDI_UNIQUE, 0, op, "You fail to learn the knowledge of the %s.\n", query_name (tmp)); 1655 op->failmsg (format ("You fail to learn the knowledge of the %s.\n", query_name (tmp)));
1826 decrease_ob (tmp);
1827 return; 1656 break;
1828 } 1657 }
1829} 1658}
1830 1659
1831/** 1660/**
1832 * Actually makes op learn spell. 1661 * Actually makes op learn spell.
… …
1852 return; 1681 return;
1853 } 1682 }
1854 return; 1683 return;
1855 } 1684 }
1856 1685
1857 play_sound_player_only (op->contr, SOUND_LEARN_SPELL, 0, 0); 1686 op->contr->play_sound (sound_find ("learn_spell"));
1858 tmp = get_object (); 1687
1859 copy_object (spell, tmp); 1688 tmp = spell->clone ();
1860 insert_ob_in_ob (tmp, op); 1689 insert_ob_in_ob (tmp, op);
1861 1690
1862 if (special_prayer) 1691 if (special_prayer)
1863 {
1864 SET_FLAG (tmp, FLAG_STARTEQUIP); 1692 SET_FLAG (tmp, FLAG_STARTEQUIP);
1865 }
1866 1693
1867 esrv_add_spells (op->contr, tmp); 1694 esrv_add_spells (op->contr, tmp);
1868} 1695}
1869 1696
1870/** 1697/**
… …
1884 { 1711 {
1885 LOG (llevError, "BUG: do_forget_spell(): spell not known\n"); 1712 LOG (llevError, "BUG: do_forget_spell(): spell not known\n");
1886 return; 1713 return;
1887 } 1714 }
1888 1715
1889 new_draw_info_format (NDI_UNIQUE | NDI_NAVY, 0, op, "You lose knowledge of %s.", spell); 1716 op->failmsg (format ("You lose knowledge of %s.", spell));
1890 player_unready_range_ob (op->contr, spob); 1717 player_unready_range_ob (op->contr, spob);
1891 esrv_remove_spell (op->contr, spob); 1718 esrv_remove_spell (op->contr, spob);
1892 remove_ob (spob); 1719 spob->destroy ();
1893 free_object (spob);
1894} 1720}
1895 1721
1896/** 1722/**
1897 * Handles player applying a spellbook. 1723 * Handles player applying a spellbook.
1898 * Checks whether player has knowledge of required skill, doesn't already know the spell, 1724 * Checks whether player has knowledge of required skill, doesn't already know the spell,
… …
1903{ 1729{
1904 object *skop, *spell, *spell_skill; 1730 object *skop, *spell, *spell_skill;
1905 1731
1906 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ)) 1732 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
1907 { 1733 {
1908 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1734 op->failmsg ("You are unable to read while blind.");
1909 return; 1735 return;
1910 } 1736 }
1911 1737
1912 /* artifact_spellbooks have 'slaying' field point to a spell name, 1738 /* artifact_spellbooks have 'slaying' field point to a spell name,
1913 * instead of having their spell stored in stats.sp. These are 1739 * instead of having their spell stored in stats.sp. These are
1914 * legacy spellbooks 1740 * legacy spellbooks
1915 */ 1741 */
1916
1917 if (tmp->slaying != NULL) 1742 if (tmp->slaying)
1918 { 1743 {
1919 spell = arch_to_object (find_archetype_by_object_name (tmp->slaying)); 1744 spell = arch_to_object (find_archetype_by_object_name (tmp->slaying));
1920 if (!spell) 1745 if (!spell)
1921 { 1746 {
1922 new_draw_info_format (NDI_UNIQUE, 0, op, "The book's formula for %s is incomplete", &tmp->slaying); 1747 op->failmsg (format ("The book's formula for %s is incomplete.", &tmp->slaying));
1923 return; 1748 return;
1924 } 1749 }
1925 else 1750 else
1926 insert_ob_in_ob (spell, tmp); 1751 insert_ob_in_ob (spell, tmp);
1752
1927 tmp->slaying = NULL; 1753 tmp->slaying = 0;
1928 } 1754 }
1929 1755
1930 skop = find_skill_by_name (op, tmp->skill); 1756 skop = find_skill_by_name (op, tmp->skill);
1931 1757
1932 /* need a literacy skill to learn spells. Also, having a literacy level 1758 /* need a literacy skill to learn spells. Also, having a literacy level
1933 * lower than the spell will make learning the spell more difficult */ 1759 * lower than the spell will make learning the spell more difficult */
1934 if (!skop) 1760 if (!skop)
1935 { 1761 {
1936 new_draw_info (NDI_UNIQUE, 0, op, "You can't read! Your attempt fails."); 1762 op->failmsg (format ("You can't read! Your attempt fails. H<You lack the %s skill.>", &tmp->skill));
1937 return; 1763 return;
1938 } 1764 }
1939 1765
1940 spell = tmp->inv; 1766 spell = tmp->inv;
1767
1941 if (!spell) 1768 if (!spell)
1942 { 1769 {
1943 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name); 1770 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name);
1944 new_draw_info (NDI_UNIQUE, 0, op, "The spellbook symbols make no sense."); 1771 op->failmsg ("The spellbook symbols make no sense. This is a bug, please report!");
1945 return; 1772 return;
1946 } 1773 }
1947 1774
1948 if (spell->level > (skop->level + 10)) 1775 if (skop->level < int (sqrtf (spell->level) * 1.5f))
1949 { 1776 {
1950 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols."); 1777 op->failmsg (format ("You are unable to decipher the strange symbols. H<Your %s level is too low.>", &tmp->skill));
1951 return; 1778 return;
1952 } 1779 }
1953 1780
1954 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name); 1781 op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name));
1955 1782
1956 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1783 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1957 {
1958 identify (tmp); 1784 identify (tmp);
1959 if (tmp->env)
1960 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1961 else
1962 op->contr->socket.update_look = 1;
1963 }
1964 1785
1965 /* I removed the check for special_prayer_mark here - it didn't make 1786 /* I removed the check for special_prayer_mark here - it didn't make
1966 * a lot of sense - special prayers are not found in spellbooks, and 1787 * a lot of sense - special prayers are not found in spellbooks, and
1967 * if the player doesn't know the spell, doesn't make a lot of sense that 1788 * if the player doesn't know the spell, doesn't make a lot of sense that
1968 * they would have a special prayer mark. 1789 * they would have a special prayer mark.
1969 */ 1790 */
1970 if (check_spell_known (op, spell->name)) 1791 if (check_spell_known (op, spell->name))
1971 { 1792 {
1972 new_draw_info (NDI_UNIQUE, 0, op, "You already know that spell.\n"); 1793 op->statusmsg ("You already know that spell. H<It makes no sense to learn spells twice, and would only waste the spellbook.>\n");
1973 return; 1794 return;
1974 } 1795 }
1975 1796
1976 if (spell->skill) 1797 if (spell->skill)
1977 { 1798 {
1978 spell_skill = find_skill_by_name (op, spell->skill); 1799 spell_skill = find_skill_by_name (op, spell->skill);
1979 1800
1980 if (!spell_skill) 1801 if (!spell_skill)
1981 { 1802 {
1982 new_draw_info_format (NDI_UNIQUE, 0, op, "You lack the skill %s to use this spell", &spell->skill); 1803 op->failmsg (format ("You lack the skill %s to use this spell.", &spell->skill));
1983 return; 1804 return;
1984 } 1805 }
1985 1806
1986 if (spell_skill->level < spell->level) 1807 if (spell_skill->level < spell->level)
1987 { 1808 {
1988 new_draw_info_format (NDI_UNIQUE, 0, op, "You need to be level %d in %s to learn this spell.", spell->level, &spell->skill); 1809 op->failmsg (format ("You need to be level %d in %s to learn this spell.", spell->level, &spell->skill));
1989 return; 1810 return;
1990 } 1811 }
1991 } 1812 }
1992 1813
1993 /* Logic as follows 1814 /* Logic as follows
… …
2002 * Overall, chances are the same but a player will find having a high 1823 * Overall, chances are the same but a player will find having a high
2003 * literacy rate very useful! -b.t. 1824 * literacy rate very useful! -b.t.
2004 */ 1825 */
2005 if (QUERY_FLAG (op, FLAG_CONFUSED)) 1826 if (QUERY_FLAG (op, FLAG_CONFUSED))
2006 { 1827 {
2007 new_draw_info (NDI_UNIQUE, 0, op, "In your confused state you flub the wording of the text!"); 1828 op->failmsg ("In your confused state you flub the wording of the text!");
2008 scroll_failure (op, 0 - random_roll (0, spell->level, op, PREFER_LOW), MAX (spell->stats.sp, spell->stats.grace)); 1829 scroll_failure (op, 0 - random_roll (0, spell->level, op, PREFER_LOW), MAX (spell->stats.sp, spell->stats.grace));
2009 } 1830 }
2010 else if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || 1831 else if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) ||
2011 (random_roll (0, 100, op, PREFER_LOW) - (5 * skop->level)) < learn_spell[spell->stats.grace ? op->stats.Wis : op->stats.Int]) 1832 (random_roll (0, 100, op, PREFER_LOW) - (5 * skop->level)) < learn_spell[spell->stats.grace ? op->stats.Wis : op->stats.Int])
2012 { 1833 {
2013 1834 op->statusmsg ("You succeed in learning the spell!", NDI_GREEN);
2014 new_draw_info (NDI_UNIQUE, 0, op, "You succeed in learning the spell!");
2015 do_learn_spell (op, spell, 0); 1835 do_learn_spell (op, spell, 0);
2016 1836
2017 /* xp gain to literacy for spell learning */ 1837 /* xp gain to literacy for spell learning */
2018 if (!QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 1838 if (!QUERY_FLAG (tmp, FLAG_STARTEQUIP))
2019 change_exp (op, calc_skill_exp (op, tmp, skop), skop->skill, 0); 1839 change_exp (op, calc_skill_exp (op, tmp, skop), skop->skill, 0);
2020 } 1840 }
2021 else 1841 else
2022 { 1842 {
2023 play_sound_player_only (op->contr, SOUND_FUMBLE_SPELL, 0, 0); 1843 op->contr->play_sound (sound_find ("fumble_spell"));
2024 new_draw_info (NDI_UNIQUE, 0, op, "You fail to learn the spell.\n"); 1844 op->failmsg ("You fail to learn the spell. H<Wis (priests) or Int (wizards) governs the chance of learning a prayer or spell.>\n");
2025 } 1845 }
2026 decrease_ob (tmp); 1846
1847 tmp->decrease ();
2027} 1848}
2028 1849
2029/** 1850/**
2030 * Handles applying a spell scroll. 1851 * Handles applying a spell scroll.
2031 */ 1852 */
… …
2034{ 1855{
2035 object *skop; 1856 object *skop;
2036 1857
2037 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ)) 1858 if (QUERY_FLAG (op, FLAG_BLIND) && !QUERY_FLAG (op, FLAG_WIZ))
2038 { 1859 {
2039 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to read while blind."); 1860 op->failmsg ("You are unable to read while blind.");
2040 return; 1861 return;
2041 } 1862 }
2042 1863
2043 if (!tmp->inv || tmp->inv->type != SPELL) 1864 if (!tmp->inv || tmp->inv->type != SPELL)
2044 { 1865 {
2045 new_draw_info (NDI_UNIQUE, 0, op, "The scroll just doesn't make sense!"); 1866 op->failmsg ("The scroll just doesn't make sense! H<...and never will make sense.>");
2046 return; 1867 return;
2047 } 1868 }
2048 1869
2049 if (op->type == PLAYER) 1870 if (op->type == PLAYER)
2050 { 1871 {
… …
2056 */ 1877 */
2057 skop = find_skill_by_name (op, skill_names[SK_LITERACY]); 1878 skop = find_skill_by_name (op, skill_names[SK_LITERACY]);
2058 1879
2059 if (!skop) 1880 if (!skop)
2060 { 1881 {
2061 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols."); 1882 op->failmsg (format ("You are unable to decipher the strange symbols. H<You lack the %s skill.>", &skill_names[SK_LITERACY]));
2062 return; 1883 return;
2063 } 1884 }
2064 1885
2065 if ((exp_gain = calc_skill_exp (op, tmp, skop))) 1886 if ((exp_gain = calc_skill_exp (op, tmp, skop)))
2066 change_exp (op, exp_gain, skop->skill, 0); 1887 change_exp (op, exp_gain, skop->skill, 0);
2067 } 1888 }
2068 1889
2069 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1890 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
2070 identify (tmp); 1891 identify (tmp);
2071 1892
2072 new_draw_info_format (NDI_BLACK, 0, op, "The scroll of %s turns to dust.", &tmp->inv->name); 1893 op->statusmsg (format ("The scroll of %s turns to dust.", &tmp->inv->name));
2073
2074 1894
2075 cast_spell (op, tmp, dir, tmp->inv, NULL); 1895 cast_spell (op, tmp, dir, tmp->inv, NULL);
2076 decrease_ob (tmp); 1896 tmp->decrease ();
2077} 1897}
2078 1898
2079/** 1899/**
2080 * Applies a treasure object - by default, chest. op 1900 * Applies a treasure object - by default, chest. op
2081 * is the person doing the applying, tmp is the treasure 1901 * is the person doing the applying, tmp is the treasure
2082 * chest. 1902 * chest.
2083 */ 1903 */
2084static void 1904static void
2085apply_treasure (object *op, object *tmp) 1905apply_treasure (object *op, object *tmp)
2086{ 1906{
2087 object *treas;
2088
2089
2090 /* Nice side effect of new treasure creation method is that the treasure 1907 /* Nice side effect of this treasure creation method is that the treasure
2091 * for the chest is done when the chest is created, and put into the chest 1908 * for the chest is done when the chest is created, and put into the chest
2092 * inventory. So that when the chest burns up, the items still exist. Also 1909 * inventory. So that when the chest burns up, the items still exist. Also
2093 * prevents people fromt moving chests to more difficult maps to get better 1910 * prevents people from moving chests to more difficult maps to get better
2094 * treasure 1911 * treasure
2095 */ 1912 */
2096
2097 treas = tmp->inv; 1913 object *treas = tmp->inv;
2098 if (treas == NULL) 1914
1915 if (!treas)
2099 { 1916 {
2100 new_draw_info (NDI_UNIQUE, 0, op, "The chest was empty."); 1917 op->statusmsg ("The chest was empty.");
2101 decrease_ob (tmp); 1918 tmp->decrease ();
2102 return; 1919 return;
2103 } 1920 }
1921
2104 while (tmp->inv) 1922 while (tmp->inv)
2105 { 1923 {
2106 treas = tmp->inv; 1924 treas = tmp->inv;
2107 1925 treas->remove ();
2108 remove_ob (treas);
2109 new_draw_info_format (NDI_UNIQUE, 0, op, "You find %s in the chest.", query_name (treas));
2110 1926
2111 treas->x = op->x; 1927 treas->x = op->x;
2112 treas->y = op->y; 1928 treas->y = op->y;
2113 treas = insert_ob_in_map (treas, op->map, op, INS_BELOW_ORIGINATOR); 1929 treas = insert_ob_in_map (treas, op->map, op, INS_BELOW_ORIGINATOR);
2114 1930
2115 if (treas && (treas->type == RUNE || treas->type == TRAP) && treas->level && QUERY_FLAG (op, FLAG_ALIVE)) 1931 if (treas && (treas->type == RUNE || treas->type == TRAP) && treas->level && QUERY_FLAG (op, FLAG_ALIVE))
2116 spring_trap (treas, op); 1932 spring_trap (treas, op);
1933
2117 /* If either player or container was destroyed, no need to do 1934 /* If either player or container was destroyed, no need to do
2118 * further processing. I think this should be enclused with 1935 * further processing. I think this should be enclused with
2119 * spring trap above, as I don't think there is otherwise 1936 * spring trap above, as I don't think there is otherwise
2120 * any way for the treasure chest or player to get killed 1937 * any way for the treasure chest or player to get killed.
2121 */ 1938 */
2122 if (op->destroyed () || tmp->destroyed ()) 1939 if (op->destroyed () || tmp->destroyed ())
2123 break; 1940 break;
2124 } 1941 }
2125 1942
2126 if (!tmp->destroyed () && tmp->inv == NULL) 1943 if (!tmp->destroyed () && !tmp->inv)
2127 decrease_ob (tmp); 1944 tmp->decrease ();
2128
2129} 1945}
2130 1946
2131/** 1947/**
2132 * op eats food. 1948 * op eats food.
2133 * If player, takes care of messages and dragon special food. 1949 * If player, takes care of messages and dragon special food.
… …
2148 { 1964 {
2149 /* usual case - no dragon meal: */ 1965 /* usual case - no dragon meal: */
2150 if (op->stats.food + tmp->stats.food > 999) 1966 if (op->stats.food + tmp->stats.food > 999)
2151 { 1967 {
2152 if (tmp->type == FOOD || tmp->type == FLESH) 1968 if (tmp->type == FOOD || tmp->type == FLESH)
2153 new_draw_info (NDI_UNIQUE, 0, op, "You feel full, but what a waste of food!"); 1969 op->failmsg ("You feel full, but what a waste of food!");
2154 else 1970 else
2155 new_draw_info (NDI_UNIQUE, 0, op, "Most of the drink goes down your face not your throat!"); 1971 op->statusmsg ("Most of the drink goes down your face not your throat!");
2156 } 1972 }
1973
1974 tmp->play_sound (
1975 tmp->sound
1976 ? tmp->sound
1977 : tmp->type == DRINK
1978 ? sound_find ("eat_drink")
1979 : sound_find ("eat_food")
1980 );
2157 1981
2158 if (!QUERY_FLAG (tmp, FLAG_CURSED)) 1982 if (!QUERY_FLAG (tmp, FLAG_CURSED))
2159 { 1983 {
2160 char buf[MAX_BUF]; 1984 const char *buf;
2161 1985
2162 if (!is_dragon_pl (op)) 1986 if (!is_dragon_pl (op))
2163 { 1987 {
2164 /* eating message for normal players */ 1988 /* eating message for normal players */
2165 if (tmp->type == DRINK) 1989 if (tmp->type == DRINK)
2166 sprintf (buf, "Ahhh...that %s tasted good.", &tmp->name); 1990 buf = format ("Ahhh...that %s tasted good.", &tmp->name);
2167 else 1991 else
2168 sprintf (buf, "The %s tasted %s", &tmp->name, tmp->type == FLESH ? "terrible!" : "good."); 1992 buf = format ("The %s tasted %s", &tmp->name, tmp->type == FLESH ? "terrible!" : "good.");
2169 } 1993 }
2170 else 1994 else
2171 {
2172 /* eating message for dragon players */ 1995 /* eating message for dragon players */
2173 sprintf (buf, "The %s tasted terrible!", &tmp->name); 1996 buf = format ("The %s tasted terrible!", &tmp->name);
2174 }
2175 1997
2176 new_draw_info (NDI_UNIQUE, 0, op, buf); 1998 op->statusmsg (buf);
1999
2177 capacity_remaining = 999 - op->stats.food; 2000 capacity_remaining = 999 - op->stats.food;
2178 op->stats.food += tmp->stats.food; 2001 op->stats.food += tmp->stats.food;
2179 if (capacity_remaining < tmp->stats.food) 2002 if (capacity_remaining < tmp->stats.food)
2180 op->stats.hp += capacity_remaining / 50; 2003 op->stats.hp += capacity_remaining / 50;
2181 else 2004 else
2182 op->stats.hp += tmp->stats.food / 50; 2005 op->stats.hp += tmp->stats.food / 50;
2006
2183 if (op->stats.hp > op->stats.maxhp) 2007 if (op->stats.hp > op->stats.maxhp)
2184 op->stats.hp = op->stats.maxhp; 2008 op->stats.hp = op->stats.maxhp;
2185 if (op->stats.food > 999) 2009 if (op->stats.food > 999)
2186 op->stats.food = 999; 2010 op->stats.food = 999;
2187 } 2011 }
… …
2189 /* special food hack -b.t. */ 2013 /* special food hack -b.t. */
2190 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED)) 2014 if (tmp->title || QUERY_FLAG (tmp, FLAG_CURSED))
2191 eat_special_food (op, tmp); 2015 eat_special_food (op, tmp);
2192 } 2016 }
2193 } 2017 }
2018
2194 handle_apply_yield (tmp); 2019 handle_apply_yield (tmp);
2195 decrease_ob (tmp); 2020 tmp->decrease ();
2196} 2021}
2197 2022
2198/** 2023/**
2199 * A dragon is eating some flesh. If the flesh contains resistances, 2024 * A dragon is eating some flesh. If the flesh contains resistances,
2200 * there is a chance for the dragon's skin to get improved. 2025 * there is a chance for the dragon's skin to get improved.
… …
2210{ 2035{
2211 object *skin = NULL; /* pointer to dragon skin force */ 2036 object *skin = NULL; /* pointer to dragon skin force */
2212 object *abil = NULL; /* pointer to dragon ability force */ 2037 object *abil = NULL; /* pointer to dragon ability force */
2213 object *tmp = NULL; /* tmp. object */ 2038 object *tmp = NULL; /* tmp. object */
2214 2039
2215 char buf[MAX_BUF]; /* tmp. string buffer */
2216 double chance; /* improvement-chance of one resistance type */ 2040 double chance; /* improvement-chance of one resistance type */
2217 double totalchance = 1; /* total chance of gaining one resistance */ 2041 double totalchance = 1; /* total chance of gaining one resistance */
2218 double bonus = 0; /* level bonus (improvement is easier at lowlevel) */ 2042 double bonus = 0; /* level bonus (improvement is easier at lowlevel) */
2219 double mbonus = 0; /* monster bonus */ 2043 double mbonus = 0; /* monster bonus */
2220 int atnr_winner[NROFATTACKS]; /* winning candidates for resistance improvement */ 2044 int atnr_winner[NROFATTACKS]; /* winning candidates for resistance improvement */
… …
2225 if (meal->type != FLESH || !is_dragon_pl (op)) 2049 if (meal->type != FLESH || !is_dragon_pl (op))
2226 return 0; 2050 return 0;
2227 2051
2228 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces 2052 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces
2229 from the player's inventory */ 2053 from the player's inventory */
2230 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2054 for (tmp = op->inv; tmp; tmp = tmp->below)
2231 {
2232 if (tmp->type == FORCE) 2055 if (tmp->type == FORCE)
2233 { 2056 if (tmp->arch->archname == shstr_dragon_skin_force)
2234 if (strcmp (tmp->arch->name, "dragon_skin_force") == 0)
2235 skin = tmp; 2057 skin = tmp;
2236 else if (strcmp (tmp->arch->name, "dragon_ability_force") == 0) 2058 else if (tmp->arch->archname == shstr_dragon_ability_force)
2237 abil = tmp; 2059 abil = tmp;
2238 }
2239 }
2240 2060
2241 /* if either skin or ability are missing, this is an old player 2061 /* if either skin or ability are missing, this is an old player
2242 which is not to be considered a dragon -> bail out */ 2062 which is not to be considered a dragon -> bail out */
2243 if (skin == NULL || abil == NULL) 2063 if (skin == NULL || abil == NULL)
2244 return 0; 2064 return 0;
… …
2246 /* now start by filling stomache and health, according to food-value */ 2066 /* now start by filling stomache and health, according to food-value */
2247 if ((999 - op->stats.food) < meal->stats.food) 2067 if ((999 - op->stats.food) < meal->stats.food)
2248 op->stats.hp += (999 - op->stats.food) / 50; 2068 op->stats.hp += (999 - op->stats.food) / 50;
2249 else 2069 else
2250 op->stats.hp += meal->stats.food / 50; 2070 op->stats.hp += meal->stats.food / 50;
2071
2251 if (op->stats.hp > op->stats.maxhp) 2072 if (op->stats.hp > op->stats.maxhp)
2252 op->stats.hp = op->stats.maxhp; 2073 op->stats.hp = op->stats.maxhp;
2253 2074
2254 op->stats.food = MIN (999, op->stats.food + meal->stats.food); 2075 op->stats.food = MIN (999, op->stats.food + meal->stats.food);
2255 2076
… …
2285 /* doubled chance for resistance of ability-focus */ 2106 /* doubled chance for resistance of ability-focus */
2286 if (i == abil->stats.exp) 2107 if (i == abil->stats.exp)
2287 chance = MIN (100., chance * 2.); 2108 chance = MIN (100., chance * 2.);
2288 2109
2289 /* now make the throw and save all winners (Don't insert luck bonus here!) */ 2110 /* now make the throw and save all winners (Don't insert luck bonus here!) */
2290 if (RANDOM () % 10000 < (int) (chance * 100)) 2111 if (rndm (10000) < (unsigned int) (chance * 100))
2291 { 2112 {
2292 atnr_winner[winners] = i; 2113 atnr_winner[winners] = i;
2293 winners++; 2114 winners++;
2294 } 2115 }
2295 2116
… …
2300 } 2121 }
2301 } 2122 }
2302 2123
2303 /* inverse totalchance as until now we have the failure-chance */ 2124 /* inverse totalchance as until now we have the failure-chance */
2304 totalchance = 100 - totalchance * 100; 2125 totalchance = 100 - totalchance * 100;
2126
2305 /* print message according to totalchance */ 2127 /* print message according to totalchance */
2128 const char *buf;
2306 if (totalchance > 50.) 2129 if (totalchance > 50.)
2307 sprintf (buf, "Hmm! The %s tasted delicious!", &meal->name); 2130 buf = format ("Hmm! The %s tasted delicious!", &meal->name);
2308 else if (totalchance > 10.) 2131 else if (totalchance > 10.)
2309 sprintf (buf, "The %s tasted very good.", &meal->name); 2132 buf = format ("The %s tasted very good.", &meal->name);
2310 else if (totalchance > 1.) 2133 else if (totalchance > 1.)
2311 sprintf (buf, "The %s tasted good.", &meal->name); 2134 buf = format ("The %s tasted good.", &meal->name);
2312 else if (totalchance > 0.1) 2135 else if (totalchance > 0.1)
2313 sprintf (buf, "The %s tasted bland.", &meal->name); 2136 buf = format ("The %s tasted bland.", &meal->name);
2314 else if (totalchance >= 0.01) 2137 else if (totalchance >= 0.01)
2315 sprintf (buf, "The %s had a boring taste.", &meal->name); 2138 buf = format ("The %s had a boring taste.", &meal->name);
2316 else if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat)) 2139 else if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat))
2317 sprintf (buf, "The %s tasted strange.", &meal->name); 2140 buf = format ("The %s tasted strange.", &meal->name);
2318 else 2141 else
2319 sprintf (buf, "The %s had no taste.", &meal->name); 2142 buf = format ("The %s had no taste.", &meal->name);
2320 new_draw_info (NDI_UNIQUE, 0, op, buf); 2143
2144 op->statusmsg (buf);
2321 2145
2322 /* now choose a winner if we have any */ 2146 /* now choose a winner if we have any */
2323 i = -1; 2147 i = -1;
2324 if (winners > 0) 2148 if (winners > 0)
2325 i = atnr_winner[RANDOM () % winners]; 2149 i = atnr_winner[RANDOM () % winners];
2326 2150
2327 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95) 2151 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95)
2328 { 2152 {
2329 /* resistance increased! */ 2153 /* resistance increased! */
2330 skin->resist[i]++; 2154 skin->resist[i]++;
2331 fix_player (op); 2155 op->update_stats ();
2332 2156
2333 sprintf (buf, "Your skin is now more resistant to %s!", change_resist_msg[i]); 2157 op->statusmsg (format ("Your skin is now more resistant to %s!", change_resist_msg[i]));
2334 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, buf);
2335 } 2158 }
2336 2159
2337 /* if this flesh contains a new ability focus, we mark it 2160 /* if this flesh contains a new ability focus, we mark it
2338 into the ability_force and it will take effect on next level */ 2161 into the ability_force and it will take effect on next level */
2339 if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat) && meal->last_eat != abil->last_eat) 2162 if (meal->last_eat > 0 && atnr_is_dragon_enabled (meal->last_eat) && meal->last_eat != abil->last_eat)
2340 { 2163 {
2341 abil->last_eat = meal->last_eat; /* write: last_eat <new attnr focus> */ 2164 abil->last_eat = meal->last_eat; /* write: last_eat <new attnr focus> */
2342 2165
2343 if (meal->last_eat != abil->stats.exp) 2166 if (meal->last_eat != abil->stats.exp)
2167 op->statusmsg (format (
2168 "Your metabolism prepares to focus on %s!\n"
2169 "The change will happen at level %d.",
2170 change_resist_msg[meal->last_eat],
2171 abil->level + 1
2344 { 2172 ));
2345 sprintf (buf, "Your metabolism prepares to focus on %s!", change_resist_msg[meal->last_eat]);
2346 new_draw_info (NDI_UNIQUE, 0, op, buf);
2347 sprintf (buf, "The change will happen at level %d", abil->level + 1);
2348 new_draw_info (NDI_UNIQUE, 0, op, buf);
2349 }
2350 else 2173 else
2351 { 2174 {
2352 sprintf (buf, "Your metabolism will continue to focus on %s.", change_resist_msg[meal->last_eat]); 2175 op->statusmsg (format ("Your metabolism will continue to focus on %s.", change_resist_msg[meal->last_eat]));
2353 new_draw_info (NDI_UNIQUE, 0, op, buf);
2354 abil->last_eat = 0; 2176 abil->last_eat = 0;
2355 } 2177 }
2356 } 2178 }
2179
2357 return 1; 2180 return 1;
2358}
2359
2360static void
2361apply_savebed (object *pl)
2362{
2363#ifndef COZY_SERVER
2364 if (!pl->contr->name_changed || !pl->stats.exp)
2365 {
2366 new_draw_info (NDI_UNIQUE, 0, pl, "You don't deserve to save your character yet.");
2367 return;
2368 }
2369#endif
2370 INVOKE_PLAYER (LOGOUT, pl->contr);
2371 /* Need to call terminate_all_pets() before we remove the player ob */
2372 terminate_all_pets (pl);
2373 remove_ob (pl);
2374 pl->direction = 0;
2375 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, pl, "%s leaves the game.", &pl->name);
2376
2377 /* update respawn position */
2378 strcpy (pl->contr->savebed_map, pl->map->path);
2379 pl->contr->bed_x = pl->x;
2380 pl->contr->bed_y = pl->y;
2381
2382 strcpy (pl->contr->killer, "left");
2383 check_score (pl); /* Always check score */
2384 (void) save_player (pl, 0);
2385 pl->map->players--;
2386#if MAP_MAXTIMEOUT
2387 MAP_SWAP_TIME (pl->map) = MAP_TIMEOUT (pl->map);
2388#endif
2389 play_again (pl);
2390 pl->speed = 0;
2391 update_ob_speed (pl);
2392} 2181}
2393 2182
2394/** 2183/**
2395 * Handles applying an improve armor scroll. 2184 * Handles applying an improve armor scroll.
2396 * Does some sanity checks, then calls improve_armour. 2185 * Does some sanity checks, then calls improve_armour.
… …
2398static void 2187static void
2399apply_armour_improver (object *op, object *tmp) 2188apply_armour_improver (object *op, object *tmp)
2400{ 2189{
2401 object *armor; 2190 object *armor;
2402 2191
2403 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) 2192 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_NO_MAGIC))
2404 { 2193 {
2405 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll."); 2194 op->failmsg ("Something blocks the magic of the scroll. H<This area prevents magic effects.>");
2406 return; 2195 return;
2407 } 2196 }
2197
2408 armor = find_marked_object (op); 2198 armor = find_marked_object (op);
2199
2409 if (!armor) 2200 if (!armor)
2410 { 2201 {
2411 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark an armor object."); 2202 op->failmsg ("You need to mark an armor object. Use the right mouse button popup or the mark command to do this.");
2412 return; 2203 return;
2413 } 2204 }
2205
2414 if (armor->type != ARMOUR 2206 if (armor->type != ARMOUR
2415 && armor->type != CLOAK 2207 && armor->type != CLOAK
2416 && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET) 2208 && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET)
2417 { 2209 {
2418 new_draw_info (NDI_UNIQUE, 0, op, "Your marked item is not armour!\n"); 2210 op->failmsg ("Your marked item is not armour!\n");
2419 return; 2211 return;
2420 } 2212 }
2421 2213
2422 new_draw_info (NDI_UNIQUE, 0, op, "Applying armour enchantment."); 2214 op->statusmsg ("Applying armour enchantment.");
2423 improve_armour (op, tmp, armor); 2215 improve_armour (op, tmp, armor);
2424} 2216}
2425 2217
2426 2218void
2427extern void
2428apply_poison (object *op, object *tmp) 2219apply_poison (object *op, object *tmp)
2429{ 2220{
2221 object *poison = tmp->split (1);
2222
2430 if (op->type == PLAYER) 2223 if (op->type == PLAYER)
2431 { 2224 {
2432 play_sound_player_only (op->contr, SOUND_DRINK_POISON, 0, 0); 2225 op->contr->play_sound (sound_find ("drink_poison"));
2433 new_draw_info (NDI_UNIQUE, 0, op, "Yech! That tasted poisonous!"); 2226 op->failmsg ("Yech! That tasted poisonous!");
2434 strcpy (op->contr->killer, "poisonous booze"); 2227 op->contr->killer = poison;
2435 } 2228 }
2229
2436 if (tmp->stats.hp > 0) 2230 if (poison->stats.hp > 0)
2437 { 2231 {
2438 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", tmp->stats.hp); 2232 LOG (llevDebug, "Trying to poison player/monster for %d hp\n", poison->stats.hp);
2439 hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1); 2233 hit_player (op, poison->stats.hp, tmp, AT_POISON, 1);
2440 } 2234 }
2235
2441 op->stats.food -= op->stats.food / 4; 2236 op->stats.food -= op->stats.food / 4;
2442 handle_apply_yield (tmp); 2237 handle_apply_yield (poison);
2443 decrease_ob (tmp); 2238 poison->destroy ();
2444} 2239}
2445 2240
2446/** 2241/**
2447 * This fonction return true if the exit is not a 2 ways one or it is 2 ways, valid exit. 2242 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit.
2448 * A valid 2 way exit means: 2243 * A valid 2 way exit means:
2449 * -You can come back (there is another exit at the other side) 2244 * -You can come back (there is another exit at the other side)
2450 * -You are 2245 * -You are
2451 * ° the owner of the exit 2246 * ° the owner of the exit
2452 * ° or in the same party as the owner 2247 * ° or in the same party as the owner
2453 * 2248 *
2454 * Note: a owner in a 2 way exit is saved as the owner's name 2249 * Note: a owner in a 2 way exit is saved as the owner's name
2455 * in the field exit->name cause the field exit->owner doesn't 2250 * in the field exit->name cause the field exit->owner doesn't
2456 * survive in the swapping (in fact the whole exit doesn't survive). 2251 * survive in the swapping (in fact the whole exit doesn't survive).
2457 */ 2252 */
2458int 2253int
2459is_legal_2ways_exit (object *op, object *exit) 2254is_legal_2ways_exit (object *op, object *exit)
2460{ 2255{
2461 object *tmp;
2462 object *exit_owner;
2463 player *pp;
2464 maptile *exitmap;
2465
2466 if (exit->stats.exp != 1) 2256 if (exit->stats.exp != 1)
2467 return 1; /*This is not a 2 way, so it is legal */ 2257 return 1; /*This is not a 2 way, so it is legal */
2258
2259#if 0 //TODO
2468 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race) 2260 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race)
2469 return 0; /* This is a reset town portal */ 2261 return 0; /* This is a reset town portal */
2470 /* To know if an exit has a correspondant, we look at 2262#endif
2471 * all the exits in destination and try to find one with same path as 2263
2472 * the current exit's position */ 2264 LOG (llevError | logBacktrace, "sync map load due to %s\n", exit->debug_desc ());
2473 if (!strncmp (EXIT_PATH (exit), settings.localdir, strlen (settings.localdir))) 2265
2474 exitmap = ready_map_name (EXIT_PATH (exit), MAP_PLAYER_UNIQUE); 2266 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map);
2475 else 2267
2476 exitmap = ready_map_name (EXIT_PATH (exit), 0);
2477 if (exitmap) 2268 if (exitmap)
2478 { 2269 {
2270 exitmap->load_sync ();
2271
2479 tmp = get_map_ob (exitmap, EXIT_X (exit), EXIT_Y (exit)); 2272 object *tmp = exitmap->at (EXIT_X (exit), EXIT_Y (exit)).bot;
2273
2480 if (!tmp) 2274 if (!tmp)
2481 return 0; 2275 return 0;
2482 for ((tmp = get_map_ob (exitmap, EXIT_X (exit), EXIT_Y (exit))); tmp; tmp = tmp->above) 2276
2277 for (; tmp; tmp = tmp->above)
2483 { 2278 {
2484 if (tmp->type != EXIT) 2279 if (tmp->type != EXIT)
2485 continue; /*Not an exit */ 2280 continue; /*Not an exit */
2281
2486 if (!EXIT_PATH (tmp)) 2282 if (!EXIT_PATH (tmp))
2487 continue; /*Not a valid exit */ 2283 continue; /*Not a valid exit */
2284
2488 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y)) 2285 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y))
2489 continue; /*Not in the same place */ 2286 continue; /*Not in the same place */
2287
2490 if (strcmp (exit->map->path, EXIT_PATH (tmp)) != 0) 2288 if (exit->map->path != EXIT_PATH (tmp))
2491 continue; /*Not in the same map */ 2289 continue; /*Not in the same map */
2492 2290
2493 /* From here we have found the exit is valid. However we do 2291 /* From here we have found the exit is valid. However we do
2494 * here the check of the exit owner. It is important for the 2292 * here the check of the exit owner. It is important for the
2495 * town portals to prevent strangers from visiting your appartments 2293 * town portals to prevent strangers from visiting your appartments
2496 */ 2294 */
2497 if (!exit->race) 2295 if (!exit->race)
2498 return 1; /*No owner, free for all! */ 2296 return 1; /*No owner, free for all! */
2297
2499 exit_owner = NULL; 2298 object *exit_owner = 0;
2500 for (pp = first_player; pp; pp = pp->next) 2299
2300 for_all_players (pp)
2501 { 2301 {
2502 if (!pp->ob) 2302 if (!pp->ob)
2503 continue; 2303 continue;
2304
2504 if (pp->ob->name != exit->race) 2305 if (pp->ob->name != exit->race)
2505 continue; 2306 continue;
2307
2506 exit_owner = pp->ob; /*We found a player which correspond to the player name */ 2308 exit_owner = pp->ob; /*We found a player which correspond to the player name */
2507 break; 2309 break;
2508 } 2310 }
2311
2509 if (!exit_owner) 2312 if (!exit_owner)
2510 return 0; /* No more owner */ 2313 return 0; /* No more owner */
2314
2511 if (exit_owner->contr == op->contr) 2315 if (exit_owner->contr == op->contr)
2512 return 1; /*It is your exit */ 2316 return 1; /*It is your exit */
2317
2513 if (exit_owner && /*There is a owner */ 2318 if (exit_owner && /*There is a owner */
2514 (op->contr) && /*A player tries to pass */ 2319 (op->contr) && /*A player tries to pass */
2515 ((exit_owner->contr->party == NULL) || /*No pass if controller has no party */ 2320 ((exit_owner->contr->party == NULL) || /*No pass if controller has no party */
2516 (exit_owner->contr->party != op->contr->party))) /* Or not the same as op */ 2321 (exit_owner->contr->party != op->contr->party))) /* Or not the same as op */
2517 return 0; 2322 return 0;
2323
2518 return 1; 2324 return 1;
2519 } 2325 }
2520 } 2326 }
2327
2521 return 0; 2328 return 0;
2522} 2329}
2523
2524 2330
2525/** 2331/**
2526 * Main apply handler. 2332 * Main apply handler.
2527 * 2333 *
2528 * Checks for unpaid items before applying. 2334 * Checks for unpaid items before applying.
… …
2536 * being applied. 2342 * being applied.
2537 * 2343 *
2538 * aflag is special (always apply/unapply) flags. Nothing is done with 2344 * aflag is special (always apply/unapply) flags. Nothing is done with
2539 * them in this function - they are passed to apply_special 2345 * them in this function - they are passed to apply_special
2540 */ 2346 */
2541
2542int 2347int
2543manual_apply (object *op, object *tmp, int aflag) 2348manual_apply (object *op, object *tmp, int aflag)
2544{ 2349{
2545 if (tmp->head) 2350 if (tmp->head)
2546 tmp = tmp->head; 2351 tmp = tmp->head;
2547 2352
2548 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED)) 2353 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED))
2549 { 2354 {
2550 if (op->type == PLAYER) 2355 if (op->type == PLAYER)
2551 { 2356 {
2552 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first."); 2357 op->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>");
2553 return 1; 2358 return 1;
2554 } 2359 }
2555 else 2360 else
2556 {
2557 return 0; /* monsters just skip unpaid items */ 2361 return 0; /* monsters just skip unpaid items */
2558 }
2559 } 2362 }
2560 2363
2561 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op))) 2364 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op)))
2562 return RESULT_INT (0); 2365 return RESULT_INT (0);
2563 2366
2564 switch (tmp->type) 2367 switch (tmp->type)
2565 { 2368 {
2566
2567 case CF_HANDLE: 2369 case CF_HANDLE:
2568 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2370 op->play_sound (sound_find ("turn_handle"));
2569 play_sound_map (op->map, op->x, op->y, SOUND_TURN_HANDLE); 2371 op->statusmsg ("You turn the handle.");
2570 tmp->value = tmp->value ? 0 : 1; 2372 tmp->value = tmp->value ? 0 : 1;
2571 SET_ANIMATION (tmp, tmp->value); 2373 SET_ANIMATION (tmp, tmp->value);
2572 update_object (tmp, UP_OBJ_FACE); 2374 update_object (tmp, UP_OBJ_FACE);
2573 push_button (tmp); 2375 push_button (tmp);
2574 return 1; 2376 return 1;
2575 2377
2576 case TRIGGER: 2378 case TRIGGER:
2577 if (check_trigger (tmp, op)) 2379 if (check_trigger (tmp, op))
2578 { 2380 {
2579 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2381 op->statusmsg ("You turn the handle.");
2580 play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE); 2382 op->play_sound (sound_find ("turn_handle"));
2581 } 2383 }
2582 else 2384 else
2583 { 2385 op->failmsg ("The handle doesn't move.");
2584 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move."); 2386
2585 }
2586 return 1; 2387 return 1;
2587 2388
2588 case EXIT: 2389 case EXIT:
2589 if (op->type != PLAYER) 2390 if (op->type != PLAYER)
2590 return 0; 2391 return 0;
2392
2591 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2393 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp))
2592 { 2394 op->failmsg (format ("The %s is closed.", query_name (tmp)));
2593 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp));
2594 }
2595 else 2395 else
2596 { 2396 {
2597 /* Don't display messages for random maps. */ 2397 /* Don't display messages for random maps. */
2598 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2) && strncmp (EXIT_PATH (tmp), "/random/", 8)) 2398 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2))
2599 new_draw_info (NDI_NAVY, 0, op, tmp->msg); 2399 op->statusmsg (tmp->msg, NDI_NAVY);
2400
2600 enter_exit (op, tmp); 2401 op->enter_exit (tmp);
2601 } 2402 }
2403
2404 return 1;
2405
2406 case INSCRIBABLE:
2407 op->statusmsg (tmp->msg);
2408 // maybe show a spell menu to chose from or something like that
2602 return 1; 2409 return 1;
2603 2410
2604 case SIGN: 2411 case SIGN:
2605 apply_sign (op, tmp, 0); 2412 apply_sign (op, tmp, 0);
2606 return 1; 2413 return 1;
… …
2610 { 2417 {
2611 apply_book (op, tmp); 2418 apply_book (op, tmp);
2612 return 1; 2419 return 1;
2613 } 2420 }
2614 else 2421 else
2615 {
2616 return 0; 2422 return 0;
2617 }
2618 2423
2619 case SKILLSCROLL: 2424 case SKILLSCROLL:
2620 if (op->type == PLAYER) 2425 if (op->type == PLAYER)
2621 { 2426 {
2622 apply_skillscroll (op, tmp); 2427 apply_skillscroll (op, tmp);
2623 return 1; 2428 return 1;
2624 } 2429 }
2430 else
2625 return 0; 2431 return 0;
2626 2432
2627 case SPELLBOOK: 2433 case SPELLBOOK:
2628 if (op->type == PLAYER) 2434 if (op->type == PLAYER)
2629 { 2435 {
2630 apply_spellbook (op, tmp); 2436 apply_spellbook (op, tmp);
2631 return 1; 2437 return 1;
2632 } 2438 }
2439 else
2633 return 0; 2440 return 0;
2634 2441
2635 case SCROLL: 2442 case SCROLL:
2636 apply_scroll (op, tmp, 0); 2443 apply_scroll (op, tmp, 0);
2637 return 1; 2444 return 1;
2638 2445
2639 case POTION: 2446 case POTION:
2640 (void) apply_potion (op, tmp); 2447 apply_potion (op, tmp);
2641 return 1; 2448 return 1;
2642 2449
2643 /* Eneq(@csd.uu.se): Handle apply on containers. */ 2450 /* Eneq(@csd.uu.se): Handle apply on containers. */
2451 //TODO: remove, as it is unsed?
2644 case CLOSE_CON: 2452 case CLOSE_CON:
2645 if (op->type == PLAYER)
2646 (void) esrv_apply_container (op, tmp->env);
2647 else
2648 (void) apply_container (op, tmp->env); 2453 apply_container (op, tmp->env);
2649 return 1; 2454 return 1;
2650 2455
2651 case CONTAINER: 2456 case CONTAINER:
2652 if (op->type == PLAYER)
2653 (void) esrv_apply_container (op, tmp);
2654 else
2655 (void) apply_container (op, tmp); 2457 apply_container (op, tmp);
2656 return 1; 2458 return 1;
2657 2459
2658 case TREASURE: 2460 case TREASURE:
2659 if (op->type == PLAYER) 2461 if (op->type == PLAYER)
2660 { 2462 {
2661 apply_treasure (op, tmp); 2463 apply_treasure (op, tmp);
2662 return 1; 2464 return 1;
2663 } 2465 }
2664 else 2466 else
2665 {
2666 return 0; 2467 return 0;
2667 }
2668 2468
2669 case WEAPON: 2469 case WEAPON:
2670 case ARMOUR: 2470 case ARMOUR:
2671 case BOOTS: 2471 case BOOTS:
2672 case GLOVES: 2472 case GLOVES:
… …
2685 case LAMP: 2485 case LAMP:
2686 case BUILDER: 2486 case BUILDER:
2687 case SKILL_TOOL: 2487 case SKILL_TOOL:
2688 if (tmp->env != op) 2488 if (tmp->env != op)
2689 return 2; /* not in inventory */ 2489 return 2; /* not in inventory */
2490
2690 (void) apply_special (op, tmp, aflag); 2491 apply_special (op, tmp, aflag);
2691 return 1; 2492 return 1;
2692 2493
2693 case DRINK: 2494 case DRINK:
2694 case FOOD: 2495 case FOOD:
2695 case FLESH: 2496 case FLESH:
… …
2699 case POISON: 2500 case POISON:
2700 apply_poison (op, tmp); 2501 apply_poison (op, tmp);
2701 return 1; 2502 return 1;
2702 2503
2703 case SAVEBED: 2504 case SAVEBED:
2704 if (op->type == PLAYER)
2705 {
2706 apply_savebed (op);
2707 return 1; 2505 return 1;
2708 }
2709 else
2710 {
2711 return 0;
2712 }
2713 2506
2714 case ARMOUR_IMPROVER: 2507 case ARMOUR_IMPROVER:
2715 if (op->type == PLAYER) 2508 if (op->type == PLAYER)
2716 { 2509 {
2717 apply_armour_improver (op, tmp); 2510 apply_armour_improver (op, tmp);
2718 return 1; 2511 return 1;
2719 } 2512 }
2720 else 2513 else
2721 {
2722 return 0; 2514 return 0;
2723 }
2724 2515
2725 case WEAPON_IMPROVER: 2516 case WEAPON_IMPROVER:
2726 (void) check_improve_weapon (op, tmp); 2517 check_improve_weapon (op, tmp);
2727 return 1; 2518 return 1;
2728 2519
2729 case CLOCK: 2520 case CLOCK:
2730 if (op->type == PLAYER) 2521 if (op->type == PLAYER)
2731 { 2522 {
2732 char buf[MAX_BUF]; 2523 char buf[MAX_BUF];
2733 timeofday_t tod; 2524 timeofday_t tod;
2734 2525
2735 get_tod (&tod); 2526 get_tod (&tod);
2527 op->play_sound (sound_find ("sound_clock"));
2528 op->statusmsg (format (
2736 sprintf (buf, "It is %d minute%s past %d o'clock %s", 2529 "It is %d minute%s past %d o'clock %s",
2737 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"), 2530 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"),
2738 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am")); 2531 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am")
2739 play_sound_player_only (op->contr, SOUND_CLOCK, 0, 0); 2532 ));
2740 new_draw_info (NDI_UNIQUE, 0, op, buf);
2741 return 1; 2533 return 1;
2742 } 2534 }
2743 else 2535 else
2744 {
2745 return 0; 2536 return 0;
2746 }
2747 2537
2748 case MENU: 2538 case MENU:
2749 if (op->type == PLAYER) 2539 if (op->type == PLAYER)
2750 { 2540 {
2751 shop_listing (op); 2541 shop_listing (tmp, op);
2752 return 1; 2542 return 1;
2753 } 2543 }
2754 else 2544 else
2755 {
2756 return 0; 2545 return 0;
2757 }
2758 2546
2759 case POWER_CRYSTAL: 2547 case POWER_CRYSTAL:
2760 apply_power_crystal (op, tmp); /* see egoitem.c */ 2548 apply_power_crystal (op, tmp); /* see egoitem.c */
2761 return 1; 2549 return 1;
2762 2550
… …
2765 { 2553 {
2766 apply_lighter (op, tmp); 2554 apply_lighter (op, tmp);
2767 return 1; 2555 return 1;
2768 } 2556 }
2769 else 2557 else
2770 {
2771 return 0; 2558 return 0;
2772 }
2773 2559
2774 case ITEM_TRANSFORMER: 2560 case ITEM_TRANSFORMER:
2775 apply_item_transformer (op, tmp); 2561 apply_item_transformer (op, tmp);
2776 return 1; 2562 return 1;
2777 2563
… …
2790int 2576int
2791player_apply (object *pl, object *op, int aflag, int quiet) 2577player_apply (object *pl, object *op, int aflag, int quiet)
2792{ 2578{
2793 int tmp; 2579 int tmp;
2794 2580
2795 if (op->env == NULL && (pl->move_type & MOVE_FLYING)) 2581 if (op->env && (pl->move_type & MOVE_FLYING))
2796 { 2582 {
2797 /* player is flying and applying object not in inventory */ 2583 /* player is flying and applying object not in inventory */
2798 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING)) 2584 if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
2799 { 2585 {
2800 new_draw_info (NDI_UNIQUE, 0, pl, "But you are floating high " "above the ground!"); 2586 pl->failmsg ("But you are floating high above the ground! H<You have to stop levitating first, if you can.>");
2801 return 0; 2587 return 0;
2802 } 2588 }
2803 } 2589 }
2804 2590
2805 /* Check for PLAYER to avoid a DM to disappear in a puff of smoke if
2806 * applied.
2807 */
2808 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_WAS_WIZ) && !QUERY_FLAG (pl, FLAG_WAS_WIZ))
2809 {
2810 play_sound_map (pl->map, pl->x, pl->y, SOUND_OB_EVAPORATE);
2811 new_draw_info (NDI_UNIQUE, 0, pl, "The object disappears in a puff " "of smoke!");
2812 new_draw_info (NDI_UNIQUE, 0, pl, "It must have been an illusion.");
2813 remove_ob (op);
2814 free_object (op);
2815 return 1;
2816 }
2817
2818 pl->contr->last_used = op; 2591 pl->contr->last_used = op;
2819 pl->contr->last_used_id = op->count;
2820 2592
2821 tmp = manual_apply (pl, op, aflag); 2593 tmp = manual_apply (pl, op, aflag);
2822 if (!quiet) 2594 if (!quiet)
2823 { 2595 {
2824 if (tmp == 0) 2596 if (tmp == 0)
2825 new_draw_info_format (NDI_UNIQUE, 0, pl, "I don't know how to apply the %s.", query_name (op)); 2597 pl->statusmsg (format ("I don't know how to apply the %s.", query_name (op)));
2826 else if (tmp == 2) 2598 else if (tmp == 2)
2827 new_draw_info_format (NDI_UNIQUE, 0, pl, "You must get it first!\n"); 2599 pl->failmsg ("You must get it first!\n");
2828 } 2600 }
2601
2829 return tmp; 2602 return tmp;
2830} 2603}
2831 2604
2832/** 2605/**
2833 * player_apply_below attempts to apply the object 'below' the player. 2606 * player_apply_below attempts to apply the object 'below' the player.
2834 * If the player has an open container, we use that for below, otherwise 2607 * If the player has an open container, we use that for below, otherwise
2835 * we use the ground. 2608 * we use the ground.
2836 */ 2609 */
2837
2838void 2610void
2839player_apply_below (object *pl) 2611player_apply_below (object *pl)
2840{ 2612{
2841 object *tmp, *next;
2842 int floors; 2613 int floors = 0;
2843 2614
2844 /* If using a container, set the starting item to be the top 2615 /* If using a container, set the starting item to be the top
2845 * item in the container. Otherwise, use the map. 2616 * item in the container. Otherwise, use the map.
2846 */
2847 tmp = (pl->container != NULL) ? pl->container->inv : pl->below;
2848
2849 /* This is perhaps more complicated. However, I want to make sure that 2617 * This is perhaps more complicated. However, I want to make sure that
2850 * we don't use a corrupt pointer for the next object, so we get the 2618 * we don't use a corrupt pointer for the next object, so we get the
2851 * next object in the stack before applying. This is can only be a 2619 * next object in the stack before applying. This is can only be a
2852 * problem if player_apply() has a bug in that it uses the object but does 2620 * problem if player_apply() has a bug in that it uses the object but does
2853 * not return a proper value. 2621 * not return a proper value.
2854 */ 2622 */
2855 for (floors = 0; tmp != NULL; tmp = next) 2623 for (object *next, *tmp = pl->container ? pl->container->inv : pl->below; tmp; tmp = next)
2856 { 2624 {
2857 next = tmp->below; 2625 next = tmp->below;
2626
2858 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 2627 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
2859 floors++; 2628 floors++;
2860 else if (floors > 0) 2629 else if (floors > 0)
2861 return; /* process only floor objects after first floor object */ 2630 return; /* process only floor objects after first floor object */
2862 2631
… …
2882 * to keep the size of apply_special to a more managable size. 2651 * to keep the size of apply_special to a more managable size.
2883 */ 2652 */
2884static int 2653static int
2885unapply_special (object *who, object *op, int aflags) 2654unapply_special (object *who, object *op, int aflags)
2886{ 2655{
2887 if (INVOKE_OBJECT (BE_UNREADY, op, ARG_OBJECT (who), ARG_INT (aflags)) || INVOKE_OBJECT (UNREADY, who, ARG_OBJECT (op), ARG_INT (aflags))) 2656 if (INVOKE_OBJECT (BE_UNREADY, op, ARG_OBJECT (who), ARG_INT (aflags))
2657 || INVOKE_OBJECT (UNREADY, who, ARG_OBJECT (op), ARG_INT (aflags)))
2888 return RESULT_INT (0); 2658 return RESULT_INT (0);
2889 2659
2890 object *tmp2;
2891
2892 CLEAR_FLAG (op, FLAG_APPLIED); 2660 CLEAR_FLAG (op, FLAG_APPLIED);
2661
2893 switch (op->type) 2662 switch (op->type)
2894 { 2663 {
2664 case SKILL_TOOL:
2665 // unapplying a skill tool should also unapply the skill it governs
2666 // but this is hard, as it shouldn't do so when the skill can
2667 // be used for other reasons
2668 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2669 if (tmp->skill == op->skill
2670 && tmp->type == SKILL
2671 && tmp->flag [FLAG_APPLIED]
2672 && !tmp->flag [FLAG_CAN_USE_SKILL])
2673 unapply_special (who, tmp, 0);
2674
2675 change_abil (who, op);
2676 break;
2677
2895 case WEAPON: 2678 case WEAPON:
2896 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwield %s.", query_name (op)); 2679 if (player *pl = who->contr)
2680 if (op == pl->combat_ob)
2681 {
2682 pl->combat_ob = 0;
2683 who->change_weapon (pl->ranged_ob);
2684 }
2897 2685
2686 who->statusmsg (format ("You unwield %s.", query_name (op)));
2687
2898 (void) change_abil (who, op); 2688 change_abil (who, op);
2899 if (QUERY_FLAG (who, FLAG_READY_WEAPON))
2900 CLEAR_FLAG (who, FLAG_READY_WEAPON); 2689 CLEAR_FLAG (who, FLAG_READY_WEAPON);
2901 clear_skill (who);
2902 break; 2690 break;
2903 2691
2904 case SKILL: /* allows objects to impart skills */
2905 case SKILL_TOOL: 2692 case SKILL:
2906 if (op != who->chosen_skill) 2693 if (who->contr)
2907 { 2694 {
2908 LOG (llevError, "BUG: apply_special(): applied skill is not a chosen skill\n"); 2695 if (!op->invisible)
2696 who->statusmsg (format ("You stop using the %s.", query_name (op)));
2697 else
2698 who->statusmsg (format ("You can no longer use the skill: %s.", &op->skill));
2909 } 2699 }
2910 if (who->type == PLAYER) 2700
2911 {
2912 if (who->contr->shoottype == range_skill)
2913 who->contr->shoottype = range_none;
2914 if (!op->invisible)
2915 {
2916 new_draw_info_format (NDI_UNIQUE, 0, who, "You stop using the %s.", query_name (op));
2917 }
2918 else
2919 {
2920 new_draw_info_format (NDI_UNIQUE, 0, who, "You can no longer use the skill: %s.", &op->skill);
2921 }
2922 }
2923 (void) change_abil (who, op); 2701 change_abil (who, op);
2924 who->chosen_skill = NULL;
2925 CLEAR_FLAG (who, FLAG_READY_SKILL); 2702 CLEAR_FLAG (who, FLAG_READY_SKILL);
2926 break; 2703 break;
2927 2704
2928 case ARMOUR: 2705 case ARMOUR:
2929 case HELMET: 2706 case HELMET:
… …
2933 case GLOVES: 2710 case GLOVES:
2934 case AMULET: 2711 case AMULET:
2935 case GIRDLE: 2712 case GIRDLE:
2936 case BRACERS: 2713 case BRACERS:
2937 case CLOAK: 2714 case CLOAK:
2938 new_draw_info_format (NDI_UNIQUE, 0, who, "You unwear %s.", query_name (op)); 2715 who->statusmsg (format ("You unwear %s.", query_name (op)));
2939 (void) change_abil (who, op); 2716 change_abil (who, op);
2940 break; 2717 break;
2718
2941 case LAMP: 2719 case LAMP:
2942 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn off your %s.", &op->name); 2720 {
2721 who->statusmsg (format ("You turn off your %s.", &op->name));
2722
2943 tmp2 = arch_to_object (op->other_arch); 2723 object *tmp2 = arch_to_object (op->other_arch);
2944 tmp2->x = op->x; 2724 tmp2->x = op->x;
2945 tmp2->y = op->y; 2725 tmp2->y = op->y;
2946 tmp2->map = op->map; 2726 tmp2->map = op->map;
2947 tmp2->below = op->below; 2727 tmp2->below = op->below;
2948 tmp2->above = op->above; 2728 tmp2->above = op->above;
2949 tmp2->stats.food = op->stats.food; 2729 tmp2->stats.food = op->stats.food;
2950 CLEAR_FLAG (tmp2, FLAG_APPLIED); 2730 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2951 2731
2952 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 2732 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2953 SET_FLAG (tmp2, FLAG_INV_LOCKED); 2733 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2954 2734
2955 if (who->type == PLAYER) 2735 op->destroy ();
2956 esrv_del_item (who->contr, op->count); 2736 who->insert (tmp2);
2737 who->update_stats ();
2957 2738
2958 remove_ob (op); 2739 if (who->contr)
2959 free_object (op); 2740 {
2960 insert_ob_in_ob (tmp2, who);
2961 fix_player (who);
2962 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 2741 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2963 {
2964 if (who->type == PLAYER)
2965 { 2742 {
2966 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 2743 who->failmsg ("Oops, it feels deadly cold!");
2967 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 2744 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2968 } 2745 }
2969 } 2746 }
2970 if (who->type == PLAYER) 2747 }
2971 esrv_send_item (who, tmp2); 2748
2972 return 1; /* otherwise, an attempt to drop causes problems */ 2749 return 1; /* otherwise, an attempt to drop causes problems */
2973 break; 2750
2974 case BOW: 2751 case BOW:
2975 case WAND: 2752 case WAND:
2976 case ROD: 2753 case ROD:
2977 case HORN: 2754 case HORN:
2978 clear_skill (who); 2755 if (player *pl = who->contr)
2979 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op));
2980 if (who->type == PLAYER)
2981 { 2756 {
2982 who->contr->shoottype = range_none; 2757 if (op == pl->ranged_ob)
2758 {
2759 pl->ranged_ob = 0;
2760 who->change_weapon (pl->combat_ob);
2761 }
2762
2763 who->statusmsg (format ("You unready %s.", query_name (op)));
2983 } 2764 }
2984 else 2765 else
2985 { 2766 {
2767 who->change_skill (0);
2768
2986 if (op->type == BOW) 2769 if (op->type == BOW)
2987 CLEAR_FLAG (who, FLAG_READY_BOW); 2770 CLEAR_FLAG (who, FLAG_READY_BOW);
2988 else 2771 else
2989 CLEAR_FLAG (who, FLAG_READY_RANGE); 2772 CLEAR_FLAG (who, FLAG_READY_RANGE);
2990 } 2773 }
2774
2991 break; 2775 break;
2992 2776
2993 case BUILDER: 2777 case BUILDER:
2994 new_draw_info_format (NDI_UNIQUE, 0, who, "You unready %s.", query_name (op)); 2778 if (who->contr)
2995 who->contr->shoottype = range_none; 2779 who->statusmsg (format ("You unready %s.", query_name (op)));
2996 who->contr->ranges[range_builder] = NULL;
2997 break; 2780 break;
2998 2781
2999 default: 2782 default:
3000 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op)); 2783 who->statusmsg (format ("You unapply %s.", query_name (op)));
3001 break; 2784 break;
3002 } 2785 }
3003 2786
3004 fix_player (who); 2787 if (aflags & AP_NO_MERGE || !merge_ob (op, 0))
3005 2788 if (object *pl = op->visible_to ())
3006 if (!(aflags & AP_NO_MERGE))
3007 {
3008 object *tmp;
3009
3010 tmp = merge_ob (op, NULL);
3011 if (who->type == PLAYER)
3012 {
3013 if (tmp)
3014 { /* it was merged */
3015 esrv_del_item (who->contr, op->count);
3016 op = tmp;
3017 }
3018
3019 esrv_send_item (who, op); 2789 esrv_send_item (pl, op);
3020 } 2790
3021 } 2791 who->update_stats ();
2792
3022 return 0; 2793 return 0;
3023} 2794}
3024 2795
3025/** 2796/**
3026 * Returns the object that is using location 'loc'. 2797 * Returns the object that is using location 'loc'.
3027 * Note that 'start' is the first object to start examing - we 2798 * Note that 'start' is the first object to start examing - we
3028 * then go through the below of this. In this way, you can do 2799 * then go through the below of this. In this way, you can do
3029 * something like: 2800 * something like:
3030 * tmp = get_item_from_body_location(who->inv, 1); 2801 * tmp = get_next_item_from_body_location(who->inv, 1);
3031 * if (tmp) tmp1 = get_item_from_body_location(tmp->below, 1); 2802 * if (tmp) tmp1 = get_next_item_from_body_location(tmp->below, 1);
3032 * to find the second object that may use this location, etc. 2803 * to find the second object that may use this location, etc.
3033 * Returns NULL if no match is found. 2804 * Returns NULL if no match is found.
3034 * loc is the index into the array we are looking for a match. 2805 * loc is the index into the array we are looking for a match.
3035 * don't return invisible objects unless they are skill objects 2806 * don't return invisible objects unless they are skill objects
3036 * invisible other objects that use 2807 * invisible other objects that use
3037 * up body locations can be used as restrictions. 2808 * up body locations can be used as restrictions.
3038 */ 2809 */
3039object * 2810static object *
3040get_item_from_body_location (object *start, int loc) 2811get_next_item_from_body_location (int loc, object *start)
3041{ 2812{
3042 object *tmp;
3043
3044 if (!start)
3045 return NULL;
3046
3047 for (tmp = start; tmp; tmp = tmp->below) 2813 for (object *tmp = start; tmp; tmp = tmp->below)
3048 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->body_info[loc] && (!tmp->invisible || tmp->type == SKILL)) 2814 if (tmp->flag [FLAG_APPLIED]
2815 && tmp->slot[loc].info
2816 && (!tmp->invisible || tmp->type == SKILL))
3049 return tmp; 2817 return tmp;
3050 2818
3051 return NULL; 2819 return 0;
3052} 2820}
3053
3054
3055 2821
3056/** 2822/**
3057 * 'op' wants to apply an object, but can't because of other equipment. 2823 * 'op' wants to apply an object, but can't because of other equipment.
3058 * This should only be called when it is known 2824 * This should only be called when it is known
3059 * that there are objects to unapply. This makes pretty heavy 2825 * that there are objects to unapply. This makes pretty heavy
… …
3062 * Returns 0 on success, returns 1 if there is some problem. 2828 * Returns 0 on success, returns 1 if there is some problem.
3063 * if aflags is AP_PRINT, we instead print out waht to unapply 2829 * if aflags is AP_PRINT, we instead print out waht to unapply
3064 * instead of doing it. This is a lot less code than having 2830 * instead of doing it. This is a lot less code than having
3065 * another function that does just that. 2831 * another function that does just that.
3066 */ 2832 */
2833
2834#define CANNOT_REMOVE_CURSED \
2835 "H<You cannot remove cursed or damned items, you first have to remove the curse. " \
2836 "Praying over an altar, scrolls of remove curse/damnation, " \
2837 "priests or even other players might help.>"
2838
3067int 2839int
3068unapply_for_ob (object *who, object *op, int aflags) 2840unapply_for_ob (object *who, object *op, int aflags)
3069{ 2841{
3070 int i; 2842 if (op->is_range ())
3071 object *tmp = NULL, *last;
3072
3073 /* If we are applying a shield or weapon, unapply any equipped shield
3074 * or weapons first - only allowed to use one weapon/shield at a time.
3075 */
3076 if (op->type == WEAPON || op->type == SHIELD)
3077 {
3078 for (tmp = who->inv; tmp; tmp = tmp->below) 2843 for (object *tmp = who->inv; tmp; tmp = tmp->below)
3079 {
3080 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type) 2844 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ())
3081 {
3082 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))) 2845 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)))
3083 { 2846 {
3084 if (aflags & AP_PRINT) 2847 if (aflags & AP_PRINT)
3085 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2848 who->failmsg (query_name (tmp));
3086 else 2849 else
3087 unapply_special (who, tmp, aflags); 2850 unapply_special (who, tmp, aflags);
3088 } 2851 }
3089 else 2852 else
3090 { 2853 {
3091 /* In this case, we want to try and remove a cursed item. 2854 /* In this case, we want to try and remove a cursed item.
3092 * While we know it won't work, we want unapply_special to 2855 * While we know it won't work, we want unapply_special to
3093 * at least generate the message. 2856 * at least generate the message.
3094 */ 2857 */
3095 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (tmp)); 2858 who->failmsg (format ("No matter how hard you try, you just can't remove the %s." CANNOT_REMOVE_CURSED, query_name (tmp)));
3096 return 1; 2859 return 1;
3097 }
3098
3099 } 2860 }
3100 }
3101 }
3102 2861
3103 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 2862 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
3104 { 2863 {
3105 /* this used up a slot that we need to free */ 2864 /* this used up a slot that we need to free */
3106 if (op->body_info[i]) 2865 if (op->slot[i].info)
3107 { 2866 {
3108 last = who->inv; 2867 object *last = who->inv;
3109 2868
3110 /* We do a while loop - may need to remove several items in order 2869 /* We do a while loop - may need to remove several items in order
3111 * to free up enough slots. 2870 * to free up enough slots.
3112 */ 2871 */
3113 while ((who->body_used[i] + op->body_info[i]) < 0) 2872 while ((who->slot[i].used + op->slot[i].info) < 0)
3114 { 2873 {
3115 tmp = get_item_from_body_location (last, i); 2874 object *tmp = get_next_item_from_body_location (i, last);
2875
3116 if (!tmp) 2876 if (!tmp)
3117 { 2877 {
3118#if 0 2878#if 0
3119 /* Not a bug - we'll get this if the player has cursed items 2879 /* Not a bug - we'll get this if the player has cursed items
3120 * equipped. 2880 * equipped.
3121 */ 2881 */
3122 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name); 2882 LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name);
3123#endif 2883#endif
3124 return 1; 2884 return 1;
3125 } 2885 }
2886
3126 /* If we are just printing, we don't care about cursed status */ 2887 /* If we are just printing, we don't care about cursed status */
3127 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))) 2888 if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))))
3128 { 2889 {
3129 if (aflags & AP_PRINT) 2890 if (aflags & AP_PRINT)
3130 new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp)); 2891 who->failmsg (query_name (tmp));
3131 else 2892 else
3132 unapply_special (who, tmp, aflags); 2893 unapply_special (who, tmp, aflags);
3133 } 2894 }
3134 else 2895 else
3135 { 2896 {
3136 /* Cursed item that we can't unequip - tell the player. 2897 /* Cursed item that we can't unequip - tell the player.
3137 * Note this could be annoying if this is just one of a few, 2898 * Note this could be annoying if this is just one of a few,
3138 * so it may not be critical (eg, putting on a ring and you have 2899 * so it may not be critical (eg, putting on a ring and you have
3139 * one cursed ring.) 2900 * one cursed ring.)
3140 */ 2901 */
3141 new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp)); 2902 who->failmsg (format ("The %s just won't come off." CANNOT_REMOVE_CURSED, query_name (tmp)));
3142 } 2903 }
2904
3143 last = tmp->below; 2905 last = tmp->below;
3144 } 2906 }
3145 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the 2907 /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the
3146 * return in the !tmp would have kicked in. 2908 * return in the !tmp would have kicked in.
3147 */ 2909 */
3148 } /* if op is using this body location */ 2910 } /* if op is using this body location */
3149 } /* for body lcoations */ 2911 } /* for body lcoations */
2912
3150 return 0; 2913 return 0;
3151} 2914}
3152 2915
3153/** 2916/**
3154 * Checks to see if 'who' can apply object 'op'. 2917 * Checks to see if 'who' can apply object 'op'.
3155 * Returns 0 if apply can be done without anything special. 2918 * Returns 0 if apply can be done without anything special.
3156 * Otherwise returns a bitmask - potentially several of these may be 2919 * Otherwise returns a bitmask - potentially several of these may be
3157 * set, but largely depends on circumstance - in the future, processing 2920 * set, but largely depends on circumstance - in the future, processing
3158 * may be pruned once we know some status (eg, once CAN_APPLY_NEVER 2921 * may be pruned once we know some status (eg, once CAN_APPLY_NEVER
3159 * is set, do we really are what the other flags may be?) 2922 * is set, do we really care what the other flags may be?)
3160 * 2923 *
3161 * See include/define.h for detailed description of the meaning of 2924 * See include/define.h for detailed description of the meaning of
3162 * these return values. 2925 * these return values.
3163 */ 2926 */
3164int 2927int
3165can_apply_object (object *who, object *op) 2928can_apply_object (object *who, object *op)
3166{ 2929{
3167 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op))) 2930 if (INVOKE_OBJECT (CAN_BE_APPLIED, op, ARG_OBJECT (who)) || INVOKE_OBJECT (CAN_APPLY, who, ARG_OBJECT (op)))
3168 return RESULT_INT (0); 2931 return RESULT_INT (0);
3169 2932
3170 int i, retval = 0; 2933 int retval = 0;
3171 object *tmp = NULL, *ws = NULL; 2934 object *tmp = 0, *ws = 0;
3172 2935
3173 /* Players have 2 'arm's, so they could in theory equip 2 shields or 2936 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
3174 * 2 weapons, but we don't want to let them do that. So if they are
3175 * trying to equip a weapon or shield, see if they already have one
3176 * in place and store that way.
3177 */
3178 if (op->type == WEAPON || op->type == SHIELD)
3179 { 2937 {
3180 for (tmp = who->inv; tmp && !ws; tmp = tmp->below) 2938 if (op->slot[i].info)
3181 { 2939 {
3182 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type) 2940 /* Item uses more slots than we have */
2941 if (who->slot[i].info + op->slot [i].info < 0)
3183 { 2942 {
3184 retval = CAN_APPLY_UNAPPLY;
3185 ws = tmp;
3186 }
3187 }
3188 }
3189
3190
3191 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
3192 {
3193 if (op->body_info[i])
3194 {
3195 /* Item uses more slots than we have */
3196 if (FABS (op->body_info[i]) > who->body_info[i])
3197 {
3198 /* Could return now for efficiently - rest of info below isn' 2943 /* Could return now for efficiency - rest of info below isn't
3199 * really needed. 2944 * really needed.
3200 */ 2945 */
3201 retval |= CAN_APPLY_NEVER; 2946 retval |= CAN_APPLY_NEVER;
3202 } 2947 }
3203 else if ((who->body_used[i] + op->body_info[i]) < 0) 2948 else if (who->slot[i].used + op->slot[i].info < 0)
3204 { 2949 {
3205 /* in this case, equipping this would use more free spots than 2950 /* in this case, equipping this would use more free spots than
3206 * we have. 2951 * we have.
3207 */ 2952 */
3208 object *tmp1;
3209
3210 2953
3211 /* if we have an applied weapon/shield, and unapply it would free 2954 /* if we have an applied weapon/shield, and unapply it would free
3212 * enough slots to equip the new item, then just set this can 2955 * enough slots to equip the new item, then just set "can
3213 * continue. We don't care about the logic below - if you have 2956 * apply unapply". We don't care about the logic below - if you have a
3214 * shield equipped and try to equip another shield, there is only 2957 * shield equipped and try to equip another shield, there is only
3215 * one choice. However, the check for the number of body locations 2958 * one choice. However, the check for the number of body locations
3216 * does take into the account cases where what is being applied 2959 * does take into the account cases where what is being applied
3217 * may be two handed for example. 2960 * may be two handed for example.
3218 */ 2961 */
3219 if (ws) 2962 if (ws)
3220 { 2963 if ((who->slot[i].used - ws->slot[i].info + op->slot[i].info) >= 0)
3221 if ((who->body_used[i] - ws->body_info[i] + op->body_info[i]) >= 0)
3222 { 2964 {
3223 retval |= CAN_APPLY_UNAPPLY; 2965 retval |= CAN_APPLY_UNAPPLY;
3224 continue; 2966 continue;
3225 } 2967 }
3226 }
3227 2968
3228 tmp1 = get_item_from_body_location (who->inv, i); 2969 object *tmp1 = get_next_item_from_body_location (i, who->inv);
3229 if (!tmp1) 2970 if (!tmp1)
3230 { 2971 {
3231#if 0 2972#if 0
3232 /* This is sort of an error, but happens a lot when old players 2973 /* This is sort of an error, but happens a lot when old players
3233 * join in with more stuff equipped than they are now allowed. 2974 * join in with more stuff equipped than they are now allowed.
… …
3241 /* need to unapply something. However, if this something 2982 /* need to unapply something. However, if this something
3242 * is different than we had found before, it means they need 2983 * is different than we had found before, it means they need
3243 * to apply multiple objects 2984 * to apply multiple objects
3244 */ 2985 */
3245 retval |= CAN_APPLY_UNAPPLY; 2986 retval |= CAN_APPLY_UNAPPLY;
2987
3246 if (!tmp) 2988 if (!tmp)
3247 tmp = tmp1; 2989 tmp = tmp1;
3248 else if (tmp != tmp1) 2990 else if (tmp != tmp1)
3249 {
3250 retval |= CAN_APPLY_UNAPPLY_MULT; 2991 retval |= CAN_APPLY_UNAPPLY_MULT;
3251 } 2992
3252 /* This object isn't using up all the slots, so there must 2993 /* This object isn't using up all the slots, so there must
3253 * be another. If so, and it the new item doesn't need all 2994 * be another. If so, and it the new item doesn't need all
3254 * the slots, the player then has a choice. 2995 * the slots, the player then has a choice.
3255 */ 2996 */
3256 if (((who->body_used[i] - tmp1->body_info[i]) != who->body_info[i]) && (FABS (op->body_info[i]) < who->body_info[i])) 2997 if ((who->slot[i].used - tmp1->slot[i].info != who->slot[i].info)
2998 && abs (op->slot[i].info) < who->slot[i].info)
3257 retval |= CAN_APPLY_UNAPPLY_CHOICE; 2999 retval |= CAN_APPLY_UNAPPLY_CHOICE;
3258 3000
3259 /* Does unequippint 'tmp1' free up enough slots for this to be 3001 /* Does unequippint 'tmp1' free up enough slots for this to be
3260 * equipped? If not, there must be something else to unapply. 3002 * equipped? If not, there must be something else to unapply.
3261 */ 3003 */
3262 if ((who->body_used[i] + op->body_info[i] - tmp1->body_info[i]) < 0) 3004 if (who->slot[i].used + op->slot[i].info < tmp1->slot[i].info)
3263 retval |= CAN_APPLY_UNAPPLY_MULT; 3005 retval |= CAN_APPLY_UNAPPLY_MULT;
3264
3265 } 3006 }
3266 } /* if not enough free slots */ 3007 } /* if not enough free slots */
3267 } /* if this object uses location i */ 3008 } /* if this object uses location i */
3268 } /* for i -> num_body_locations loop */ 3009 } /* for i -> num_body_locations loop */
3269 3010
… …
3274 * and weapons all use the same slot. Similar for horn/rod/wand - they 3015 * and weapons all use the same slot. Similar for horn/rod/wand - they
3275 * all use the same location. 3016 * all use the same location.
3276 */ 3017 */
3277 if (op->type == WEAPON && !QUERY_FLAG (who, FLAG_USE_WEAPON)) 3018 if (op->type == WEAPON && !QUERY_FLAG (who, FLAG_USE_WEAPON))
3278 retval |= CAN_APPLY_RESTRICTION; 3019 retval |= CAN_APPLY_RESTRICTION;
3020
3279 if (op->type == SHIELD && !QUERY_FLAG (who, FLAG_USE_SHIELD)) 3021 if (op->type == SHIELD && !QUERY_FLAG (who, FLAG_USE_SHIELD))
3280 retval |= CAN_APPLY_RESTRICTION; 3022 retval |= CAN_APPLY_RESTRICTION;
3281 3023
3282
3283 if (who->type != PLAYER) 3024 if (who->type != PLAYER)
3284 { 3025 {
3285 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE)) 3026 if ((op->type == WAND || op->type == HORN || op->type == ROD) && !QUERY_FLAG (who, FLAG_USE_RANGE))
3286 retval |= CAN_APPLY_RESTRICTION; 3027 retval |= CAN_APPLY_RESTRICTION;
3028
3287 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3029 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3288 retval |= CAN_APPLY_RESTRICTION; 3030 retval |= CAN_APPLY_RESTRICTION;
3031
3289 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING)) 3032 if (op->type == RING && !QUERY_FLAG (who, FLAG_USE_RING))
3290 retval |= CAN_APPLY_RESTRICTION; 3033 retval |= CAN_APPLY_RESTRICTION;
3034
3291 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW)) 3035 if (op->type == BOW && !QUERY_FLAG (who, FLAG_USE_BOW))
3292 retval |= CAN_APPLY_RESTRICTION; 3036 retval |= CAN_APPLY_RESTRICTION;
3293 } 3037 }
3038
3294 return retval; 3039 return retval;
3295} 3040}
3296
3297
3298 3041
3299/** 3042/**
3300 * who is the object using the object. It can be a monster. 3043 * who is the object using the object. It can be a monster.
3301 * op is the object they are using. op is an equipment type item, 3044 * op is the object they are using. op is an equipment type item,
3302 * eg, one which you put on and keep on for a while, and not something 3045 * eg, one which you put on and keep on for a while, and not something
… …
3311 * AP_UNAPPLY=always unapply). 3054 * AP_UNAPPLY=always unapply).
3312 * 3055 *
3313 * Optional flags: 3056 * Optional flags:
3314 * AP_NO_MERGE: don't merge an unapplied object with other objects 3057 * AP_NO_MERGE: don't merge an unapplied object with other objects
3315 * AP_IGNORE_CURSE: unapply cursed items 3058 * AP_IGNORE_CURSE: unapply cursed items
3059 * AP_NO_READY: do not ready skills when applying skill tools
3316 * 3060 *
3317 * Usage example: apply_special (who, op, AP_UNAPPLY | AP_IGNORE_CURSE) 3061 * Usage example: apply_special (who, op, AP_UNAPPLY | AP_IGNORE_CURSE)
3318 * 3062 *
3319 * apply_special() doesn't check for unpaid items. 3063 * apply_special() doesn't check for unpaid items.
3320 */ 3064 */
3065
3066#define LACK_ITEM_POWER \
3067 " H<You lack enough unused item power to use this weapon, see the skills command.>"
3068
3321int 3069int
3322apply_special (object *who, object *op, int aflags) 3070apply_special (object *who, object *op, int aflags)
3323{ 3071{
3324 int basic_flag = aflags & AP_BASIC_FLAGS; 3072 int basic_flag = aflags & AP_BASIC_FLAGS;
3325 object *tmp, *tmp2, *skop = NULL; 3073 object *tmp, *tmp2, *skop = NULL;
3326 int i;
3327 3074
3328 if (who == NULL) 3075 if (who == NULL)
3329 { 3076 {
3330 LOG (llevError, "apply_special() from object without environment.\n"); 3077 LOG (llevError, "apply_special() from object without environment.\n");
3331 return 1; 3078 return 1;
… …
3341 if (basic_flag == AP_APPLY) 3088 if (basic_flag == AP_APPLY)
3342 return 0; 3089 return 0;
3343 3090
3344 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 3091 if (!(aflags & AP_IGNORE_CURSE) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
3345 { 3092 {
3346 new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (op)); 3093 who->failmsg (format ("No matter how hard you try, you just can't remove %s." CANNOT_REMOVE_CURSED, query_name (op)));
3347 return 1; 3094 return 1;
3348 } 3095 }
3096
3349 return unapply_special (who, op, aflags); 3097 return unapply_special (who, op, aflags);
3350 } 3098 }
3351 3099
3352 if (basic_flag == AP_UNAPPLY) 3100 if (basic_flag == AP_UNAPPLY)
3353 return 0; 3101 return 0;
3354 3102
3355 i = can_apply_object (who, op); 3103 // if the item is combat/ranged, wield the relevant slot first
3104 // to resolve conflicts.
3105 if (player *pl = who->contr)
3106 switch (op->slottype ())
3107 {
3108 case slot_combat: who->change_weapon (pl->combat_ob); break;
3109 case slot_ranged: who->change_weapon (pl->ranged_ob); break;
3110 }
3111
3112 splay (op);
3356 3113
3357 /* Can't just apply this object. Lets see what not and what to do */ 3114 /* Can't just apply this object. Lets see what not and what to do */
3358 if (i) 3115 if (int i = can_apply_object (who, op))
3359 { 3116 {
3360 if (i & CAN_APPLY_NEVER) 3117 if (i & CAN_APPLY_NEVER)
3361 { 3118 {
3362 new_draw_info_format (NDI_UNIQUE, 0, who, "You don't have the body to use a %s\n", query_name (op)); 3119 who->failmsg (format ("You don't have the body to use a %s. H<You can never apply this item.>", query_name (op)));
3363 return 1; 3120 return 1;
3364 } 3121 }
3365 else if (i & CAN_APPLY_RESTRICTION) 3122 else if (i & CAN_APPLY_RESTRICTION)
3366 { 3123 {
3367 new_draw_info_format (NDI_UNIQUE, 0, who, "You have a prohibition against using a %s\n", query_name (op)); 3124 who->failmsg (format (
3125 "You have a prohibition against using a %s. "
3126 "H<Your belief, profession or class prevents you from applying this item.>",
3127 query_name (op)
3128 ));
3368 return 1; 3129 return 1;
3369 } 3130 }
3131
3370 if (who->type != PLAYER) 3132 if (who->type != PLAYER)
3371 { 3133 {
3372 /* Some error, so don't try to equip something more */ 3134 /* Some error, so don't try to equip something more */
3373 if (unapply_for_ob (who, op, aflags)) 3135 if (unapply_for_ob (who, op, aflags))
3374 return 1; 3136 return 1;
3375 } 3137 }
3376 else 3138 else
3377 { 3139 {
3378 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice)) 3140 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice))
3379 { 3141 {
3380 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some item(s):"); 3142 who->failmsg ("You need to unapply some of the following item(s) or change your applymode:");
3381 unapply_for_ob (who, op, AP_PRINT); 3143 unapply_for_ob (who, op, AP_PRINT);
3382 return 1; 3144 return 1;
3383 } 3145 }
3384 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE)) 3146 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE))
3385 {
3386 i = unapply_for_ob (who, op, aflags); 3147 if (unapply_for_ob (who, op, aflags))
3387 if (i)
3388 return 1; 3148 return 1;
3389 } 3149 }
3390 }
3391 } 3150 }
3151
3392 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL) 3152 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL)
3393 { 3153 {
3394 skop = find_skill_by_name (who, op->skill); 3154 skop = find_skill_by_name (who, op->skill);
3155
3395 if (!skop) 3156 if (!skop)
3396 { 3157 {
3397 new_draw_info_format (NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill); 3158 who->failmsg (format ("You need the %s skill to use this item!", &op->skill));
3398 return 1; 3159 return 1;
3399 } 3160 }
3400 else 3161 else
3401 {
3402 /* While experience will be credited properly, we want to change the 3162 /* While experience will be credited properly, we want to change the
3403 * skill so that the dam and wc get updated 3163 * skill so that the dam and wc get updated
3404 */ 3164 */
3405 change_skill (who, skop, 0); 3165 who->change_skill (skop);
3406 }
3407 }
3408
3409 if (who->type == PLAYER && op->item_power && (op->item_power + who->contr->item_power) > (settings.item_power_factor * who->level))
3410 { 3166 }
3411 new_draw_info (NDI_UNIQUE, 0, who, "Equipping that combined with other items would consume your soul!"); 3167
3168 if (who->type == PLAYER
3169 && op->item_power
3170 && op->item_power + who->contr->item_power > settings.item_power_factor * who->level)
3171 {
3172 who->failmsg ("Equipping that combined with other items would consume your soul!" LACK_ITEM_POWER);
3412 return 1; 3173 return 1;
3413 } 3174 }
3414
3415 3175
3416 /* Ok. We are now at the state where we can apply the new object. 3176 /* Ok. We are now at the state where we can apply the new object.
3417 * Note that we don't have the checks for can_use_... 3177 * Note that we don't have the checks for can_use_...
3418 * below - that is already taken care of by can_apply_object. 3178 * below - that is already taken care of by can_apply_object.
3419 */ 3179 */
3420 3180 tmp = op->nrof > 1 ? op->split (op->nrof - 1) : 0;
3421
3422 if (op->nrof > 1)
3423 tmp = get_split_ob (op, op->nrof - 1);
3424 else
3425 tmp = NULL;
3426 3181
3427 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op))) 3182 if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
3428 return RESULT_INT (0); 3183 return RESULT_INT (0);
3429 3184
3430 switch (op->type) 3185 switch (op->type)
3431 { 3186 {
3432 case WEAPON: 3187 case WEAPON:
3433 if (!check_weapon_power (who, op->last_eat)) 3188 if (!check_weapon_power (who, op->last_eat))
3434 { 3189 {
3435 new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use."); 3190 op->failmsg ("This weapon is too powerful for you to use. It would consume your soul!." LACK_ITEM_POWER);
3436 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3191
3437 if (tmp != NULL) 3192 if (tmp)
3438 (void) insert_ob_in_ob (tmp, who); 3193 insert_ob_in_ob (tmp, who);
3194
3439 return 1; 3195 return 1;
3440 } 3196 }
3197
3198 //TODO: this obviously fails for players using a shorter prefix
3199 // i.e. "R" can use Ragnarok's sword.
3441 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3200 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3442 { 3201 {
3443 /* if the weapon does not have the name as the character, can't use it. */ 3202 /* if the weapon does not have the name as the character, can't use it. */
3444 /* (Ragnarok's sword attempted to be used by Foo: won't work) */ 3203 /* (Ragnarok's sword attempted to be used by Foo: won't work) */
3445 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3204 who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>");
3205
3446 if (tmp != NULL) 3206 if (tmp)
3447 (void) insert_ob_in_ob (tmp, who); 3207 insert_ob_in_ob (tmp, who);
3208
3448 return 1; 3209 return 1;
3449 } 3210 }
3211
3212 if (!skop)
3213 {
3214 who->failmsg (format ("The %s is broken, please report this to the dungeon master!", query_name (op)));//TODO
3215 return 1;
3216 }
3217
3450 SET_FLAG (op, FLAG_APPLIED); 3218 SET_FLAG (op, FLAG_APPLIED);
3451
3452 if (skop)
3453 change_skill (who, skop, 1); 3219 who->change_skill (skop);
3454 if (!QUERY_FLAG (who, FLAG_READY_WEAPON)) 3220
3221 if (who->contr)
3222 who->change_weapon (who->contr->combat_ob = op);
3223
3224 who->statusmsg (format ("You wield %s.", query_name (op)));
3225
3455 SET_FLAG (who, FLAG_READY_WEAPON); 3226 SET_FLAG (who, FLAG_READY_WEAPON);
3456
3457 new_draw_info_format (NDI_UNIQUE, 0, who, "You wield %s.", query_name (op));
3458
3459 (void) change_abil (who, op); 3227 change_abil (who, op);
3460 break; 3228 break;
3461 3229
3462 case ARMOUR: 3230 case ARMOUR:
3463 case HELMET: 3231 case HELMET:
3464 case SHIELD: 3232 case SHIELD:
… …
3468 case BRACERS: 3236 case BRACERS:
3469 case CLOAK: 3237 case CLOAK:
3470 case RING: 3238 case RING:
3471 case AMULET: 3239 case AMULET:
3472 SET_FLAG (op, FLAG_APPLIED); 3240 SET_FLAG (op, FLAG_APPLIED);
3473 new_draw_info_format (NDI_UNIQUE, 0, who, "You wear %s.", query_name (op)); 3241 who->statusmsg (format ("You wear %s.", query_name (op)));
3474 (void) change_abil (who, op); 3242 change_abil (who, op);
3475 break; 3243 break;
3244
3476 case LAMP: 3245 case LAMP:
3477 if (op->stats.food < 1) 3246 if (op->stats.food < 1)
3478 { 3247 {
3479 new_draw_info_format (NDI_UNIQUE, 0, who, "Your %s is out of" " fuel!", &op->name); 3248 who->failmsg (format (
3249 "Your %s is out of fuel! "
3250 "H<Lamps and similar items need fuel. They cannot be refilled.>",
3251 &op->name
3252 ));
3480 return 1; 3253 return 1;
3481 } 3254 }
3482 new_draw_info_format (NDI_UNIQUE, 0, who, "You turn on your %s.", &op->name); 3255
3256 who->statusmsg (format ("You turn on your %s.", &op->name));
3257
3483 tmp2 = arch_to_object (op->other_arch); 3258 tmp2 = arch_to_object (op->other_arch);
3484 tmp2->stats.food = op->stats.food; 3259 tmp2->stats.food = op->stats.food;
3485 SET_FLAG (tmp2, FLAG_APPLIED); 3260 SET_FLAG (tmp2, FLAG_APPLIED);
3261
3486 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 3262 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3487 SET_FLAG (tmp2, FLAG_INV_LOCKED); 3263 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3488 insert_ob_in_ob (tmp2, who); 3264
3265 who->insert (tmp2);
3489 3266
3490 /* Remove the old lantern */ 3267 /* Remove the old lantern */
3491 if (who->type == PLAYER) 3268 op->destroy ();
3492 esrv_del_item (who->contr, op->count);
3493
3494 remove_ob (op);
3495 free_object (op);
3496 3269
3497 /* insert the portion that was split off */ 3270 /* insert the portion that was split off */
3498 if (tmp != NULL) 3271 if (tmp)
3272 who->insert (tmp);
3273
3274 who->update_stats ();
3275
3276 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3277 if (who->type == PLAYER)
3278 {
3279 who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>");
3280 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3281 }
3282
3283 return 0;
3284
3285 case SKILL_TOOL:
3286 // applying a skill tool also readies the skill
3287 SET_FLAG (op, FLAG_APPLIED);
3288
3289 if (!(aflags & AP_NO_READY))
3499 { 3290 {
3500 (void) insert_ob_in_ob (tmp, who); 3291 skop = find_skill_by_name (who, op->skill);
3501 if (who->type == PLAYER) 3292 if (!skop->flag [FLAG_APPLIED])
3502 esrv_send_item (who, tmp); 3293 apply_special (who, skop, AP_APPLY);
3503 } 3294 }
3504 fix_player (who); 3295 break;
3505 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3296
3297 case SKILL:
3298 if (player *pl = who->contr)
3506 { 3299 {
3507 if (who->type == PLAYER) 3300 if (IS_COMBAT_SKILL (op->subtype))
3508 { 3301 {
3509 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3302 if (skill_flags [op->subtype] & SF_NEED_WEAPON)
3510 SET_FLAG (tmp2, FLAG_KNOWN_CURSED); 3303 {
3304 for (object *item = who->inv; item; item = item->below)
3305 if (item->type == WEAPON && item->flag [FLAG_APPLIED])
3306 {
3307 if (item->skill == op->skill)
3308 {
3309 who->change_weapon (pl->combat_ob = item);
3310 goto found_weapon;
3311 }
3312 }
3313
3314 who->failmsg (format (
3315 "You need to apply a '%s' melee weapon before readying this skill. "
3316 "H<Some skills need an item, in this case a melee weapon, to function.>",
3317 &op->skill
3318 ));
3319 return 1;
3320
3321 found_weapon:;
3322 }
3323 else
3324 who->change_weapon (pl->combat_ob = op);
3511 } 3325 }
3512 } 3326 else if (IS_RANGED_SKILL (op->subtype))
3513 if (who->type == PLAYER)
3514 esrv_send_item (who, tmp2);
3515 return 0;
3516 break;
3517
3518 /* this part is needed for skill-tools */
3519 case SKILL:
3520 case SKILL_TOOL:
3521 if (who->chosen_skill)
3522 { 3327 {
3523 LOG (llevError, "BUG: apply_special(): can't apply two skills\n"); 3328 if (skill_flags [op->subtype] & SF_NEED_BOW)
3329 {
3330 for (object *item = who->inv; item; item = item->below)
3331 if (item->type == BOW && item->flag [FLAG_APPLIED])
3332 {
3333 //TODO: bows should/must all have skill missile weapon right now
3334 who->change_weapon (pl->ranged_ob = item);
3335 goto found_bow;
3336 }
3337
3338 who->failmsg (
3339 "You need to apply a missile weapon before readying this skill. "
3340 "H<Some skills need an item, in this case a missile weapon, to function.>"
3341 );
3524 return 1; 3342 return 1;
3343
3344 found_bow:;
3345 }
3346 else
3347 who->change_weapon (pl->ranged_ob = op);
3525 } 3348 }
3526 if (who->type == PLAYER) 3349
3527 {
3528 who->contr->shoottype = range_skill;
3529 who->contr->ranges[range_skill] = op;
3530 if (!op->invisible) 3350 if (!op->invisible)
3531 { 3351 {
3532 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op)); 3352 who->statusmsg (format (
3533 new_draw_info_format (NDI_UNIQUE, 0, who, "You can now use the skill: %s.", &op->skill); 3353 "You ready %s."
3354 "You can now use the skill: %s.",
3355 query_name (op),
3356 &op->skill
3357 ));
3534 } 3358 }
3535 else 3359 else
3536 {
3537 new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name); 3360 who->statusmsg (format ("Readied skill: %s.", op->skill ? &op->skill : &op->name));
3538 }
3539 } 3361 }
3362 else
3363 {
3540 SET_FLAG (op, FLAG_APPLIED); 3364 SET_FLAG (op, FLAG_APPLIED);
3541 (void) change_abil (who, op); 3365 change_abil (who, op);
3542 who->chosen_skill = op; 3366 who->chosen_skill = op;
3543 SET_FLAG (who, FLAG_READY_SKILL); 3367 SET_FLAG (who, FLAG_READY_SKILL);
3368 }
3369
3544 break; 3370 break;
3545 3371
3546 case BOW: 3372 case BOW:
3547 if (!check_weapon_power (who, op->last_eat)) 3373 if (!check_weapon_power (who, op->last_eat))
3548 { 3374 {
3549 new_draw_info (NDI_UNIQUE, 0, who, "That item is too powerful for you to use."); 3375 who->failmsg ("That weapon is too powerful for you to use. It would consume your soul!" LACK_ITEM_POWER);
3550 new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!."); 3376
3551 if (tmp != NULL) 3377 if (tmp)
3552 (void) insert_ob_in_ob (tmp, who); 3378 insert_ob_in_ob (tmp, who);
3379
3553 return 1; 3380 return 1;
3554 } 3381 }
3382
3555 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3383 if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
3556 { 3384 {
3557 new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner."); 3385 who->failmsg ("The weapon does not recognize you as its owner. "
3386 "H<Its name indicates that it belongs to somebody else.>");
3558 if (tmp != NULL) 3387 if (tmp)
3559 (void) insert_ob_in_ob (tmp, who); 3388 insert_ob_in_ob (tmp, who);
3389
3560 return 1; 3390 return 1;
3561 } 3391 }
3392
3562 /*FALLTHROUGH*/ case WAND: 3393 /*FALLTHROUGH*/
3394 case WAND:
3563 case ROD: 3395 case ROD:
3564 case HORN: 3396 case HORN:
3565 /* check for skill, alter player status */ 3397 /* check for skill, alter player status */
3398
3399 if (!skop)
3400 {
3401 who->failmsg (format ("The %s is broken, please report this to the dungeon master!", query_name (op)));//TODO
3402 return 1;
3403 }
3404
3566 SET_FLAG (op, FLAG_APPLIED); 3405 SET_FLAG (op, FLAG_APPLIED);
3567 if (skop)
3568 change_skill (who, skop, 0); 3406 who->change_skill (skop);
3569 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.", query_name (op));
3570 3407
3571 if (who->type == PLAYER) 3408 if (who->contr)
3572 { 3409 {
3410 who->contr->ranged_ob = op;
3411
3412 who->statusmsg (format ("You ready %s.", query_name (op)));
3413
3573 if (op->type == BOW) 3414 if (op->type == BOW)
3574 { 3415 {
3416 who->current_weapon = op;
3575 (void) change_abil (who, op); 3417 change_abil (who, op);
3576 new_draw_info_format (NDI_UNIQUE, 0, who,
3577 "You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)); 3418 who->statusmsg (format ("You will now fire %s with %s.", op->race ? &op->race : "nothing", query_name (op)));
3578 who->contr->shoottype = range_bow;
3579 }
3580 else
3581 {
3582 who->contr->shoottype = range_misc;
3583 } 3419 }
3584 } 3420 }
3585 else 3421 else
3586 { 3422 {
3587 if (op->type == BOW) 3423 if (op->type == BOW)
3588 SET_FLAG (who, FLAG_READY_BOW); 3424 SET_FLAG (who, FLAG_READY_BOW);
3589 else 3425 else
3590 SET_FLAG (who, FLAG_READY_RANGE); 3426 SET_FLAG (who, FLAG_READY_RANGE);
3591 } 3427 }
3428
3592 break; 3429 break;
3593 3430
3594 case BUILDER: 3431 case BUILDER:
3595 if (who->contr->ranges[range_builder]) 3432 if (who->type == PLAYER)
3433 {
3434 //TODO: wtf does this do? shouldn't this be managed automatically (slots?)
3435 if (who->contr->ranged_ob && who->contr->ranged_ob->type == BUILDER)
3596 unapply_special (who, who->contr->ranges[range_builder], 0); 3436 unapply_special (who, who->contr->ranged_ob, 0);
3597 who->contr->shoottype = range_builder; 3437
3438 who->statusmsg (format ("You ready your %s.", query_name (op)));
3439
3598 who->contr->ranges[range_builder] = op; 3440 who->contr->ranged_ob = op;
3599 new_draw_info_format (NDI_UNIQUE, 0, who, "You ready your %s.", query_name (op)); 3441 }
3600 break; 3442 break;
3601 3443
3602 default: 3444 default:
3603 new_draw_info_format (NDI_UNIQUE, 0, who, "You apply %s.", query_name (op)); 3445 who->statusmsg (format ("You apply %s.", query_name (op)));
3604 } /* end of switch op->type */ 3446 }
3605 3447
3606 SET_FLAG (op, FLAG_APPLIED); 3448 SET_FLAG (op, FLAG_APPLIED);
3607 3449
3608 if (tmp != NULL) 3450 if (tmp)
3609 tmp = insert_ob_in_ob (tmp, who); 3451 who->insert (tmp);
3610 3452
3611 fix_player (who); 3453 who->update_stats ();
3612 3454
3613 /* We exclude spell casting objects. The fire code will set the 3455 /* We exclude spell casting objects. The fire code will set the
3614 * been applied flag when they are used - until that point, 3456 * been applied flag when they are used - until that point,
3615 * you don't know anything about them. 3457 * you don't know anything about them.
3616 */ 3458 */
3617 if (who->type == PLAYER && op->type != WAND && op->type != HORN && op->type != ROD) 3459 if (who->type == PLAYER && op->type != WAND && op->type != HORN && op->type != ROD)
3618 SET_FLAG (op, FLAG_BEEN_APPLIED); 3460 SET_FLAG (op, FLAG_BEEN_APPLIED);
3619 3461
3620 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3462 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3621 {
3622 if (who->type == PLAYER) 3463 if (who->type == PLAYER)
3623 { 3464 {
3624 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3465 who->failmsg (
3466 "Oops, it feels deadly cold! "
3467 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>"
3468 );
3625 SET_FLAG (op, FLAG_KNOWN_CURSED); 3469 SET_FLAG (op, FLAG_KNOWN_CURSED);
3626 } 3470 }
3627 } 3471
3628 if (who->type == PLAYER) 3472 if (object *pl = op->visible_to ())
3629 {
3630 /* if multiple objects were applied, update both slots */
3631 if (tmp)
3632 esrv_send_item (who, tmp);
3633 esrv_send_item (who, op); 3473 esrv_send_item (pl, op);
3634 } 3474
3635 return 0; 3475 return 0;
3636} 3476}
3637
3638 3477
3639int 3478int
3640monster_apply_special (object *who, object *op, int aflags) 3479monster_apply_special (object *who, object *op, int aflags)
3641{ 3480{
3642 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED)) 3481 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
3643 return 1; 3482 return 1;
3483
3644 return apply_special (who, op, aflags); 3484 return apply_special (who, op, aflags);
3645} 3485}
3646 3486
3647/** 3487/**
3648 * Map was just loaded, handle op's initialisation. 3488 * Map was just loaded, handle op's initialisation.
… …
3656 int i; 3496 int i;
3657 3497
3658 switch (op->type) 3498 switch (op->type)
3659 { 3499 {
3660 case SHOP_FLOOR: 3500 case SHOP_FLOOR:
3661 if (!HAS_RANDOM_ITEMS (op)) 3501 if (!op->has_random_items ())
3662 return 0; 3502 return 0;
3503
3663 do 3504 do
3664 { 3505 {
3665 i = 10; /* let's give it 10 tries */ 3506 i = 10; /* let's give it 10 tries */
3666 while ((tmp = generate_treasure (op->randomitems, 3507 while ((tmp = generate_treasure (op->randomitems,
3667 op->stats.exp ? (int) op->stats.exp : MAX (op->map->difficulty, 5))) == NULL && --i); 3508 op->stats.exp ? (int) op->stats.exp : MAX (op->map->difficulty, 5))) == NULL && --i);
3668 if (tmp == NULL) 3509 if (tmp == NULL)
3669 return 0; 3510 return 0;
3670 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 3511 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
3671 { 3512 {
3672 free_object (tmp); 3513 tmp->destroy ();
3673 tmp = NULL; 3514 tmp = NULL;
3674 } 3515 }
3675 } 3516 }
3676 while (!tmp); 3517 while (!tmp);
3518
3677 tmp->x = op->x; 3519 tmp->x = op->x;
3678 tmp->y = op->y; 3520 tmp->y = op->y;
3679 SET_FLAG (tmp, FLAG_UNPAID); 3521 SET_FLAG (tmp, FLAG_UNPAID);
3680 insert_ob_in_map (tmp, op->map, NULL, 0); 3522 insert_ob_in_map (tmp, op->map, NULL, 0);
3681 CLEAR_FLAG (op, FLAG_AUTO_APPLY); 3523 CLEAR_FLAG (op, FLAG_AUTO_APPLY);
… …
3683 break; 3525 break;
3684 3526
3685 case TREASURE: 3527 case TREASURE:
3686 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 3528 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
3687 return 0; 3529 return 0;
3530
3688 while ((op->stats.hp--) > 0) 3531 while (op->stats.hp-- > 0)
3689 create_treasure (op->randomitems, op, op->map ? GT_ENVIRONMENT : 0, 3532 create_treasure (op->randomitems, op, op->map ? GT_ENVIRONMENT : 0,
3690 op->stats.exp ? (int) op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0); 3533 op->stats.exp ? (int) op->stats.exp : op->map == NULL ? 14 : op->map->difficulty, 0);
3691 3534
3692 /* If we generated an object and put it in this object inventory, 3535 /* If we generated an object and put it in this object inventory,
3693 * move it to the parent object as the current object is about 3536 * move it to the parent object as the current object is about
… …
3695 * that is put inside other objects. 3538 * that is put inside other objects.
3696 */ 3539 */
3697 for (tmp = op->inv; tmp; tmp = tmp2) 3540 for (tmp = op->inv; tmp; tmp = tmp2)
3698 { 3541 {
3699 tmp2 = tmp->below; 3542 tmp2 = tmp->below;
3700 remove_ob (tmp); 3543 tmp->remove ();
3544
3701 if (op->env) 3545 if (op->env)
3702 insert_ob_in_ob (tmp, op->env); 3546 insert_ob_in_ob (tmp, op->env);
3703 else 3547 else
3704 free_object (tmp); 3548 tmp->destroy ();
3705 } 3549 }
3706 remove_ob (op); 3550
3707 free_object (op); 3551 op->destroy ();
3708 break; 3552 break;
3709 } 3553 }
3710 return tmp ? 1 : 0; 3554 return tmp ? 1 : 0;
3711} 3555}
3712 3556
3713/** 3557/**
3714 * fix_auto_apply goes through the entire map (only the first time 3558 * fix_auto_apply goes through the entire map every time a map
3715 * when an original map is loaded) and performs special actions for 3559 * is loaded or swapped in and performs special actions for
3716 * certain objects (most initialization of chests and creation of 3560 * certain objects (most initialization of chests and creation of
3717 * treasures and stuff). Calls auto_apply if appropriate. 3561 * treasures and stuff). Calls auto_apply if appropriate.
3718 */ 3562 */
3719void 3563void
3720fix_auto_apply (maptile *m) 3564maptile::fix_auto_apply ()
3721{ 3565{
3722 object *tmp, *above = NULL; 3566 if (!spaces)
3723 int x, y;
3724
3725 if (m == NULL)
3726 return; 3567 return;
3727 3568
3728 for (x = 0; x < MAP_WIDTH (m); x++) 3569 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3729 for (y = 0; y < MAP_HEIGHT (m); y++) 3570 for (object *tmp = ms->bot; tmp; )
3730 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = above)
3731 { 3571 {
3732 above = tmp->above; 3572 object *above = tmp->above;
3733 3573
3734 if (tmp->inv) 3574 if (tmp->inv)
3735 { 3575 {
3736 object *invtmp, *invnext; 3576 object *invtmp, *invnext;
3737 3577
3738 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext) 3578 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext)
3739 { 3579 {
3740 invnext = invtmp->below; 3580 invnext = invtmp->below;
3741 3581
3742 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY)) 3582 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY))
3743 auto_apply (invtmp); 3583 auto_apply (invtmp);
3744 else if (invtmp->type == TREASURE && HAS_RANDOM_ITEMS (invtmp)) 3584 else if (invtmp->type == TREASURE && invtmp->has_random_items ())
3745 { 3585 {
3746 while ((invtmp->stats.hp--) > 0) 3586 while ((invtmp->stats.hp--) > 0)
3747 create_treasure (invtmp->randomitems, invtmp, 0, m->difficulty, 0);
3748
3749 invtmp->randomitems = NULL;
3750 }
3751 else if (invtmp && invtmp->arch
3752 && invtmp->type != TREASURE && invtmp->type != SPELL && invtmp->type != CLASS && HAS_RANDOM_ITEMS (invtmp))
3753 {
3754 create_treasure (invtmp->randomitems, invtmp, 0, m->difficulty, 0); 3587 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3588
3589 invtmp->randomitems = NULL;
3590 }
3591 else if (invtmp && invtmp->arch
3592 && invtmp->type != TREASURE && invtmp->type != SPELL && invtmp->type != CLASS && invtmp->has_random_items ())
3593 {
3594 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3755 /* Need to clear this so that we never try to create 3595 /* Need to clear this so that we never try to create
3756 * treasure again for this object 3596 * treasure again for this object
3757 */ 3597 */
3758 invtmp->randomitems = NULL; 3598 invtmp->randomitems = NULL;
3759 } 3599 }
3760 } 3600 }
3761 /* This is really temporary - the code at the bottom will 3601 /* This is really temporary - the code at the bottom will
3762 * also set randomitems to null. The problem is there are bunches 3602 * also set randomitems to null. The problem is there are bunches
3763 * of maps/players already out there with items that have spells 3603 * of maps/players already out there with items that have spells
3764 * which haven't had the randomitems set to null yet. 3604 * which haven't had the randomitems set to null yet.
3765 * MSW 2004-05-13 3605 * MSW 2004-05-13
3766 * 3606 *
3767 * And if it's a spellbook, it's better to set randomitems to NULL too, 3607 * And if it's a spellbook, it's better to set randomitems to NULL too,
3768 * else you get two spells in the book ^_- 3608 * else you get two spells in the book ^_-
3769 * Ryo 2004-08-16 3609 * Ryo 2004-08-16
3770 */ 3610 */
3771 if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL 3611 if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL
3772 || tmp->type == HORN || tmp->type == FIREWALL || tmp->type == POTION || tmp->type == ALTAR || tmp->type == SPELLBOOK) 3612 || tmp->type == HORN || tmp->type == FIREWALL || tmp->type == POTION || tmp->type == ALTAR || tmp->type == SPELLBOOK)
3773 tmp->randomitems = NULL;
3774
3775 }
3776
3777 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY))
3778 auto_apply (tmp);
3779 else if ((tmp->type == TREASURE || (tmp->type == CONTAINER)) && HAS_RANDOM_ITEMS (tmp))
3780 {
3781 while ((tmp->stats.hp--) > 0)
3782 create_treasure (tmp->randomitems, tmp, 0, m->difficulty, 0);
3783 tmp->randomitems = NULL; 3613 tmp->randomitems = NULL;
3614
3784 } 3615 }
3616
3617 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY))
3618 auto_apply (tmp);
3619 else if ((tmp->type == TREASURE || (tmp->type == CONTAINER)) && tmp->has_random_items ())
3620 {
3621 while ((tmp->stats.hp--) > 0)
3622 create_treasure (tmp->randomitems, tmp, 0, difficulty, 0);
3623 tmp->randomitems = NULL;
3624 }
3785 else if (tmp->type == TIMED_GATE) 3625 else if (tmp->type == TIMED_GATE)
3786 { 3626 {
3787 object *head = tmp->head != NULL ? tmp->head : tmp; 3627 object *head = tmp->head != NULL ? tmp->head : tmp;
3788 3628
3789 if (QUERY_FLAG (head, FLAG_IS_LINKED)) 3629 if (QUERY_FLAG (head, FLAG_IS_LINKED))
3790 {
3791 tmp->speed = 0; 3630 tmp->set_speed (0);
3792 update_ob_speed (tmp);
3793 }
3794 } 3631 }
3795 /* This function can be called everytime a map is loaded, even when 3632 /* This function can be called everytime a map is loaded, even when
3796 * swapping back in. As such, we don't want to create the treasure 3633 * swapping back in. As such, we don't want to create the treasure
3797 * over and ove again, so after we generate the treasure, blank out 3634 * over and ove again, so after we generate the treasure, blank out
3798 * randomitems so if it is swapped in again, it won't make anything. 3635 * randomitems so if it is swapped in again, it won't make anything.
3799 * This is a problem for the above objects, because they have counters 3636 * This is a problem for the above objects, because they have counters
3800 * which say how many times to make the treasure. 3637 * which say how many times to make the treasure.
3801 */ 3638 */
3802 else if (tmp && tmp->arch && tmp->type != PLAYER 3639 else if (tmp && tmp->arch && tmp->type != PLAYER
3803 && tmp->type != TREASURE && tmp->type != SPELL 3640 && tmp->type != TREASURE && tmp->type != SPELL
3804 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && HAS_RANDOM_ITEMS (tmp)) 3641 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && tmp->has_random_items ())
3805 { 3642 {
3806 create_treasure (tmp->randomitems, tmp, GT_APPLY, m->difficulty, 0); 3643 create_treasure (tmp->randomitems, tmp, GT_APPLY, difficulty, 0);
3807 tmp->randomitems = NULL; 3644 tmp->randomitems = NULL;
3808 } 3645 }
3646
3647 // close all containers
3648 else if (tmp->type == CONTAINER)
3649 tmp->flag [FLAG_APPLIED] = 0;
3650
3651 tmp = above;
3809 } 3652 }
3810 3653
3811 for (x = 0; x < MAP_WIDTH (m); x++) 3654 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3812 for (y = 0; y < MAP_HEIGHT (m); y++) 3655 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
3813 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above)
3814 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL)) 3656 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL))
3815 check_trigger (tmp, tmp->above); 3657 check_trigger (tmp, tmp->above);
3816} 3658}
3817 3659
3818/** 3660/**
3819 * Handles player eating food that temporarily changes status (resistances, stats). 3661 * Handles player eating food that temporarily changes status (resistances, stats).
3820 * This used to call cast_change_attr(), but 3662 * This used to call cast_change_attr(), but
3821 * that doesn't work with the new spell code. Since we know what 3663 * that doesn't work with the new spell code. Since we know what
3822 * the food changes, just grab a force and use that instead. 3664 * the food changes, just grab a force and use that instead.
3823 */ 3665 */
3824
3825void 3666void
3826eat_special_food (object *who, object *food) 3667eat_special_food (object *who, object *food)
3827{ 3668{
3828 object *force; 3669 object *force;
3829 int i, did_one = 0; 3670 int i, did_one = 0;
3830 sint8 k;
3831 3671
3832 force = get_archetype (FORCE_NAME); 3672 force = get_archetype (FORCE_NAME);
3833 3673
3834 for (i = 0; i < NUM_STATS; i++) 3674 for (i = 0; i < NUM_STATS; i++)
3835 { 3675 if (sint8 k = food->stats.stat (i))
3836 k = get_attr_value (&food->stats, i);
3837 if (k)
3838 { 3676 {
3839 set_attr_value (&force->stats, i, k); 3677 force->stats.stat (i) = k;
3840 did_one = 1; 3678 did_one = 1;
3841 } 3679 }
3842 }
3843 3680
3844 /* check if we can protect the eater */ 3681 /* check if we can protect the eater */
3845 for (i = 0; i < NROFATTACKS; i++) 3682 for (i = 0; i < NROFATTACKS; i++)
3846 { 3683 {
3847 if (food->resist[i] > 0) 3684 if (food->resist[i] > 0)
3848 { 3685 {
3849 force->resist[i] = food->resist[i] / 2; 3686 force->resist[i] = food->resist[i] / 2;
3850 did_one = 1; 3687 did_one = 1;
3851 } 3688 }
3852 } 3689 }
3690
3853 if (did_one) 3691 if (did_one)
3854 { 3692 {
3855 force->speed = 0.1; 3693 force->set_speed (0.1);
3856 update_ob_speed (force);
3857 /* bigger morsel of food = longer effect time */ 3694 /* bigger morsel of food = longer effect time */
3858 force->stats.food = food->stats.food / 5; 3695 force->duration = food->stats.food / 5;
3859 SET_FLAG (force, FLAG_IS_USED_UP);
3860 SET_FLAG (force, FLAG_APPLIED); 3696 SET_FLAG (force, FLAG_APPLIED);
3861 change_abil (who, force); 3697 change_abil (who, force);
3862 insert_ob_in_ob (force, who); 3698 insert_ob_in_ob (force, who);
3863 } 3699 }
3864 else 3700 else
3865 { 3701 force->destroy ();
3866 free_object (force);
3867 }
3868 3702
3869 /* check for hp, sp change */ 3703 /* check for hp, sp change */
3870 if (food->stats.hp != 0) 3704 if (food->stats.hp != 0)
3871 { 3705 {
3872 if (QUERY_FLAG (food, FLAG_CURSED)) 3706 if (QUERY_FLAG (food, FLAG_CURSED))
3873 { 3707 {
3874 strcpy (who->contr->killer, food->name); 3708 who->contr->killer = food;
3875 hit_player (who, food->stats.hp, food, AT_POISON, 1); 3709 hit_player (who, food->stats.hp, food, AT_POISON, 1);
3876 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!"); 3710 who->failmsg ("Eck!...that was poisonous!");
3877 } 3711 }
3878 else 3712 else
3879 { 3713 {
3880 if (food->stats.hp > 0) 3714 if (food->stats.hp > 0)
3881 new_draw_info (NDI_UNIQUE, 0, who, "You begin to feel better."); 3715 who->statusmsg ("You begin to feel better.");
3882 else 3716 else
3883 new_draw_info (NDI_UNIQUE, 0, who, "Eck!...that was poisonous!"); 3717 who->failmsg ("Eck!...that was poisonous!");
3718
3884 who->stats.hp += food->stats.hp; 3719 who->stats.hp += food->stats.hp;
3885 } 3720 }
3886 } 3721 }
3722
3887 if (food->stats.sp != 0) 3723 if (food->stats.sp != 0)
3888 { 3724 {
3889 if (QUERY_FLAG (food, FLAG_CURSED)) 3725 if (QUERY_FLAG (food, FLAG_CURSED))
3890 { 3726 {
3891 new_draw_info (NDI_UNIQUE, 0, who, "You are drained of mana!"); 3727 who->failmsg ("You are drained of mana!");
3892 who->stats.sp -= food->stats.sp; 3728 who->stats.sp -= food->stats.sp;
3893 if (who->stats.sp < 0) 3729 if (who->stats.sp < 0)
3894 who->stats.sp = 0; 3730 who->stats.sp = 0;
3895 } 3731 }
3896 else 3732 else
3897 { 3733 {
3898 new_draw_info (NDI_UNIQUE, 0, who, "You feel a rush of magical energy!"); 3734 who->statusmsg ("You feel a rush of magical energy!");
3899 who->stats.sp += food->stats.sp; 3735 who->stats.sp += food->stats.sp;
3900 /* place limit on max sp from food? */ 3736 /* place limit on max sp from food? */
3901 } 3737 }
3902 } 3738 }
3903 fix_player (who);
3904}
3905 3739
3740 who->update_stats ();
3741}
3906 3742
3907/** 3743/**
3908 * Designed primarily to light torches/lanterns/etc. 3744 * Designed primarily to light torches/lanterns/etc.
3909 * Also burns up burnable material too. First object in the inventory is 3745 * Also burns up burnable material too. First object in the inventory is
3910 * the selected object to "burn". -b.t. 3746 * the selected object to "burn". -b.t.
3911 */ 3747 */
3912
3913void 3748void
3914apply_lighter (object *who, object *lighter) 3749apply_lighter (object *who, object *lighter)
3915{ 3750{
3916 object *item; 3751 object *item;
3917 int is_player_env = 0; 3752 int is_player_env = 0;
3918 char item_name[MAX_BUF];
3919 3753
3920 item = find_marked_object (who); 3754 item = find_marked_object (who);
3921 if (item) 3755 if (item)
3922 { 3756 {
3923 if (lighter->last_eat && lighter->stats.food) 3757 if (lighter->last_eat && lighter->stats.food)
3924 { /* lighter gets used up */ 3758 { /* lighter gets used up */
3925 /* Split multiple lighters if they're being used up. Otherwise *
3926 * one charge from each would be used up. --DAMN */
3927 if (lighter->nrof > 1)
3928 {
3929 object *oneLighter = get_object (); 3759 object *oneLighter = lighter->split ();
3930
3931 copy_object (lighter, oneLighter);
3932 lighter->nrof -= 1;
3933 oneLighter->nrof = 1;
3934 oneLighter->stats.food--; 3760 oneLighter->stats.food--;
3935 esrv_send_item (who, lighter); 3761 who->insert (oneLighter);
3936 oneLighter = insert_ob_in_ob (oneLighter, who);
3937 esrv_send_item (who, oneLighter);
3938 }
3939 else
3940 lighter->stats.food--;
3941 } 3762 }
3942 else if (lighter->last_eat) 3763 else if (lighter->last_eat)
3764 {
3943 { /* no charges left in lighter */ 3765 /* no charges left in lighter */
3944 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with a used up %s.", &item->name, &lighter->name); 3766 who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name));
3945 return; 3767 return;
3946 } 3768 }
3769
3947 /* Perhaps we should split what we are trying to light on fire? 3770 /* Perhaps we should split what we are trying to light on fire?
3948 * I can't see many times when you would want to light multiple 3771 * I can't see many times when you would want to light multiple
3949 * objects at once. 3772 * objects at once.
3950 */ 3773 */
3951 /* If the item is destroyed, we don't have a valid pointer to the 3774
3952 * name object, so make a copy so the message we print out makes
3953 * some sense.
3954 */
3955 strcpy (item_name, item->name);
3956 if (who == is_player_inv (item)) 3775 if (who == item->in_player ())
3957 is_player_env = 1; 3776 is_player_env = 1;
3958 3777
3959 save_throw_object (item, AT_FIRE, who); 3778 save_throw_object (item, AT_FIRE, who);
3960 /* Change to check count and not freed, since the object pointer 3779
3961 * may have gotten recycled
3962 */
3963 if (item->destroyed ()) 3780 if (item->destroyed ())
3964 { 3781 {
3965 new_draw_info_format (NDI_UNIQUE, 0, who, "You light the %s with the %s.", &item_name, &lighter->name); 3782 who->statusmsg (format ("You light the %s with the %s.", &item->name, &lighter->name));
3966 /* Need to update the player so that the players glow radius 3783 /* Need to update the player so that the players glow radius
3967 * gets changed. 3784 * gets changed.
3968 */ 3785 */
3969 if (is_player_env) 3786 if (is_player_env)
3970 fix_player (who); 3787 who->update_stats ();
3971 } 3788 }
3972 else 3789 else
3973 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with the %s and fail.", &item->name, &lighter->name); 3790 who->failmsg (format ("You attempt to light the %s with the %s and fail.", &item->name, &lighter->name));
3974 } 3791 }
3975 else /* nothing to light */ 3792 else
3976 new_draw_info (NDI_UNIQUE, 0, who, "You need to mark a lightable object."); 3793 who->failmsg ("You need to mark a lightable object.");
3977
3978} 3794}
3979 3795
3980/** 3796/**
3981 * op made some mistake with a scroll, this takes care of punishment. 3797 * op made some mistake with a scroll, this takes care of punishment.
3982 * scroll_failure()- hacked directly from spell_failure 3798 * scroll_failure()- hacked directly from spell_failure
… …
3989 3805
3990 if (failure <= -1 && failure > -15) 3806 if (failure <= -1 && failure > -15)
3991 { /* wonder */ 3807 { /* wonder */
3992 object *tmp; 3808 object *tmp;
3993 3809
3994 new_draw_info (NDI_UNIQUE, 0, op, "Your spell warps!."); 3810 op->failmsg ("Your spell warps!");
3995 tmp = get_archetype (SPELL_WONDER); 3811 tmp = get_archetype (SPELL_WONDER);
3996 cast_wonder (op, op, 0, tmp); 3812 cast_wonder (op, op, 0, tmp);
3997 free_object (tmp); 3813 tmp->destroy ();
3998 } 3814 }
3999 else if (failure <= -15 && failure > -35) 3815 else if (failure <= -15 && failure > -35)
4000 { /* drain mana */ 3816 { /* drain mana */
4001 new_draw_info (NDI_UNIQUE, 0, op, "Your mana is drained!."); 3817 op->failmsg ("Your mana is drained!");
4002 op->stats.sp -= random_roll (0, power - 1, op, PREFER_LOW); 3818 op->stats.sp -= random_roll (0, power - 1, op, PREFER_LOW);
4003 if (op->stats.sp < 0) 3819 if (op->stats.sp < 0)
4004 op->stats.sp = 0; 3820 op->stats.sp = 0;
4005 } 3821 }
4006 else if (settings.spell_failure_effects == TRUE) 3822 else if (settings.spell_failure_effects == TRUE)
4007 { 3823 {
4008 if (failure <= -35 && failure > -60) 3824 if (failure <= -35 && failure > -60)
4009 { /* confusion */ 3825 { /* confusion */
4010 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!"); 3826 op->failmsg ("The magic recoils on you!");
4011 confuse_player (op, op, power); 3827 confuse_player (op, op, power);
4012 } 3828 }
4013 else if (failure <= -60 && failure > -70) 3829 else if (failure <= -60 && failure > -70)
4014 { /* paralysis */ 3830 { /* paralysis */
4015 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils and paralyzes " "you!"); 3831 op->failmsg ("The magic recoils and paralyzes you!");
4016 paralyze_player (op, op, power); 3832 paralyze_player (op, op, power);
4017 } 3833 }
4018 else if (failure <= -70 && failure > -80) 3834 else if (failure <= -70 && failure > -80)
4019 { /* blind */ 3835 { /* blind */
4020 new_draw_info (NDI_UNIQUE, 0, op, "The magic recoils on you!"); 3836 op->failmsg ("The magic recoils on you!");
4021 blind_player (op, op, power); 3837 blind_player (op, op, power);
4022 } 3838 }
4023 else if (failure <= -80) 3839 else if (failure <= -80)
4024 { /* blast the immediate area */ 3840 { /* blast the immediate area */
4025 object *tmp;
4026
4027 tmp = get_archetype (LOOSE_MANA); 3841 object *tmp = get_archetype (LOOSE_MANA);
4028 cast_magic_storm (op, tmp, power); 3842 cast_magic_storm (op, tmp, power);
4029 new_draw_info (NDI_UNIQUE, 0, op, "You unlease uncontrolled mana!"); 3843 op->failmsg ("You unleash uncontrolled mana!");
4030 free_object (tmp); 3844 tmp->destroy ();
4031 } 3845 }
4032 } 3846 }
4033} 3847}
4034 3848
4035void 3849void
… …
4054 */ 3868 */
4055 int i, j; 3869 int i, j;
4056 3870
4057 for (i = 0; i < NUM_STATS; i++) 3871 for (i = 0; i < NUM_STATS; i++)
4058 { 3872 {
4059 sint8 stat = get_attr_value (stats, i); 3873 int race_bonus = pl->arch->stats.stat (i);
4060 int race_bonus = get_attr_value (&(pl->arch->clone.stats), i); 3874 sint8 stat = stats->stat (i) + ns->stat (i);
4061 3875
4062 stat += get_attr_value (ns, i);
4063 if (stat > 20 + race_bonus) 3876 if (stat > 20 + race_bonus)
4064 { 3877 {
4065 excess_stat++; 3878 excess_stat++;
4066 stat = 20 + race_bonus; 3879 stat = 20 + race_bonus;
4067 } 3880 }
4068 set_attr_value (stats, i, stat); 3881
3882 stats->stat (i) = stat;
4069 } 3883 }
4070 3884
4071 for (j = 0; excess_stat > 0 && j < 100; j++) 3885 for (j = 0; excess_stat > 0 && j < 100; j++)
4072 { /* try 100 times to assign excess stats */ 3886 { /* try 100 times to assign excess stats */
4073 int i = rndm (0, 6); 3887 int i = rndm (0, 6);
4074 int stat = get_attr_value (stats, i);
4075 int race_bonus = get_attr_value (&(pl->arch->clone.stats), i);
4076 3888
4077 if (i == CHA) 3889 if (i == CHA)
4078 continue; /* exclude cha from this */ 3890 continue; /* exclude cha from this */
3891
3892 int stat = stats->stat (i);
3893 int race_bonus = pl->arch->stats.stat (i);
4079 if (stat < 20 + race_bonus) 3894 if (stat < 20 + race_bonus)
4080 { 3895 {
4081 change_attr_value (stats, i, 1); 3896 change_attr_value (stats, i, 1);
4082 excess_stat--; 3897 excess_stat--;
4083 } 3898 }
… …
4086 /* insert the randomitems from the change's treasurelist into 3901 /* insert the randomitems from the change's treasurelist into
4087 * the player ref: player.c 3902 * the player ref: player.c
4088 */ 3903 */
4089 if (change->randomitems != NULL) 3904 if (change->randomitems != NULL)
4090 give_initial_items (pl, change->randomitems); 3905 give_initial_items (pl, change->randomitems);
4091
4092 3906
4093 /* set up the face, for some races. */ 3907 /* set up the face, for some races. */
4094 3908
4095 /* first, look for the force object banning 3909 /* first, look for the force object banning
4096 * changing the face. Certain races never change face with class. 3910 * changing the face. Certain races never change face with class.
… …
4141 char got[MAX_BUF]; 3955 char got[MAX_BUF];
4142 int len; 3956 int len;
4143 3957
4144 if (!pl || !transformer) 3958 if (!pl || !transformer)
4145 return; 3959 return;
3960
4146 marked = find_marked_object (pl); 3961 marked = find_marked_object (pl);
3962
4147 if (!marked) 3963 if (!marked)
4148 { 3964 {
4149 new_draw_info_format (NDI_UNIQUE, 0, pl, "Use the %s with what item?", query_name (transformer)); 3965 pl->failmsg (format ("Use the %s with what item?", query_name (transformer)));
4150 return; 3966 return;
4151 } 3967 }
3968
4152 if (!marked->slaying) 3969 if (!marked->slaying)
4153 { 3970 {
4154 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked)); 3971 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
4155 return; 3972 return;
4156 } 3973 }
3974
4157 /* check whether they are compatible or not */ 3975 /* check whether they are compatible or not */
4158 find = strstr (marked->slaying, transformer->arch->name); 3976 find = strstr (marked->slaying, transformer->arch->archname);
4159 if (!find || (*(find + strlen (transformer->arch->name)) != ':')) 3977 if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
4160 { 3978 {
4161 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't use the %s with your %s!", query_name (transformer), query_name (marked)); 3979 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
4162 return; 3980 return;
4163 } 3981 }
3982
4164 find += strlen (transformer->arch->name) + 1; 3983 find += strlen (transformer->arch->archname) + 1;
4165 /* Item can be used, now find how many and what it yields */ 3984 /* Item can be used, now find how many and what it yields */
4166 if (isdigit (*(find))) 3985 if (isdigit (*(find)))
4167 { 3986 {
4168 yield = atoi (find); 3987 yield = atoi (find);
4169 if (yield < 1) 3988 if (yield < 1)
… …
4175 else 3994 else
4176 yield = 1; 3995 yield = 1;
4177 3996
4178 while (isdigit (*find)) 3997 while (isdigit (*find))
4179 find++; 3998 find++;
3999
4180 while (*find == ' ') 4000 while (*find == ' ')
4181 find++; 4001 find++;
4002
4182 memset (got, 0, MAX_BUF); 4003 memset (got, 0, MAX_BUF);
4004
4183 if ((separator = strchr (find, ';')) != NULL) 4005 if ((separator = strchr (find, ';')) != NULL)
4184 {
4185 len = separator - find; 4006 len = separator - find;
4186 }
4187 else 4007 else
4188 {
4189 len = strlen (find); 4008 len = strlen (find);
4190 } 4009
4191 if (len > MAX_BUF - 1) 4010 if (len > MAX_BUF - 1)
4192 len = MAX_BUF - 1; 4011 len = MAX_BUF - 1;
4012
4193 strcpy (got, find); 4013 strcpy (got, find);
4194 got[len] = '\0'; 4014 got[len] = '\0';
4195 4015
4196 /* Now create new item, remove used ones when required. */ 4016 /* Now create new item, remove used ones when required. */
4197 new_item = get_archetype (got); 4017 new_item = get_archetype (got);
4198 if (!new_item) 4018 if (!new_item)
4199 { 4019 {
4200 new_draw_info_format (NDI_UNIQUE, 0, pl, "This %s is strange, better to not use it.", query_base_name (marked, 0)); 4020 pl->failmsg (format ("This %s is strange, better to not use it.", query_base_name (marked, 0)));
4201 return; 4021 return;
4202 } 4022 }
4203 4023
4204 new_item->nrof = yield; 4024 new_item->nrof = yield;
4025
4205 new_draw_info_format (NDI_UNIQUE, 0, pl, "You %s the %s.", &transformer->slaying, query_base_name (marked, 0)); 4026 pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0)));
4206 insert_ob_in_ob (new_item, pl); 4027
4207 esrv_send_inventory (pl, pl); 4028 pl->insert (new_item);
4208 /* Eat up one item */ 4029 /* Eat up one item */
4209 decrease_ob_nr (marked, 1); 4030 marked->decrease ();
4031
4210 /* Eat one transformer if needed */ 4032 /* Eat one transformer if needed */
4211 if (transformer->stats.food) 4033 if (transformer->stats.food)
4212 if (--transformer->stats.food == 0) 4034 if (--transformer->stats.food == 0)
4213 decrease_ob_nr (transformer, 1); 4035 transformer->decrease ();
4214} 4036}
4037

Diff Legend

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