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.6 by root, Thu Sep 14 22:33:58 2006 UTC vs.
Revision 1.41 by root, Thu Nov 8 19:43:23 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#include <funcpoint.h> 25#include <funcpoint.h>
26#include <living.h> 26#include <living.h>
27#include <spells.h> 27#include <spells.h>
46 * may be better. 46 * may be better.
47 * Basically, for the use/nonuse, the code does something like: 47 * Basically, for the use/nonuse, the code does something like:
48 * "This item goes %s\n", with the use/nonuse values filling in the %s 48 * "This item goes %s\n", with the use/nonuse values filling in the %s
49 */ 49 */
50Body_Locations body_locations[NUM_BODY_LOCATIONS] = { 50Body_Locations body_locations[NUM_BODY_LOCATIONS] = {
51 {"body_range", "in your range slot", "in a human's range slot"} 51 {KW_body_skill , "You can use it as your skill" , "It is used as a skill"},
52 , 52 {KW_body_combat , "You can wield it as your weapon" , "It is used as a combat weapon"},
53 {"body_arm", "on your arm", "on a human's arm"} 53 {KW_body_range , "You can use it as your range weapon" , "It is used as a range weapon"},
54 , 54 {KW_body_shield , "You can wield it as a shield" , "It is used as a shield"},
55 {"body_torso", "on your body", "on a human's torso"} 55 {KW_body_arm , "You can put it on your arm" , "It goes on a human's arm"},
56 , 56 {KW_body_torso , "You can wear it on your body" , "It goes on a human's torso"},
57 {"body_head", "on your head", "on a human's head"} 57 {KW_body_head , "You can wear it on your head" , "It goes on a human's head"},
58 , 58 {KW_body_neck , "You can wear it around your neck" , "It goes around a human's neck"},
59 {"body_neck", "around your neck", "around a humans neck"} 59 {KW_body_finger , "You can wear it on your finger" , "It goes on a human's finger"} ,
60 ,
61 {"body_skill", "in your skill slot", "in a human's skill slot"}
62 ,
63 {"body_finger", "on your finger", "on a human's finger"}
64 ,
65 {"body_shoulder", "around your shoulders", "around a human's shoulders"} 60 {KW_body_shoulder, "You can wear it around your shoulders", "It goes around a human's shoulders"},
66 , 61 {KW_body_foot , "You can put it on your foot" , "It goes on a human's foot"},
67 {"body_foot", "on your feet", "on a human's feet"} 62 {KW_body_hand , "You can put it on your hand" , "It goes on a human's hand"},
68 , 63 {KW_body_wrist , "You can wear it around your wrist" , "It goes around a human's wrist"},
69 {"body_hand", "on your hands", "on a human's hands"} 64 {KW_body_waist , "You can wear it around your waist" , "It goes around a human's waist"},
70 ,
71 {"body_wrist", "around your wrists", "around a human's wrist"}
72 ,
73 {"body_waist", "around your waist", "around a human's waist"}
74 ,
75
76/*{"body_dragon_torso", "your body", "a dragon's body"} */ 65/*{"body_dragon_torso", "your body", "a dragon's body"} */
77}; 66};
78 67
79static char numbers[21][20] = { 68static char numbers[21][20] = {
80 "no", "", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten", 69 "no", "", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten",
112 {POTION, "potion", "potions", SK_ALCHEMY, 0}, 101 {POTION, "potion", "potions", SK_ALCHEMY, 0},
113 {FOOD, "food", "food", SK_WOODSMAN, 0}, 102 {FOOD, "food", "food", SK_WOODSMAN, 0},
114 {POISON, "poison", "poisons", SK_ALCHEMY, 0}, 103 {POISON, "poison", "poisons", SK_ALCHEMY, 0},
115 {BOOK, "book", "books", SK_LITERACY, 0}, 104 {BOOK, "book", "books", SK_LITERACY, 0},
116 {CLOCK, "clock", "clocks", 0, 0}, 105 {CLOCK, "clock", "clocks", 0, 0},
117 {LIGHTNING, "lightning", "lightning", 0, 0},
118 {ARROW, "arrow", "arrows", SK_BOWYER, 0}, 106 {ARROW, "arrow", "arrows", SK_BOWYER, 0},
119 {BOW, "bow", "bows", SK_BOWYER, 0}, 107 {BOW, "bow", "bows", SK_BOWYER, 0},
120 {WEAPON, "weapon", "weapons", SK_SMITHERY, 0}, 108 {WEAPON, "weapon", "weapons", SK_SMITHERY, 0},
121 {ARMOUR, "armour", "armour", SK_SMITHERY, 0}, 109 {ARMOUR, "armour", "armour", SK_SMITHERY, 0},
122 {PEDESTAL, "pedestal", "pedestals", 0, 0}, 110 {PEDESTAL, "pedestal", "pedestals", 0, 0},
142 {AMULET, "amulet", "amulets", SK_JEWELER, 0}, 130 {AMULET, "amulet", "amulets", SK_JEWELER, 0},
143 {PLAYERMOVER, "player mover", "player movers", 0, 0}, 131 {PLAYERMOVER, "player mover", "player movers", 0, 0},
144 {TELEPORTER, "teleporter", "teleporters", 0, 0}, 132 {TELEPORTER, "teleporter", "teleporters", 0, 0},
145 {CREATOR, "creator", "creators", 0, 0}, 133 {CREATOR, "creator", "creators", 0, 0},
146 {SKILL, "skill", "skills", 0, 0}, 134 {SKILL, "skill", "skills", 0, 0},
147 {EXPERIENCE, "experience", "experience", 0, 0},
148 {EARTHWALL, "earthwall", "earthwalls", 0, 0}, 135 {EARTHWALL, "earthwall", "earthwalls", 0, 0},
149 {GOLEM, "golem", "golems", 0, 0}, 136 {GOLEM, "golem", "golems", 0, 0},
150 {THROWN_OBJ, "projectile", "projectiles", 0, 0}, 137 {THROWN_OBJ, "projectile", "projectiles", 0, 0},
151 {BLINDNESS, "blindness", "blindness", 0, 0}, 138 {BLINDNESS, "blindness", "blindness", 0, 0},
152 {GOD, "god", "gods", 0, 0}, 139 {GOD, "god", "gods", 0, 0},
172 {FLOOR, "floor", "floors", 0, 0}, 159 {FLOOR, "floor", "floors", 0, 0},
173 {FLESH, "flesh", "flesh", SK_WOODSMAN, 0}, 160 {FLESH, "flesh", "flesh", SK_WOODSMAN, 0},
174 {INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0}, 161 {INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0},
175 {SKILL_TOOL, "skill tool", "skill tools", 0, 0}, 162 {SKILL_TOOL, "skill tool", "skill tools", 0, 0},
176 {LIGHTER, "lighter", "lighters", 0, 0}, 163 {LIGHTER, "lighter", "lighters", 0, 0},
177 {TRAP_PART, "trap part", "trap parts", 0, 0}, 164 {BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0},
178 {WALL, "wall", "walls", 0, 0},
179 {LIGHT_SOURCE, "light source", "light sources", 0, 0},
180 {MISC_OBJECT, "bric-a-brac", "bric-a-brac", 0, 0}, 165 {MISC_OBJECT, "bric-a-brac", "bric-a-brac", 0, 0},
181 {MONSTER, "monster", "monsters", 0, 0},
182 {SPAWN_GENERATOR, "monster generator", "monster generators", 0, 0},
183 {LAMP, "lamp", "lamps", 0, 0}, 166 {LAMP, "lamp", "lamps", 0, 0},
184 {DUPLICATOR, "duplicator", "duplicators", 0, 0}, 167 {DUPLICATOR, "duplicator", "duplicators", 0, 0},
185 {TOOL, "tool", "tools", 0, 0},
186 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0}, 168 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0},
187 {BUILDFAC, "building facility", "building facilities", 0, 0},
188 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0}, 169 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0},
189 {SPINNER, "spinner", "spinners", 0, 0}, 170 {SPINNER, "spinner", "spinners", 0, 0},
190 {GATE, "gate", "gates", 0, 0}, 171 {GATE, "gate", "gates", 0, 0},
191 {BUTTON, "button", "buttons", 0, 0}, 172 {BUTTON, "button", "buttons", 0, 0},
192 {CF_HANDLE, "cf handle", "cf handles", 0, 0}, 173 {CF_HANDLE, "cf handle", "cf handles", 0, 0},
199 {SPELL_EFFECT, "spell effect", "spell effects", 0, 0}, 180 {SPELL_EFFECT, "spell effect", "spell effects", 0, 0},
200 {CONVERTER, "converter", "converters", 0, 0}, 181 {CONVERTER, "converter", "converters", 0, 0},
201 {BRACERS, "bracers", "bracers", SK_SMITHERY, 0}, 182 {BRACERS, "bracers", "bracers", SK_SMITHERY, 0},
202 {POISONING, "poisoning", "poisonings", 0, 0}, 183 {POISONING, "poisoning", "poisonings", 0, 0},
203 {SAVEBED, "savebed", "savebeds", 0, 0}, 184 {SAVEBED, "savebed", "savebeds", 0, 0},
204 {POISONCLOUD, "poison cloud", "poison clouds", 0, 0},
205 {FIREHOLES, "fireholes", "fireholes", 0, 0},
206 {WAND, "wand", "wands", SK_THAUMATURGY, 0}, 185 {WAND, "wand", "wands", SK_THAUMATURGY, 0},
207 {SCROLL, "scroll", "scrolls", SK_LITERACY, 0}, 186 {SCROLL, "scroll", "scrolls", SK_LITERACY, 0},
208 {DIRECTOR, "director", "directors", 0, 0}, 187 {DIRECTOR, "director", "directors", 0, 0},
209 {GIRDLE, "girdle", "girdles", SK_SMITHERY, 0}, 188 {GIRDLE, "girdle", "girdles", SK_SMITHERY, 0},
210 {FORCE, "force", "forces", 0, 0}, 189 {FORCE, "force", "forces", 0, 0},
272}; 251};
273 252
274int 253int
275get_power_from_ench (int ench) 254get_power_from_ench (int ench)
276{ 255{
277 if (ench < 0) 256 if (ench < 0) ench = 0;
278 ench = 0; 257 if (ench > 20) ench = 20;
279 if (ench > 20) 258
280 ench = 20;
281 return enc_to_item_power[ench]; 259 return enc_to_item_power[ench];
282} 260}
283 261
284/* This takes an object 'op' and figures out what its item_power 262/* This takes an object 'op' and figures out what its item_power
285 * rating should be. This should only really be used by the treasure 263 * rating should be. This should only really be used by the treasure
293{ 271{
294 int i, tmp, enc; 272 int i, tmp, enc;
295 273
296 enc = 0; 274 enc = 0;
297 for (i = 0; i < NUM_STATS; i++) 275 for (i = 0; i < NUM_STATS; i++)
298 enc += get_attr_value (&op->stats, i); 276 enc += op->stats.stat (i);
299 277
300 /* This protection logic is pretty flawed. 20% fire resistance 278 /* This protection logic is pretty flawed. 20% fire resistance
301 * is much more valuable than 20% confusion, or 20% slow, or 279 * is much more valuable than 20% confusion, or 20% slow, or
302 * several others. Start at 1 - ignore physical - all that normal 280 * several others. Start at 1 - ignore physical - all that normal
303 * armour shouldn't be counted against 281 * armour shouldn't be counted against
364 enc += 1; 342 enc += 1;
365 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 343 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
366 enc += 1; 344 enc += 1;
367 345
368 return get_power_from_ench (enc); 346 return get_power_from_ench (enc);
369
370} 347}
371 348
372/* returns the typedata that has a number equal to itemtype, if there 349/* returns the typedata that has a number equal to itemtype, if there
373 * isn't one, returns NULL */ 350 * isn't one, returns NULL */
374
375const typedata * 351const typedata *
376get_typedata (int itemtype) 352get_typedata (int itemtype)
377{ 353{
378 int i; 354 int i;
379 355
384} 360}
385 361
386/* returns the typedata that has a name equal to itemtype, if there 362/* returns the typedata that has a name equal to itemtype, if there
387 * isn't one, return the plural name that matches, if there still isn't 363 * isn't one, return the plural name that matches, if there still isn't
388 * one return NULL */ 364 * one return NULL */
389
390const typedata * 365const typedata *
391get_typedata_by_name (const char *name) 366get_typedata_by_name (const char *name)
392{ 367{
393 int i; 368 int i;
394 369
409 * returns a static array of the description. This can return 384 * returns a static array of the description. This can return
410 * a big buffer. 385 * a big buffer.
411 * if newline is true, we don't put parens around the description 386 * if newline is true, we don't put parens around the description
412 * but do put a newline at the end. Useful when dumping to files 387 * but do put a newline at the end. Useful when dumping to files
413 */ 388 */
414char * 389const char *
415describe_resistance (const object *op, int newline) 390describe_resistance (const object *op, int newline)
416{ 391{
417 static char buf[VERY_BIG_BUF]; 392 static char buf[VERY_BIG_BUF];
418 char buf1[VERY_BIG_BUF]; 393 char buf1[VERY_BIG_BUF];
419 int tmpvar; 394 int tmpvar;
438/* 413/*
439 * query_weight(object) returns a character pointer to a static buffer 414 * query_weight(object) returns a character pointer to a static buffer
440 * containing the text-representation of the weight of the given object. 415 * containing the text-representation of the weight of the given object.
441 * The buffer will be overwritten by the next call to query_weight(). 416 * The buffer will be overwritten by the next call to query_weight().
442 */ 417 */
443 418const char *
444char *
445query_weight (const object *op) 419query_weight (const object *op)
446{ 420{
447 static char buf[10]; 421 static char buf[10];
448 sint32 i = (op->nrof ? op->nrof : 1) * op->weight + op->carrying; 422 sint32 i = (op->nrof ? op->nrof : 1) * op->weight + op->carrying;
449 423
450 if (op->weight < 0) 424 if (op->weight < 0)
451 return " "; 425 return " ";
426
452 if (i % 1000) 427 if (i % 1000)
453 sprintf (buf, "%6.1f", i / 1000.0); 428 sprintf (buf, "%6.1f", i / 1000.0);
454 else 429 else
455 sprintf (buf, "%4d ", i / 1000); 430 sprintf (buf, "%4d ", i / 1000);
431
456 return buf; 432 return buf;
457} 433}
458 434
459/* 435/*
460 * Returns the pointer to a static buffer containing 436 * Returns the pointer to a static buffer containing
461 * the number requested (of the form first, second, third...) 437 * the number requested (of the form first, second, third...)
462 */ 438 */
463 439const char *
464char *
465get_levelnumber (int i) 440get_levelnumber (int i)
466{ 441{
467 static char buf[MAX_BUF]; 442 static char buf[MAX_BUF];
468 443
469 if (i > 99) 444 if (i > 99)
470 { 445 {
471 sprintf (buf, "%d.", i); 446 sprintf (buf, "%d.", i);
472 return buf; 447 return buf;
473 } 448 }
449
474 if (i < 21) 450 if (i < 21)
475 return levelnumbers[i]; 451 return levelnumbers[i];
476 if (!(i % 10)) 452 if (!(i % 10))
477 return levelnumbers_10[i / 10]; 453 return levelnumbers_10[i / 10];
454
478 strcpy (buf, numbers_10[i / 10]); 455 strcpy (buf, numbers_10[i / 10]);
479 strcat (buf, levelnumbers[i % 10]); 456 strcat (buf, levelnumbers[i % 10]);
480 return buf; 457 return buf;
481} 458}
482
483 459
484/* 460/*
485 * get_number(integer) returns the text-representation of the given number 461 * get_number(integer) returns the text-representation of the given number
486 * in a static buffer. The buffer might be overwritten at the next 462 * in a static buffer. The buffer might be overwritten at the next
487 * call to get_number(). 463 * call to get_number().
488 * It is currently only used by the query_name() function. 464 * It is currently only used by the query_name() function.
489 */ 465 */
490 466const char *
491char *
492get_number (int i) 467get_number (int i)
493{ 468{
494 if (i <= 20) 469 if (i <= 20)
495 return numbers[i]; 470 return numbers[i];
496 else 471 else
513 */ 488 */
514 489
515/* Aug 95 modified this slightly so that Skill tools don't have magic bonus 490/* Aug 95 modified this slightly so that Skill tools don't have magic bonus
516 * from stats.sp - b.t. 491 * from stats.sp - b.t.
517 */ 492 */
518char * 493const char *
519ring_desc (const object *op) 494ring_desc (const object *op)
520{ 495{
521 static char buf[VERY_BIG_BUF]; 496 static dynbuf_text buf; buf.clear ();
522 int attr, val, len; 497 int attr, val, len;
523 498
524 buf[0] = 0;
525
526 if (!QUERY_FLAG (op, FLAG_IDENTIFIED)) 499 if (QUERY_FLAG (op, FLAG_IDENTIFIED))
527 return buf; 500 {
528
529 for (attr = 0; attr < NUM_STATS; attr++) 501 for (attr = 0; attr < NUM_STATS; attr++)
530 { 502 if ((val = op->stats.stat (attr)))
531 if ((val = get_attr_value (&(op->stats), attr)) != 0)
532 {
533 sprintf (buf + strlen (buf), "(%s%+d)", short_stat_name[attr], val); 503 buf.printf ("(%s%+d)", short_stat_name[attr], val);
534 }
535 }
536 if (op->stats.exp)
537 sprintf (buf + strlen (buf), "(speed %+lld)", (long long) op->stats.exp);
538 if (op->stats.wc)
539 sprintf (buf + strlen (buf), "(wc%+d)", op->stats.wc);
540 if (op->stats.dam)
541 sprintf (buf + strlen (buf), "(dam%+d)", op->stats.dam);
542 if (op->stats.ac)
543 sprintf (buf + strlen (buf), "(ac%+d)", op->stats.ac);
544 504
505 if (op->stats.exp) buf.printf ("(speed %+lld)", (long long)op->stats.exp);
506 if (op->stats.wc) buf.printf ("(wc%+d)", op->stats.wc);
507 if (op->stats.dam) buf.printf ("(dam%+d)", op->stats.dam);
508 if (op->stats.ac) buf.printf ("(ac%+d)", op->stats.ac);
509
545 strcat (buf, describe_resistance (op, 0)); 510 buf << describe_resistance (op, 0);
546 511
547 if (op->stats.food != 0) 512 if (op->stats.food) buf.printf ("(sustenance%+d)", op->stats.food);
548 sprintf (buf + strlen (buf), "(sustenance%+d)", op->stats.food); 513 if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace);
549 /* else if (op->stats.food < 0) 514 if (op->stats.sp && op->type != SKILL) buf.printf ("(magic%+d)", op->stats.sp);
550 sprintf(buf+strlen(buf), "(hunger%+d)", op->stats.food); */ 515 if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp);
551 if (op->stats.grace) 516 if (op->stats.luck) buf.printf ("(luck%+d)", op->stats.luck);
552 sprintf (buf + strlen (buf), "(grace%+d)", op->stats.grace);
553 if (op->stats.sp && op->type != SKILL)
554 sprintf (buf + strlen (buf), "(magic%+d)", op->stats.sp);
555 if (op->stats.hp)
556 sprintf (buf + strlen (buf), "(regeneration%+d)", op->stats.hp);
557 if (op->stats.luck)
558 sprintf (buf + strlen (buf), "(luck%+d)", op->stats.luck);
559 if (QUERY_FLAG (op, FLAG_LIFESAVE))
560 strcat (buf, "(lifesaving)");
561 if (QUERY_FLAG (op, FLAG_REFL_SPELL))
562 strcat (buf, "(reflect spells)");
563 if (QUERY_FLAG (op, FLAG_REFL_MISSILE))
564 strcat (buf, "(reflect missiles)");
565 if (QUERY_FLAG (op, FLAG_STEALTH))
566 strcat (buf, "(stealth)");
567 /* Shorten some of the names, so they appear better in the windows */
568 len = strlen (buf);
569 DESCRIBE_PATH_SAFE (buf, op->path_attuned, "Attuned", &len, VERY_BIG_BUF);
570 DESCRIBE_PATH_SAFE (buf, op->path_repelled, "Repelled", &len, VERY_BIG_BUF);
571 DESCRIBE_PATH_SAFE (buf, op->path_denied, "Denied", &len, VERY_BIG_BUF);
572 517
573 /* if(op->item_power) 518 if (QUERY_FLAG (op, FLAG_LIFESAVE)) buf << "(lifesaving)";
574 sprintf(buf+strlen(buf), "(item_power %+d)",op->item_power); 519 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) buf << "(reflect spells)";
575 */ 520 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) buf << "(reflect missiles)";
576 if (buf[0] == 0 && op->type != SKILL) 521 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)";
577 strcpy (buf, "of adornment");
578 522
523 buf.add_paths ("Attuned" , op->path_attuned);
524 buf.add_paths ("Repelled", op->path_repelled);
525 buf.add_paths ("Denied" , op->path_denied);
526
527 if (buf.empty ())
528 buf << "of adornment";
529 }
579 530
580 return buf; 531 return buf;
581} 532}
582 533
583/* 534/*
585 * contain any information about object status (worn/cursed/etc.) 536 * contain any information about object status (worn/cursed/etc.)
586 */ 537 */
587const char * 538const char *
588query_short_name (const object *op) 539query_short_name (const object *op)
589{ 540{
590 static char buf[HUGE_BUF]; 541 static dynbuf_text buf; buf.clear ();
591 char buf2[HUGE_BUF];
592 int len = 0;
593 542
594 if (op->name == NULL) 543 if (op->name == NULL)
595 return "(null)"; 544 return "(null)";
596 545
597 if (!op->nrof && !op->weight && !op->title && !is_magical (op)) 546 if (!op->nrof && !op->weight && !op->title && !is_magical (op))
598 return op->name; /* To speed things up (or make things slower?) */ 547 return op->name; /* To speed things up (or make things slower?) */
599 548
600 if (op->nrof <= 1) 549 buf << (op->nrof <= 1 ? op->name : op->name_pl);
601 safe_strcat (buf, op->name, &len, HUGE_BUF);
602 else
603 safe_strcat (buf, op->name_pl, &len, HUGE_BUF);
604 550
605 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED)) 551 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED))
606 { 552 buf << ' ' << op->title;
607 safe_strcat (buf, " ", &len, HUGE_BUF);
608 safe_strcat (buf, op->title, &len, HUGE_BUF);
609 }
610 553
611 switch (op->type) 554 switch (op->type)
612 { 555 {
613 case SPELLBOOK: 556 case SPELLBOOK:
614 case SCROLL: 557 case SCROLL:
615 case WAND: 558 case WAND:
616 case ROD: 559 case ROD:
617 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 560 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED))
618 { 561 {
619 if (!op->title) 562 if (!op->title)
620 { 563 buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
621 safe_strcat (buf, " of ", &len, HUGE_BUF); 564
622 if (op->inv)
623 safe_strcat (buf, op->inv->name, &len, HUGE_BUF);
624 else
625 LOG (llevError, "Spellbook %s lacks inventory\n", &op->name);
626 }
627 if (op->type != SPELLBOOK) 565 if (op->type != SPELLBOOK)
628 {
629 sprintf (buf2, " (lvl %d)", op->level); 566 buf.printf (" (lvl %d)", op->level);
630 safe_strcat (buf, buf2, &len, HUGE_BUF);
631 }
632 } 567 }
633 break; 568 break;
634 569
635 case SKILL: 570 case SKILL:
636 case AMULET: 571 case AMULET:
637 case RING: 572 case RING:
638 if (!op->title) 573 if (!op->title)
639 { 574 {
640 /* If ring has a title, full description isn't so useful */ 575 /* If ring has a title, full description isn't so useful */
641 char *s = ring_desc (op); 576 const char *s = ring_desc (op);
642 577
643 if (s[0]) 578 if (s && *s)
644 { 579 buf << " " << s;
645 safe_strcat (buf, " ", &len, HUGE_BUF);
646 safe_strcat (buf, s, &len, HUGE_BUF);
647 }
648 } 580 }
649 break; 581 break;
650 default: 582 default:
651 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) 583 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED)))
652 {
653 sprintf (buf2, " %+d", op->magic); 584 buf.printf (" %+d", op->magic);
654 safe_strcat (buf, buf2, &len, HUGE_BUF);
655 }
656 } 585 }
586
657 return buf; 587 return buf;
658} 588}
659 589
660/* 590/*
661 * query_name(object) returns a character pointer pointing to a static 591 * query_name(object) returns a character pointer pointing to a static
666 * overwritten. This may be a bad thing (it may be easier to assume the value 596 * overwritten. This may be a bad thing (it may be easier to assume the value
667 * returned is good forever.) However, it makes printing statements that 597 * returned is good forever.) However, it makes printing statements that
668 * use several names much easier (don't need to store them to temp variables.) 598 * use several names much easier (don't need to store them to temp variables.)
669 * 599 *
670 */ 600 */
671char * 601const char *
672query_name (const object *op) 602query_name (const object *op)
673{ 603{
674 static char buf[5][HUGE_BUF]; 604 int len = 0;
605 static dynbuf_text bufs[5];
675 static int use_buf = 0; 606 static int use_buf = 0;
676 int len = 0;
677
678#ifdef NEW_MATERIAL_CODE
679 materialtype_t *mt;
680#endif
681 607
682 use_buf++; 608 use_buf++;
683 use_buf %= 5; 609 use_buf %= 5;
684 610
685#ifdef NEW_MATERIAL_CODE 611 dynbuf_text &buf = bufs [use_buf];
686 if ((IS_ARMOR (op) || IS_WEAPON (op)) && op->materialname) 612 buf.clear ();
687 { 613
614 if ((op->is_armor () || op->is_weapon ()) && op->materialname)
688 mt = name_to_material (op->materialname); 615 if (materialtype_t *mt = name_to_material (op->materialname))
689 if (mt) 616 buf << mt->description << ' ';
690 {
691 safe_strcat (buf[use_buf], mt->description, &len, HUGE_BUF);
692 safe_strcat (buf[use_buf], " ", &len, HUGE_BUF);
693 }
694 }
695#endif
696 617
697 safe_strcat (buf[use_buf], query_short_name (op), &len, HUGE_BUF); 618 buf << query_short_name (op);
698 619
699 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 620 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
700 safe_strcat (buf[use_buf], " *", &len, HUGE_BUF); 621 buf << " *";
701 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 622 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))
702 safe_strcat (buf[use_buf], " (open)", &len, HUGE_BUF); 623 buf << " (open)";
703 624
704 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 625 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
705 { 626 {
706 if (QUERY_FLAG (op, FLAG_DAMNED)) 627 if (QUERY_FLAG (op, FLAG_DAMNED))
707 safe_strcat (buf[use_buf], " (damned)", &len, HUGE_BUF); 628 buf << " (damned)";
708 else if (QUERY_FLAG (op, FLAG_CURSED)) 629 else if (QUERY_FLAG (op, FLAG_CURSED))
709 safe_strcat (buf[use_buf], " (cursed)", &len, HUGE_BUF); 630 buf << " (cursed)";
710 } 631 }
632
711 /* Basically, if the object is known magical (detect magic spell on it), 633 /* Basically, if the object is known magical (detect magic spell on it),
712 * and it isn't identified, print out the fact that 634 * and it isn't identified, print out the fact that
713 * it is magical. Assume that the detect magical spell will only set 635 * it is magical. Assume that the detect magical spell will only set
714 * KNOWN_MAGICAL if the item actually is magical. 636 * KNOWN_MAGICAL if the item actually is magical.
715 * 637 *
716 * Changed in V 0.91.4 - still print that the object is magical even 638 * Changed in V 0.91.4 - still print that the object is magical even
717 * if it has been applied. Equipping an item does not tell full 639 * if it has been applied. Equipping an item does not tell full
718 * abilities, especially for artifact items. 640 * abilities, especially for artifact items.
719 */ 641 */
720 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 642 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))
721 safe_strcat (buf[use_buf], " (magic)", &len, HUGE_BUF); 643 buf << " (magic)";
722 644
723#if 0 645#if 0
724 /* item_power will be returned in desribe_item - it shouldn't really 646 /* item_power will be returned in desribe_item - it shouldn't really
725 * be returned in the name. 647 * be returned in the name.
726 */ 648 */
731 653
732 if (QUERY_FLAG (op, FLAG_APPLIED)) 654 if (QUERY_FLAG (op, FLAG_APPLIED))
733 { 655 {
734 switch (op->type) 656 switch (op->type)
735 { 657 {
736 case BOW: 658 case BOW:
737 case WAND: 659 case WAND:
738 case ROD: 660 case ROD:
739 case HORN: 661 case HORN:
740 safe_strcat (buf[use_buf], " (readied)", &len, HUGE_BUF); 662 buf << (op->env && op->env->current_weapon == op ? " (readied)" : " (applied)");
741 break; 663 break;
742 case WEAPON: 664 case WEAPON:
743 safe_strcat (buf[use_buf], " (wielded)", &len, HUGE_BUF); 665 buf << (op->env && op->env->current_weapon == op ? " (wielded)" : " (applied)");
744 break; 666 break;
745 case ARMOUR: 667 case ARMOUR:
746 case HELMET: 668 case HELMET:
747 case SHIELD: 669 case SHIELD:
748 case RING: 670 case RING:
749 case BOOTS: 671 case BOOTS:
750 case GLOVES: 672 case GLOVES:
751 case AMULET: 673 case AMULET:
752 case GIRDLE: 674 case GIRDLE:
753 case BRACERS: 675 case BRACERS:
754 case CLOAK: 676 case CLOAK:
755 safe_strcat (buf[use_buf], " (worn)", &len, HUGE_BUF); 677 buf << " (worn)";
756 break; 678 break;
757 case CONTAINER: 679 case CONTAINER:
758 safe_strcat (buf[use_buf], " (active)", &len, HUGE_BUF); 680 buf << " (active)";
759 break; 681 break;
760 case SKILL: 682 case SKILL:
761 default: 683 default:
762 safe_strcat (buf[use_buf], " (applied)", &len, HUGE_BUF); 684 buf << " (applied)";
763 } 685 }
764 } 686 }
687
765 if (QUERY_FLAG (op, FLAG_UNPAID)) 688 if (QUERY_FLAG (op, FLAG_UNPAID))
766 safe_strcat (buf[use_buf], " (unpaid)", &len, HUGE_BUF); 689 buf << " (unpaid)";
767 690
768 return buf[use_buf]; 691 return buf;
769} 692}
770 693
771/* 694/*
772 * query_base_name(object) returns a character pointer pointing to a static 695 * query_base_name(object) returns a character pointer pointing to a static
773 * buffer which contains a verbose textual representation of the name 696 * buffer which contains a verbose textual representation of the name
778 * If plural is set, we generate the plural name of this. 701 * If plural is set, we generate the plural name of this.
779 */ 702 */
780const char * 703const char *
781query_base_name (const object *op, int plural) 704query_base_name (const object *op, int plural)
782{ 705{
783 static char buf[MAX_BUF], buf2[MAX_BUF];
784 int len;
785 materialtype_t *mt;
786
787 if ((!plural && !op->name) || (plural && !op->name_pl)) 706 if ((!plural && !op->name) || (plural && !op->name_pl))
788 return "(null)"; 707 return "(null)";
789 708
790 if (!op->nrof && !op->weight && !op->title && !is_magical (op)) 709 if (!op->nrof && !op->weight && !op->title && !is_magical (op))
791 return op->name; /* To speed things up (or make things slower?) */ 710 return op->name; /* To speed things up (or make things slower?) */
792 711
793 if ((IS_ARMOR (op) || IS_WEAPON (op)) && op->materialname) 712 static dynbuf_text buf; buf.clear ();
713
714 if ((op->is_armor () || op->is_weapon ()) && op->materialname)
794 mt = name_to_material (op->materialname); 715 if (materialtype_t *mt = name_to_material (op->materialname))
716 if (op->arch->materialname != mt->name)
717 buf << mt->description << ' ';
795 718
796#ifdef NEW_MATERIAL_CODE 719 buf << (plural ? op->name_pl : op->name);
797 if ((IS_ARMOR (op) || IS_WEAPON (op)) && op->materialname && mt &&
798 op->arch->clone.materialname != mt->name && !(op->material & M_SPECIAL))
799 {
800 strcpy (buf, mt->description);
801 len = strlen (buf);
802 safe_strcat (buf, " ", &len, MAX_BUF);
803 if (!plural)
804 safe_strcat (buf, op->name, &len, MAX_BUF);
805 else
806 safe_strcat (buf, op->name_pl, &len, MAX_BUF);
807 }
808 else
809 {
810#endif
811 if (!plural)
812 strcpy (buf, op->name);
813 else
814 strcpy (buf, op->name_pl);
815 len = strlen (buf);
816#ifdef NEW_MATERIAL_CODE
817 }
818#endif
819 720
820 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED)) 721 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED))
821 { 722 buf << ' ' << op->title;
822 safe_strcat (buf, " ", &len, MAX_BUF);
823 safe_strcat (buf, op->title, &len, MAX_BUF);
824 }
825 723
826 switch (op->type) 724 switch (op->type)
827 { 725 {
828 case SPELLBOOK: 726 case SPELLBOOK:
829 case SCROLL: 727 case SCROLL:
830 case WAND: 728 case WAND:
831 case ROD: 729 case ROD:
832 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 730 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED))
833 { 731 {
834 if (!op->title) 732 if (!op->title)
835 { 733 buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
836 safe_strcat (buf, " of ", &len, MAX_BUF); 734
837 if (op->inv)
838 safe_strcat (buf, op->inv->name, &len, MAX_BUF);
839 else
840 LOG (llevError, "Spellbook %s lacks inventory\n", &op->name);
841 }
842 if (op->type != SPELLBOOK) 735 if (op->type != SPELLBOOK)
843 {
844 sprintf (buf2, " (lvl %d)", op->level); 736 buf.printf (" (lvl %d)", op->level);
845 safe_strcat (buf, buf2, &len, MAX_BUF);
846 }
847 } 737 }
848 break; 738 break;
849 739
850 740
851 case SKILL: 741 case SKILL:
852 case AMULET: 742 case AMULET:
853 case RING: 743 case RING:
854 if (!op->title) 744 if (!op->title)
855 { 745 {
856 /* If ring has a title, full description isn't so useful */ 746 /* If ring has a title, full description isn't so useful */
857 char *s = ring_desc (op); 747 const char *s = ring_desc (op);
858 748
859 if (s[0]) 749 if (s && *s)
860 { 750 buf << ' ' << s;
861 safe_strcat (buf, " ", &len, MAX_BUF);
862 safe_strcat (buf, s, &len, MAX_BUF);
863 }
864 } 751 }
865 break; 752 break;
753
866 default: 754 default:
867 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) 755 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED)))
868 { 756 buf.printf (" %+d", op->magic);
869 sprintf (buf + strlen (buf), " %+d", op->magic);
870 }
871 } 757 }
758
872 return buf; 759 return buf;
873} 760}
874 761
875/* Break this off from describe_item - that function was way 762/* Break this off from describe_item - that function was way
876 * too long, making it difficult to read. This function deals 763 * too long, making it difficult to read. This function deals
877 * with describing the monsters & players abilities. It should only 764 * with describing the monsters & players abilities. It should only
878 * be called with monster & player objects. Returns a description 765 * be called with monster & player objects. Returns a description
879 * in a static buffer. 766 * in a static buffer.
880 */ 767 */
881
882static char * 768static const char *
883describe_monster (const object *op) 769describe_monster (const object *op)
884{ 770{
885 char buf[MAX_BUF]; 771 static dynbuf_text buf; buf.clear ();
886 static char retbuf[VERY_BIG_BUF];
887 int i;
888
889 retbuf[0] = '\0';
890 772
891 /* Note that the resolution this provides for players really isn't 773 /* Note that the resolution this provides for players really isn't
892 * very good. Any player with a speed greater than .67 will 774 * very good. Any player with a speed greater than .67 will
893 * fall into the 'lightning fast movement' category. 775 * fall into the 'lightning fast movement' category.
894 */ 776 */
895 if (FABS (op->speed) > MIN_ACTIVE_SPEED) 777 if (op->has_active_speed ())
896 {
897 switch ((int) ((FABS (op->speed)) * 15)) 778 switch ((int) ((FABS (op->speed)) * 15))
898 { 779 {
899 case 0: 780 case 0:
900 strcat (retbuf, "(very slow movement)"); 781 buf << "(very slow movement";
901 break; 782 break;
902 case 1: 783 case 1:
903 strcat (retbuf, "(slow movement)"); 784 buf << "(slow movement)";
904 break; 785 break;
905 case 2: 786 case 2:
906 strcat (retbuf, "(normal movement)"); 787 buf << "(normal movement)";
907 break; 788 break;
908 case 3: 789 case 3:
909 case 4: 790 case 4:
910 strcat (retbuf, "(fast movement)"); 791 buf << "(fast movement)";
911 break; 792 break;
912 case 5: 793 case 5:
913 case 6: 794 case 6:
914 strcat (retbuf, "(very fast movement)"); 795 buf << "(very fast movement)";
915 break; 796 break;
916 case 7: 797 case 7:
917 case 8: 798 case 8:
918 case 9: 799 case 9:
919 case 10: 800 case 10:
920 strcat (retbuf, "(extremely fast movement)"); 801 buf << "(extremely fast movement)";
921 break; 802 break;
922 default: 803 default:
923 strcat (retbuf, "(lightning fast movement)"); 804 buf << "(lightning fast movement)";
924 break; 805 break;
925 } 806 }
926 } 807
927 if (QUERY_FLAG (op, FLAG_UNDEAD)) 808 if (QUERY_FLAG (op, FLAG_UNDEAD)) buf << "(undead)";
928 strcat (retbuf, "(undead)");
929 if (QUERY_FLAG (op, FLAG_SEE_INVISIBLE)) 809 if (QUERY_FLAG (op, FLAG_SEE_INVISIBLE)) buf << "(see invisible)";
930 strcat (retbuf, "(see invisible)"); 810 if (QUERY_FLAG (op, FLAG_USE_WEAPON)) buf << "(wield weapon)";
931 if (QUERY_FLAG (op, FLAG_USE_WEAPON)) 811 if (QUERY_FLAG (op, FLAG_USE_BOW)) buf << "(archer)";
932 strcat (retbuf, "(wield weapon)"); 812 if (QUERY_FLAG (op, FLAG_USE_ARMOUR)) buf << "(wear armour)";
933 if (QUERY_FLAG (op, FLAG_USE_BOW)) 813 if (QUERY_FLAG (op, FLAG_USE_RING)) buf << "(wear ring)";
934 strcat (retbuf, "(archer)"); 814 if (QUERY_FLAG (op, FLAG_USE_SCROLL)) buf << "(read scroll)";
935 if (QUERY_FLAG (op, FLAG_USE_ARMOUR)) 815 if (QUERY_FLAG (op, FLAG_USE_RANGE)) buf << "(fires wand/rod/horn)";
936 strcat (retbuf, "(wear armour)");
937 if (QUERY_FLAG (op, FLAG_USE_RING))
938 strcat (retbuf, "(wear ring)");
939 if (QUERY_FLAG (op, FLAG_USE_SCROLL))
940 strcat (retbuf, "(read scroll)");
941 if (QUERY_FLAG (op, FLAG_USE_RANGE))
942 strcat (retbuf, "(fires wand/rod/horn)");
943 if (QUERY_FLAG (op, FLAG_CAN_USE_SKILL)) 816 if (QUERY_FLAG (op, FLAG_CAN_USE_SKILL)) buf << "(skill user)";
944 strcat (retbuf, "(skill user)"); 817 if (QUERY_FLAG (op, FLAG_CAST_SPELL)) buf << "(spellcaster)";
945 if (QUERY_FLAG (op, FLAG_CAST_SPELL)) 818 if (QUERY_FLAG (op, FLAG_FRIENDLY)) buf << "(friendly)";
946 strcat (retbuf, "(spellcaster)");
947 if (QUERY_FLAG (op, FLAG_FRIENDLY))
948 strcat (retbuf, "(friendly)");
949 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE)) 819 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE)) buf << "(unaggressive)";
950 strcat (retbuf, "(unaggressive)"); 820 if (QUERY_FLAG (op, FLAG_HITBACK)) buf << "(hitback)";
951 if (QUERY_FLAG (op, FLAG_HITBACK)) 821 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealthy)";
952 strcat (retbuf, "(hitback)"); 822
953 if (QUERY_FLAG (op, FLAG_STEALTH))
954 strcat (retbuf, "(stealthy)");
955 if (op->randomitems != NULL) 823 if (op->randomitems)
956 { 824 {
957 treasure *t;
958 int first = 1; 825 bool first = 1;
959 826
960 for (t = op->randomitems->items; t != NULL; t = t->next) 827 for (treasure *t = op->randomitems->items; t; t = t->next)
961 if (t->item && (t->item->clone.type == SPELL)) 828 if (t->item && t->item->type == SPELL)
962 { 829 {
963 if (first) 830 if (first)
964 { 831 buf << "(Spell abilities:)";
832
965 first = 0; 833 first = 0;
966 strcat (retbuf, "(Spell abilities:)"); 834
967 } 835 buf << '(' << t->item->object::name << ')';
968 strcat (retbuf, "(");
969 strcat (retbuf, t->item->clone.name);
970 strcat (retbuf, ")");
971 } 836 }
972 } 837 }
838
973 if (op->type == PLAYER) 839 if (op->type == PLAYER)
974 { 840 {
975 if (op->contr->digestion) 841 if (op->contr->digestion)
976 {
977 if (op->contr->digestion != 0)
978 sprintf (buf, "(sustenance%+d)", op->contr->digestion); 842 buf.printf ("(sustenance%+d)", op->contr->digestion);
979 strcat (retbuf, buf); 843
980 }
981 if (op->contr->gen_grace) 844 if (op->contr->gen_grace)
982 {
983 sprintf (buf, "(grace%+d)", op->contr->gen_grace); 845 buf.printf ("(grace%+d)", op->contr->gen_grace);
984 strcat (retbuf, buf); 846
985 }
986 if (op->contr->gen_sp) 847 if (op->contr->gen_sp)
987 {
988 sprintf (buf, "(magic%+d)", op->contr->gen_sp); 848 buf.printf ("(magic%+d)", op->contr->gen_sp);
989 strcat (retbuf, buf); 849
990 }
991 if (op->contr->gen_hp) 850 if (op->contr->gen_hp)
992 {
993 sprintf (buf, "(regeneration%+d)", op->contr->gen_hp); 851 buf.printf ("(regeneration%+d)", op->contr->gen_hp);
994 strcat (retbuf, buf); 852
995 }
996 if (op->stats.luck) 853 if (op->stats.luck)
997 {
998 sprintf (buf, "(luck%+d)", op->stats.luck); 854 buf.printf ("(luck%+d)", op->stats.luck);
999 strcat (retbuf, buf);
1000 }
1001 } 855 }
1002 856
1003 /* describe attacktypes */ 857 /* describe attacktypes */
1004 if (is_dragon_pl (op)) 858 if (is_dragon_pl (op))
1005 { 859 {
1007 * Break apart the for loop - move the comparison checking down - 861 * Break apart the for loop - move the comparison checking down -
1008 * this makes it more readable. 862 * this makes it more readable.
1009 */ 863 */
1010 object *tmp; 864 object *tmp;
1011 865
1012 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 866 for (tmp = op->inv; tmp; tmp = tmp->below)
1013 if (tmp->type == SKILL && !strcmp (tmp->name, "clawing")) 867 if (tmp->type == SKILL && tmp->name == shstr_clawing)
1014 break; 868 break;
1015 869
1016 if (tmp && tmp->attacktype != 0) 870 if (tmp && tmp->attacktype)
1017 { 871 buf.add_abilities ("Claws", tmp->attacktype);
1018 DESCRIBE_ABILITY (retbuf, tmp->attacktype, "Claws");
1019 }
1020 else 872 else
1021 { 873 buf.add_abilities ("Attacks", op->attacktype);
1022 DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks");
1023 }
1024 } 874 }
1025 else 875 else
1026 { 876 buf.add_abilities ("Attacks", op->attacktype);
1027 DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks"); 877
1028 } 878 buf.add_paths ("Attuned" , op->path_attuned);
1029 DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned"); 879 buf.add_paths ("Repelled", op->path_repelled);
1030 DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled"); 880 buf.add_paths ("Denied" , op->path_denied);
1031 DESCRIBE_PATH (retbuf, op->path_denied, "Denied"); 881
1032 for (i = 0; i < NROFATTACKS; i++) 882 for (int i = 0; i < NROFATTACKS; i++)
1033 {
1034 if (op->resist[i]) 883 if (op->resist[i])
1035 {
1036 sprintf (buf, "(%s %+d)", resist_plus[i], op->resist[i]); 884 buf.printf ("(%s %+d)", resist_plus[i], op->resist[i]);
1037 strcat (retbuf, buf); 885
1038 }
1039 }
1040 return retbuf; 886 return buf;
1041} 887}
1042
1043 888
1044/* 889/*
1045 * Returns a pointer to a static buffer which contains a 890 * Returns a pointer to a static buffer which contains a
1046 * description of the given object. 891 * description of the given object.
1047 * If it is a monster, lots of information about its abilities 892 * If it is a monster, lots of information about its abilities
1065 * 910 *
1066 * Add 'owner' who is the person examining this object. 911 * Add 'owner' who is the person examining this object.
1067 * owner can be null if no one is being associated with this 912 * owner can be null if no one is being associated with this
1068 * item (eg, debug dump or the like) 913 * item (eg, debug dump or the like)
1069 */ 914 */
1070 915const char *
1071char *
1072describe_item (const object *op, object *owner) 916describe_item (const object *op, object *owner)
1073{ 917{
1074 char buf[MAX_BUF]; 918 if (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER)
1075 static char retbuf[VERY_BIG_BUF]; 919 return describe_monster (op);
920
921 static dynbuf_text buf; buf.clear ();
1076 int identified, i; 922 int identified, i;
1077 923
1078 retbuf[0] = '\0';
1079 if (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER)
1080 {
1081 return describe_monster (op);
1082 }
1083 /* figure this out once, instead of making multiple calls to need_identify. 924 /* figure this out once, instead of making multiple calls to need_identify.
1084 * also makes the code easier to read. 925 * also makes the code easier to read.
1085 */ 926 */
1086 if (!need_identify (op) || QUERY_FLAG (op, FLAG_IDENTIFIED)) 927 identified = !need_identify (op) || QUERY_FLAG (op, FLAG_IDENTIFIED);
1087 identified = 1; 928 if (!identified)
1088 else 929 buf << "(unidentified)";
1089 { 930
1090 strcpy (retbuf, "(unidentified)");
1091 identified = 0;
1092 }
1093 switch (op->type) 931 switch (op->type)
1094 { 932 {
1095 case BOW: 933 case BOW:
1096 case ARROW: 934 case ARROW:
1097 case WAND: 935 case WAND:
1098 case ROD: 936 case ROD:
1099 case HORN: 937 case HORN:
1100 case WEAPON: 938 case WEAPON:
1101 case ARMOUR: 939 case ARMOUR:
1102 case HELMET: 940 case HELMET:
1103 case SHIELD: 941 case SHIELD:
1104 case BOOTS: 942 case BOOTS:
1105 case GLOVES: 943 case GLOVES:
1106 case GIRDLE: 944 case GIRDLE:
1107 case BRACERS: 945 case BRACERS:
1108 case CLOAK: 946 case CLOAK:
1109 case SKILL_TOOL: 947 case SKILL_TOOL:
1110 break; /* We have more information to do below this switch */ 948 break; /* We have more information to do below this switch */
1111 949
1112 case POWER_CRYSTAL: 950 case POWER_CRYSTAL:
1113 if (op->stats.maxsp > 1000) 951 if (op->stats.maxsp > 1000)
1114 { /*higher capacity crystals */ 952 { /*higher capacity crystals */
1115 i = (op->stats.maxsp % 100) / 10; 953 i = (op->stats.maxsp % 1000) / 100;
954
1116 if (i) 955 if (i)
1117 snprintf (buf, MAX_BUF, "(capacity %d.%dk). It is ", op->stats.maxsp / 100, i); 956 buf.printf ("(capacity %d.%dk). It is ", op->stats.maxsp / 1000, i);
1118 else 957 else
1119 snprintf (buf, MAX_BUF, "(capacity %dk). It is ", op->stats.maxsp / 100); 958 buf.printf ("(capacity %dk). It is ", op->stats.maxsp / 1000);
1120 } 959 }
1121 else 960 else
1122 snprintf (buf, MAX_BUF, "(capacity %d). It is ", op->stats.maxsp); 961 buf.printf ("(capacity %d). It is ", op->stats.maxsp);
1123 strcat (retbuf, buf); 962
1124 i = (op->stats.sp * 10) / op->stats.maxsp; 963 i = (op->stats.sp * 10) / op->stats.maxsp;
1125 if (op->stats.sp == 0) 964 if (op->stats.sp == 0)
1126 strcat (retbuf, "empty."); 965 buf << "empty.";
1127 else if (i == 0) 966 else if (i == 0)
1128 strcat (retbuf, "almost empty."); 967 buf << "almost empty.";
1129 else if (i < 3) 968 else if (i < 3)
1130 strcat (retbuf, "partially filled."); 969 buf << "partially filled.";
1131 else if (i < 6) 970 else if (i < 6)
1132 strcat (retbuf, "half full."); 971 buf << "half full.";
1133 else if (i < 9) 972 else if (i < 9)
1134 strcat (retbuf, "well charged."); 973 buf << "well charged.";
1135 else if (op->stats.sp == op->stats.maxsp) 974 else if (op->stats.sp == op->stats.maxsp)
1136 strcat (retbuf, "fully charged."); 975 buf << "fully charged.";
1137 else 976 else
1138 strcat (retbuf, "almost full."); 977 buf << "almost full.";
1139 break; 978 break;
979
1140 case FOOD: 980 case FOOD:
1141 case FLESH: 981 case FLESH:
1142 case DRINK: 982 case DRINK:
1143 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 983 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED))
1144 { 984 {
1145 sprintf (buf, "(food+%d)", op->stats.food); 985 buf.printf ("(food+%d)", op->stats.food);
1146 strcat (retbuf, buf);
1147 986
1148 if (op->type == FLESH && op->last_eat > 0 && atnr_is_dragon_enabled (op->last_eat)) 987 if (op->type == FLESH && op->last_eat > 0 && atnr_is_dragon_enabled (op->last_eat))
1149 {
1150 sprintf (buf, "(%s metabolism)", change_resist_msg[op->last_eat]); 988 buf.printf ("(%s metabolism)", change_resist_msg[op->last_eat]);
1151 strcat (retbuf, buf);
1152 }
1153 989
1154 if (!QUERY_FLAG (op, FLAG_CURSED)) 990 if (!QUERY_FLAG (op, FLAG_CURSED))
1155 { 991 {
1156 if (op->stats.hp) 992 if (op->stats.hp) buf << "(heals)";
1157 strcat (retbuf, "(heals)");
1158 if (op->stats.sp)
1159 strcat (retbuf, "(spellpoint regen)"); 993 if (op->stats.sp) buf << "(spellpoint regen)";
1160 } 994 }
1161 else 995 else
1162 { 996 {
1163 if (op->stats.hp) 997 if (op->stats.hp) buf << "(damages)";
1164 strcat (retbuf, "(damages)");
1165 if (op->stats.sp)
1166 strcat (retbuf, "(spellpoint depletion)"); 998 if (op->stats.sp) buf << "(spellpoint depletion)";
1167 } 999 }
1168 } 1000 }
1169 break; 1001 break;
1170 1002
1171
1172 case SKILL: 1003 case SKILL:
1173 case RING: 1004 case RING:
1174 case AMULET: 1005 case AMULET:
1175 if (op->item_power) 1006 if (op->item_power)
1176 {
1177 sprintf (buf, "(item_power %+d)", op->item_power); 1007 buf.printf ("(item_power %+d)", op->item_power);
1178 strcat (retbuf, buf); 1008
1179 }
1180 if (op->title) 1009 if (op->title)
1181 strcat (retbuf, ring_desc (op)); 1010 buf << ring_desc (op);
1011
1182 return retbuf; 1012 return buf;
1183 1013
1184 default: 1014 default:
1185 return retbuf; 1015 return buf;
1186 } 1016 }
1187 1017
1188 /* Down here, we more further describe equipment type items. 1018 /* Down here, we more further describe equipment type items.
1189 * only describe them if they have been identified or the like. 1019 * only describe them if they have been identified or the like.
1190 */ 1020 */
1191 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 1021 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED))
1192 { 1022 {
1193 int attr, val; 1023 int attr, val;
1194 1024
1195 for (attr = 0; attr < NUM_STATS; attr++) 1025 for (attr = 0; attr < NUM_STATS; attr++)
1196 { 1026 if ((val = op->stats.stat (attr)))
1197 if ((val = get_attr_value (&(op->stats), attr)) != 0)
1198 {
1199 sprintf (buf, "(%s%+d)", short_stat_name[attr], val); 1027 buf.printf ("(%s%+d)", short_stat_name[attr], val);
1200 strcat (retbuf, buf);
1201 }
1202 }
1203 1028
1204 if (op->stats.exp) 1029 if (op->stats.exp)
1205 {
1206 sprintf (buf, "(speed %+lld)", (long long) op->stats.exp); 1030 buf.printf ("(speed %+lld)", (long long) op->stats.exp);
1207 strcat (retbuf, buf);
1208 }
1209
1210 1031
1211 switch (op->type) 1032 switch (op->type)
1212 { 1033 {
1213 case BOW: 1034 case BOW:
1214 case ARROW: 1035 case ARROW:
1215 case GIRDLE: 1036 case GIRDLE:
1216 case HELMET: 1037 case HELMET:
1217 case SHIELD: 1038 case SHIELD:
1218 case BOOTS: 1039 case BOOTS:
1219 case GLOVES: 1040 case GLOVES:
1220 case WEAPON: 1041 case WEAPON:
1221 case SKILL: 1042 case SKILL:
1222 case RING: 1043 case RING:
1223 case AMULET: 1044 case AMULET:
1224 case ARMOUR: 1045 case ARMOUR:
1225 case BRACERS: 1046 case BRACERS:
1226 case FORCE: 1047 case FORCE:
1227 case CLOAK: 1048 case CLOAK:
1228 if (op->stats.wc) 1049 if (op->stats.wc) buf.printf ("(wc%+d)", op->stats.wc);
1229 { 1050 if (op->stats.dam) buf.printf ("(dam%+d)", op->stats.dam);
1230 sprintf (buf, "(wc%+d)", op->stats.wc); 1051 if (op->stats.ac) buf.printf ("(ac%+d)", op->stats.ac);
1231 strcat (retbuf, buf); 1052
1232 }
1233 if (op->stats.dam)
1234 {
1235 sprintf (buf, "(dam%+d)", op->stats.dam);
1236 strcat (retbuf, buf);
1237 }
1238 if (op->stats.ac)
1239 {
1240 sprintf (buf, "(ac%+d)", op->stats.ac);
1241 strcat (retbuf, buf);
1242 }
1243 if ((op->type == WEAPON || op->type == BOW) && op->level > 0) 1053 if ((op->type == WEAPON || op->type == BOW) && op->level > 0)
1244 {
1245 sprintf (buf, "(improved %d/%d)", op->last_eat, op->level); 1054 buf.printf ("(improved %d/%d)", op->last_eat, op->level);
1246 strcat (retbuf, buf); 1055
1247 }
1248 break; 1056 break;
1249 1057
1250 default: 1058 default:
1251 break; 1059 break;
1252 } 1060 }
1253 if (QUERY_FLAG (op, FLAG_XRAYS)) 1061
1254 strcat (retbuf, "(xray-vision)"); 1062 if (QUERY_FLAG (op, FLAG_XRAYS)) buf << "(xray-vision)";
1255 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK)) 1063 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK)) buf << "(infravision)";
1256 strcat (retbuf, "(infravision)");
1257 1064
1258 /* levitate was what is was before, so we'll keep it */ 1065 /* levitate was what is was before, so we'll keep it */
1259 if (op->move_type & MOVE_FLY_LOW) 1066 if (op->move_type & MOVE_FLY_LOW) buf << "(levitate)";
1260 strcat (retbuf, "(levitate)");
1261
1262 if (op->move_type & MOVE_FLY_HIGH) 1067 if (op->move_type & MOVE_FLY_HIGH) buf << "(fly)";
1263 strcat (retbuf, "(fly)");
1264
1265 if (op->move_type & MOVE_SWIM) 1068 if (op->move_type & MOVE_SWIM) buf << "(swim)";
1266 strcat (retbuf, "(swim)");
1267 1069
1268 /* walking is presumed as 'normal', so doesn't need mentioning */ 1070 /* walking is presumed as 'normal', so doesn't need mentioning */
1269 1071
1270 if (op->item_power) 1072 if (op->item_power)
1271 {
1272 sprintf (buf, "(item_power %+d)", op->item_power); 1073 buf.printf ("(item_power %+d)", op->item_power);
1273 strcat (retbuf, buf);
1274 }
1275 } /* End if identified or applied */ 1074 } /* End if identified or applied */
1276 1075
1277 /* This blocks only deals with fully identified object. 1076 /* This blocks only deals with fully identified object.
1278 * it is intentional that this is not an 'else' from a above - 1077 * it is intentional that this is not an 'else' from a above -
1279 * in this way, information is added. 1078 * in this way, information is added.
1282 { 1081 {
1283 int more_info = 0; 1082 int more_info = 0;
1284 1083
1285 switch (op->type) 1084 switch (op->type)
1286 { 1085 {
1287 case ROD: /* These use stats.sp for spell selection and stats.food */ 1086 case ROD: /* These use stats.sp for spell selection and stats.food */
1288 case HORN: /* and stats.hp for spell-point regeneration... */ 1087 case HORN: /* and stats.hp for spell-point regeneration... */
1289 case BOW: 1088 case BOW:
1290 case ARROW: 1089 case ARROW:
1291 case WAND: 1090 case WAND:
1292 case FOOD: 1091 case FOOD:
1293 case FLESH: 1092 case FLESH:
1294 case DRINK: 1093 case DRINK:
1295 more_info = 0; 1094 more_info = 0;
1296 break; 1095 break;
1297 1096
1298 /* Armor type objects */ 1097 /* Armor type objects */
1299 case ARMOUR: 1098 case ARMOUR:
1300 case HELMET: 1099 case HELMET:
1301 case SHIELD: 1100 case SHIELD:
1302 case BOOTS: 1101 case BOOTS:
1303 case GLOVES: 1102 case GLOVES:
1304 case GIRDLE: 1103 case GIRDLE:
1305 case BRACERS: 1104 case BRACERS:
1306 case CLOAK: 1105 case CLOAK:
1307 if (ARMOUR_SPEED (op)) 1106 if (ARMOUR_SPEED (op)) buf.printf ("(Max speed %1.2f)", ARMOUR_SPEED (op) / 10.0);
1308 { 1107 if (ARMOUR_SPELLS (op)) buf.printf ("(Spell regen penalty %d)", ARMOUR_SPELLS (op));
1309 sprintf (buf, "(Max speed %1.2f)", ARMOUR_SPEED (op) / 10.0);
1310 strcat (retbuf, buf);
1311 }
1312 if (ARMOUR_SPELLS (op))
1313 {
1314 sprintf (buf, "(Spell regen penalty %d)", ARMOUR_SPELLS (op));
1315 strcat (retbuf, buf);
1316 }
1317 more_info = 1; 1108 more_info = 1;
1318 break; 1109 break;
1319 1110
1320 case WEAPON: 1111 case WEAPON:
1321 /* Calculate it the same way fix_player does so the results 1112 /* Calculate it the same way fix_player does so the results
1322 * make sense. 1113 * make sense.
1323 */ 1114 */
1324 i = (WEAPON_SPEED (op) * 2 - op->magic) / 2; 1115 i = (WEAPON_SPEED (op) * 2 - op->magic) / 2;
1325 if (i < 0) 1116 if (i < 0)
1326 i = 0; 1117 i = 0;
1327 1118
1328 sprintf (buf, "(weapon speed %d)", i); 1119 buf.printf ("(weapon speed %d)", i);
1329 strcat (retbuf, buf);
1330 more_info = 1; 1120 more_info = 1;
1331 break; 1121 break;
1332
1333 } 1122 }
1123
1334 if (more_info) 1124 if (more_info)
1335 { 1125 {
1336 if (op->stats.food)
1337 {
1338 if (op->stats.food != 0)
1339 sprintf (buf, "(sustenance%+d)", op->stats.food); 1126 if (op->stats.food) buf.printf ("(sustenance%+d)", op->stats.food);
1340 strcat (retbuf, buf);
1341 }
1342 if (op->stats.grace)
1343 {
1344 sprintf (buf, "(grace%+d)", op->stats.grace); 1127 if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace);
1345 strcat (retbuf, buf); 1128 if (op->stats.sp) buf.printf ("(magic%+d)", op->stats.sp);
1346 }
1347 if (op->stats.sp)
1348 {
1349 sprintf (buf, "(magic%+d)", op->stats.sp);
1350 strcat (retbuf, buf);
1351 }
1352 if (op->stats.hp)
1353 {
1354 sprintf (buf, "(regeneration%+d)", op->stats.hp); 1129 if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp);
1355 strcat (retbuf, buf);
1356 }
1357 } 1130 }
1358 1131
1359 if (op->stats.luck) 1132 if (op->stats.luck)
1360 {
1361 sprintf (buf, "(luck%+d)", op->stats.luck); 1133 buf.printf ("(luck%+d)", op->stats.luck);
1362 strcat (retbuf, buf); 1134
1363 }
1364 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 1135 if (QUERY_FLAG (op, FLAG_LIFESAVE)) buf << "(lifesaving)";
1365 strcat (retbuf, "(lifesaving)"); 1136 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) buf << "(reflect spells)";
1366 if (QUERY_FLAG (op, FLAG_REFL_SPELL))
1367 strcat (retbuf, "(reflect spells)");
1368 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) 1137 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) buf << "(reflect missiles)";
1369 strcat (retbuf, "(reflect missiles)");
1370 if (QUERY_FLAG (op, FLAG_STEALTH)) 1138 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)";
1371 strcat (retbuf, "(stealth)"); 1139
1372 if (op->slaying != NULL && op->type != FOOD) 1140 if (op->slaying && op->type != FOOD)
1373 {
1374 sprintf (buf, "(slay %s)", &op->slaying); 1141 buf.printf ("(slay %s)", &op->slaying);
1375 strcat (retbuf, buf); 1142
1376 } 1143 buf.add_abilities ("Attacks", op->attacktype);
1377 DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks");
1378 /* resistance on flesh is only visible for quetzals. If 1144 /* resistance on flesh is only visible for quetzals. If
1379 * non flesh, everyone can see its resistances 1145 * non flesh, everyone can see its resistances
1380 */ 1146 */
1381 if (op->type != FLESH || (owner && is_dragon_pl (owner))) 1147 if (op->type != FLESH || (owner && is_dragon_pl (owner)))
1382 strcat (retbuf, describe_resistance (op, 0)); 1148 buf << describe_resistance (op, 0);
1383 DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned");
1384 DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled");
1385 DESCRIBE_PATH (retbuf, op->path_denied, "Denied");
1386 }
1387 1149
1150 buf.add_paths ("Attuned", op->path_attuned);
1151 buf.add_paths ("Repelled", op->path_repelled);
1152 buf.add_paths ("Denied", op->path_denied);
1153 }
1154
1388 return retbuf; 1155 return buf;
1156}
1157
1158std::string
1159object::describe_item (object *who)
1160{
1161 return std::string (::describe_item (this, who));
1162}
1163
1164void
1165examine (object *op, object *tmp)
1166{
1167 std::string s = tmp->describe (op);
1168
1169 new_draw_info (NDI_UNIQUE, 0, op, s.c_str ());
1170}
1171
1172/*
1173 * inventory prints object's inventory. If inv==NULL then print player's
1174 * inventory.
1175 * [ Only items which are applied are showed. Tero.Haatanen@lut.fi ]
1176 */
1177const char *
1178object::query_inventory (object *who, const char *indent)
1179{
1180 static dynbuf_text buf; buf.clear ();
1181
1182 for (object *tmp = inv; tmp; tmp = tmp->below)
1183 if (who && QUERY_FLAG (who, FLAG_WIZ))
1184 buf.printf ("%s- %-28.28s (%5d) %-8s\n", indent, query_name (tmp), tmp->count, query_weight (tmp));
1185 else if (!tmp->invisible && (type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED)))
1186 buf.printf ("%s- %-36.36s %-8s\n", indent, query_name (tmp), query_weight (tmp));
1187
1188 if (buf.size ())
1189 buf.printf ("%s(total weight: %s)\n", indent, query_weight (this));
1190 else
1191 buf.printf ("%s(empty)\n", indent);
1192
1193 return buf;
1389} 1194}
1390 1195
1391/* Return true if the item is magical. A magical item is one that 1196/* Return true if the item is magical. A magical item is one that
1392 * increases/decreases any abilities, provides a resistance, 1197 * increases/decreases any abilities, provides a resistance,
1393 * has a generic magical bonus, or is an artifact. 1198 * has a generic magical bonus, or is an artifact.
1394 * This function is used by detect_magic to determine if an item 1199 * This function is used by detect_magic to determine if an item
1395 * should be marked as magical. 1200 * should be marked as magical.
1396 */ 1201 */
1397
1398int 1202int
1399is_magical (const object *op) 1203is_magical (const object *op)
1400{ 1204{
1401 int i; 1205 int i;
1402 1206
1453 if (op->magic || op->type == POWER_CRYSTAL || op->type == SPELLBOOK || op->type == SCROLL || op->type == GIRDLE) 1257 if (op->magic || op->type == POWER_CRYSTAL || op->type == SPELLBOOK || op->type == SCROLL || op->type == GIRDLE)
1454 return 1; 1258 return 1;
1455 1259
1456 /* Check to see if it increases/decreases any stats */ 1260 /* Check to see if it increases/decreases any stats */
1457 for (i = 0; i < NUM_STATS; i++) 1261 for (i = 0; i < NUM_STATS; i++)
1458 if (get_attr_value (&(op->stats), i) != 0) 1262 if (op->stats.stat (i))
1459 return 1; 1263 return 1;
1460 1264
1461 /* If it doesn't fall into any of the above categories, must 1265 /* If it doesn't fall into any of the above categories, must
1462 * be non magical. 1266 * be non magical.
1463 */ 1267 */
1472int 1276int
1473need_identify (const object *op) 1277need_identify (const object *op)
1474{ 1278{
1475 switch (op->type) 1279 switch (op->type)
1476 { 1280 {
1477 case RING: 1281 case RING:
1478 case WAND: 1282 case WAND:
1479 case ROD: 1283 case ROD:
1480 case HORN: 1284 case HORN:
1481 case SCROLL: 1285 case SCROLL:
1482 case SKILL: 1286 case SKILL:
1483 case SKILLSCROLL: 1287 case SKILLSCROLL:
1484 case SPELLBOOK: 1288 case SPELLBOOK:
1485 case FOOD: 1289 case FOOD:
1486 case POTION: 1290 case POTION:
1487 case BOW: 1291 case BOW:
1488 case ARROW: 1292 case ARROW:
1489 case WEAPON: 1293 case WEAPON:
1490 case ARMOUR: 1294 case ARMOUR:
1491 case SHIELD: 1295 case SHIELD:
1492 case HELMET: 1296 case HELMET:
1493 case AMULET: 1297 case AMULET:
1494 case BOOTS: 1298 case BOOTS:
1495 case GLOVES: 1299 case GLOVES:
1496 case BRACERS: 1300 case BRACERS:
1497 case GIRDLE: 1301 case GIRDLE:
1498 case CONTAINER: 1302 case CONTAINER:
1499 case DRINK: 1303 case DRINK:
1500 case FLESH: 1304 case FLESH:
1501 case INORGANIC: 1305 case INORGANIC:
1502 case CLOSE_CON: 1306 case CLOSE_CON:
1503 case CLOAK: 1307 case CLOAK:
1504 case GEM: 1308 case GEM:
1505 case POWER_CRYSTAL: 1309 case POWER_CRYSTAL:
1506 case POISON: 1310 case POISON:
1507 case BOOK: 1311 case BOOK:
1508 case SKILL_TOOL: 1312 case SKILL_TOOL:
1509 return 1; 1313 return 1;
1510 } 1314 }
1315
1511 /* Try to track down some stuff that may show up here. Thus, the 1316 /* Try to track down some stuff that may show up here. Thus, the
1512 * archetype file can be updated, and this function removed. 1317 * archetype file can be updated, and this function removed.
1513 */ 1318 */
1514#if 0 1319#if 0
1515 LOG (llevDebug, "need_identify: %s does not need to be id'd\n", op->name); 1320 LOG (llevDebug, "need_identify: %s does not need to be id'd\n", op->name);
1516#endif 1321#endif
1517 return 0; 1322 return 0;
1518} 1323}
1519 1324
1520
1521/* 1325/*
1522 * Supposed to fix face-values as well here, but later. 1326 * Supposed to fix face-values as well here, but later.
1523 */ 1327 */
1524
1525void 1328void
1526identify (object *op) 1329identify (object *op)
1527{ 1330{
1528 object *pl; 1331 object *pl;
1529 1332
1541 { 1344 {
1542 if (op->inv && op->randomitems) 1345 if (op->inv && op->randomitems)
1543 op->title = op->inv->name; 1346 op->title = op->inv->name;
1544 else if (op->arch) 1347 else if (op->arch)
1545 { 1348 {
1546 op->name = op->arch->clone.name; 1349 op->name = op->arch->object::name;
1547 op->name_pl = op->arch->clone.name_pl; 1350 op->name_pl = op->arch->object::name_pl;
1548 } 1351 }
1549 } 1352 }
1550 1353
1551 /* If the object is on a map, make sure we update its face */ 1354 /* If the object is on a map, make sure we update its face */
1552 if (op->map) 1355 if (op->map)
1553 update_object (op, UP_OBJ_FACE); 1356 update_object (op, UP_OBJ_CHANGE);
1554 else 1357 else
1555 { 1358 {
1556 pl = is_player_inv (op->env); 1359 pl = op->in_player ();
1557 if (pl) 1360 if (pl)
1558 /* A lot of the values can change from an update - might as well send 1361 /* A lot of the values can change from an update - might as well send
1559 * it all. 1362 * it all.
1560 */ 1363 */
1561 esrv_send_item (pl, op); 1364 esrv_send_item (pl, op);
1562 } 1365 }
1563} 1366}
1367

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines