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

Diff Legend

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