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

Comparing deliantra/server/common/item.C (file contents):
Revision 1.51 by root, Sun Sep 7 21:31:23 2008 UTC vs.
Revision 1.64 by root, Fri Nov 6 13:31:47 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009 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 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * 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 Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
… …
62 {KW_body_foot , "You can put it on your foot" , "It goes on a human's foot"}, 63 {KW_body_foot , "You can put it on your foot" , "It goes on a human's foot"},
63 {KW_body_hand , "You can put it on your hand" , "It goes on a human's hand"}, 64 {KW_body_hand , "You can put it on your hand" , "It goes on a human's hand"},
64 {KW_body_wrist , "You can wear it around your wrist" , "It goes around a human's wrist"}, 65 {KW_body_wrist , "You can wear it around your wrist" , "It goes around a human's wrist"},
65 {KW_body_waist , "You can wear it around your waist" , "It goes around a human's waist"}, 66 {KW_body_waist , "You can wear it around your waist" , "It goes around a human's waist"},
66/*{"body_dragon_torso", "your body", "a dragon's body"} */ 67/*{"body_dragon_torso", "your body", "a dragon's body"} */
67};
68
69static char numbers[21][20] = {
70 "no", "", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten",
71 "eleven", "twelve", "thirteen", "fourteen", "fifteen", "sixteen", "seventeen",
72 "eighteen", "nineteen", "twenty"
73}; 68};
74 69
75static char numbers_10[10][20] = { 70static char numbers_10[10][20] = {
76 "zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy", 71 "zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy",
77 "eighty", "ninety" 72 "eighty", "ninety"
… …
169 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0}, 164 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0},
170 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0}, 165 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0},
171 {SPINNER, "spinner", "spinners", 0, 0}, 166 {SPINNER, "spinner", "spinners", 0, 0},
172 {GATE, "gate", "gates", 0, 0}, 167 {GATE, "gate", "gates", 0, 0},
173 {BUTTON, "button", "buttons", 0, 0}, 168 {BUTTON, "button", "buttons", 0, 0},
174 {CF_HANDLE, "cf handle", "cf handles", 0, 0}, 169 {T_HANDLE, "cf handle", "cf handles", 0, 0},
175 {HOLE, "hole", "holes", 0, 0}, 170 {HOLE, "hole", "holes", 0, 0},
176 {TRAPDOOR, "trapdoor", "trapdoors", 0, 0}, 171 {TRAPDOOR, "trapdoor", "trapdoors", 0, 0},
177 {SIGN, "sign", "signs", 0, 0}, 172 {SIGN, "sign", "signs", 0, 0},
178 {BOOTS, "boots", "boots", SK_SMITHERY, 0}, 173 {BOOTS, "boots", "boots", SK_SMITHERY, 0},
179 {GLOVES, "gloves", "gloves", SK_SMITHERY, 0}, 174 {GLOVES, "gloves", "gloves", SK_SMITHERY, 0},
… …
206 {BUILDER, "item builder", "item builders", 0, 0}, 201 {BUILDER, "item builder", "item builders", 0, 0},
207 {MATERIAL, "building material", "building materials", 0, 0}, 202 {MATERIAL, "building material", "building materials", 0, 0},
208 {ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0}, 203 {ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0},
209}; 204};
210 205
211const int item_types_size = sizeof (item_types) / sizeof (*item_types); 206static const int item_types_size = sizeof (item_types) / sizeof (*item_types);
212 207
213materialtype_t *materialt; 208materialtype_t *materialt;
214 209
215/* 210/*
216materialtype material[NROFMATERIALS] = { 211materialtype material[NROFMATERIALS] = {
… …
252}; 247};
253 248
254int 249int
255get_power_from_ench (int ench) 250get_power_from_ench (int ench)
256{ 251{
257 if (ench < 0) ench = 0;
258 if (ench > 20) ench = 20;
259
260 return enc_to_item_power[ench]; 252 return enc_to_item_power [clamp (ench, 0, 20)];
261} 253}
262 254
263/* This takes an object 'op' and figures out what its item_power 255/* This takes an object 'op' and figures out what its item_power
264 * rating should be. This should only really be used by the treasure 256 * rating should be. This should only really be used by the treasure
265 * generation code, and when loading legacy objects. It returns 257 * generation code, and when loading legacy objects. It returns
… …
330 enc -= 2; 322 enc -= 2;
331 else if (op->path_repelled & (1 << i)) 323 else if (op->path_repelled & (1 << i))
332 enc--; 324 enc--;
333 } 325 }
334 326
335 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 327 if (op->flag [FLAG_LIFESAVE ]) enc += 5;
336 enc += 5; 328 if (op->flag [FLAG_REFL_SPELL ]) enc += 3;
337 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) 329 if (op->flag [FLAG_REFL_MISSILE]) enc += 2;
338 enc += 3; 330 if (op->flag [FLAG_XRAYS ]) enc += 2;
339 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) 331 if (op->flag [FLAG_STEALTH ]) enc += 1;
340 enc += 2; 332 if (op->flag [FLAG_SEE_IN_DARK ]) enc += 1;
341 if (QUERY_FLAG (op, FLAG_STEALTH)) 333 if (op->flag [FLAG_MAKE_INVIS ]) enc += 1;
342 enc += 1;
343 if (QUERY_FLAG (op, FLAG_XRAYS))
344 enc += 2;
345 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK))
346 enc += 1;
347 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
348 enc += 1;
349 334
350 return get_power_from_ench (enc); 335 return get_power_from_ench (enc);
351} 336}
352 337
353/* returns the typedata that has a number equal to itemtype, if there 338/* returns the typedata that has a number equal to itemtype, if there
354 * isn't one, returns NULL */ 339 * isn't one, returns NULL */
355const typedata * 340const typedata *
356get_typedata (int itemtype) 341get_typedata (int itemtype)
357{ 342{
358 int i;
359
360 for (i = 0; i < item_types_size; i++) 343 for (int i = 0; i < item_types_size; i++)
361 if (item_types[i].number == itemtype) 344 if (item_types[i].number == itemtype)
362 return &item_types[i]; 345 return &item_types[i];
363 346
364 return NULL; 347 return NULL;
365} 348}
… …
368 * isn't one, return the plural name that matches, if there still isn't 351 * isn't one, return the plural name that matches, if there still isn't
369 * one return NULL */ 352 * one return NULL */
370const typedata * 353const typedata *
371get_typedata_by_name (const char *name) 354get_typedata_by_name (const char *name)
372{ 355{
373 int i;
374
375 for (i = 0; i < item_types_size; i++) 356 for (int i = 0; i < item_types_size; i++)
376 if (!strcmp (item_types[i].name, name)) 357 if (!strcmp (item_types[i].name, name))
377 return &item_types[i]; 358 return &item_types[i];
378 359
379 for (i = 0; i < item_types_size; i++) 360 for (int i = 0; i < item_types_size; i++)
380 if (!strcmp (item_types[i].name_pl, name)) 361 if (!strcmp (item_types[i].name_pl, name))
381 { 362 {
382 LOG (llevInfo, 363 LOG (llevInfo,
383 "get_typedata_by_name: I have been sent the plural %s, the singular form %s is prefered\n", name, item_types[i].name); 364 "get_typedata_by_name: I have been sent the plural %s, the singular form %s is prefered\n", name, item_types[i].name);
384 return &item_types[i]; 365 return &item_types[i];
385 } 366 }
386 367
387 return NULL; 368 return 0;
388} 369}
389 370
390/* describe_resistance generates the visible naming for resistances. 371/* describe_resistance generates the visible naming for resistances.
391 * returns a static array of the description. This can return 372 * returns a static array of the description. This can return
392 * a big buffer. 373 * a big buffer.
… …
394 * but do put a newline at the end. Useful when dumping to files 375 * but do put a newline at the end. Useful when dumping to files
395 */ 376 */
396const char * 377const char *
397describe_resistance (const object *op, int newline) 378describe_resistance (const object *op, int newline)
398{ 379{
399 static char buf[VERY_BIG_BUF]; 380 static dynbuf_text buf; buf.clear ();
400 char buf1[VERY_BIG_BUF];
401 int tmpvar;
402 381
403 buf[0] = 0; 382 for (int i = 0; i < NROFATTACKS; i++)
404 for (tmpvar = 0; tmpvar < NROFATTACKS; tmpvar++)
405 {
406 if (op->resist[tmpvar] && (op->type != FLESH || atnr_is_dragon_enabled (tmpvar) == 1)) 383 if (op->resist[i] && (op->type != FLESH || atnr_is_dragon_enabled (i) == 1))
407 { 384 buf.printf (newline ? "%s %d\n" : "(%s %+d)", resist_plus[i], op->resist[i]);
408 if (!newline)
409 sprintf (buf1, "(%s %+d)", resist_plus[tmpvar], op->resist[tmpvar]);
410 else
411 sprintf (buf1, "%s %d\n", resist_plus[tmpvar], op->resist[tmpvar]);
412 385
413 strcat (buf, buf1);
414 }
415 }
416 return buf; 386 return buf;
417} 387}
418
419 388
420/* 389/*
421 * query_weight(object) returns a character pointer to a static buffer 390 * query_weight(object) returns a character pointer to a static buffer
422 * containing the text-representation of the weight of the given object. 391 * containing the text-representation of the weight of the given object.
423 * The buffer will be overwritten by the next call to query_weight(). 392 * The buffer will be overwritten by the next call to query_weight().
393 *
394 * Seems to be used only by unimportant stuff. Remove?
424 */ 395 */
425const char * 396const char *
426query_weight (const object *op) 397query_weight (const object *op)
427{ 398{
428 static char buf[10]; 399 static char buf[10];
… …
454 return buf; 425 return buf;
455 } 426 }
456 427
457 if (i < 21) 428 if (i < 21)
458 return levelnumbers[i]; 429 return levelnumbers[i];
430
459 if (!(i % 10)) 431 if (!(i % 10))
460 return levelnumbers_10[i / 10]; 432 return levelnumbers_10[i / 10];
461 433
462 strcpy (buf, numbers_10[i / 10]); 434 strcpy (buf, numbers_10[i / 10]);
463 strcat (buf, levelnumbers[i % 10]); 435 strcat (buf, levelnumbers[i % 10]);
464 return buf; 436 return buf;
465}
466
467/*
468 * get_number(integer) returns the text-representation of the given number
469 * in a static buffer. The buffer might be overwritten at the next
470 * call to get_number().
471 * It is currently only used by the query_name() function.
472 */
473const char *
474get_number (int i)
475{
476 if (i <= 20)
477 return numbers[i];
478 else
479 {
480 static char buf[MAX_BUF];
481
482 sprintf (buf, "%d", i);
483 return buf;
484 }
485} 437}
486 438
487/* 439/*
488 * Returns pointer to static buffer containing ring's or amulet's 440 * Returns pointer to static buffer containing ring's or amulet's
489 * abilities 441 * abilities
… …
495 */ 447 */
496 448
497/* Aug 95 modified this slightly so that Skill tools don't have magic bonus 449/* Aug 95 modified this slightly so that Skill tools don't have magic bonus
498 * from stats.sp - b.t. 450 * from stats.sp - b.t.
499 */ 451 */
500const char * 452static const char *
501ring_desc (const object *op) 453ring_desc (const object *op)
502{ 454{
503 static dynbuf_text buf; buf.clear (); 455 static dynbuf_text buf; buf.clear ();
504 int attr, val, len; 456 int attr, val, len;
505 457
… …
539} 491}
540 492
541/* 493/*
542 * query_short_name(object) is similar to query_name, but doesn't 494 * query_short_name(object) is similar to query_name, but doesn't
543 * contain any information about object status (worn/cursed/etc.) 495 * contain any information about object status (worn/cursed/etc.)
496 *
497 * It is sometimes used when printing messages, so should fit well into a sentence.
544 */ 498 */
545const char * 499const char *
546query_short_name (const object *op) 500query_short_name (const object *op)
547{ 501{
548 if (op->name == 0) 502 if (!op->name)
549 return "(null)"; 503 return "(null)";
550 504
551 if (!op->nrof 505 if (!op->nrof
552 && !op->weight 506 && !op->weight
553 && !op->title 507 && !op->title
… …
576 if (op->type != SPELLBOOK) 530 if (op->type != SPELLBOOK)
577 buf.printf (" (lvl %d)", op->level); 531 buf.printf (" (lvl %d)", op->level);
578 } 532 }
579 break; 533 break;
580 534
581 case ALTAR: 535 case ALTAR:
582 case TRIGGER_ALTAR: 536 case TRIGGER_ALTAR:
583 case IDENTIFY_ALTAR: 537 case IDENTIFY_ALTAR:
584 case CONVERTER: 538 case CONVERTER:
585 if (op->slaying == shstr_money) 539 if (op->slaying == shstr_money)
586 { 540 {
587 bool wrap = !!buf.size (); 541 bool wrap = !!buf.size ();
588 542
589 if (wrap) buf << " ["; 543 if (wrap) buf << " [";
590 544
591 archetype *coin = 0; 545 archetype *coin = 0;
592 546
593 for (char const *const *c = coins; *coins; ++c) 547 for (char const *const *c = coins; *coins; ++c)
594 if ((coin = archetype::find (*c))) 548 if ((coin = archetype::find (*c)))
595 if (op->stats.food % coin->value == 0) 549 if (op->stats.food % coin->value == 0)
596 break; 550 break;
597 551
598 sint32 coins = op->stats.food / coin->value; 552 sint32 coins = op->stats.food / coin->value;
599 553
600 buf.printf ("drop %d %s (or equivalent)", coins, coins == 1 ? &coin->name : &coin->name_pl); 554 buf.printf ("drop %d %s (or equivalent)", coins, coins == 1 ? &coin->name : &coin->name_pl);
601 555
602 if (wrap) buf << ']'; 556 if (wrap) buf << ']';
603 } 557 }
604 break; 558 break;
605 559
606 case SKILL: 560 case SKILL:
607 case AMULET: 561 case AMULET:
608 case RING: 562 case RING:
609 if (!op->title) 563 if (!op->title)
… …
632 * you can make several calls to query_name before the bufs start getting 586 * you can make several calls to query_name before the bufs start getting
633 * overwritten. This may be a bad thing (it may be easier to assume the value 587 * overwritten. This may be a bad thing (it may be easier to assume the value
634 * returned is good forever.) However, it makes printing statements that 588 * returned is good forever.) However, it makes printing statements that
635 * use several names much easier (don't need to store them to temp variables.) 589 * use several names much easier (don't need to store them to temp variables.)
636 * 590 *
591 * It is used extensively within messages, so should return only a prose
592 * and short description of the item.
637 */ 593 */
638const char * 594const char *
639query_name (const object *op) 595query_name (const object *op)
640{ 596{
641 int len = 0; 597 int len = 0;
… …
654 610
655 buf << query_short_name (op); 611 buf << query_short_name (op);
656 612
657 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 613 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
658 buf << " *"; 614 buf << " *";
659 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 615 if (op->is_open_container ())
660 buf << " (open)"; 616 buf << " (open)";
661 617
662 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 618 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
663 { 619 {
664 if (QUERY_FLAG (op, FLAG_DAMNED)) 620 if (QUERY_FLAG (op, FLAG_DAMNED))
… …
678 */ 634 */
679 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 635 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))
680 buf << " (magic)"; 636 buf << " (magic)";
681 637
682#if 0 638#if 0
683 /* item_power will be returned in desribe_item - it shouldn't really 639 /* item_power will be returned in describe_item - it shouldn't really
684 * be returned in the name. 640 * be returned in the name.
685 */ 641 */
686 if (op->item_power) 642 if (op->item_power)
687 sprintf (buf[use_buf] + strlen (buf[use_buf]), "(item_power %+d)", op->item_power); 643 sprintf (buf[use_buf] + strlen (buf[use_buf]), "(item_power %+d)", op->item_power);
688 644
… …
720 default: 676 default:
721 buf << " (applied)"; 677 buf << " (applied)";
722 } 678 }
723 } 679 }
724 680
681 switch (op->type)
682 {
683 case LAMP:
684 if (op->glow_radius)
685 buf << " (on)";
686 else if (op->stats.food <= 0)
687 buf << " (empty)";
688 else
689 buf << " (off)";
690 break;
691
692 case TORCH:
693 if (op->glow_radius)
694 buf << " (burning)";
695 else if (op->stats.food <= 0)
696 buf << " (burned out)";
697 break;
698 }
699
725 if (QUERY_FLAG (op, FLAG_UNPAID)) 700 if (QUERY_FLAG (op, FLAG_UNPAID))
726 buf << " (unpaid)"; 701 buf << " (unpaid)";
727 702
728 return buf; 703 return buf;
729} 704}
… …
734 * of the given object. The buffer will be overwritten at the next 709 * of the given object. The buffer will be overwritten at the next
735 * call to query_base_name(). This is a lot like query_name, but we 710 * call to query_base_name(). This is a lot like query_name, but we
736 * don't include the item count or item status. Used for inventory sorting 711 * don't include the item count or item status. Used for inventory sorting
737 * and sending to client. 712 * and sending to client.
738 * If plural is set, we generate the plural name of this. 713 * If plural is set, we generate the plural name of this.
714 *
715 * It is sometimes used to display messages, and usually only used to match stuff,
716 * so maybe this function should be removed.
739 */ 717 */
740const char * 718const char *
741query_base_name (const object *op, int plural) 719query_base_name (const object *op, int plural)
742{ 720{
743 if ((!plural && !op->name) || (plural && !op->name_pl)) 721 if ((!plural && !op->name) || (plural && !op->name_pl))
… …
938 * wouldn't need to use the SEE_INVISIBLE flag to know it is 916 * wouldn't need to use the SEE_INVISIBLE flag to know it is
939 * a dragon player examining food. Could have things like 917 * a dragon player examining food. Could have things like
940 * a dwarven axe, in which the full abilities are only known to 918 * a dwarven axe, in which the full abilities are only known to
941 * dwarves, etc. 919 * dwarves, etc.
942 * 920 *
943 * This function is really much more complicated than it should
944 * be, because different objects have different meanings
945 * for the same field (eg, wands use 'food' for charges). This
946 * means these special cases need to be worked out.
947 *
948 * Add 'owner' who is the person examining this object. 921 * Add 'owner' who is the person examining this object.
949 * owner can be null if no one is being associated with this 922 * owner can be null if no one is being associated with this
950 * item (eg, debug dump or the like) 923 * item (eg, debug dump or the like)
951 */ 924 */
952const char * 925const char *
… …
1010 buf << "well charged."; 983 buf << "well charged.";
1011 else if (op->stats.sp == op->stats.maxsp) 984 else if (op->stats.sp == op->stats.maxsp)
1012 buf << "fully charged."; 985 buf << "fully charged.";
1013 else 986 else
1014 buf << "almost full."; 987 buf << "almost full.";
988 break;
989
990 case LAMP:
991 {
992 int percent = ((double) 100 / op->arch->stats.food) * op->stats.food;
993 buf << "(fuel: ";
994 if (percent == 0)
995 buf << "empty";
996 else if (percent < 10)
997 buf << "very low";
998 else if (percent < 25)
999 buf << "low";
1000 else if (percent < 50)
1001 buf << "half empty";
1002 else if (percent < 75)
1003 buf << "half full";
1004 else if (percent < 95)
1005 buf << "well filled";
1006 else if (percent <= 100)
1007 buf << "full";
1008 buf << ")";
1009 }
1015 break; 1010 break;
1016 1011
1017 case FOOD: 1012 case FOOD:
1018 case FLESH: 1013 case FLESH:
1019 case DRINK: 1014 case DRINK:
… …
1175 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)"; 1170 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)";
1176 1171
1177 if (op->slaying && op->type != FOOD) 1172 if (op->slaying && op->type != FOOD)
1178 buf.printf ("(slay %s)", &op->slaying); 1173 buf.printf ("(slay %s)", &op->slaying);
1179 1174
1175 if (op->type == SKILL_TOOL && op->skill)
1176 buf.printf ("(%s)", &op->skill);
1177
1180 buf.add_abilities ("Attacks", op->attacktype); 1178 buf.add_abilities ("Attacks", op->attacktype);
1181 /* resistance on flesh is only visible for quetzals. If 1179 /* resistance on flesh is only visible for quetzals. If
1182 * non flesh, everyone can see its resistances 1180 * non flesh, everyone can see its resistances
1183 */ 1181 */
1184 if (op->type != FLESH || (owner && is_dragon_pl (owner))) 1182 if (op->type != FLESH || (owner && is_dragon_pl (owner)))
… …
1200 1198
1201void 1199void
1202examine (object *op, object *tmp) 1200examine (object *op, object *tmp)
1203{ 1201{
1204 std::string info = tmp->describe (op); 1202 std::string info = tmp->describe (op);
1203
1205 op->contr->infobox (MSG_CHANNEL ("examine"), info.c_str ()); 1204 op->contr->infobox (MSG_CHANNEL ("examine"), info.c_str ());
1206} 1205}
1207 1206
1208/* 1207/*
1209 * inventory prints object's inventory. If inv==NULL then print player's 1208 * inventory prints object's inventory. If inv==NULL then print player's
… …
1215{ 1214{
1216 static dynbuf_text buf; buf.clear (); 1215 static dynbuf_text buf; buf.clear ();
1217 1216
1218 for (object *tmp = inv; tmp; tmp = tmp->below) 1217 for (object *tmp = inv; tmp; tmp = tmp->below)
1219 if (who && QUERY_FLAG (who, FLAG_WIZ)) 1218 if (who && QUERY_FLAG (who, FLAG_WIZ))
1220 buf.printf ("%s- %-28.28s (%5d) %-8s\n", indent, query_name (tmp), tmp->count, query_weight (tmp)); 1219 buf.printf ("%s- %-28.28s (%5d) %-8s\n", indent, tmp->query_name (), tmp->count, tmp->query_weight ());
1221 else if (!tmp->invisible && (type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) 1220 else if (!tmp->invisible && (type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED)))
1222 buf.printf ("%s- %-36.36s %-8s\n", indent, query_name (tmp), query_weight (tmp)); 1221 buf.printf ("%s- %-36.36s %-8s\n", indent, tmp->query_name (), tmp->query_weight ());
1223 1222
1224 if (buf.size ()) 1223 if (buf.size ())
1225 buf.printf ("%s(total weight: %s)\n", indent, query_weight (this)); 1224 buf.printf ("%s(total weight: %s)\n", indent, query_weight ());
1226 else 1225 else
1227 buf.printf ("%s(empty)\n", indent); 1226 buf.printf ("%s(empty)\n", indent);
1228 1227
1229 return buf; 1228 return buf;
1230} 1229}

Diff Legend

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