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.52 by root, Thu Jan 1 11:41:17 2009 UTC vs.
Revision 1.66 by root, Sun Nov 8 20:55:39 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
… …
321 313
322 enc += op->stats.luck; 314 enc += op->stats.luck;
323 315
324 /* Do spell paths now */ 316 /* Do spell paths now */
325 for (i = 1; i < NRSPELLPATHS; i++) 317 for (i = 1; i < NRSPELLPATHS; i++)
326 {
327 if (op->path_attuned & (1 << i)) 318 if (op->path_attuned & (1 << i))
328 enc++; 319 enc++;
329 else if (op->path_denied & (1 << i)) 320 else if (op->path_denied & (1 << i))
330 enc -= 2; 321 enc -= 2;
331 else if (op->path_repelled & (1 << i)) 322 else if (op->path_repelled & (1 << i))
332 enc--; 323 enc--;
333 }
334 324
335 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 325 if (op->flag [FLAG_LIFESAVE ]) enc += 5;
336 enc += 5; 326 if (op->flag [FLAG_REFL_SPELL ]) enc += 3;
337 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) 327 if (op->flag [FLAG_REFL_MISSILE]) enc += 2;
338 enc += 3; 328 if (op->flag [FLAG_XRAYS ]) enc += 2;
339 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) 329 if (op->flag [FLAG_STEALTH ]) enc += 1;
340 enc += 2; 330 if (op->flag [FLAG_SEE_IN_DARK ]) enc += 1;
341 if (QUERY_FLAG (op, FLAG_STEALTH)) 331 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 332
350 return get_power_from_ench (enc); 333 return get_power_from_ench (enc);
351} 334}
352 335
353/* returns the typedata that has a number equal to itemtype, if there 336/* returns the typedata that has a number equal to itemtype, if there
354 * isn't one, returns NULL */ 337 * isn't one, returns NULL */
355const typedata * 338const typedata *
356get_typedata (int itemtype) 339get_typedata (int itemtype)
357{ 340{
358 int i;
359
360 for (i = 0; i < item_types_size; i++) 341 for (int i = 0; i < item_types_size; i++)
361 if (item_types[i].number == itemtype) 342 if (item_types[i].number == itemtype)
362 return &item_types[i]; 343 return &item_types[i];
363 344
364 return NULL; 345 return NULL;
365} 346}
… …
368 * isn't one, return the plural name that matches, if there still isn't 349 * isn't one, return the plural name that matches, if there still isn't
369 * one return NULL */ 350 * one return NULL */
370const typedata * 351const typedata *
371get_typedata_by_name (const char *name) 352get_typedata_by_name (const char *name)
372{ 353{
373 int i;
374
375 for (i = 0; i < item_types_size; i++) 354 for (int i = 0; i < item_types_size; i++)
376 if (!strcmp (item_types[i].name, name)) 355 if (!strcmp (item_types[i].name, name))
377 return &item_types[i]; 356 return &item_types[i];
378 357
379 for (i = 0; i < item_types_size; i++) 358 for (int i = 0; i < item_types_size; i++)
380 if (!strcmp (item_types[i].name_pl, name)) 359 if (!strcmp (item_types[i].name_pl, name))
381 { 360 {
382 LOG (llevInfo, 361 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); 362 "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]; 363 return &item_types[i];
385 } 364 }
386 365
387 return NULL; 366 return 0;
388} 367}
389 368
390/* describe_resistance generates the visible naming for resistances. 369/* describe_resistance generates the visible naming for resistances.
391 * returns a static array of the description. This can return 370 * returns a static array of the description. This can return
392 * a big buffer. 371 * a big buffer.
… …
394 * but do put a newline at the end. Useful when dumping to files 373 * but do put a newline at the end. Useful when dumping to files
395 */ 374 */
396const char * 375const char *
397describe_resistance (const object *op, int newline) 376describe_resistance (const object *op, int newline)
398{ 377{
399 static char buf[VERY_BIG_BUF]; 378 static dynbuf_text buf; buf.clear ();
400 char buf1[VERY_BIG_BUF];
401 int tmpvar;
402 379
403 buf[0] = 0; 380 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)) 381 if (op->resist[i] && (op->type != FLESH || atnr_is_dragon_enabled (i) == 1))
407 { 382 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 383
413 strcat (buf, buf1);
414 }
415 }
416 return buf; 384 return buf;
417} 385}
418
419 386
420/* 387/*
421 * query_weight(object) returns a character pointer to a static buffer 388 * query_weight(object) returns a character pointer to a static buffer
422 * containing the text-representation of the weight of the given object. 389 * containing the text-representation of the weight of the given object.
423 * The buffer will be overwritten by the next call to query_weight(). 390 * The buffer will be overwritten by the next call to query_weight().
391 *
392 * Seems to be used only by unimportant stuff. Remove?
424 */ 393 */
425const char * 394const char *
426query_weight (const object *op) 395query_weight (const object *op)
427{ 396{
428 static char buf[10]; 397 static char buf[10];
… …
454 return buf; 423 return buf;
455 } 424 }
456 425
457 if (i < 21) 426 if (i < 21)
458 return levelnumbers[i]; 427 return levelnumbers[i];
428
459 if (!(i % 10)) 429 if (!(i % 10))
460 return levelnumbers_10[i / 10]; 430 return levelnumbers_10[i / 10];
461 431
462 strcpy (buf, numbers_10[i / 10]); 432 strcpy (buf, numbers_10[i / 10]);
463 strcat (buf, levelnumbers[i % 10]); 433 strcat (buf, levelnumbers[i % 10]);
464 return buf; 434 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} 435}
486 436
487/* 437/*
488 * Returns pointer to static buffer containing ring's or amulet's 438 * Returns pointer to static buffer containing ring's or amulet's
489 * abilities 439 * abilities
… …
495 */ 445 */
496 446
497/* Aug 95 modified this slightly so that Skill tools don't have magic bonus 447/* Aug 95 modified this slightly so that Skill tools don't have magic bonus
498 * from stats.sp - b.t. 448 * from stats.sp - b.t.
499 */ 449 */
500const char * 450static const char *
501ring_desc (const object *op) 451ring_desc (const object *op)
502{ 452{
503 static dynbuf_text buf; buf.clear (); 453 static dynbuf_text buf; buf.clear ();
504 int attr, val, len; 454 int attr, val, len;
505 455
… …
539} 489}
540 490
541/* 491/*
542 * query_short_name(object) is similar to query_name, but doesn't 492 * query_short_name(object) is similar to query_name, but doesn't
543 * contain any information about object status (worn/cursed/etc.) 493 * contain any information about object status (worn/cursed/etc.)
494 *
495 * It is sometimes used when printing messages, so should fit well into a sentence.
544 */ 496 */
545const char * 497const char *
546query_short_name (const object *op) 498query_short_name (const object *op)
547{ 499{
548 if (!op->name) 500 if (!op->name)
… …
576 if (op->type != SPELLBOOK) 528 if (op->type != SPELLBOOK)
577 buf.printf (" (lvl %d)", op->level); 529 buf.printf (" (lvl %d)", op->level);
578 } 530 }
579 break; 531 break;
580 532
581 case ALTAR: 533 case ALTAR:
582 case TRIGGER_ALTAR: 534 case TRIGGER_ALTAR:
583 case IDENTIFY_ALTAR: 535 case IDENTIFY_ALTAR:
584 case CONVERTER: 536 case CONVERTER:
585 if (op->slaying == shstr_money) 537 if (op->slaying == shstr_money)
586 { 538 {
587 bool wrap = !!buf.size (); 539 bool wrap = !!buf.size ();
588 540
589 if (wrap) buf << " ["; 541 if (wrap) buf << " [";
590 542
591 archetype *coin = 0; 543 archetype *coin = 0;
592 544
593 for (char const *const *c = coins; *coins; ++c) 545 for (char const *const *c = coins; *coins; ++c)
594 if ((coin = archetype::find (*c))) 546 if ((coin = archetype::find (*c)))
595 if (op->stats.food % coin->value == 0) 547 if (op->stats.food % coin->value == 0)
596 break; 548 break;
597 549
598 sint32 coins = op->stats.food / coin->value; 550 sint32 coins = op->stats.food / coin->value;
599 551
600 buf.printf ("drop %d %s (or equivalent)", coins, coins == 1 ? &coin->name : &coin->name_pl); 552 buf.printf ("drop %d %s (or equivalent)", coins, coins == 1 ? &coin->name : &coin->name_pl);
601 553
602 if (wrap) buf << ']'; 554 if (wrap) buf << ']';
603 } 555 }
604 break; 556 break;
605 557
606 case SKILL: 558 case SKILL:
607 case AMULET: 559 case AMULET:
608 case RING: 560 case RING:
609 if (!op->title) 561 if (!op->title)
… …
632 * you can make several calls to query_name before the bufs start getting 584 * 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 585 * 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 586 * 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.) 587 * use several names much easier (don't need to store them to temp variables.)
636 * 588 *
589 * It is used extensively within messages, so should return only a prose
590 * and short description of the item.
637 */ 591 */
638const char * 592const char *
639query_name (const object *op) 593query_name (const object *op)
640{ 594{
641 int len = 0; 595 int len = 0;
… …
654 608
655 buf << query_short_name (op); 609 buf << query_short_name (op);
656 610
657 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 611 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
658 buf << " *"; 612 buf << " *";
659 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 613 if (op->is_open_container ())
660 buf << " (open)"; 614 buf << " (open)";
661 615
662 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 616 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
663 { 617 {
664 if (QUERY_FLAG (op, FLAG_DAMNED)) 618 if (QUERY_FLAG (op, FLAG_DAMNED))
… …
678 */ 632 */
679 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 633 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))
680 buf << " (magic)"; 634 buf << " (magic)";
681 635
682#if 0 636#if 0
683 /* item_power will be returned in desribe_item - it shouldn't really 637 /* item_power will be returned in describe_item - it shouldn't really
684 * be returned in the name. 638 * be returned in the name.
685 */ 639 */
686 if (op->item_power) 640 if (op->item_power)
687 sprintf (buf[use_buf] + strlen (buf[use_buf]), "(item_power %+d)", op->item_power); 641 sprintf (buf[use_buf] + strlen (buf[use_buf]), "(item_power %+d)", op->item_power);
688 642
… …
720 default: 674 default:
721 buf << " (applied)"; 675 buf << " (applied)";
722 } 676 }
723 } 677 }
724 678
679 switch (op->type)
680 {
681 case LAMP:
682 if (op->glow_radius)
683 buf << " (on)";
684 else if (op->stats.food <= 0)
685 buf << " (empty)";
686 else
687 buf << " (off)";
688 break;
689
690 case TORCH:
691 if (op->glow_radius)
692 buf << " (burning)";
693 else if (op->stats.food <= 0)
694 buf << " (burned out)";
695 break;
696 }
697
725 if (QUERY_FLAG (op, FLAG_UNPAID)) 698 if (QUERY_FLAG (op, FLAG_UNPAID))
726 buf << " (unpaid)"; 699 buf << " (unpaid)";
727 700
728 return buf; 701 return buf;
729} 702}
… …
734 * of the given object. The buffer will be overwritten at the next 707 * 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 708 * 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 709 * don't include the item count or item status. Used for inventory sorting
737 * and sending to client. 710 * and sending to client.
738 * If plural is set, we generate the plural name of this. 711 * If plural is set, we generate the plural name of this.
712 *
713 * It is sometimes used to display messages, and usually only used to match stuff,
714 * so maybe this function should be removed.
739 */ 715 */
740const char * 716const char *
741query_base_name (const object *op, int plural) 717query_base_name (const object *op, int plural)
742{ 718{
743 if ((!plural && !op->name) || (plural && !op->name_pl)) 719 if ((!plural && !op->name) || (plural && !op->name_pl))
… …
810 /* Note that the resolution this provides for players really isn't 786 /* Note that the resolution this provides for players really isn't
811 * very good. Any player with a speed greater than .67 will 787 * very good. Any player with a speed greater than .67 will
812 * fall into the 'lightning fast movement' category. 788 * fall into the 'lightning fast movement' category.
813 */ 789 */
814 if (op->has_active_speed ()) 790 if (op->has_active_speed ())
815 switch ((int) ((FABS (op->speed)) * 15)) 791 switch ((int)((fabs (op->speed)) * 15.))
816 { 792 {
817 case 0: 793 case 0:
818 buf << "(very slow movement)"; 794 buf << "(very slow movement)";
819 break; 795 break;
820 case 1: 796 case 1:
… …
938 * wouldn't need to use the SEE_INVISIBLE flag to know it is 914 * wouldn't need to use the SEE_INVISIBLE flag to know it is
939 * a dragon player examining food. Could have things like 915 * a dragon player examining food. Could have things like
940 * a dwarven axe, in which the full abilities are only known to 916 * a dwarven axe, in which the full abilities are only known to
941 * dwarves, etc. 917 * dwarves, etc.
942 * 918 *
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. 919 * Add 'owner' who is the person examining this object.
949 * owner can be null if no one is being associated with this 920 * owner can be null if no one is being associated with this
950 * item (eg, debug dump or the like) 921 * item (eg, debug dump or the like)
951 */ 922 */
952const char * 923const char *
… …
1010 buf << "well charged."; 981 buf << "well charged.";
1011 else if (op->stats.sp == op->stats.maxsp) 982 else if (op->stats.sp == op->stats.maxsp)
1012 buf << "fully charged."; 983 buf << "fully charged.";
1013 else 984 else
1014 buf << "almost full."; 985 buf << "almost full.";
986 break;
987
988 case LAMP:
989 {
990 int percent = ((double) 100 / op->arch->stats.food) * op->stats.food;
991 buf << "(fuel: ";
992 if (percent == 0)
993 buf << "empty";
994 else if (percent < 10)
995 buf << "very low";
996 else if (percent < 25)
997 buf << "low";
998 else if (percent < 50)
999 buf << "half empty";
1000 else if (percent < 75)
1001 buf << "half full";
1002 else if (percent < 95)
1003 buf << "well filled";
1004 else if (percent <= 100)
1005 buf << "full";
1006 buf << ")";
1007 }
1015 break; 1008 break;
1016 1009
1017 case FOOD: 1010 case FOOD:
1018 case FLESH: 1011 case FLESH:
1019 case DRINK: 1012 case DRINK:
… …
1175 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)"; 1168 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)";
1176 1169
1177 if (op->slaying && op->type != FOOD) 1170 if (op->slaying && op->type != FOOD)
1178 buf.printf ("(slay %s)", &op->slaying); 1171 buf.printf ("(slay %s)", &op->slaying);
1179 1172
1173 if (op->type == SKILL_TOOL && op->skill)
1174 buf.printf ("(%s)", &op->skill);
1175
1180 buf.add_abilities ("Attacks", op->attacktype); 1176 buf.add_abilities ("Attacks", op->attacktype);
1181 /* resistance on flesh is only visible for quetzals. If 1177 /* resistance on flesh is only visible for quetzals. If
1182 * non flesh, everyone can see its resistances 1178 * non flesh, everyone can see its resistances
1183 */ 1179 */
1184 if (op->type != FLESH || (owner && is_dragon_pl (owner))) 1180 if (op->type != FLESH || (owner && is_dragon_pl (owner)))
… …
1200 1196
1201void 1197void
1202examine (object *op, object *tmp) 1198examine (object *op, object *tmp)
1203{ 1199{
1204 std::string info = tmp->describe (op); 1200 std::string info = tmp->describe (op);
1201
1205 op->contr->infobox (MSG_CHANNEL ("examine"), info.c_str ()); 1202 op->contr->infobox (MSG_CHANNEL ("examine"), info.c_str ());
1206} 1203}
1207 1204
1208/* 1205/*
1209 * inventory prints object's inventory. If inv==NULL then print player's 1206 * inventory prints object's inventory. If inv==NULL then print player's
… …
1215{ 1212{
1216 static dynbuf_text buf; buf.clear (); 1213 static dynbuf_text buf; buf.clear ();
1217 1214
1218 for (object *tmp = inv; tmp; tmp = tmp->below) 1215 for (object *tmp = inv; tmp; tmp = tmp->below)
1219 if (who && QUERY_FLAG (who, FLAG_WIZ)) 1216 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)); 1217 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))) 1218 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)); 1219 buf.printf ("%s- %-36.36s %-8s\n", indent, tmp->query_name (), tmp->query_weight ());
1223 1220
1224 if (buf.size ()) 1221 if (buf.size ())
1225 buf.printf ("%s(total weight: %s)\n", indent, query_weight (this)); 1222 buf.printf ("%s(total weight: %s)\n", indent, query_weight ());
1226 else 1223 else
1227 buf.printf ("%s(empty)\n", indent); 1224 buf.printf ("%s(empty)\n", indent);
1228 1225
1229 return buf; 1226 return buf;
1230} 1227}

Diff Legend

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