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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines