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.9 by root, Fri Aug 25 17:11:53 2006 UTC vs.
Revision 1.42 by root, Mon Dec 18 03:00:02 2006 UTC

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

Diff Legend

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