ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/c_object.C
(Generate patch)

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.51 by root, Sat May 12 16:06:42 2007 UTC vs.
Revision 1.80 by elmex, Sun Oct 5 12:40:21 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 *
24 */ 22 */
25 23
26/* 24/*
27 * Object (handling) commands 25 * Object (handling) commands
28 */ 26 */
… …
58 * only unapply applied, or apply unapplied objects 56 * only unapply applied, or apply unapplied objects
59 **/ 57 **/
60static object * 58static object *
61find_best_apply_object_match (object *pl, const char *params, enum apply_flag aflag) 59find_best_apply_object_match (object *pl, const char *params, enum apply_flag aflag)
62{ 60{
63 object *tmp, *best = NULL; 61 object *best = 0;
64 int match_val = 0, tmpmatch; 62 int match_val = 0;
65 63
66 for (tmp = pl->inv; tmp; tmp = tmp->below) 64 for (object *tmp = pl->inv; tmp; tmp = tmp->below)
67 { 65 {
68 if (tmp->invisible) 66 if (tmp->invisible)
69 continue; 67 continue;
68
70 if ((tmpmatch = item_matched_string (pl, tmp, params)) > match_val) 69 int tmpmatch = item_matched_string (pl, tmp, params);
70
71 if (tmpmatch > match_val)
71 { 72 {
72 if ((aflag == AP_APPLY) && (QUERY_FLAG (tmp, FLAG_APPLIED))) 73 if ((aflag == AP_APPLY) && (QUERY_FLAG (tmp, FLAG_APPLIED)))
73 continue; 74 continue;
75
74 if ((aflag == AP_UNAPPLY) && (!QUERY_FLAG (tmp, FLAG_APPLIED))) 76 if ((aflag == AP_UNAPPLY) && (!QUERY_FLAG (tmp, FLAG_APPLIED)))
75 continue; 77 continue;
78
76 match_val = tmpmatch; 79 match_val = tmpmatch;
77 best = tmp; 80 best = tmp;
78 } 81 }
79 } 82 }
83
80 return best; 84 return best;
81} 85}
82 86
83/** 87/**
84 * Shortcut to find_best_apply_object_match(pl, params, AF_NULL); 88 * Shortcut to find_best_apply_object_match(pl, params, AF_NULL);
85 **/ 89 **/
86object * 90object *
87find_best_object_match (object *pl, const char *params) 91find_best_object_match (object *pl, const char *params)
88{ 92{
89 return find_best_apply_object_match (pl, params, AP_NULL); 93 return find_best_apply_object_match (pl, params, AP_TOGGLE);
94}
95
96static bool
97can_split (object *pl, object *&op, sint32 nrof)
98{
99 if (object *tmp = op->split (nrof ? nrof : op->number_of ()))
100 {
101 op = tmp;
102 return true;
103 }
104 else
105 {
106 if (op->nrof > 1)
107 new_draw_info_format (NDI_UNIQUE, 0, pl, "There are only %d %s.", op->nrof, &op->name_pl);
108 else
109 new_draw_info_format (NDI_UNIQUE, 0, pl, "There is only one %s.", &op->name);
110
111 return false;
112 }
90} 113}
91 114
92int 115int
93command_uskill (object *pl, char *params) 116command_uskill (object *pl, char *params)
94{ 117{
… …
118 { 141 {
119 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the skill %s", params); 142 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the skill %s", params);
120 return 0; 143 return 0;
121 } 144 }
122 145
123 return change_skill (pl, skill, 0); 146 pl->change_skill (0);
147 apply_special (pl, skill, AP_APPLY);
148 return 1;
124} 149}
125 150
126/* These functions (command_search, command_disarm) are really just wrappers for 151/* These functions (command_search, command_disarm) are really just wrappers for
127 * things like 'use_skill ...'). In fact, they should really be obsoleted 152 * things like 'use_skill ...'). In fact, they should really be obsoleted
128 * and replaced with those. 153 * and replaced with those.
… …
202 * not need to use split_ob and stuff. 227 * not need to use split_ob and stuff.
203 */ 228 */
204int 229int
205sack_can_hold (object *pl, object *sack, object *op, uint32 nrof) 230sack_can_hold (object *pl, object *sack, object *op, uint32 nrof)
206{ 231{
207
208 if (!QUERY_FLAG (sack, FLAG_APPLIED)) 232 if (!QUERY_FLAG (sack, FLAG_APPLIED))
209 { 233 {
210 new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is not active.", query_name (sack)); 234 new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is not active.", query_name (sack));
211 return 0; 235 return 0;
212 } 236 }
237
213 if (sack == op) 238 if (sack == op)
214 { 239 {
215 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the %s into itself.", query_name (sack)); 240 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the %s into itself.", query_name (sack));
216 return 0; 241 return 0;
217 } 242 }
243
218 if (sack->race && (sack->race != op->race || op->type == CONTAINER || (sack->stats.food && sack->stats.food != op->type))) 244 if (sack->race && (sack->race != op->race || op->type == CONTAINER || (sack->stats.food && sack->stats.food != op->type)))
219 { 245 {
220 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can put only %s into the %s.", &sack->race, query_name (sack)); 246 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can put only %s into the %s.", &sack->race, query_name (sack));
221 return 0; 247 return 0;
222 } 248 }
249
223 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying) 250 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)
224 { 251 {
225 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the key into %s.", query_name (sack)); 252 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the key into %s.", query_name (sack));
226 return 0; 253 return 0;
227 } 254 }
255
228 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) * 256 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) *
229 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0)) 257 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0))
230 * (100 - sack->stats.Str) / 100) > sack->weight_limit) 258 * (100 - sack->stats.Str) / 100) > sack->weight_limit)
231 { 259 {
232 new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack)); 260 new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack));
233 return 0; 261 return 0;
234 } 262 }
263
235 /* All other checks pass, must be OK */ 264 /* All other checks pass, must be OK */
236 return 1; 265 return 1;
237} 266}
238 267
239/* Pick up commands follow */ 268/* Pick up commands follow */
… …
244 * pick up (0 means all of them) 273 * pick up (0 means all of them)
245 */ 274 */
246static void 275static void
247pick_up_object (object *pl, object *op, object *tmp, int nrof) 276pick_up_object (object *pl, object *op, object *tmp, int nrof)
248{ 277{
249 /* buf needs to be big (more than 256 chars) because you can get
250 * very long item names.
251 */
252 char buf[HUGE_BUF];
253 object *env = tmp->env; 278 object *env = tmp->env;
254 uint32 weight, effective_weight_limit; 279 uint32 weight, effective_weight_limit;
255 int tmp_nrof = tmp->nrof ? tmp->nrof : 1; 280 int tmp_nrof = tmp->number_of ();
256 281
257 /* IF the player is flying & trying to take the item out of a container 282 /* IF the player is flying & trying to take the item out of a container
258 * that is in his inventory, let him. tmp->env points to the container 283 * that is in his inventory, let him. tmp->env points to the container
259 * (sack, luggage, etc), tmp->env->env then points to the player (nested 284 * (sack, luggage, etc), tmp->env->env then points to the player (nested
260 * containers not allowed as of now) 285 * containers not allowed as of now)
261 */ 286 */
262 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl) 287 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl)
263 { 288 {
264 new_draw_info (NDI_UNIQUE, 0, pl, "You are levitating, you can't reach the ground!"); 289 pl->failmsg ("You are levitating, you can't reach the ground! "
290 "H<You have to stop levitating first, if you can, either by using your levitation skill, "
291 "or waiting till the levitation effect wears off.>");
265 return; 292 return;
266 } 293 }
267 294
268 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 295 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
269 return; 296 return;
270 297
271 if (QUERY_FLAG (tmp, FLAG_WAS_WIZ) && !QUERY_FLAG (pl, FLAG_WAS_WIZ))
272 {
273 new_draw_info (NDI_UNIQUE, 0, pl, "The object disappears in a puff of smoke!");
274 new_draw_info (NDI_UNIQUE, 0, pl, "It must have been an illusion.");
275
276 if (pl->contr)
277 esrv_del_item (pl->contr, tmp->count);
278
279 tmp->destroy ();
280 return;
281 }
282
283 if (nrof > tmp_nrof || nrof == 0) 298 if (nrof > tmp_nrof || nrof <= 0)
284 nrof = tmp_nrof; 299 nrof = tmp_nrof;
285 300
286 /* Figure out how much weight this object will add to the player */ 301 /* Figure out how much weight this object will add to the player */
287 weight = tmp->weight * nrof; 302 weight = tmp->weight * nrof;
288 if (tmp->inv) 303 if (tmp->inv)
289 weight += tmp->carrying * (100 - tmp->stats.Str) / 100; 304 weight += tmp->carrying * (100 - tmp->stats.Str) / 100;
290 305
291 if (pl->stats.Str <= MAX_STAT)
292 effective_weight_limit = weight_limit[pl->stats.Str]; 306 effective_weight_limit = weight_limit [min (MAX_STAT, pl->stats.Str)];
293 else
294 effective_weight_limit = weight_limit[MAX_STAT];
295 307
296 if ((pl->weight + pl->carrying + weight) > effective_weight_limit) 308 if ((pl->weight + pl->carrying + weight) > effective_weight_limit)
297 { 309 {
298 new_draw_info (0, 0, pl, "That item is too heavy for you to pick up."); 310 new_draw_info (0, 0, pl, "That item is too heavy for you to pick up.");
299 return; 311 return;
300 } 312 }
301 313
302 if (nrof != tmp_nrof) 314 if (!can_split (pl, tmp, nrof))
303 {
304 object *tmp2 = tmp;
305
306 tmp = get_split_ob (tmp, nrof);
307 if (!tmp)
308 {
309 new_draw_info (NDI_UNIQUE, 0, pl, errmsg);
310 return; 315 return;
311 }
312 316
313 /* Tell the client what happened to the rest of objects */ 317 if (QUERY_FLAG (tmp, FLAG_UNPAID))
314 if (pl->contr) 318 {
315 if (tmp2->destroyed ()) 319 tmp->flag.reset (FLAG_UNPAID);
316 esrv_del_item (pl->contr, tmp2->count); 320 new_draw_info_format (NDI_UNIQUE, 0, pl, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP));
317 else 321 tmp->flag.set (FLAG_UNPAID);
318 esrv_update_item (UPD_NROF, pl, tmp2);
319 } 322 }
320 else 323 else
321 { 324 new_draw_info_format (NDI_UNIQUE, 0, pl, "You pick up the %s.", query_name (tmp));
322 /* If the object is in a container, send a delete to the client.
323 * - we are moving all the items from the container to elsewhere,
324 * so it needs to be deleted.
325 */
326 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
327 {
328 if (tmp->env && pl->type == PLAYER)
329 esrv_del_item (pl->contr, tmp->count);
330 325
331 tmp->remove (); /* Unlink it */ 326 op->insert (tmp);
332 }
333 }
334
335 if (QUERY_FLAG (tmp, FLAG_UNPAID))
336 sprintf (buf, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP));
337 else
338 sprintf (buf, "You pick up the %s.", query_name (tmp));
339
340 new_draw_info (NDI_UNIQUE, 0, pl, buf);
341
342 tmp = insert_ob_in_ob (tmp, op);
343
344 /* All the stuff below deals with client/server code, and is only
345 * usable by players
346 */
347 if (pl->contr)
348 {
349 esrv_send_item (pl, tmp);
350
351 /* These are needed to update the weight for the container we
352 * are putting the object in.
353 */
354 if (op != pl)
355 {
356 esrv_update_item (UPD_WEIGHT, pl, op);
357 esrv_send_item (pl, pl);
358 }
359
360 /* Update the container the object was in */
361 if (env && env != pl && env != op)
362 esrv_update_item (UPD_WEIGHT, pl, env);
363 }
364} 327}
365 328
366/* modified slightly to allow monsters use this -b.t. 5-31-95 */ 329/* modified slightly to allow monsters use this -b.t. 5-31-95 */
367void 330void
368pick_up (object *op, object *alt) 331pick_up (object *op, object *alt)
… …
378 if (!can_pick (op, alt)) 341 if (!can_pick (op, alt))
379 { 342 {
380 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up the %s.", &alt->name); 343 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up the %s.", &alt->name);
381 goto leave; 344 goto leave;
382 } 345 }
346
383 tmp = alt; 347 tmp = alt;
384 } 348 }
385 else 349 else
386 { 350 {
387 if (op->below == NULL || !can_pick (op, op->below)) 351 if (op->below == NULL || !can_pick (op, op->below))
… …
396 /* Try to catch it. */ 360 /* Try to catch it. */
397 tmp_map = tmp->map; 361 tmp_map = tmp->map;
398 tmp = stop_item (tmp); 362 tmp = stop_item (tmp);
399 if (tmp == NULL) 363 if (tmp == NULL)
400 goto leave; 364 goto leave;
365
401 need_fix_tmp = 1; 366 need_fix_tmp = 1;
402 if (!can_pick (op, tmp)) 367 if (!can_pick (op, tmp))
403 goto leave; 368 goto leave;
404 369
405 if (op->type == PLAYER) 370 if (op->type == PLAYER)
… …
410 } 375 }
411 else 376 else
412 count = tmp->nrof; 377 count = tmp->nrof;
413 378
414 /* container is open, so use it */ 379 /* container is open, so use it */
380 if (tmp->flag [FLAG_STARTEQUIP])
381 alt = op;
415 if (op->container) 382 else if (op->container)
416 { 383 {
417 alt = op->container; 384 alt = op->container;
418 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count)) 385 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
419 goto leave; 386 goto leave;
420 } 387 }
… …
439 /* here it could be possible to check rent, 406 /* here it could be possible to check rent,
440 * if someone wants to implement it 407 * if someone wants to implement it
441 */ 408 */
442 alt = op; 409 alt = op;
443 } 410 }
411
444#ifdef PICKUP_DEBUG 412#ifdef PICKUP_DEBUG
445 LOG (llevDebug, "Pick_up(): %s picks %s (%d) and inserts it %s.\n", op->name, tmp->name, op->contr->count, alt->name); 413 LOG (llevDebug, "Pick_up(): %s picks %s (%d) and inserts it %s.\n", op->name, tmp->name, op->contr->count, alt->name);
446#endif 414#endif
447 415
448 /* startequip items are not allowed to be put into containers: */ 416 /* startequip items are not allowed to be put into containers: */
… …
498 466
499 /* Makes processing easier */ 467 /* Makes processing easier */
500 if (params && *params == '\0') 468 if (params && *params == '\0')
501 params = 0; 469 params = 0;
502 470
471 int cnt = MAX_ITEM_PER_DROP;
472
503 while (tmp) 473 while (tmp)
504 { 474 {
505 next = tmp->below; 475 next = tmp->below;
506 476
507 if (tmp->invisible) 477 if (tmp->invisible)
… …
513 /* This following two if and else if could be merged into line 483 /* This following two if and else if could be merged into line
514 * but that probably will make it more difficult to read, and 484 * but that probably will make it more difficult to read, and
515 * not make it any more efficient 485 * not make it any more efficient
516 */ 486 */
517 if (params && item_matched_string (op, tmp, params)) 487 if (params && item_matched_string (op, tmp, params))
488 {
489 if (--cnt < 0) break;
518 pick_up (op, tmp); 490 pick_up (op, tmp);
491 }
519 else if (can_pick (op, tmp) && !params) 492 else if (can_pick (op, tmp) && !params)
520 { 493 {
494 if (--cnt < 0) break;
521 pick_up (op, tmp); 495 pick_up (op, tmp);
522 break; 496 break;
523 } 497 }
524 498
525 tmp = next; 499 tmp = next;
500 }
501
502 if (cnt < 0)
503 {
504 op->failmsg ("Couldn't pick up so many items at once.");
505 return 0;
526 } 506 }
527 507
528 if (!params && !tmp) 508 if (!params && !tmp)
529 { 509 {
530 for (tmp = op->below; tmp; tmp = tmp->below) 510 for (tmp = op->below; tmp; tmp = tmp->below)
531 if (!tmp->invisible) 511 if (!tmp->invisible)
532 { 512 {
533 char buf[MAX_BUF];
534
535 sprintf (buf, "You can't pick up a %s.", &tmp->name); 513 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up a %s.", &tmp->name);
536 new_draw_info (NDI_UNIQUE, 0, op, buf);
537 break; 514 break;
538 } 515 }
539 516
540 if (!tmp) 517 if (!tmp)
541 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up."); 518 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up.");
542 } 519 }
543 520
544 return 0; 521 return 0;
545} 522}
546
547 523
548/* 524/*
549 * This function was part of drop, now is own function. 525 * This function was part of drop, now is own function.
550 * Player 'op' tries to put object 'tmp' into sack 'sack', 526 * Player 'op' tries to put object 'tmp' into sack 'sack',
551 * if nrof is non zero, then nrof objects is tried to put into sack. 527 * if nrof is non zero, then nrof objects is tried to put into sack.
… …
567 return; 543 return;
568 } 544 }
569 545
570 if (tmp->type == CONTAINER && tmp->inv) 546 if (tmp->type == CONTAINER && tmp->inv)
571 { 547 {
572
573 /* Eneq(@csd.uu.se): If the object to be dropped is a container 548 /* Eneq(@csd.uu.se): If the object to be dropped is a container
574 * we instead move the contents of that container into the active 549 * we instead move the contents of that container into the active
575 * container, this is only done if the object has something in it. 550 * container, this is only done if the object has something in it.
576 */ 551 */
577 sack2 = tmp; 552 sack2 = tmp;
… …
580 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) 555 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
581 { 556 {
582 tmp = tmp2->below; 557 tmp = tmp2->below;
583 558
584 if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof))) 559 if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof)))
585 {
586 put_object_in_sack (op, sack, tmp2, 0); 560 put_object_in_sack (op, sack, tmp2, 0);
587 }
588 else 561 else
589 { 562 {
590 sprintf (buf, "Your %s fills up.", query_name (sack)); 563 sprintf (buf, "Your %s fills up.", query_name (sack));
591 new_draw_info (NDI_UNIQUE, 0, op, buf); 564 new_draw_info (NDI_UNIQUE, 0, op, buf);
592 break; 565 break;
593 } 566 }
594 } 567 }
595 568
596 esrv_update_item (UPD_WEIGHT, op, sack2);
597 return; 569 return;
598 } 570 }
599 571
600 /* Don't worry about this for containers - our caller should have 572 /* Don't worry about this for containers - our caller should have
601 * already checked this. 573 * already checked this.
… …
606 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 578 if (QUERY_FLAG (tmp, FLAG_APPLIED))
607 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 579 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
608 return; 580 return;
609 581
610 /* we want to put some portion of the item into the container */ 582 /* we want to put some portion of the item into the container */
611 if (nrof && tmp->nrof != nrof) 583 if (!can_split (op, tmp, nrof))
612 {
613 object *tmp2 = tmp;
614
615 tmp = get_split_ob (tmp, nrof);
616
617 if (!tmp)
618 {
619 new_draw_info (NDI_UNIQUE, 0, op, errmsg);
620 return; 584 return;
621 }
622 /* Tell a client what happened other objects */
623 if (tmp2->destroyed ())
624 esrv_del_item (op->contr, tmp2->count);
625 else /* this can proably be replaced with an update */
626 esrv_send_item (op, tmp2);
627 }
628 else
629 tmp->remove ();
630 585
631 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack)); 586 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack));
632 tmp2 = insert_ob_in_ob (tmp, sack); 587 sack->insert (tmp);
633 op->update_stats (); /* This is overkill, fix_player() is called somewhere */
634 /* in object.c */
635
636 /* If an object merged (and thus, different object), we need to
637 * delete the original.
638 */
639 if (tmp2 != tmp)
640 esrv_del_item (op->contr, tmp->count);
641
642 esrv_send_item (op, tmp2);
643
644 /* update the sacks weight */
645 esrv_update_item (UPD_WEIGHT, op, sack);
646} 588}
647 589
648/* 590/*
649 * This function was part of drop, now is own function. 591 * This function was part of drop, now is own function.
650 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then 592 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then
… …
652 * This is used when dropping objects onto the floor. 594 * This is used when dropping objects onto the floor.
653 */ 595 */
654void 596void
655drop_object (object *op, object *tmp, uint32 nrof) 597drop_object (object *op, object *tmp, uint32 nrof)
656{ 598{
657 char buf[MAX_BUF];
658 object *floor;
659
660 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 599 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
661 return; 600 return;
662 601
663 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 602 if (QUERY_FLAG (tmp, FLAG_APPLIED))
664 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 603 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
… …
667 //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D 606 //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D
668 607
669 /* We are only dropping some of the items. We split the current object 608 /* We are only dropping some of the items. We split the current object
670 * off 609 * off
671 */ 610 */
672 if (nrof && tmp->nrof != nrof) 611 if (!can_split (op, tmp, nrof))
673 {
674 object *tmp2 = tmp;
675
676 tmp = get_split_ob (tmp, nrof);
677 if (!tmp)
678 {
679 new_draw_info (NDI_UNIQUE, 0, op, errmsg);
680 return; 612 return;
681 }
682 /* Tell a client what happened rest of objects. tmp2 is now the
683 * original object
684 */
685 if (op->type == PLAYER)
686 {
687 if (tmp2->destroyed ())
688 esrv_del_item (op->contr, tmp2->count);
689 else
690 esrv_send_item (op, tmp2);
691 }
692 }
693 else
694 tmp->remove ();
695 613
696 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op))) 614 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
697 return; 615 return;
698 616
699 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 617 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))
700 { 618 {
701 sprintf (buf, "You drop the %s.", query_name (tmp)); 619 op->statusmsg (format ("You drop the %s.", query_name (tmp)));
702 new_draw_info (NDI_UNIQUE, 0, op, buf); 620 op->statusmsg ("The god who lent it to you retrieves it.");
703 new_draw_info (NDI_UNIQUE, 0, op, "The gods who lent it to you retrieves it.");
704
705 if (op->type == PLAYER)
706 esrv_del_item (op->contr, tmp->count);
707 621
708 tmp->destroy (); 622 tmp->destroy ();
709 op->update_stats (); 623 op->update_stats ();
710 return; 624 return;
711 } 625 }
712 626
713 if (op->type == PLAYER)
714 esrv_del_item (op->contr, tmp->count);
715
716 /* Call this before we update the various windows/players. At least 627 /* Call this before we update the various windows/players. At least
717 * that we, we know the weight is correct. 628 * that we, we know the weight is correct.
718 */ 629 */
719 op->update_stats (); /* This is overkill, fix_player() is called somewhere */ 630 // 2007-11-26: moved op->update_stats away and calling it later after
720 /* in object.c */ 631 // all items of a drop command have been processed.
721 632
722 if (op->type == PLAYER)
723 {
724 /* Need to update the weight for the player */
725 esrv_send_item (op, op);
726 op->contr->ns->floorbox_update ();
727 }
728
729 for (floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above) 633 for (object *floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)
730 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op))) 634 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
731 return; 635 return;
732 636
733 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY) 637 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
638 {
734 sell_item (tmp, op); 639 if (!sell_item (tmp, op))
640 {
641 // if we can't sell it we don't drop it, so give it back to the seller
642 op->insert (tmp);
643 return;
644 }
645 }
735 646
736 tmp->x = op->x; 647 tmp->x = op->x;
737 tmp->y = op->y; 648 tmp->y = op->y;
738 649
739 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR); 650 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
… …
753 if (tmp->env && tmp->env->type != PLAYER) 664 if (tmp->env && tmp->env->type != PLAYER)
754 { 665 {
755 /* Just toss the object - probably shouldn't be hanging 666 /* Just toss the object - probably shouldn't be hanging
756 * around anyways 667 * around anyways
757 */ 668 */
758 tmp->remove ();
759 tmp->destroy (); 669 tmp->destroy ();
760 return; 670 return;
761 } 671 }
762 else 672 else
763 { 673 {
764 while (tmp != NULL && tmp->invisible) 674 while (tmp && tmp->invisible)
765 tmp = tmp->below; 675 tmp = tmp->below;
766 } 676 }
767 } 677 }
768 678
769 if (tmp == NULL) 679 if (tmp == NULL)
770 { 680 {
771 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop."); 681 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop.");
772 return; 682 return;
773 } 683 }
684
774 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 685 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED))
775 { 686 {
776 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked"); 687 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
777 return; 688 return;
778 } 689 }
690
779 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 691 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
780 { 692 {
781#if 0 693#if 0
782 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */ 694 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */
783 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped."); 695 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped.");
… …
807 719
808 if (op->type == PLAYER) 720 if (op->type == PLAYER)
809 op->contr->count = 0; 721 op->contr->count = 0;
810} 722}
811 723
812
813
814/* Command will drop all items that have not been locked */ 724/* Command will drop all items that have not been locked */
815int 725int
816command_dropall (object *op, char *params) 726command_dropall (object *op, char *params)
817{ 727{
818 728
819 object *curinv, *nextinv;
820
821 if (op->inv == NULL) 729 if (op->inv == NULL)
822 { 730 {
823 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!"); 731 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!");
824 return 0; 732 return 0;
825 } 733 }
826 734
827 curinv = op->inv; 735 object *curinv = op->inv;
736 object *nextinv;
828 737
829 /* 738 /*
830 This is the default. Drops everything not locked or considered 739 This is the default. Drops everything not locked or considered
831 not something that should be dropped. 740 not something that should be dropped.
832 */ 741 */
… …
834 Care must be taken that the next item pointer is not to money as 743 Care must be taken that the next item pointer is not to money as
835 the drop() routine will do unknown things to it when dropping 744 the drop() routine will do unknown things to it when dropping
836 in a shop. --Tero.Pelander@utu.fi 745 in a shop. --Tero.Pelander@utu.fi
837 */ 746 */
838 747
839 if (params == NULL) 748 int cnt = MAX_ITEM_PER_DROP;
749
750 if (!params)
840 { 751 {
841 while (curinv != NULL) 752 while (curinv)
842 { 753 {
843 nextinv = curinv->below; 754 nextinv = curinv->below;
755
844 while (nextinv && nextinv->type == MONEY) 756 while (nextinv && nextinv->type == MONEY)
845 nextinv = nextinv->below; 757 nextinv = nextinv->below;
758
846 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && 759 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY &&
847 curinv->type != FOOD && curinv->type != KEY && 760 curinv->type != FOOD && curinv->type != KEY &&
848 curinv->type != SPECIAL_KEY && curinv->type != GEM && 761 curinv->type != SPECIAL_KEY && curinv->type != GEM &&
849 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv)) 762 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv))
850 { 763 {
851 drop (op, curinv); 764 drop (op, curinv);
765 if (--cnt <= 0) break;
852 } 766 }
767
853 curinv = nextinv; 768 curinv = nextinv;
854 } 769 }
855 } 770 }
856
857 else if (strcmp (params, "weapons") == 0) 771 else if (strcmp (params, "weapons") == 0)
858 { 772 {
859 while (curinv != NULL) 773 while (curinv)
860 { 774 {
861 nextinv = curinv->below; 775 nextinv = curinv->below;
776
862 while (nextinv && nextinv->type == MONEY) 777 while (nextinv && nextinv->type == MONEY)
863 nextinv = nextinv->below; 778 nextinv = nextinv->below;
779
864 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW))) 780 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW)))
865 { 781 {
866 drop (op, curinv); 782 drop (op, curinv);
783 if (--cnt <= 0) break;
867 } 784 }
785
868 curinv = nextinv; 786 curinv = nextinv;
869 } 787 }
870 } 788 }
871
872 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0) 789 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0)
873 { 790 {
874 while (curinv != NULL) 791 while (curinv)
875 { 792 {
876 nextinv = curinv->below; 793 nextinv = curinv->below;
794
877 while (nextinv && nextinv->type == MONEY) 795 while (nextinv && nextinv->type == MONEY)
878 nextinv = nextinv->below; 796 nextinv = nextinv->below;
797
879 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET)) 798 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET))
880 { 799 {
881 drop (op, curinv); 800 drop (op, curinv);
801 if (--cnt <= 0) break;
882 } 802 }
803
883 curinv = nextinv; 804 curinv = nextinv;
884 } 805 }
885 } 806 }
886
887 else if (strcmp (params, "misc") == 0) 807 else if (strcmp (params, "misc") == 0)
888 { 808 {
889 while (curinv != NULL) 809 while (curinv)
890 { 810 {
891 nextinv = curinv->below; 811 nextinv = curinv->below;
812
892 while (nextinv && nextinv->type == MONEY) 813 while (nextinv && nextinv->type == MONEY)
893 nextinv = nextinv->below; 814 nextinv = nextinv->below;
815
894 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED)) 816 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED))
895 { 817 {
896 switch (curinv->type) 818 switch (curinv->type)
897 { 819 {
898 case HORN: 820 case HORN:
… …
916 break; 838 break;
917 default: 839 default:
918 curinv = nextinv; 840 curinv = nextinv;
919 break; 841 break;
920 } 842 }
843
844 if (--cnt <= 0) break;
921 } 845 }
846
922 curinv = nextinv; 847 curinv = nextinv;
923 } 848 }
924 } 849 }
925 850
926 op->contr->ns->floorbox_update (); 851 if (cnt <= 0)
852 op->failmsg ("Only dropped some items, can't drop that many items at once.");
927 853
928/* draw_look(op);*/ 854/* draw_look(op);*/
929 return 0; 855 return 0;
930} 856}
931 857
932/* Object op wants to drop object(s) params. params can be a 858/* Object op wants to drop object(s) params. params can be a
933 * comma seperated list. 859 * comma seperated list.
934 */ 860 */
935
936int 861int
937command_drop (object *op, char *params) 862command_drop (object *op, char *params)
938{ 863{
939 object *tmp, *next; 864 object *tmp, *next;
940 int did_one = 0; 865 int did_one = 0;
… …
944 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?"); 869 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
945 return 0; 870 return 0;
946 } 871 }
947 else 872 else
948 { 873 {
874 int cnt = MAX_ITEM_PER_DROP;
875
949 for (tmp = op->inv; tmp; tmp = next) 876 for (tmp = op->inv; tmp; tmp = next)
950 { 877 {
951 next = tmp->below; 878 next = tmp->below;
952 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible) 879 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible)
953 continue; 880 continue;
881
954 if (item_matched_string (op, tmp, params)) 882 if (item_matched_string (op, tmp, params))
955 { 883 {
956 drop (op, tmp); 884 drop (op, tmp);
885 if (--cnt <= 0) break;
957 did_one = 1; 886 did_one = 1;
958 } 887 }
959 } 888 }
889
960 if (!did_one) 890 if (!did_one)
961 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); 891 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
962 } 892
963 if (op->type == PLAYER) 893 if (cnt <= 0)
964 { 894 op->failmsg ("Only dropped some items, can't drop that many items at once.");
965 op->contr->count = 0;
966 op->contr->ns->floorbox_update ();
967 }; 895 }
968 896
969/* draw_look(op);*/
970 return 0; 897 return 0;
971} 898}
972 899
973int 900int
974command_examine (object *op, char *params) 901command_examine (object *op, char *params)
… …
977 { 904 {
978 object *tmp = op->below; 905 object *tmp = op->below;
979 906
980 while (tmp && !tmp->client_visible ()) 907 while (tmp && !tmp->client_visible ())
981 tmp = tmp->below; 908 tmp = tmp->below;
909
982 if (tmp) 910 if (tmp)
983 examine (op, tmp); 911 examine (op, tmp);
984 } 912 }
985 else 913 else
986 { 914 {
987 object *tmp = find_best_object_match (op, params); 915 object *tmp = find_best_object_match (op, params);
988 916
989 if (tmp) 917 if (tmp)
990 examine (op, tmp); 918 examine (op, tmp);
991 else 919 else
992 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find an object that matches %s", params); 920 op->contr->infobox (MSG_CHANNEL ("examine"), format ("Could not find an object that matches %s", params));
993 } 921 }
922
994 return 0; 923 return 0;
995} 924}
996 925
997/* op should be a player. 926/* op should be a player.
998 * we return the object the player has marked with the 'mark' command 927 * we return the object the player has marked with the 'mark' command
… …
1045 dynbuf_text buf (512, 512); 974 dynbuf_text buf (512, 512);
1046 975
1047 object *mon = head ? head : this; 976 object *mon = head ? head : this;
1048 977
1049 if (QUERY_FLAG (mon, FLAG_UNDEAD)) 978 if (QUERY_FLAG (mon, FLAG_UNDEAD))
1050 buf << "It is an undead force.\n"; 979 buf << "It is an undead force.\r";
1051 980
1052 if (mon->level > who->level) 981 if (mon->level > who->level)
1053 buf << "It is likely more powerful than you.\n"; 982 buf << "It is likely more powerful than you.\r";
1054 else if (mon->level < who->level) 983 else if (mon->level < who->level)
1055 buf << "It is likely less powerful than you.\n"; 984 buf << "It is likely less powerful than you.\r";
1056 else 985 else
1057 buf << "It is probably as powerful as you.\n"; 986 buf << "It is probably as powerful as you.\r";
1058 987
1059 if (mon->attacktype & AT_ACID) 988 if (mon->attacktype & AT_ACID)
1060 buf << "You seem to smell an acrid odor.\n"; 989 buf << "You seem to smell an acrid odor.\r";
1061 990
1062 /* Anyone know why this used to use the clone value instead of the 991 /* Anyone know why this used to use the clone value instead of the
1063 * maxhp field? This seems that it should give more accurate results. 992 * maxhp field? This seems that it should give more accurate results.
1064 */ 993 */
1065 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1)) 994 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
1066 { /* From 1-4 */ 995 { /* From 1-4 */
1067 case 1: 996 case 1:
1068 buf << "It is in a bad shape.\n"; 997 buf << "It is in a bad shape.\r";
1069 break; 998 break;
1070 case 2: 999 case 2:
1071 buf << "It is hurt.\n"; 1000 buf << "It is hurt.\r";
1072 break; 1001 break;
1073 case 3: 1002 case 3:
1074 buf << "It is somewhat hurt.\n"; 1003 buf << "It is somewhat hurt.\r";
1075 break; 1004 break;
1076 case 4: 1005 case 4:
1077 buf << "It is in excellent shape.\n"; 1006 buf << "It is in excellent shape.\r";
1078 break; 1007 break;
1079 } 1008 }
1080 1009
1081 if (present_in_ob (POISONING, mon)) 1010 if (present_in_ob (POISONING, mon))
1082 buf << "It looks very ill.\n"; 1011 buf << "It looks very ill.\r";
1012
1013 buf << '\n';
1083 1014
1084 return buf; 1015 return buf;
1085} 1016}
1086 1017
1087/* tmp is the object being described, pl is who is examing it. */ 1018/* tmp is the object being described, pl is who is examing it. */
… …
1145std::string 1076std::string
1146object::describe (object *who) 1077object::describe (object *who)
1147{ 1078{
1148 dynbuf_text buf (1024, 1024); 1079 dynbuf_text buf (1024, 1024);
1149 1080
1150 buf.printf ("That is: %s.\n", long_desc (who).c_str ()); 1081 buf.printf ("That is: %s.\r", long_desc (who).c_str ());
1151 1082
1152 if (custom_name) 1083 if (custom_name)
1153 buf,printf ("You call it %s\n", &custom_name); 1084 buf.printf ("You call it %s.\r", &custom_name);
1154 1085
1155 switch (type) 1086 switch (type)
1156 { 1087 {
1157 case SPELLBOOK: 1088 case SPELLBOOK:
1158 if (flag [FLAG_IDENTIFIED] && inv) 1089 if (flag [FLAG_IDENTIFIED] && inv)
1159 buf.printf ("%s is a %s %s spell\n", &inv->name, get_levelnumber (inv->level), &inv->skill); 1090 buf.printf ("%s is a %s %s spell.\r", &inv->name, get_levelnumber (inv->level), &inv->skill);
1160 break; 1091 break;
1161 1092
1162 case BOOK: 1093 case BOOK:
1163 if (msg) 1094 if (msg)
1164 buf << "Something is written in it.\n"; 1095 buf << "Something is written in it.\r";
1165 break; 1096 break;
1166 1097
1167 case CONTAINER: 1098 case CONTAINER:
1168 if (race != NULL) 1099 if (race)
1169 { 1100 {
1170 if (weight_limit && stats.Str < 100) 1101 if (weight_limit && stats.Str < 100)
1171 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\n", 1102 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\r",
1172 &race, weight_limit / (10.0 * (100 - stats.Str))); 1103 &race, weight_limit / (10.0 * (100 - stats.Str)));
1173 else 1104 else
1174 buf.printf ("It can hold only %s.\n", &race); 1105 buf.printf ("It can hold only %s.\r", &race);
1175 } 1106 }
1176 else if (weight_limit && stats.Str < 100) 1107 else if (weight_limit && stats.Str < 100)
1177 buf.printf ("Its weight limit is %.1f kg.\n", weight_limit / (10.0 * (100 - stats.Str))); 1108 buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str)));
1178 break; 1109 break;
1179 1110
1180 case WAND: 1111 case WAND:
1181 if (flag [FLAG_IDENTIFIED]) 1112 if (flag [FLAG_IDENTIFIED])
1182 buf.printf ("It has %d charges left.\n", stats.food); 1113 buf.printf ("It has %d charges left.\r", stats.food);
1183 break; 1114 break;
1184 } 1115 }
1185 1116
1186 if (materialname && !msg) 1117 if (materialname && !msg)
1187 buf.printf ("It is made of: %s.\n", &materialname); 1118 buf.printf ("It is made of: %s.\r", &materialname);
1188 1119
1189 if (who) 1120 if (who)
1190 /* Where to wear this item */ 1121 /* Where to wear this item */
1191 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1122 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1192 if (slot[i].info) 1123 if (slot[i].info)
… …
1194 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name); 1125 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1195 1126
1196 if (slot[i].info < -1 && who->slot[i].info) 1127 if (slot[i].info < -1 && who->slot[i].info)
1197 buf.printf ("(%d)", -slot[i].info); 1128 buf.printf ("(%d)", -slot[i].info);
1198 1129
1199 buf << ".\n"; 1130 buf << ".\r";
1200 } 1131 }
1201 1132
1202 if (weight) 1133 if (weight)
1203 buf.printf (nrof > 1 ? "They weigh %3.3f kg.\n" : "It weighs %3.3f kg.\n", weight * (nrof ? nrof : 1) / 1000.0); 1134 buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0);
1204 1135
1205 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who) 1136 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1206 { 1137 {
1207 buf.printf ("You reckon %s worth %s.\n", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX)); 1138 buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
1208 1139
1209 if (is_in_shop (who)) 1140 if (is_in_shop (who))
1210 { 1141 {
1211 if (flag [FLAG_UNPAID]) 1142 if (flag [FLAG_UNPAID])
1212 buf.printf ("%s would cost you %s.\n", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP)); 1143 buf.printf ("%s would cost you %s.\r", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
1213 else 1144 else
1214 buf.printf ("You are offered %s for %s.\n", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it"); 1145 buf.printf ("You are offered %s for %s.\r", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1215 } 1146 }
1216 } 1147 }
1217 1148
1218 if (flag [FLAG_MONSTER]) 1149 if (flag [FLAG_MONSTER])
1219 buf << describe_monster (who); 1150 buf << describe_monster (who);
1220 1151
1221 /* Is this item buildable? */ 1152 /* Is this item buildable? */
1222 if (flag [FLAG_IS_BUILDABLE]) 1153 if (flag [FLAG_IS_BUILDABLE])
1223 buf << "This is a buildable item.\n"; 1154 buf << "This is a buildable item.\r";
1224 1155
1225 /* Does the object have a message? Don't show message for all object 1156 /* Does the object have a message? Don't show message for all object
1226 * types - especially if the first entry is a match 1157 * types - especially if the first entry is a match
1227 */ 1158 */
1228 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && strncasecmp (msg, "@match", 7)) 1159 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
1229 { 1160 {
1230 /* This is just a hack so when identifying the items, we print 1161 /* This is just a hack so when identifying the items, we print
1231 * out the extra message 1162 * out the extra message
1232 */ 1163 */
1233 if (need_identify (this) && flag [FLAG_IDENTIFIED]) 1164 if (need_identify (this) && flag [FLAG_IDENTIFIED])
1234 buf << "The object has a story:\n"; 1165 buf << "The object has a story:\r";
1235 1166
1236 buf << msg << '\n'; 1167 buf << msg << '\n';
1237 } 1168 }
1238 1169
1239 buf << '\n'; 1170 buf << '\n';
1240 1171
1241 return std::string (buf.linearise (), buf.size ()); 1172 return std::string (buf.linearise (), buf.size ());
1242}
1243
1244void
1245examine (object *op, object *tmp)
1246{
1247 std::string s = tmp->describe (op);
1248
1249 new_draw_info (NDI_UNIQUE, 0, op, s.c_str ());
1250}
1251
1252/*
1253 * inventory prints object's inventory. If inv==NULL then print player's
1254 * inventory.
1255 * [ Only items which are applied are showed. Tero.Haatanen@lut.fi ]
1256 */
1257void
1258inventory (object *op, object *inv)
1259{
1260 object *tmp;
1261 const char *in;
1262 int items = 0, length;
1263
1264 if (inv == NULL && op == NULL)
1265 {
1266 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object?");
1267 return;
1268 }
1269
1270 tmp = inv ? inv->inv : op->inv;
1271
1272 while (tmp)
1273 {
1274 if ((!tmp->invisible &&
1275 (inv == NULL || inv->type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) || (!op || QUERY_FLAG (op, FLAG_WIZ)))
1276 items++;
1277 tmp = tmp->below;
1278 }
1279
1280 if (inv == NULL)
1281 { /* player's inventory */
1282 if (items == 0)
1283 {
1284 new_draw_info (NDI_UNIQUE, 0, op, "You carry nothing.");
1285 return;
1286 }
1287 else
1288 {
1289 length = 28;
1290 in = "";
1291 if (op)
1292 clear_win_info (op);
1293 new_draw_info (NDI_UNIQUE, 0, op, "Inventory:");
1294 }
1295 }
1296 else
1297 {
1298 if (items == 0)
1299 return;
1300 else
1301 {
1302 length = 28;
1303 in = " ";
1304 }
1305 }
1306
1307 for (tmp = inv ? inv->inv : op->inv; tmp; tmp = tmp->below)
1308 {
1309 if ((!op || !QUERY_FLAG (op, FLAG_WIZ)) && (tmp->invisible || (inv && inv->type != CONTAINER && !QUERY_FLAG (tmp, FLAG_APPLIED))))
1310 continue;
1311 if ((!op || QUERY_FLAG (op, FLAG_WIZ)))
1312 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s (%5d) %-8s", in, length, length,
1313 query_name (tmp), tmp->count, query_weight (tmp));
1314 else
1315 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s %-8s", in, length + 8, length + 8, query_name (tmp), query_weight (tmp));
1316 }
1317
1318 if (!inv && op)
1319 new_draw_info_format (NDI_UNIQUE, 0, op, "%-*s %-8s", 41, "Total weight :", query_weight (op));
1320} 1173}
1321 1174
1322static void 1175static void
1323display_new_pickup (object *op) 1176display_new_pickup (object *op)
1324{ 1177{

Diff Legend

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