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.4 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.47 by root, Mon Apr 21 23:35:24 2008 UTC

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

Diff Legend

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