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.54 by root, Thu May 17 20:27:01 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 */
… …
93find_best_object_match (object *pl, const char *params) 91find_best_object_match (object *pl, const char *params)
94{ 92{
95 return find_best_apply_object_match (pl, params, AP_TOGGLE); 93 return find_best_apply_object_match (pl, params, AP_TOGGLE);
96} 94}
97 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 }
113}
114
98int 115int
99command_uskill (object *pl, char *params) 116command_uskill (object *pl, char *params)
100{ 117{
101 if (!params) 118 if (!params)
102 { 119 {
… …
210 * not need to use split_ob and stuff. 227 * not need to use split_ob and stuff.
211 */ 228 */
212int 229int
213sack_can_hold (object *pl, object *sack, object *op, uint32 nrof) 230sack_can_hold (object *pl, object *sack, object *op, uint32 nrof)
214{ 231{
215
216 if (!QUERY_FLAG (sack, FLAG_APPLIED)) 232 if (!QUERY_FLAG (sack, FLAG_APPLIED))
217 { 233 {
218 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));
219 return 0; 235 return 0;
220 } 236 }
237
221 if (sack == op) 238 if (sack == op)
222 { 239 {
223 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));
224 return 0; 241 return 0;
225 } 242 }
243
226 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)))
227 { 245 {
228 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));
229 return 0; 247 return 0;
230 } 248 }
249
231 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying) 250 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)
232 { 251 {
233 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));
234 return 0; 253 return 0;
235 } 254 }
255
236 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) * 256 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) *
237 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0)) 257 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0))
238 * (100 - sack->stats.Str) / 100) > sack->weight_limit) 258 * (100 - sack->stats.Str) / 100) > sack->weight_limit)
239 { 259 {
240 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));
241 return 0; 261 return 0;
242 } 262 }
263
243 /* All other checks pass, must be OK */ 264 /* All other checks pass, must be OK */
244 return 1; 265 return 1;
245} 266}
246 267
247/* Pick up commands follow */ 268/* Pick up commands follow */
… …
252 * pick up (0 means all of them) 273 * pick up (0 means all of them)
253 */ 274 */
254static void 275static void
255pick_up_object (object *pl, object *op, object *tmp, int nrof) 276pick_up_object (object *pl, object *op, object *tmp, int nrof)
256{ 277{
257 /* buf needs to be big (more than 256 chars) because you can get
258 * very long item names.
259 */
260 char buf[HUGE_BUF];
261 object *env = tmp->env; 278 object *env = tmp->env;
262 uint32 weight, effective_weight_limit; 279 uint32 weight, effective_weight_limit;
263 int tmp_nrof = tmp->nrof ? tmp->nrof : 1; 280 int tmp_nrof = tmp->number_of ();
264 281
265 /* 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
266 * 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
267 * (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
268 * containers not allowed as of now) 285 * containers not allowed as of now)
269 */ 286 */
270 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)
271 { 288 {
272 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.>");
273 return; 292 return;
274 } 293 }
275 294
276 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 295 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
277 return; 296 return;
278 297
279 if (nrof > tmp_nrof || nrof == 0) 298 if (nrof > tmp_nrof || nrof <= 0)
280 nrof = tmp_nrof; 299 nrof = tmp_nrof;
281 300
282 /* 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 */
283 weight = tmp->weight * nrof; 302 weight = tmp->weight * nrof;
284 if (tmp->inv) 303 if (tmp->inv)
285 weight += tmp->carrying * (100 - tmp->stats.Str) / 100; 304 weight += tmp->carrying * (100 - tmp->stats.Str) / 100;
286 305
287 if (pl->stats.Str <= MAX_STAT)
288 effective_weight_limit = weight_limit[pl->stats.Str]; 306 effective_weight_limit = weight_limit [min (MAX_STAT, pl->stats.Str)];
289 else
290 effective_weight_limit = weight_limit[MAX_STAT];
291 307
292 if ((pl->weight + pl->carrying + weight) > effective_weight_limit) 308 if ((pl->weight + pl->carrying + weight) > effective_weight_limit)
293 { 309 {
294 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.");
295 return; 311 return;
296 } 312 }
297 313
298 if (nrof != tmp_nrof) 314 if (!can_split (pl, tmp, nrof))
299 {
300 object *tmp2 = tmp;
301
302 tmp = get_split_ob (tmp, nrof);
303 if (!tmp)
304 {
305 new_draw_info (NDI_UNIQUE, 0, pl, errmsg);
306 return; 315 return;
307 }
308 316
309 /* Tell the client what happened to the rest of objects */ 317 if (QUERY_FLAG (tmp, FLAG_UNPAID))
310 if (pl->contr) 318 {
311 if (tmp2->destroyed ()) 319 tmp->flag.reset (FLAG_UNPAID);
312 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));
313 else 321 tmp->flag.set (FLAG_UNPAID);
314 esrv_update_item (UPD_NROF, pl, tmp2);
315 } 322 }
316 else 323 else
317 { 324 new_draw_info_format (NDI_UNIQUE, 0, pl, "You pick up the %s.", query_name (tmp));
318 /* If the object is in a container, send a delete to the client.
319 * - we are moving all the items from the container to elsewhere,
320 * so it needs to be deleted.
321 */
322 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
323 {
324 if (tmp->env && pl->type == PLAYER)
325 esrv_del_item (pl->contr, tmp->count);
326 325
327 tmp->remove (); /* Unlink it */ 326 op->insert (tmp);
328 }
329 }
330
331 if (QUERY_FLAG (tmp, FLAG_UNPAID))
332 sprintf (buf, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP));
333 else
334 sprintf (buf, "You pick up the %s.", query_name (tmp));
335
336 new_draw_info (NDI_UNIQUE, 0, pl, buf);
337
338 tmp = insert_ob_in_ob (tmp, op);
339
340 /* All the stuff below deals with client/server code, and is only
341 * usable by players
342 */
343 if (pl->contr)
344 {
345 esrv_send_item (pl, tmp);
346
347 /* These are needed to update the weight for the container we
348 * are putting the object in.
349 */
350 if (op != pl)
351 {
352 esrv_update_item (UPD_WEIGHT, pl, op);
353 esrv_send_item (pl, pl);
354 }
355
356 /* Update the container the object was in */
357 if (env && env != pl && env != op)
358 esrv_update_item (UPD_WEIGHT, pl, env);
359 }
360} 327}
361 328
362/* 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 */
363void 330void
364pick_up (object *op, object *alt) 331pick_up (object *op, object *alt)
… …
374 if (!can_pick (op, alt)) 341 if (!can_pick (op, alt))
375 { 342 {
376 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);
377 goto leave; 344 goto leave;
378 } 345 }
346
379 tmp = alt; 347 tmp = alt;
380 } 348 }
381 else 349 else
382 { 350 {
383 if (op->below == NULL || !can_pick (op, op->below)) 351 if (op->below == NULL || !can_pick (op, op->below))
… …
392 /* Try to catch it. */ 360 /* Try to catch it. */
393 tmp_map = tmp->map; 361 tmp_map = tmp->map;
394 tmp = stop_item (tmp); 362 tmp = stop_item (tmp);
395 if (tmp == NULL) 363 if (tmp == NULL)
396 goto leave; 364 goto leave;
365
397 need_fix_tmp = 1; 366 need_fix_tmp = 1;
398 if (!can_pick (op, tmp)) 367 if (!can_pick (op, tmp))
399 goto leave; 368 goto leave;
400 369
401 if (op->type == PLAYER) 370 if (op->type == PLAYER)
… …
406 } 375 }
407 else 376 else
408 count = tmp->nrof; 377 count = tmp->nrof;
409 378
410 /* container is open, so use it */ 379 /* container is open, so use it */
380 if (tmp->flag [FLAG_STARTEQUIP])
381 alt = op;
411 if (op->container) 382 else if (op->container)
412 { 383 {
413 alt = op->container; 384 alt = op->container;
414 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count)) 385 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
415 goto leave; 386 goto leave;
416 } 387 }
… …
435 /* here it could be possible to check rent, 406 /* here it could be possible to check rent,
436 * if someone wants to implement it 407 * if someone wants to implement it
437 */ 408 */
438 alt = op; 409 alt = op;
439 } 410 }
411
440#ifdef PICKUP_DEBUG 412#ifdef PICKUP_DEBUG
441 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);
442#endif 414#endif
443 415
444 /* startequip items are not allowed to be put into containers: */ 416 /* startequip items are not allowed to be put into containers: */
… …
494 466
495 /* Makes processing easier */ 467 /* Makes processing easier */
496 if (params && *params == '\0') 468 if (params && *params == '\0')
497 params = 0; 469 params = 0;
498 470
471 int cnt = MAX_ITEM_PER_DROP;
472
499 while (tmp) 473 while (tmp)
500 { 474 {
501 next = tmp->below; 475 next = tmp->below;
502 476
503 if (tmp->invisible) 477 if (tmp->invisible)
… …
509 /* 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
510 * but that probably will make it more difficult to read, and 484 * but that probably will make it more difficult to read, and
511 * not make it any more efficient 485 * not make it any more efficient
512 */ 486 */
513 if (params && item_matched_string (op, tmp, params)) 487 if (params && item_matched_string (op, tmp, params))
488 {
489 if (--cnt < 0) break;
514 pick_up (op, tmp); 490 pick_up (op, tmp);
491 }
515 else if (can_pick (op, tmp) && !params) 492 else if (can_pick (op, tmp) && !params)
516 { 493 {
494 if (--cnt < 0) break;
517 pick_up (op, tmp); 495 pick_up (op, tmp);
518 break; 496 break;
519 } 497 }
520 498
521 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;
522 } 506 }
523 507
524 if (!params && !tmp) 508 if (!params && !tmp)
525 { 509 {
526 for (tmp = op->below; tmp; tmp = tmp->below) 510 for (tmp = op->below; tmp; tmp = tmp->below)
527 if (!tmp->invisible) 511 if (!tmp->invisible)
528 { 512 {
529 char buf[MAX_BUF];
530
531 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);
532 new_draw_info (NDI_UNIQUE, 0, op, buf);
533 break; 514 break;
534 } 515 }
535 516
536 if (!tmp) 517 if (!tmp)
537 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.");
538 } 519 }
539 520
540 return 0; 521 return 0;
541} 522}
542
543 523
544/* 524/*
545 * This function was part of drop, now is own function. 525 * This function was part of drop, now is own function.
546 * Player 'op' tries to put object 'tmp' into sack 'sack', 526 * Player 'op' tries to put object 'tmp' into sack 'sack',
547 * 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.
… …
563 return; 543 return;
564 } 544 }
565 545
566 if (tmp->type == CONTAINER && tmp->inv) 546 if (tmp->type == CONTAINER && tmp->inv)
567 { 547 {
568
569 /* 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
570 * we instead move the contents of that container into the active 549 * we instead move the contents of that container into the active
571 * 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.
572 */ 551 */
573 sack2 = tmp; 552 sack2 = tmp;
… …
576 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) 555 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
577 { 556 {
578 tmp = tmp2->below; 557 tmp = tmp2->below;
579 558
580 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)))
581 {
582 put_object_in_sack (op, sack, tmp2, 0); 560 put_object_in_sack (op, sack, tmp2, 0);
583 }
584 else 561 else
585 { 562 {
586 sprintf (buf, "Your %s fills up.", query_name (sack)); 563 sprintf (buf, "Your %s fills up.", query_name (sack));
587 new_draw_info (NDI_UNIQUE, 0, op, buf); 564 new_draw_info (NDI_UNIQUE, 0, op, buf);
588 break; 565 break;
589 } 566 }
590 } 567 }
591 568
592 esrv_update_item (UPD_WEIGHT, op, sack2);
593 return; 569 return;
594 } 570 }
595 571
596 /* Don't worry about this for containers - our caller should have 572 /* Don't worry about this for containers - our caller should have
597 * already checked this. 573 * already checked this.
… …
602 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 578 if (QUERY_FLAG (tmp, FLAG_APPLIED))
603 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 579 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
604 return; 580 return;
605 581
606 /* 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 */
607 if (nrof && tmp->nrof != nrof) 583 if (!can_split (op, tmp, nrof))
608 {
609 object *tmp2 = tmp;
610
611 tmp = get_split_ob (tmp, nrof);
612
613 if (!tmp)
614 {
615 new_draw_info (NDI_UNIQUE, 0, op, errmsg);
616 return; 584 return;
617 }
618 /* Tell a client what happened other objects */
619 if (tmp2->destroyed ())
620 esrv_del_item (op->contr, tmp2->count);
621 else /* this can proably be replaced with an update */
622 esrv_send_item (op, tmp2);
623 }
624 else
625 tmp->remove ();
626 585
627 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));
628 tmp2 = insert_ob_in_ob (tmp, sack); 587 sack->insert (tmp);
629 op->update_stats (); /* This is overkill, fix_player() is called somewhere */
630 /* in object.c */
631
632 /* If an object merged (and thus, different object), we need to
633 * delete the original.
634 */
635 if (tmp2 != tmp)
636 esrv_del_item (op->contr, tmp->count);
637
638 esrv_send_item (op, tmp2);
639
640 /* update the sacks weight */
641 esrv_update_item (UPD_WEIGHT, op, sack);
642} 588}
643 589
644/* 590/*
645 * This function was part of drop, now is own function. 591 * This function was part of drop, now is own function.
646 * 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
… …
648 * This is used when dropping objects onto the floor. 594 * This is used when dropping objects onto the floor.
649 */ 595 */
650void 596void
651drop_object (object *op, object *tmp, uint32 nrof) 597drop_object (object *op, object *tmp, uint32 nrof)
652{ 598{
653 char buf[MAX_BUF];
654 object *floor;
655
656 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 599 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
657 return; 600 return;
658 601
659 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 602 if (QUERY_FLAG (tmp, FLAG_APPLIED))
660 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 603 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
… …
663 //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
664 607
665 /* 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
666 * off 609 * off
667 */ 610 */
668 if (nrof && tmp->nrof != nrof) 611 if (!can_split (op, tmp, nrof))
669 {
670 object *tmp2 = tmp;
671
672 tmp = get_split_ob (tmp, nrof);
673 if (!tmp)
674 {
675 new_draw_info (NDI_UNIQUE, 0, op, errmsg);
676 return; 612 return;
677 }
678 /* Tell a client what happened rest of objects. tmp2 is now the
679 * original object
680 */
681 if (op->type == PLAYER)
682 {
683 if (tmp2->destroyed ())
684 esrv_del_item (op->contr, tmp2->count);
685 else
686 esrv_send_item (op, tmp2);
687 }
688 }
689 else
690 tmp->remove ();
691 613
692 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op))) 614 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
693 return; 615 return;
694 616
695 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 617 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))
696 { 618 {
697 sprintf (buf, "You drop the %s.", query_name (tmp)); 619 op->statusmsg (format ("You drop the %s.", query_name (tmp)));
698 new_draw_info (NDI_UNIQUE, 0, op, buf); 620 op->statusmsg ("The god who lent it to you retrieves it.");
699 new_draw_info (NDI_UNIQUE, 0, op, "The gods who lent it to you retrieves it.");
700
701 if (op->type == PLAYER)
702 esrv_del_item (op->contr, tmp->count);
703 621
704 tmp->destroy (); 622 tmp->destroy ();
705 op->update_stats (); 623 op->update_stats ();
706 return; 624 return;
707 } 625 }
708 626
709 if (op->type == PLAYER)
710 esrv_del_item (op->contr, tmp->count);
711
712 /* Call this before we update the various windows/players. At least 627 /* Call this before we update the various windows/players. At least
713 * that we, we know the weight is correct. 628 * that we, we know the weight is correct.
714 */ 629 */
715 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
716 /* in object.c */ 631 // all items of a drop command have been processed.
717 632
718 if (op->type == PLAYER)
719 {
720 /* Need to update the weight for the player */
721 esrv_send_item (op, op);
722 op->contr->ns->floorbox_update ();
723 }
724
725 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)
726 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)))
727 return; 635 return;
728 636
729 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 {
730 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 }
731 646
732 tmp->x = op->x; 647 tmp->x = op->x;
733 tmp->y = op->y; 648 tmp->y = op->y;
734 649
735 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR); 650 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
… …
749 if (tmp->env && tmp->env->type != PLAYER) 664 if (tmp->env && tmp->env->type != PLAYER)
750 { 665 {
751 /* Just toss the object - probably shouldn't be hanging 666 /* Just toss the object - probably shouldn't be hanging
752 * around anyways 667 * around anyways
753 */ 668 */
754 tmp->remove ();
755 tmp->destroy (); 669 tmp->destroy ();
756 return; 670 return;
757 } 671 }
758 else 672 else
759 { 673 {
760 while (tmp != NULL && tmp->invisible) 674 while (tmp && tmp->invisible)
761 tmp = tmp->below; 675 tmp = tmp->below;
762 } 676 }
763 } 677 }
764 678
765 if (tmp == NULL) 679 if (tmp == NULL)
766 { 680 {
767 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.");
768 return; 682 return;
769 } 683 }
684
770 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 685 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED))
771 { 686 {
772 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked"); 687 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
773 return; 688 return;
774 } 689 }
690
775 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 691 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
776 { 692 {
777#if 0 693#if 0
778 /* 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. */
779 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.");
… …
803 719
804 if (op->type == PLAYER) 720 if (op->type == PLAYER)
805 op->contr->count = 0; 721 op->contr->count = 0;
806} 722}
807 723
808
809
810/* Command will drop all items that have not been locked */ 724/* Command will drop all items that have not been locked */
811int 725int
812command_dropall (object *op, char *params) 726command_dropall (object *op, char *params)
813{ 727{
814 728
815 object *curinv, *nextinv;
816
817 if (op->inv == NULL) 729 if (op->inv == NULL)
818 { 730 {
819 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!"); 731 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!");
820 return 0; 732 return 0;
821 } 733 }
822 734
823 curinv = op->inv; 735 object *curinv = op->inv;
736 object *nextinv;
824 737
825 /* 738 /*
826 This is the default. Drops everything not locked or considered 739 This is the default. Drops everything not locked or considered
827 not something that should be dropped. 740 not something that should be dropped.
828 */ 741 */
… …
830 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
831 the drop() routine will do unknown things to it when dropping 744 the drop() routine will do unknown things to it when dropping
832 in a shop. --Tero.Pelander@utu.fi 745 in a shop. --Tero.Pelander@utu.fi
833 */ 746 */
834 747
835 if (params == NULL) 748 int cnt = MAX_ITEM_PER_DROP;
749
750 if (!params)
836 { 751 {
837 while (curinv != NULL) 752 while (curinv)
838 { 753 {
839 nextinv = curinv->below; 754 nextinv = curinv->below;
755
840 while (nextinv && nextinv->type == MONEY) 756 while (nextinv && nextinv->type == MONEY)
841 nextinv = nextinv->below; 757 nextinv = nextinv->below;
758
842 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && 759 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY &&
843 curinv->type != FOOD && curinv->type != KEY && 760 curinv->type != FOOD && curinv->type != KEY &&
844 curinv->type != SPECIAL_KEY && curinv->type != GEM && 761 curinv->type != SPECIAL_KEY && curinv->type != GEM &&
845 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv)) 762 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv))
846 { 763 {
847 drop (op, curinv); 764 drop (op, curinv);
765 if (--cnt <= 0) break;
848 } 766 }
767
849 curinv = nextinv; 768 curinv = nextinv;
850 } 769 }
851 } 770 }
852
853 else if (strcmp (params, "weapons") == 0) 771 else if (strcmp (params, "weapons") == 0)
854 { 772 {
855 while (curinv != NULL) 773 while (curinv)
856 { 774 {
857 nextinv = curinv->below; 775 nextinv = curinv->below;
776
858 while (nextinv && nextinv->type == MONEY) 777 while (nextinv && nextinv->type == MONEY)
859 nextinv = nextinv->below; 778 nextinv = nextinv->below;
779
860 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)))
861 { 781 {
862 drop (op, curinv); 782 drop (op, curinv);
783 if (--cnt <= 0) break;
863 } 784 }
785
864 curinv = nextinv; 786 curinv = nextinv;
865 } 787 }
866 } 788 }
867
868 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0) 789 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0)
869 { 790 {
870 while (curinv != NULL) 791 while (curinv)
871 { 792 {
872 nextinv = curinv->below; 793 nextinv = curinv->below;
794
873 while (nextinv && nextinv->type == MONEY) 795 while (nextinv && nextinv->type == MONEY)
874 nextinv = nextinv->below; 796 nextinv = nextinv->below;
797
875 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))
876 { 799 {
877 drop (op, curinv); 800 drop (op, curinv);
801 if (--cnt <= 0) break;
878 } 802 }
803
879 curinv = nextinv; 804 curinv = nextinv;
880 } 805 }
881 } 806 }
882
883 else if (strcmp (params, "misc") == 0) 807 else if (strcmp (params, "misc") == 0)
884 { 808 {
885 while (curinv != NULL) 809 while (curinv)
886 { 810 {
887 nextinv = curinv->below; 811 nextinv = curinv->below;
812
888 while (nextinv && nextinv->type == MONEY) 813 while (nextinv && nextinv->type == MONEY)
889 nextinv = nextinv->below; 814 nextinv = nextinv->below;
815
890 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))
891 { 817 {
892 switch (curinv->type) 818 switch (curinv->type)
893 { 819 {
894 case HORN: 820 case HORN:
… …
912 break; 838 break;
913 default: 839 default:
914 curinv = nextinv; 840 curinv = nextinv;
915 break; 841 break;
916 } 842 }
843
844 if (--cnt <= 0) break;
917 } 845 }
846
918 curinv = nextinv; 847 curinv = nextinv;
919 } 848 }
920 } 849 }
921 850
922 op->contr->ns->floorbox_update (); 851 if (cnt <= 0)
852 op->failmsg ("Only dropped some items, can't drop that many items at once.");
923 853
924/* draw_look(op);*/ 854/* draw_look(op);*/
925 return 0; 855 return 0;
926} 856}
927 857
928/* 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
929 * comma seperated list. 859 * comma seperated list.
930 */ 860 */
931
932int 861int
933command_drop (object *op, char *params) 862command_drop (object *op, char *params)
934{ 863{
935 object *tmp, *next; 864 object *tmp, *next;
936 int did_one = 0; 865 int did_one = 0;
… …
940 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?"); 869 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
941 return 0; 870 return 0;
942 } 871 }
943 else 872 else
944 { 873 {
874 int cnt = MAX_ITEM_PER_DROP;
875
945 for (tmp = op->inv; tmp; tmp = next) 876 for (tmp = op->inv; tmp; tmp = next)
946 { 877 {
947 next = tmp->below; 878 next = tmp->below;
948 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible) 879 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible)
949 continue; 880 continue;
881
950 if (item_matched_string (op, tmp, params)) 882 if (item_matched_string (op, tmp, params))
951 { 883 {
952 drop (op, tmp); 884 drop (op, tmp);
885 if (--cnt <= 0) break;
953 did_one = 1; 886 did_one = 1;
954 } 887 }
955 } 888 }
889
956 if (!did_one) 890 if (!did_one)
957 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); 891 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
958 } 892
959 if (op->type == PLAYER) 893 if (cnt <= 0)
960 { 894 op->failmsg ("Only dropped some items, can't drop that many items at once.");
961 op->contr->count = 0;
962 op->contr->ns->floorbox_update ();
963 }; 895 }
964 896
965/* draw_look(op);*/
966 return 0; 897 return 0;
967} 898}
968 899
969int 900int
970command_examine (object *op, char *params) 901command_examine (object *op, char *params)
… …
973 { 904 {
974 object *tmp = op->below; 905 object *tmp = op->below;
975 906
976 while (tmp && !tmp->client_visible ()) 907 while (tmp && !tmp->client_visible ())
977 tmp = tmp->below; 908 tmp = tmp->below;
909
978 if (tmp) 910 if (tmp)
979 examine (op, tmp); 911 examine (op, tmp);
980 } 912 }
981 else 913 else
982 { 914 {
983 object *tmp = find_best_object_match (op, params); 915 object *tmp = find_best_object_match (op, params);
984 916
985 if (tmp) 917 if (tmp)
986 examine (op, tmp); 918 examine (op, tmp);
987 else 919 else
988 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));
989 } 921 }
922
990 return 0; 923 return 0;
991} 924}
992 925
993/* op should be a player. 926/* op should be a player.
994 * 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
… …
1041 dynbuf_text buf (512, 512); 974 dynbuf_text buf (512, 512);
1042 975
1043 object *mon = head ? head : this; 976 object *mon = head ? head : this;
1044 977
1045 if (QUERY_FLAG (mon, FLAG_UNDEAD)) 978 if (QUERY_FLAG (mon, FLAG_UNDEAD))
1046 buf << "It is an undead force.\n"; 979 buf << "It is an undead force.\r";
1047 980
1048 if (mon->level > who->level) 981 if (mon->level > who->level)
1049 buf << "It is likely more powerful than you.\n"; 982 buf << "It is likely more powerful than you.\r";
1050 else if (mon->level < who->level) 983 else if (mon->level < who->level)
1051 buf << "It is likely less powerful than you.\n"; 984 buf << "It is likely less powerful than you.\r";
1052 else 985 else
1053 buf << "It is probably as powerful as you.\n"; 986 buf << "It is probably as powerful as you.\r";
1054 987
1055 if (mon->attacktype & AT_ACID) 988 if (mon->attacktype & AT_ACID)
1056 buf << "You seem to smell an acrid odor.\n"; 989 buf << "You seem to smell an acrid odor.\r";
1057 990
1058 /* 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
1059 * maxhp field? This seems that it should give more accurate results. 992 * maxhp field? This seems that it should give more accurate results.
1060 */ 993 */
1061 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1)) 994 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
1062 { /* From 1-4 */ 995 { /* From 1-4 */
1063 case 1: 996 case 1:
1064 buf << "It is in a bad shape.\n"; 997 buf << "It is in a bad shape.\r";
1065 break; 998 break;
1066 case 2: 999 case 2:
1067 buf << "It is hurt.\n"; 1000 buf << "It is hurt.\r";
1068 break; 1001 break;
1069 case 3: 1002 case 3:
1070 buf << "It is somewhat hurt.\n"; 1003 buf << "It is somewhat hurt.\r";
1071 break; 1004 break;
1072 case 4: 1005 case 4:
1073 buf << "It is in excellent shape.\n"; 1006 buf << "It is in excellent shape.\r";
1074 break; 1007 break;
1075 } 1008 }
1076 1009
1077 if (present_in_ob (POISONING, mon)) 1010 if (present_in_ob (POISONING, mon))
1078 buf << "It looks very ill.\n"; 1011 buf << "It looks very ill.\r";
1012
1013 buf << '\n';
1079 1014
1080 return buf; 1015 return buf;
1081} 1016}
1082 1017
1083/* 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. */
… …
1141std::string 1076std::string
1142object::describe (object *who) 1077object::describe (object *who)
1143{ 1078{
1144 dynbuf_text buf (1024, 1024); 1079 dynbuf_text buf (1024, 1024);
1145 1080
1146 buf.printf ("That is: %s.\n", long_desc (who).c_str ()); 1081 buf.printf ("That is: %s.\r", long_desc (who).c_str ());
1147 1082
1148 if (custom_name) 1083 if (custom_name)
1149 buf,printf ("You call it %s\n", &custom_name); 1084 buf.printf ("You call it %s.\r", &custom_name);
1150 1085
1151 switch (type) 1086 switch (type)
1152 { 1087 {
1153 case SPELLBOOK: 1088 case SPELLBOOK:
1154 if (flag [FLAG_IDENTIFIED] && inv) 1089 if (flag [FLAG_IDENTIFIED] && inv)
1155 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);
1156 break; 1091 break;
1157 1092
1158 case BOOK: 1093 case BOOK:
1159 if (msg) 1094 if (msg)
1160 buf << "Something is written in it.\n"; 1095 buf << "Something is written in it.\r";
1161 break; 1096 break;
1162 1097
1163 case CONTAINER: 1098 case CONTAINER:
1164 if (race != NULL) 1099 if (race)
1165 { 1100 {
1166 if (weight_limit && stats.Str < 100) 1101 if (weight_limit && stats.Str < 100)
1167 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",
1168 &race, weight_limit / (10.0 * (100 - stats.Str))); 1103 &race, weight_limit / (10.0 * (100 - stats.Str)));
1169 else 1104 else
1170 buf.printf ("It can hold only %s.\n", &race); 1105 buf.printf ("It can hold only %s.\r", &race);
1171 } 1106 }
1172 else if (weight_limit && stats.Str < 100) 1107 else if (weight_limit && stats.Str < 100)
1173 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)));
1174 break; 1109 break;
1175 1110
1176 case WAND: 1111 case WAND:
1177 if (flag [FLAG_IDENTIFIED]) 1112 if (flag [FLAG_IDENTIFIED])
1178 buf.printf ("It has %d charges left.\n", stats.food); 1113 buf.printf ("It has %d charges left.\r", stats.food);
1179 break; 1114 break;
1180 } 1115 }
1181 1116
1182 if (materialname && !msg) 1117 if (materialname && !msg)
1183 buf.printf ("It is made of: %s.\n", &materialname); 1118 buf.printf ("It is made of: %s.\r", &materialname);
1184 1119
1185 if (who) 1120 if (who)
1186 /* Where to wear this item */ 1121 /* Where to wear this item */
1187 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1122 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1188 if (slot[i].info) 1123 if (slot[i].info)
… …
1190 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);
1191 1126
1192 if (slot[i].info < -1 && who->slot[i].info) 1127 if (slot[i].info < -1 && who->slot[i].info)
1193 buf.printf ("(%d)", -slot[i].info); 1128 buf.printf ("(%d)", -slot[i].info);
1194 1129
1195 buf << ".\n"; 1130 buf << ".\r";
1196 } 1131 }
1197 1132
1198 if (weight) 1133 if (weight)
1199 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);
1200 1135
1201 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who) 1136 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1202 { 1137 {
1203 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));
1204 1139
1205 if (is_in_shop (who)) 1140 if (is_in_shop (who))
1206 { 1141 {
1207 if (flag [FLAG_UNPAID]) 1142 if (flag [FLAG_UNPAID])
1208 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));
1209 else 1144 else
1210 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");
1211 } 1146 }
1212 } 1147 }
1213 1148
1214 if (flag [FLAG_MONSTER]) 1149 if (flag [FLAG_MONSTER])
1215 buf << describe_monster (who); 1150 buf << describe_monster (who);
1216 1151
1217 /* Is this item buildable? */ 1152 /* Is this item buildable? */
1218 if (flag [FLAG_IS_BUILDABLE]) 1153 if (flag [FLAG_IS_BUILDABLE])
1219 buf << "This is a buildable item.\n"; 1154 buf << "This is a buildable item.\r";
1220 1155
1221 /* 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
1222 * types - especially if the first entry is a match 1157 * types - especially if the first entry is a match
1223 */ 1158 */
1224 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 ())
1225 { 1160 {
1226 /* 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
1227 * out the extra message 1162 * out the extra message
1228 */ 1163 */
1229 if (need_identify (this) && flag [FLAG_IDENTIFIED]) 1164 if (need_identify (this) && flag [FLAG_IDENTIFIED])
1230 buf << "The object has a story:\n"; 1165 buf << "The object has a story:\r";
1231 1166
1232 buf << msg << '\n'; 1167 buf << msg << '\n';
1233 } 1168 }
1234 1169
1235 buf << '\n'; 1170 buf << '\n';
1236 1171
1237 return std::string (buf.linearise (), buf.size ()); 1172 return std::string (buf.linearise (), buf.size ());
1238}
1239
1240void
1241examine (object *op, object *tmp)
1242{
1243 std::string s = tmp->describe (op);
1244
1245 new_draw_info (NDI_UNIQUE, 0, op, s.c_str ());
1246}
1247
1248/*
1249 * inventory prints object's inventory. If inv==NULL then print player's
1250 * inventory.
1251 * [ Only items which are applied are showed. Tero.Haatanen@lut.fi ]
1252 */
1253void
1254inventory (object *op, object *inv)
1255{
1256 object *tmp;
1257 const char *in;
1258 int items = 0, length;
1259
1260 if (inv == NULL && op == NULL)
1261 {
1262 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object?");
1263 return;
1264 }
1265
1266 tmp = inv ? inv->inv : op->inv;
1267
1268 while (tmp)
1269 {
1270 if ((!tmp->invisible &&
1271 (inv == NULL || inv->type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) || (!op || QUERY_FLAG (op, FLAG_WIZ)))
1272 items++;
1273 tmp = tmp->below;
1274 }
1275
1276 if (inv == NULL)
1277 { /* player's inventory */
1278 if (items == 0)
1279 {
1280 new_draw_info (NDI_UNIQUE, 0, op, "You carry nothing.");
1281 return;
1282 }
1283 else
1284 {
1285 length = 28;
1286 in = "";
1287 if (op)
1288 clear_win_info (op);
1289 new_draw_info (NDI_UNIQUE, 0, op, "Inventory:");
1290 }
1291 }
1292 else
1293 {
1294 if (items == 0)
1295 return;
1296 else
1297 {
1298 length = 28;
1299 in = " ";
1300 }
1301 }
1302
1303 for (tmp = inv ? inv->inv : op->inv; tmp; tmp = tmp->below)
1304 {
1305 if ((!op || !QUERY_FLAG (op, FLAG_WIZ)) && (tmp->invisible || (inv && inv->type != CONTAINER && !QUERY_FLAG (tmp, FLAG_APPLIED))))
1306 continue;
1307 if ((!op || QUERY_FLAG (op, FLAG_WIZ)))
1308 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s (%5d) %-8s", in, length, length,
1309 query_name (tmp), tmp->count, query_weight (tmp));
1310 else
1311 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s %-8s", in, length + 8, length + 8, query_name (tmp), query_weight (tmp));
1312 }
1313
1314 if (!inv && op)
1315 new_draw_info_format (NDI_UNIQUE, 0, op, "%-*s %-8s", 41, "Total weight :", query_weight (op));
1316} 1173}
1317 1174
1318static void 1175static void
1319display_new_pickup (object *op) 1176display_new_pickup (object *op)
1320{ 1177{

Diff Legend

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