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

Diff Legend

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