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.55 by root, Mon May 28 21:28:35 2007 UTC vs.
Revision 1.80 by elmex, Sun Oct 5 12:40:21 2008 UTC

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

Diff Legend

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