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

Diff Legend

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