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.35 by root, Sun May 27 23:56:21 2007 UTC vs.
Revision 1.65 by root, Sat Nov 7 18:30:05 2009 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <funcpoint.h>
27#include <living.h> 26#include <living.h>
28#include <spells.h> 27#include <spells.h>
28
29const char *const coins[NUM_COINS + 1] = { "royalty", "platinacoin", "goldcoin", "silvercoin", 0 };
29 30
30/* the ordering of this is actually doesn't make a difference 31/* the ordering of this is actually doesn't make a difference
31 * However, for ease of use, new entries should go at the end 32 * However, for ease of use, new entries should go at the end
32 * so those people that debug the code that get used to something 33 * so those people that debug the code that get used to something
33 * being in the location 4 don't get confused. 34 * being in the location 4 don't get confused.
… …
62 {KW_body_foot , "You can put it on your foot" , "It goes on a human's foot"}, 63 {KW_body_foot , "You can put it on your foot" , "It goes on a human's foot"},
63 {KW_body_hand , "You can put it on your hand" , "It goes on a human's hand"}, 64 {KW_body_hand , "You can put it on your hand" , "It goes on a human's hand"},
64 {KW_body_wrist , "You can wear it around your wrist" , "It goes around a human's wrist"}, 65 {KW_body_wrist , "You can wear it around your wrist" , "It goes around a human's wrist"},
65 {KW_body_waist , "You can wear it around your waist" , "It goes around a human's waist"}, 66 {KW_body_waist , "You can wear it around your waist" , "It goes around a human's waist"},
66/*{"body_dragon_torso", "your body", "a dragon's body"} */ 67/*{"body_dragon_torso", "your body", "a dragon's body"} */
67};
68
69static char numbers[21][20] = {
70 "no", "", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten",
71 "eleven", "twelve", "thirteen", "fourteen", "fifteen", "sixteen", "seventeen",
72 "eighteen", "nineteen", "twenty"
73}; 68};
74 69
75static char numbers_10[10][20] = { 70static char numbers_10[10][20] = {
76 "zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy", 71 "zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy",
77 "eighty", "ninety" 72 "eighty", "ninety"
… …
169 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0}, 164 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0},
170 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0}, 165 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0},
171 {SPINNER, "spinner", "spinners", 0, 0}, 166 {SPINNER, "spinner", "spinners", 0, 0},
172 {GATE, "gate", "gates", 0, 0}, 167 {GATE, "gate", "gates", 0, 0},
173 {BUTTON, "button", "buttons", 0, 0}, 168 {BUTTON, "button", "buttons", 0, 0},
174 {CF_HANDLE, "cf handle", "cf handles", 0, 0}, 169 {T_HANDLE, "cf handle", "cf handles", 0, 0},
175 {HOLE, "hole", "holes", 0, 0}, 170 {HOLE, "hole", "holes", 0, 0},
176 {TRAPDOOR, "trapdoor", "trapdoors", 0, 0}, 171 {TRAPDOOR, "trapdoor", "trapdoors", 0, 0},
177 {SIGN, "sign", "signs", 0, 0}, 172 {SIGN, "sign", "signs", 0, 0},
178 {BOOTS, "boots", "boots", SK_SMITHERY, 0}, 173 {BOOTS, "boots", "boots", SK_SMITHERY, 0},
179 {GLOVES, "gloves", "gloves", SK_SMITHERY, 0}, 174 {GLOVES, "gloves", "gloves", SK_SMITHERY, 0},
… …
206 {BUILDER, "item builder", "item builders", 0, 0}, 201 {BUILDER, "item builder", "item builders", 0, 0},
207 {MATERIAL, "building material", "building materials", 0, 0}, 202 {MATERIAL, "building material", "building materials", 0, 0},
208 {ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0}, 203 {ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0},
209}; 204};
210 205
211const int item_types_size = sizeof (item_types) / sizeof (*item_types); 206static const int item_types_size = sizeof (item_types) / sizeof (*item_types);
212 207
213materialtype_t *materialt; 208materialtype_t *materialt;
214 209
215/* 210/*
216materialtype material[NROFMATERIALS] = { 211materialtype material[NROFMATERIALS] = {
… …
252}; 247};
253 248
254int 249int
255get_power_from_ench (int ench) 250get_power_from_ench (int ench)
256{ 251{
257 if (ench < 0) ench = 0;
258 if (ench > 20) ench = 20;
259
260 return enc_to_item_power[ench]; 252 return enc_to_item_power [clamp (ench, 0, 20)];
261} 253}
262 254
263/* This takes an object 'op' and figures out what its item_power 255/* This takes an object 'op' and figures out what its item_power
264 * rating should be. This should only really be used by the treasure 256 * rating should be. This should only really be used by the treasure
265 * generation code, and when loading legacy objects. It returns 257 * generation code, and when loading legacy objects. It returns
… …
299 if (op->type == WEAPON) 291 if (op->type == WEAPON)
300 { 292 {
301 for (i = 1; i < NROFATTACKS; i++) 293 for (i = 1; i < NROFATTACKS; i++)
302 if (op->attacktype & (1 << i)) 294 if (op->attacktype & (1 << i))
303 enc++; 295 enc++;
296
304 if (op->slaying) 297 if (op->slaying)
305 enc += 2; /* What it slays is probably more relevent */ 298 enc += 2; /* What it slays is probably more relevent */
306 } 299 }
300
307 /* Items the player can equip */ 301 /* Items the player can equip */
308 if ((op->type == WEAPON) || (op->type == ARMOUR) || (op->type == HELMET) || 302 if ((op->type == WEAPON) || (op->type == ARMOUR) || (op->type == HELMET) ||
309 (op->type == SHIELD) || (op->type == RING) || 303 (op->type == SHIELD) || (op->type == RING) ||
310 (op->type == BOOTS) || (op->type == GLOVES) || 304 (op->type == BOOTS) || (op->type == GLOVES) ||
311 (op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK)) 305 (op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK))
… …
314 enc += op->stats.hp; /* hp regen */ 308 enc += op->stats.hp; /* hp regen */
315 enc += op->stats.sp; /* mana regen */ 309 enc += op->stats.sp; /* mana regen */
316 enc += op->stats.grace; /* grace regen */ 310 enc += op->stats.grace; /* grace regen */
317 enc += op->stats.exp; /* speed bonus */ 311 enc += op->stats.exp; /* speed bonus */
318 } 312 }
313
319 enc += op->stats.luck; 314 enc += op->stats.luck;
320 315
321 /* Do spell paths now */ 316 /* Do spell paths now */
322 for (i = 1; i < NRSPELLPATHS; i++) 317 for (i = 1; i < NRSPELLPATHS; i++)
323 { 318 {
… …
327 enc -= 2; 322 enc -= 2;
328 else if (op->path_repelled & (1 << i)) 323 else if (op->path_repelled & (1 << i))
329 enc--; 324 enc--;
330 } 325 }
331 326
332 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 327 if (op->flag [FLAG_LIFESAVE ]) enc += 5;
333 enc += 5; 328 if (op->flag [FLAG_REFL_SPELL ]) enc += 3;
334 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) 329 if (op->flag [FLAG_REFL_MISSILE]) enc += 2;
335 enc += 3; 330 if (op->flag [FLAG_XRAYS ]) enc += 2;
336 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) 331 if (op->flag [FLAG_STEALTH ]) enc += 1;
337 enc += 2; 332 if (op->flag [FLAG_SEE_IN_DARK ]) enc += 1;
338 if (QUERY_FLAG (op, FLAG_STEALTH)) 333 if (op->flag [FLAG_MAKE_INVIS ]) enc += 1;
339 enc += 1;
340 if (QUERY_FLAG (op, FLAG_XRAYS))
341 enc += 2;
342 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK))
343 enc += 1;
344 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
345 enc += 1;
346 334
347 return get_power_from_ench (enc); 335 return get_power_from_ench (enc);
348} 336}
349 337
350/* returns the typedata that has a number equal to itemtype, if there 338/* returns the typedata that has a number equal to itemtype, if there
351 * isn't one, returns NULL */ 339 * isn't one, returns NULL */
352const typedata * 340const typedata *
353get_typedata (int itemtype) 341get_typedata (int itemtype)
354{ 342{
355 int i;
356
357 for (i = 0; i < item_types_size; i++) 343 for (int i = 0; i < item_types_size; i++)
358 if (item_types[i].number == itemtype) 344 if (item_types[i].number == itemtype)
359 return &item_types[i]; 345 return &item_types[i];
346
360 return NULL; 347 return NULL;
361} 348}
362 349
363/* returns the typedata that has a name equal to itemtype, if there 350/* 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 351 * isn't one, return the plural name that matches, if there still isn't
365 * one return NULL */ 352 * one return NULL */
366const typedata * 353const typedata *
367get_typedata_by_name (const char *name) 354get_typedata_by_name (const char *name)
368{ 355{
369 int i;
370
371 for (i = 0; i < item_types_size; i++) 356 for (int i = 0; i < item_types_size; i++)
372 if (!strcmp (item_types[i].name, name)) 357 if (!strcmp (item_types[i].name, name))
373 return &item_types[i]; 358 return &item_types[i];
359
374 for (i = 0; i < item_types_size; i++) 360 for (int i = 0; i < item_types_size; i++)
375 if (!strcmp (item_types[i].name_pl, name)) 361 if (!strcmp (item_types[i].name_pl, name))
376 { 362 {
377 LOG (llevInfo, 363 LOG (llevInfo,
378 "get_typedata_by_name: I have been sent the plural %s, the singular form %s is preffered\n", name, item_types[i].name); 364 "get_typedata_by_name: I have been sent the plural %s, the singular form %s is prefered\n", name, item_types[i].name);
379 return &item_types[i]; 365 return &item_types[i];
380 } 366 }
367
381 return NULL; 368 return 0;
382} 369}
383 370
384/* describe_resistance generates the visible naming for resistances. 371/* describe_resistance generates the visible naming for resistances.
385 * returns a static array of the description. This can return 372 * returns a static array of the description. This can return
386 * a big buffer. 373 * a big buffer.
… …
388 * but do put a newline at the end. Useful when dumping to files 375 * but do put a newline at the end. Useful when dumping to files
389 */ 376 */
390const char * 377const char *
391describe_resistance (const object *op, int newline) 378describe_resistance (const object *op, int newline)
392{ 379{
393 static char buf[VERY_BIG_BUF]; 380 static dynbuf_text buf; buf.clear ();
394 char buf1[VERY_BIG_BUF];
395 int tmpvar;
396 381
397 buf[0] = 0; 382 for (int i = 0; i < NROFATTACKS; i++)
398 for (tmpvar = 0; tmpvar < NROFATTACKS; tmpvar++)
399 {
400 if (op->resist[tmpvar] && (op->type != FLESH || atnr_is_dragon_enabled (tmpvar) == 1)) 383 if (op->resist[i] && (op->type != FLESH || atnr_is_dragon_enabled (i) == 1))
401 { 384 buf.printf (newline ? "%s %d\n" : "(%s %+d)", resist_plus[i], op->resist[i]);
402 if (!newline)
403 sprintf (buf1, "(%s %+d)", resist_plus[tmpvar], op->resist[tmpvar]);
404 else
405 sprintf (buf1, "%s %d\n", resist_plus[tmpvar], op->resist[tmpvar]);
406 385
407 strcat (buf, buf1);
408 }
409 }
410 return buf; 386 return buf;
411} 387}
412
413 388
414/* 389/*
415 * query_weight(object) returns a character pointer to a static buffer 390 * query_weight(object) returns a character pointer to a static buffer
416 * containing the text-representation of the weight of the given object. 391 * containing the text-representation of the weight of the given object.
417 * The buffer will be overwritten by the next call to query_weight(). 392 * The buffer will be overwritten by the next call to query_weight().
393 *
394 * Seems to be used only by unimportant stuff. Remove?
418 */ 395 */
419const char * 396const char *
420query_weight (const object *op) 397query_weight (const object *op)
421{ 398{
422 static char buf[10]; 399 static char buf[10];
423 sint32 i = (op->nrof ? op->nrof : 1) * op->weight + op->carrying; 400 sint32 i = op->total_weight ();
424 401
425 if (op->weight < 0) 402 if (op->weight < 0)
426 return " "; 403 return " ";
427 404
428 if (i % 1000) 405 if (i % 1000)
… …
448 return buf; 425 return buf;
449 } 426 }
450 427
451 if (i < 21) 428 if (i < 21)
452 return levelnumbers[i]; 429 return levelnumbers[i];
430
453 if (!(i % 10)) 431 if (!(i % 10))
454 return levelnumbers_10[i / 10]; 432 return levelnumbers_10[i / 10];
455 433
456 strcpy (buf, numbers_10[i / 10]); 434 strcpy (buf, numbers_10[i / 10]);
457 strcat (buf, levelnumbers[i % 10]); 435 strcat (buf, levelnumbers[i % 10]);
458 return buf; 436 return buf;
459}
460
461/*
462 * get_number(integer) returns the text-representation of the given number
463 * in a static buffer. The buffer might be overwritten at the next
464 * call to get_number().
465 * It is currently only used by the query_name() function.
466 */
467const char *
468get_number (int i)
469{
470 if (i <= 20)
471 return numbers[i];
472 else
473 {
474 static char buf[MAX_BUF];
475
476 sprintf (buf, "%d", i);
477 return buf;
478 }
479} 437}
480 438
481/* 439/*
482 * Returns pointer to static buffer containing ring's or amulet's 440 * Returns pointer to static buffer containing ring's or amulet's
483 * abilities 441 * abilities
… …
489 */ 447 */
490 448
491/* Aug 95 modified this slightly so that Skill tools don't have magic bonus 449/* Aug 95 modified this slightly so that Skill tools don't have magic bonus
492 * from stats.sp - b.t. 450 * from stats.sp - b.t.
493 */ 451 */
494const char * 452static const char *
495ring_desc (const object *op) 453ring_desc (const object *op)
496{ 454{
497 static char buf[VERY_BIG_BUF]; 455 static dynbuf_text buf; buf.clear ();
498 int attr, val, len; 456 int attr, val, len;
499 457
500 buf[0] = 0;
501
502 if (!QUERY_FLAG (op, FLAG_IDENTIFIED)) 458 if (QUERY_FLAG (op, FLAG_IDENTIFIED))
503 return buf; 459 {
504
505 for (attr = 0; attr < NUM_STATS; attr++) 460 for (attr = 0; attr < NUM_STATS; attr++)
506 {
507 if ((val = op->stats.stat (attr))) 461 if ((val = op->stats.stat (attr)))
508 sprintf (buf + strlen (buf), "(%s%+d)", short_stat_name[attr], val); 462 buf.printf ("(%s%+d)", short_stat_name[attr], val);
509 }
510 463
511 if (op->stats.exp) 464 if (op->stats.exp) buf.printf ("(speed %+lld)", (long long)op->stats.exp);
512 sprintf (buf + strlen (buf), "(speed %+lld)", (long long) op->stats.exp); 465 if (op->stats.wc) buf.printf ("(wc%+d)", op->stats.wc);
513 if (op->stats.wc) 466 if (op->stats.dam) buf.printf ("(dam%+d)", op->stats.dam);
514 sprintf (buf + strlen (buf), "(wc%+d)", op->stats.wc); 467 if (op->stats.ac) buf.printf ("(ac%+d)", op->stats.ac);
515 if (op->stats.dam)
516 sprintf (buf + strlen (buf), "(dam%+d)", op->stats.dam);
517 if (op->stats.ac)
518 sprintf (buf + strlen (buf), "(ac%+d)", op->stats.ac);
519 468
520 strcat (buf, describe_resistance (op, 0)); 469 buf << describe_resistance (op, 0);
521 470
522 if (op->stats.food != 0) 471 if (op->stats.food) buf.printf ("(sustenance%+d)", op->stats.food);
523 sprintf (buf + strlen (buf), "(sustenance%+d)", op->stats.food); 472 if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace);
524 /* else if (op->stats.food < 0) 473 if (op->stats.sp && op->type != SKILL) buf.printf ("(magic%+d)", op->stats.sp);
525 sprintf(buf+strlen(buf), "(hunger%+d)", op->stats.food); */ 474 if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp);
526 if (op->stats.grace) 475 if (op->stats.luck) buf.printf ("(luck%+d)", op->stats.luck);
527 sprintf (buf + strlen (buf), "(grace%+d)", op->stats.grace);
528 if (op->stats.sp && op->type != SKILL)
529 sprintf (buf + strlen (buf), "(magic%+d)", op->stats.sp);
530 if (op->stats.hp)
531 sprintf (buf + strlen (buf), "(regeneration%+d)", op->stats.hp);
532 if (op->stats.luck)
533 sprintf (buf + strlen (buf), "(luck%+d)", op->stats.luck);
534 if (QUERY_FLAG (op, FLAG_LIFESAVE))
535 strcat (buf, "(lifesaving)");
536 if (QUERY_FLAG (op, FLAG_REFL_SPELL))
537 strcat (buf, "(reflect spells)");
538 if (QUERY_FLAG (op, FLAG_REFL_MISSILE))
539 strcat (buf, "(reflect missiles)");
540 if (QUERY_FLAG (op, FLAG_STEALTH))
541 strcat (buf, "(stealth)");
542 476
543 /* Shorten some of the names, so they appear better in the windows */ 477 if (QUERY_FLAG (op, FLAG_LIFESAVE)) buf << "(lifesaving)";
544 len = strlen (buf); 478 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) buf << "(reflect spells)";
545 DESCRIBE_PATH_SAFE (buf, op->path_attuned, "Attuned", &len, VERY_BIG_BUF); 479 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) buf << "(reflect missiles)";
546 DESCRIBE_PATH_SAFE (buf, op->path_repelled, "Repelled", &len, VERY_BIG_BUF); 480 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)";
547 DESCRIBE_PATH_SAFE (buf, op->path_denied, "Denied", &len, VERY_BIG_BUF);
548 481
549 /* if(op->item_power) 482 buf.add_paths ("Attuned" , op->path_attuned);
550 sprintf(buf+strlen(buf), "(item_power %+d)",op->item_power); 483 buf.add_paths ("Repelled", op->path_repelled);
551 */ 484 buf.add_paths ("Denied" , op->path_denied);
552 if (buf[0] == 0 && op->type != SKILL)
553 strcpy (buf, "of adornment");
554 485
486 if (buf.empty ())
487 buf << "of adornment";
488 }
555 489
556 return buf; 490 return buf;
557} 491}
558 492
559/* 493/*
560 * query_short_name(object) is similar to query_name, but doesn't 494 * query_short_name(object) is similar to query_name, but doesn't
561 * contain any information about object status (worn/cursed/etc.) 495 * contain any information about object status (worn/cursed/etc.)
496 *
497 * It is sometimes used when printing messages, so should fit well into a sentence.
562 */ 498 */
563const char * 499const char *
564query_short_name (const object *op) 500query_short_name (const object *op)
565{ 501{
566 static char buf[HUGE_BUF];
567 char buf2[HUGE_BUF];
568 int len = 0;
569
570 if (op->name == NULL) 502 if (!op->name)
571 return "(null)"; 503 return "(null)";
572 504
573 if (!op->nrof && !op->weight && !op->title && !is_magical (op)) 505 if (!op->nrof
506 && !op->weight
507 && !op->title
508 && !is_magical (op)
509 && op->slaying != shstr_money)
574 return op->name; /* To speed things up (or make things slower?) */ 510 return op->name; /* To speed things up (or make things slower?) */
575 511
576 if (op->nrof <= 1) 512 static dynbuf_text buf; buf.clear ();
577 safe_strcat (buf, op->name, &len, HUGE_BUF); 513
578 else 514 buf << (op->nrof <= 1 ? op->name : op->name_pl);
579 safe_strcat (buf, op->name_pl, &len, HUGE_BUF);
580 515
581 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED)) 516 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED))
582 { 517 buf << ' ' << op->title;
583 safe_strcat (buf, " ", &len, HUGE_BUF);
584 safe_strcat (buf, op->title, &len, HUGE_BUF);
585 }
586 518
587 switch (op->type) 519 switch (op->type)
588 { 520 {
589 case SPELLBOOK: 521 case SPELLBOOK:
590 case SCROLL: 522 case SCROLL:
591 case WAND: 523 case WAND:
592 case ROD: 524 case ROD:
593 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 525 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED))
594 { 526 {
595 if (!op->title) 527 if (!op->title)
596 { 528 buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
597 safe_strcat (buf, " of ", &len, HUGE_BUF); 529
598 if (op->inv)
599 safe_strcat (buf, op->inv->name, &len, HUGE_BUF);
600 else
601 LOG (llevError, "Spellbook %s lacks inventory\n", &op->name);
602 }
603 if (op->type != SPELLBOOK) 530 if (op->type != SPELLBOOK)
604 {
605 sprintf (buf2, " (lvl %d)", op->level); 531 buf.printf (" (lvl %d)", op->level);
606 safe_strcat (buf, buf2, &len, HUGE_BUF);
607 }
608 } 532 }
609 break; 533 break;
610 534
535 case ALTAR:
536 case TRIGGER_ALTAR:
537 case IDENTIFY_ALTAR:
538 case CONVERTER:
539 if (op->slaying == shstr_money)
540 {
541 bool wrap = !!buf.size ();
542
543 if (wrap) buf << " [";
544
545 archetype *coin = 0;
546
547 for (char const *const *c = coins; *coins; ++c)
548 if ((coin = archetype::find (*c)))
549 if (op->stats.food % coin->value == 0)
550 break;
551
552 sint32 coins = op->stats.food / coin->value;
553
554 buf.printf ("drop %d %s (or equivalent)", coins, coins == 1 ? &coin->name : &coin->name_pl);
555
556 if (wrap) buf << ']';
557 }
558 break;
559
611 case SKILL: 560 case SKILL:
612 case AMULET: 561 case AMULET:
613 case RING: 562 case RING:
614 if (!op->title) 563 if (!op->title)
615 { 564 {
616 /* If ring has a title, full description isn't so useful */ 565 /* If ring has a title, full description isn't so useful */
617 const char *s = ring_desc (op); 566 const char *s = ring_desc (op);
618 567
619 if (s[0]) 568 if (s && *s)
620 { 569 buf << " " << s;
621 safe_strcat (buf, " ", &len, HUGE_BUF);
622 safe_strcat (buf, s, &len, HUGE_BUF);
623 }
624 } 570 }
625 break; 571 break;
572
626 default: 573 default:
627 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) 574 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED)))
628 {
629 sprintf (buf2, " %+d", op->magic); 575 buf.printf (" %+d", op->magic);
630 safe_strcat (buf, buf2, &len, HUGE_BUF);
631 }
632 } 576 }
577
633 return buf; 578 return buf;
634} 579}
635 580
636/* 581/*
637 * query_name(object) returns a character pointer pointing to a static 582 * query_name(object) returns a character pointer pointing to a static
… …
641 * you can make several calls to query_name before the bufs start getting 586 * you can make several calls to query_name before the bufs start getting
642 * overwritten. This may be a bad thing (it may be easier to assume the value 587 * overwritten. This may be a bad thing (it may be easier to assume the value
643 * returned is good forever.) However, it makes printing statements that 588 * returned is good forever.) However, it makes printing statements that
644 * use several names much easier (don't need to store them to temp variables.) 589 * use several names much easier (don't need to store them to temp variables.)
645 * 590 *
591 * It is used extensively within messages, so should return only a prose
592 * and short description of the item.
646 */ 593 */
647const char * 594const char *
648query_name (const object *op) 595query_name (const object *op)
649{ 596{
650 static char buf[5][HUGE_BUF]; // OMFG 597 int len = 0;
598 static dynbuf_text bufs[5];
651 static int use_buf = 0; 599 static int use_buf = 0;
652 int len = 0;
653
654#ifdef NEW_MATERIAL_CODE
655 materialtype_t *mt;
656#endif
657 600
658 use_buf++; 601 use_buf++;
659 use_buf %= 5; 602 use_buf %= 5;
660 603
661#ifdef NEW_MATERIAL_CODE 604 dynbuf_text &buf = bufs [use_buf];
605 buf.clear ();
606
662 if ((op->is_armor () || op->is_weapon ()) && op->materialname) 607 if ((op->is_armor () || op->is_weapon ()) && op->materialname)
663 {
664 mt = name_to_material (op->materialname); 608 if (materialtype_t *mt = name_to_material (op->materialname))
665 if (mt) 609 buf << mt->description << ' ';
666 {
667 safe_strcat (buf[use_buf], mt->description, &len, HUGE_BUF);
668 safe_strcat (buf[use_buf], " ", &len, HUGE_BUF);
669 }
670 }
671#endif
672 610
673 safe_strcat (buf[use_buf], query_short_name (op), &len, HUGE_BUF); 611 buf << query_short_name (op);
674 612
675 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 613 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
676 safe_strcat (buf[use_buf], " *", &len, HUGE_BUF); 614 buf << " *";
677 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 615 if (op->is_open_container ())
678 safe_strcat (buf[use_buf], " (open)", &len, HUGE_BUF); 616 buf << " (open)";
679 617
680 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 618 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
681 { 619 {
682 if (QUERY_FLAG (op, FLAG_DAMNED)) 620 if (QUERY_FLAG (op, FLAG_DAMNED))
683 safe_strcat (buf[use_buf], " (damned)", &len, HUGE_BUF); 621 buf << " (damned)";
684 else if (QUERY_FLAG (op, FLAG_CURSED)) 622 else if (QUERY_FLAG (op, FLAG_CURSED))
685 safe_strcat (buf[use_buf], " (cursed)", &len, HUGE_BUF); 623 buf << " (cursed)";
686 } 624 }
687 625
688 /* Basically, if the object is known magical (detect magic spell on it), 626 /* Basically, if the object is known magical (detect magic spell on it),
689 * and it isn't identified, print out the fact that 627 * and it isn't identified, print out the fact that
690 * it is magical. Assume that the detect magical spell will only set 628 * it is magical. Assume that the detect magical spell will only set
… …
693 * Changed in V 0.91.4 - still print that the object is magical even 631 * 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 632 * if it has been applied. Equipping an item does not tell full
695 * abilities, especially for artifact items. 633 * abilities, especially for artifact items.
696 */ 634 */
697 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 635 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))
698 safe_strcat (buf[use_buf], " (magic)", &len, HUGE_BUF); 636 buf << " (magic)";
699 637
700#if 0 638#if 0
701 /* item_power will be returned in desribe_item - it shouldn't really 639 /* item_power will be returned in describe_item - it shouldn't really
702 * be returned in the name. 640 * be returned in the name.
703 */ 641 */
704 if (op->item_power) 642 if (op->item_power)
705 sprintf (buf[use_buf] + strlen (buf[use_buf]), "(item_power %+d)", op->item_power); 643 sprintf (buf[use_buf] + strlen (buf[use_buf]), "(item_power %+d)", op->item_power);
706 644
… …
712 { 650 {
713 case BOW: 651 case BOW:
714 case WAND: 652 case WAND:
715 case ROD: 653 case ROD:
716 case HORN: 654 case HORN:
717 safe_strcat (buf[use_buf], op->env && op->env->current_weapon == op ? " (readied)" : " (applied)", &len, HUGE_BUF); 655 buf << (op->env && op->env->current_weapon == op ? " (readied)" : " (applied)");
718 break; 656 break;
719 case WEAPON: 657 case WEAPON:
720 safe_strcat (buf[use_buf], op->env && op->env->current_weapon == op ? " (wielded)" : " (applied)", &len, HUGE_BUF); 658 buf << (op->env && op->env->current_weapon == op ? " (wielded)" : " (applied)");
721 break; 659 break;
722 case ARMOUR: 660 case ARMOUR:
723 case HELMET: 661 case HELMET:
724 case SHIELD: 662 case SHIELD:
725 case RING: 663 case RING:
… …
727 case GLOVES: 665 case GLOVES:
728 case AMULET: 666 case AMULET:
729 case GIRDLE: 667 case GIRDLE:
730 case BRACERS: 668 case BRACERS:
731 case CLOAK: 669 case CLOAK:
732 safe_strcat (buf[use_buf], " (worn)", &len, HUGE_BUF); 670 buf << " (worn)";
733 break; 671 break;
734 case CONTAINER: 672 case CONTAINER:
735 safe_strcat (buf[use_buf], " (active)", &len, HUGE_BUF); 673 buf << " (active)";
736 break; 674 break;
737 case SKILL: 675 case SKILL:
738 default: 676 default:
739 safe_strcat (buf[use_buf], " (applied)", &len, HUGE_BUF); 677 buf << " (applied)";
740 } 678 }
741 } 679 }
742 680
681 switch (op->type)
682 {
683 case LAMP:
684 if (op->glow_radius)
685 buf << " (on)";
686 else if (op->stats.food <= 0)
687 buf << " (empty)";
688 else
689 buf << " (off)";
690 break;
691
692 case TORCH:
693 if (op->glow_radius)
694 buf << " (burning)";
695 else if (op->stats.food <= 0)
696 buf << " (burned out)";
697 break;
698 }
699
743 if (QUERY_FLAG (op, FLAG_UNPAID)) 700 if (QUERY_FLAG (op, FLAG_UNPAID))
744 safe_strcat (buf[use_buf], " (unpaid)", &len, HUGE_BUF); 701 buf << " (unpaid)";
745 702
746 return buf [use_buf]; 703 return buf;
747} 704}
748 705
749/* 706/*
750 * query_base_name(object) returns a character pointer pointing to a static 707 * query_base_name(object) returns a character pointer pointing to a static
751 * buffer which contains a verbose textual representation of the name 708 * buffer which contains a verbose textual representation of the name
752 * of the given object. The buffer will be overwritten at the next 709 * of the given object. The buffer will be overwritten at the next
753 * call to query_base_name(). This is a lot like query_name, but we 710 * call to query_base_name(). This is a lot like query_name, but we
754 * don't include the item count or item status. Used for inventory sorting 711 * don't include the item count or item status. Used for inventory sorting
755 * and sending to client. 712 * and sending to client.
756 * If plural is set, we generate the plural name of this. 713 * If plural is set, we generate the plural name of this.
714 *
715 * It is sometimes used to display messages, and usually only used to match stuff,
716 * so maybe this function should be removed.
757 */ 717 */
758const char * 718const char *
759query_base_name (const object *op, int plural) 719query_base_name (const object *op, int plural)
760{ 720{
761 static char buf[MAX_BUF], buf2[MAX_BUF];
762 int len;
763 materialtype_t *mt;
764
765 if ((!plural && !op->name) || (plural && !op->name_pl)) 721 if ((!plural && !op->name) || (plural && !op->name_pl))
766 return "(null)"; 722 return "(null)";
767 723
768 if (!op->nrof && !op->weight && !op->title && !is_magical (op)) 724 if (!op->nrof && !op->weight && !op->title && !is_magical (op))
769 return op->name; /* To speed things up (or make things slower?) */ 725 return op->name; /* To speed things up (or make things slower?) */
770 726
727 static dynbuf_text buf; buf.clear ();
728
771 if ((op->is_armor () || op->is_weapon ()) && op->materialname) 729 if ((op->is_armor () || op->is_weapon ()) && op->materialname)
772 mt = name_to_material (op->materialname); 730 if (materialtype_t *mt = name_to_material (op->materialname))
731 if (op->arch->materialname != mt->name)
732 buf << mt->description << ' ';
773 733
774#ifdef NEW_MATERIAL_CODE 734 buf << (plural ? op->name_pl : op->name);
775 if ((op->is_armor () || op->is_weapon ()) && op->materialname && mt &&
776 op->arch->clone.materialname != mt->name && !(op->material & M_SPECIAL))
777 {
778 strcpy (buf, mt->description);
779 len = strlen (buf);
780 safe_strcat (buf, " ", &len, MAX_BUF);
781 if (!plural)
782 safe_strcat (buf, op->name, &len, MAX_BUF);
783 else
784 safe_strcat (buf, op->name_pl, &len, MAX_BUF);
785 }
786 else
787 {
788#endif
789 if (!plural)
790 assign (buf, op->name);
791 else
792 assign (buf, op->name_pl);
793
794 len = strlen (buf);
795#ifdef NEW_MATERIAL_CODE
796 }
797#endif
798 735
799 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED)) 736 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED))
800 { 737 buf << ' ' << op->title;
801 safe_strcat (buf, " ", &len, MAX_BUF);
802 safe_strcat (buf, op->title, &len, MAX_BUF);
803 }
804 738
805 switch (op->type) 739 switch (op->type)
806 { 740 {
807 case SPELLBOOK: 741 case SPELLBOOK:
808 case SCROLL: 742 case SCROLL:
809 case WAND: 743 case WAND:
810 case ROD: 744 case ROD:
811 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 745 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED))
812 { 746 {
813 if (!op->title) 747 if (!op->title)
814 { 748 buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
815 safe_strcat (buf, " of ", &len, MAX_BUF); 749
816 if (op->inv)
817 safe_strcat (buf, op->inv->name, &len, MAX_BUF);
818 else
819 LOG (llevError, "Spellbook %s lacks inventory\n", &op->name);
820 }
821 if (op->type != SPELLBOOK) 750 if (op->type != SPELLBOOK)
822 {
823 sprintf (buf2, " (lvl %d)", op->level); 751 buf.printf (" (lvl %d)", op->level);
824 safe_strcat (buf, buf2, &len, MAX_BUF);
825 }
826 } 752 }
827 break; 753 break;
828 754
829 755
830 case SKILL: 756 case SKILL:
… …
833 if (!op->title) 759 if (!op->title)
834 { 760 {
835 /* If ring has a title, full description isn't so useful */ 761 /* If ring has a title, full description isn't so useful */
836 const char *s = ring_desc (op); 762 const char *s = ring_desc (op);
837 763
838 if (s[0]) 764 if (s && *s)
839 { 765 buf << ' ' << s;
840 safe_strcat (buf, " ", &len, MAX_BUF);
841 safe_strcat (buf, s, &len, MAX_BUF);
842 }
843 } 766 }
844 break; 767 break;
845 768
846 default: 769 default:
847 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) 770 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED)))
848 sprintf (buf + strlen (buf), " %+d", op->magic); 771 buf.printf (" %+d", op->magic);
849 } 772 }
850 773
851 return buf; 774 return buf;
852} 775}
853 776
… …
855 * too long, making it difficult to read. This function deals 778 * too long, making it difficult to read. This function deals
856 * with describing the monsters & players abilities. It should only 779 * with describing the monsters & players abilities. It should only
857 * be called with monster & player objects. Returns a description 780 * be called with monster & player objects. Returns a description
858 * in a static buffer. 781 * in a static buffer.
859 */ 782 */
860static char * 783static const char *
861describe_monster (const object *op) 784describe_monster (const object *op)
862{ 785{
863 char buf[MAX_BUF]; 786 static dynbuf_text buf; buf.clear ();
864 static char retbuf[VERY_BIG_BUF];
865 int i;
866
867 retbuf[0] = '\0';
868 787
869 /* Note that the resolution this provides for players really isn't 788 /* Note that the resolution this provides for players really isn't
870 * very good. Any player with a speed greater than .67 will 789 * very good. Any player with a speed greater than .67 will
871 * fall into the 'lightning fast movement' category. 790 * fall into the 'lightning fast movement' category.
872 */ 791 */
873 if (op->has_active_speed ()) 792 if (op->has_active_speed ())
874 {
875 switch ((int) ((FABS (op->speed)) * 15)) 793 switch ((int)((fabs (op->speed)) * 15.))
876 { 794 {
877 case 0: 795 case 0:
878 strcat (retbuf, "(very slow movement)"); 796 buf << "(very slow movement)";
879 break; 797 break;
880 case 1: 798 case 1:
881 strcat (retbuf, "(slow movement)"); 799 buf << "(slow movement)";
882 break; 800 break;
883 case 2: 801 case 2:
884 strcat (retbuf, "(normal movement)"); 802 buf << "(normal movement)";
885 break; 803 break;
886 case 3: 804 case 3:
887 case 4: 805 case 4:
888 strcat (retbuf, "(fast movement)"); 806 buf << "(fast movement)";
889 break; 807 break;
890 case 5: 808 case 5:
891 case 6: 809 case 6:
892 strcat (retbuf, "(very fast movement)"); 810 buf << "(very fast movement)";
893 break; 811 break;
894 case 7: 812 case 7:
895 case 8: 813 case 8:
896 case 9: 814 case 9:
897 case 10: 815 case 10:
898 strcat (retbuf, "(extremely fast movement)"); 816 buf << "(extremely fast movement)";
899 break; 817 break;
900 default: 818 default:
901 strcat (retbuf, "(lightning fast movement)"); 819 buf << "(lightning fast movement)";
902 break; 820 break;
903 } 821 }
904 } 822
905 if (QUERY_FLAG (op, FLAG_UNDEAD)) 823 if (QUERY_FLAG (op, FLAG_UNDEAD)) buf << "(undead)";
906 strcat (retbuf, "(undead)");
907 if (QUERY_FLAG (op, FLAG_SEE_INVISIBLE)) 824 if (QUERY_FLAG (op, FLAG_SEE_INVISIBLE)) buf << "(see invisible)";
908 strcat (retbuf, "(see invisible)"); 825 if (QUERY_FLAG (op, FLAG_USE_WEAPON)) buf << "(wield weapon)";
909 if (QUERY_FLAG (op, FLAG_USE_WEAPON)) 826 if (QUERY_FLAG (op, FLAG_USE_BOW)) buf << "(archer)";
910 strcat (retbuf, "(wield weapon)"); 827 if (QUERY_FLAG (op, FLAG_USE_ARMOUR)) buf << "(wear armour)";
911 if (QUERY_FLAG (op, FLAG_USE_BOW)) 828 if (QUERY_FLAG (op, FLAG_USE_RING)) buf << "(wear ring)";
912 strcat (retbuf, "(archer)"); 829 if (QUERY_FLAG (op, FLAG_USE_SCROLL)) buf << "(read scroll)";
913 if (QUERY_FLAG (op, FLAG_USE_ARMOUR)) 830 if (QUERY_FLAG (op, FLAG_USE_RANGE)) buf << "(fires wand/rod/horn)";
914 strcat (retbuf, "(wear armour)");
915 if (QUERY_FLAG (op, FLAG_USE_RING))
916 strcat (retbuf, "(wear ring)");
917 if (QUERY_FLAG (op, FLAG_USE_SCROLL))
918 strcat (retbuf, "(read scroll)");
919 if (QUERY_FLAG (op, FLAG_USE_RANGE))
920 strcat (retbuf, "(fires wand/rod/horn)");
921 if (QUERY_FLAG (op, FLAG_CAN_USE_SKILL)) 831 if (QUERY_FLAG (op, FLAG_CAN_USE_SKILL)) buf << "(skill user)";
922 strcat (retbuf, "(skill user)"); 832 if (QUERY_FLAG (op, FLAG_CAST_SPELL)) buf << "(spellcaster)";
923 if (QUERY_FLAG (op, FLAG_CAST_SPELL)) 833 if (QUERY_FLAG (op, FLAG_FRIENDLY)) buf << "(friendly)";
924 strcat (retbuf, "(spellcaster)");
925 if (QUERY_FLAG (op, FLAG_FRIENDLY))
926 strcat (retbuf, "(friendly)");
927 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE)) 834 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE)) buf << "(unaggressive)";
928 strcat (retbuf, "(unaggressive)"); 835 if (QUERY_FLAG (op, FLAG_HITBACK)) buf << "(hitback)";
929 if (QUERY_FLAG (op, FLAG_HITBACK)) 836 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealthy)";
930 strcat (retbuf, "(hitback)"); 837
931 if (QUERY_FLAG (op, FLAG_STEALTH))
932 strcat (retbuf, "(stealthy)");
933 if (op->randomitems != NULL) 838 if (op->randomitems)
934 { 839 {
935 treasure *t;
936 int first = 1; 840 bool first = 1;
937 841
938 for (t = op->randomitems->items; t != NULL; t = t->next) 842 for (treasure *t = op->randomitems->items; t; t = t->next)
939 if (t->item && t->item->clone.type == SPELL) 843 if (t->item && t->item->type == SPELL)
940 { 844 {
941 if (first) 845 if (first)
942 { 846 buf << "(Spell abilities:)";
847
943 first = 0; 848 first = 0;
944 strcat (retbuf, "(Spell abilities:)"); 849
945 } 850 buf << '(' << t->item->object::name << ')';
946 strcat (retbuf, "(");
947 strcat (retbuf, t->item->clone.name);
948 strcat (retbuf, ")");
949 } 851 }
950 } 852 }
853
951 if (op->type == PLAYER) 854 if (op->type == PLAYER)
952 { 855 {
953 if (op->contr->digestion) 856 if (op->contr->digestion)
954 {
955 if (op->contr->digestion != 0)
956 sprintf (buf, "(sustenance%+d)", op->contr->digestion); 857 buf.printf ("(sustenance%+d)", op->contr->digestion);
957 strcat (retbuf, buf); 858
958 }
959 if (op->contr->gen_grace) 859 if (op->contr->gen_grace)
960 {
961 sprintf (buf, "(grace%+d)", op->contr->gen_grace); 860 buf.printf ("(grace%+d)", op->contr->gen_grace);
962 strcat (retbuf, buf); 861
963 }
964 if (op->contr->gen_sp) 862 if (op->contr->gen_sp)
965 {
966 sprintf (buf, "(magic%+d)", op->contr->gen_sp); 863 buf.printf ("(magic%+d)", op->contr->gen_sp);
967 strcat (retbuf, buf); 864
968 }
969 if (op->contr->gen_hp) 865 if (op->contr->gen_hp)
970 {
971 sprintf (buf, "(regeneration%+d)", op->contr->gen_hp); 866 buf.printf ("(regeneration%+d)", op->contr->gen_hp);
972 strcat (retbuf, buf); 867
973 }
974 if (op->stats.luck) 868 if (op->stats.luck)
975 {
976 sprintf (buf, "(luck%+d)", op->stats.luck); 869 buf.printf ("(luck%+d)", op->stats.luck);
977 strcat (retbuf, buf);
978 }
979 } 870 }
980 871
981 /* describe attacktypes */ 872 /* describe attacktypes */
982 if (is_dragon_pl (op)) 873 if (is_dragon_pl (op))
983 { 874 {
… …
985 * Break apart the for loop - move the comparison checking down - 876 * Break apart the for loop - move the comparison checking down -
986 * this makes it more readable. 877 * this makes it more readable.
987 */ 878 */
988 object *tmp; 879 object *tmp;
989 880
990 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 881 for (tmp = op->inv; tmp; tmp = tmp->below)
991 if (tmp->type == SKILL && !strcmp (tmp->name, "clawing")) 882 if (tmp->type == SKILL && tmp->name == shstr_clawing)
992 break; 883 break;
993 884
994 if (tmp && tmp->attacktype != 0) 885 if (tmp && tmp->attacktype)
995 { DESCRIBE_ABILITY (retbuf, tmp->attacktype, "Claws") } 886 buf.add_abilities ("Claws", tmp->attacktype);
996 else 887 else
997 { DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks") } 888 buf.add_abilities ("Attacks", op->attacktype);
998 } 889 }
999 else 890 else
1000 { DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks") } 891 buf.add_abilities ("Attacks", op->attacktype);
1001 892
1002 DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned"); 893 buf.add_paths ("Attuned" , op->path_attuned);
1003 DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled"); 894 buf.add_paths ("Repelled", op->path_repelled);
1004 DESCRIBE_PATH (retbuf, op->path_denied, "Denied"); 895 buf.add_paths ("Denied" , op->path_denied);
1005 896
1006 for (i = 0; i < NROFATTACKS; i++) 897 for (int i = 0; i < NROFATTACKS; i++)
1007 if (op->resist[i]) 898 if (op->resist[i])
1008 {
1009 sprintf (buf, "(%s %+d)", resist_plus[i], op->resist[i]); 899 buf.printf ("(%s %+d)", resist_plus[i], op->resist[i]);
1010 strcat (retbuf, buf);
1011 }
1012 900
1013 return retbuf; 901 return buf;
1014} 902}
1015
1016 903
1017/* 904/*
1018 * Returns a pointer to a static buffer which contains a 905 * Returns a pointer to a static buffer which contains a
1019 * description of the given object. 906 * description of the given object.
1020 * If it is a monster, lots of information about its abilities 907 * If it is a monster, lots of information about its abilities
… …
1029 * wouldn't need to use the SEE_INVISIBLE flag to know it is 916 * wouldn't need to use the SEE_INVISIBLE flag to know it is
1030 * a dragon player examining food. Could have things like 917 * a dragon player examining food. Could have things like
1031 * a dwarven axe, in which the full abilities are only known to 918 * a dwarven axe, in which the full abilities are only known to
1032 * dwarves, etc. 919 * dwarves, etc.
1033 * 920 *
1034 * This function is really much more complicated than it should
1035 * be, because different objects have different meanings
1036 * for the same field (eg, wands use 'food' for charges). This
1037 * means these special cases need to be worked out.
1038 *
1039 * Add 'owner' who is the person examining this object. 921 * Add 'owner' who is the person examining this object.
1040 * owner can be null if no one is being associated with this 922 * owner can be null if no one is being associated with this
1041 * item (eg, debug dump or the like) 923 * item (eg, debug dump or the like)
1042 */ 924 */
1043const char * 925const char *
1044describe_item (const object *op, object *owner) 926describe_item (const object *op, object *owner)
1045{ 927{
1046 char buf[MAX_BUF]; 928 if (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER)
1047 static char retbuf[VERY_BIG_BUF]; 929 return describe_monster (op);
930
931 static dynbuf_text buf; buf.clear ();
1048 int identified, i; 932 int identified, i;
1049 933
1050 retbuf[0] = '\0';
1051 if (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER)
1052 {
1053 return describe_monster (op);
1054 }
1055 /* figure this out once, instead of making multiple calls to need_identify. 934 /* figure this out once, instead of making multiple calls to need_identify.
1056 * also makes the code easier to read. 935 * also makes the code easier to read.
1057 */ 936 */
1058 if (!need_identify (op) || QUERY_FLAG (op, FLAG_IDENTIFIED)) 937 identified = !need_identify (op) || QUERY_FLAG (op, FLAG_IDENTIFIED);
1059 identified = 1; 938 if (!identified)
1060 else 939 buf << "(unidentified)";
1061 { 940
1062 strcpy (retbuf, "(unidentified)");
1063 identified = 0;
1064 }
1065 switch (op->type) 941 switch (op->type)
1066 { 942 {
1067 case BOW: 943 case BOW:
1068 case ARROW: 944 case ARROW:
1069 case WAND: 945 case WAND:
1070 case ROD: 946 case ROD:
1071 case HORN: 947 case HORN:
1072 case WEAPON: 948 case WEAPON:
1073 case ARMOUR: 949 case ARMOUR:
1074 case HELMET: 950 case HELMET:
1075 case SHIELD: 951 case SHIELD:
1076 case BOOTS: 952 case BOOTS:
1077 case GLOVES: 953 case GLOVES:
1078 case GIRDLE: 954 case GIRDLE:
1079 case BRACERS: 955 case BRACERS:
1080 case CLOAK: 956 case CLOAK:
1081 case SKILL_TOOL: 957 case SKILL_TOOL:
1082 break; /* We have more information to do below this switch */ 958 break; /* We have more information to do below this switch */
1083 959
1084 case POWER_CRYSTAL: 960 case POWER_CRYSTAL:
1085 if (op->stats.maxsp > 1000) 961 if (op->stats.maxsp > 1000)
1086 { /*higher capacity crystals */ 962 { /*higher capacity crystals */
1087 i = (op->stats.maxsp % 1000) / 100; 963 i = (op->stats.maxsp % 1000) / 100;
1088 964
1089 if (i) 965 if (i)
1090 snprintf (buf, MAX_BUF, "(capacity %d.%dk). It is ", op->stats.maxsp / 1000, i); 966 buf.printf ("(capacity %d.%dk). It is ", op->stats.maxsp / 1000, i);
1091 else 967 else
1092 snprintf (buf, MAX_BUF, "(capacity %dk). It is ", op->stats.maxsp / 1000); 968 buf.printf ("(capacity %dk). It is ", op->stats.maxsp / 1000);
1093 } 969 }
1094 else 970 else
1095 snprintf (buf, MAX_BUF, "(capacity %d). It is ", op->stats.maxsp); 971 buf.printf ("(capacity %d). It is ", op->stats.maxsp);
1096 972
1097 strcat (retbuf, buf);
1098 i = (op->stats.sp * 10) / op->stats.maxsp; 973 i = (op->stats.sp * 10) / op->stats.maxsp;
1099 if (op->stats.sp == 0) 974 if (op->stats.sp == 0)
1100 strcat (retbuf, "empty."); 975 buf << "empty.";
1101 else if (i == 0) 976 else if (i == 0)
1102 strcat (retbuf, "almost empty."); 977 buf << "almost empty.";
1103 else if (i < 3) 978 else if (i < 3)
1104 strcat (retbuf, "partially filled."); 979 buf << "partially filled.";
1105 else if (i < 6) 980 else if (i < 6)
1106 strcat (retbuf, "half full."); 981 buf << "half full.";
1107 else if (i < 9) 982 else if (i < 9)
1108 strcat (retbuf, "well charged."); 983 buf << "well charged.";
1109 else if (op->stats.sp == op->stats.maxsp) 984 else if (op->stats.sp == op->stats.maxsp)
1110 strcat (retbuf, "fully charged."); 985 buf << "fully charged.";
1111 else 986 else
1112 strcat (retbuf, "almost full."); 987 buf << "almost full.";
1113 break; 988 break;
989
990 case LAMP:
991 {
992 int percent = ((double) 100 / op->arch->stats.food) * op->stats.food;
993 buf << "(fuel: ";
994 if (percent == 0)
995 buf << "empty";
996 else if (percent < 10)
997 buf << "very low";
998 else if (percent < 25)
999 buf << "low";
1000 else if (percent < 50)
1001 buf << "half empty";
1002 else if (percent < 75)
1003 buf << "half full";
1004 else if (percent < 95)
1005 buf << "well filled";
1006 else if (percent <= 100)
1007 buf << "full";
1008 buf << ")";
1009 }
1010 break;
1011
1114 case FOOD: 1012 case FOOD:
1115 case FLESH: 1013 case FLESH:
1116 case DRINK: 1014 case DRINK:
1117 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 1015 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED))
1118 { 1016 {
1119 sprintf (buf, "(food+%d)", op->stats.food); 1017 buf.printf ("(food+%d)", op->stats.food);
1120 strcat (retbuf, buf);
1121 1018
1122 if (op->type == FLESH && op->last_eat > 0 && atnr_is_dragon_enabled (op->last_eat)) 1019 if (op->type == FLESH && op->last_eat > 0 && atnr_is_dragon_enabled (op->last_eat))
1123 {
1124 sprintf (buf, "(%s metabolism)", change_resist_msg[op->last_eat]); 1020 buf.printf ("(%s metabolism)", change_resist_msg[op->last_eat]);
1125 strcat (retbuf, buf);
1126 }
1127 1021
1128 if (!QUERY_FLAG (op, FLAG_CURSED)) 1022 if (!QUERY_FLAG (op, FLAG_CURSED))
1129 { 1023 {
1130 if (op->stats.hp) 1024 if (op->stats.hp) buf << "(heals)";
1131 strcat (retbuf, "(heals)");
1132 if (op->stats.sp)
1133 strcat (retbuf, "(spellpoint regen)"); 1025 if (op->stats.sp) buf << "(spellpoint regen)";
1134 } 1026 }
1135 else 1027 else
1136 { 1028 {
1137 if (op->stats.hp) 1029 if (op->stats.hp) buf << "(damages)";
1138 strcat (retbuf, "(damages)");
1139 if (op->stats.sp)
1140 strcat (retbuf, "(spellpoint depletion)"); 1030 if (op->stats.sp) buf << "(spellpoint depletion)";
1141 } 1031 }
1142 } 1032 }
1143 break; 1033 break;
1144 1034
1145
1146 case SKILL: 1035 case SKILL:
1147 case RING: 1036 case RING:
1148 case AMULET: 1037 case AMULET:
1149 if (op->item_power) 1038 if (op->item_power)
1150 {
1151 sprintf (buf, "(item_power %+d)", op->item_power); 1039 buf.printf ("(item_power %+d)", op->item_power);
1152 strcat (retbuf, buf); 1040
1153 }
1154 if (op->title) 1041 if (op->title)
1155 strcat (retbuf, ring_desc (op)); 1042 buf << ring_desc (op);
1043
1156 return retbuf; 1044 return buf;
1157 1045
1158 default: 1046 default:
1159 return retbuf; 1047 return buf;
1160 } 1048 }
1161 1049
1162 /* Down here, we more further describe equipment type items. 1050 /* Down here, we more further describe equipment type items.
1163 * only describe them if they have been identified or the like. 1051 * only describe them if they have been identified or the like.
1164 */ 1052 */
1165 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 1053 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED))
1166 { 1054 {
1167 int attr, val; 1055 int attr, val;
1168 1056
1169 for (attr = 0; attr < NUM_STATS; attr++) 1057 for (attr = 0; attr < NUM_STATS; attr++)
1170 {
1171 if ((val = op->stats.stat (attr))) 1058 if ((val = op->stats.stat (attr)))
1172 {
1173 sprintf (buf, "(%s%+d)", short_stat_name[attr], val); 1059 buf.printf ("(%s%+d)", short_stat_name[attr], val);
1174 strcat (retbuf, buf);
1175 }
1176 }
1177 1060
1178 if (op->stats.exp) 1061 if (op->stats.exp)
1179 {
1180 sprintf (buf, "(speed %+lld)", (long long) op->stats.exp); 1062 buf.printf ("(speed %+lld)", (long long) op->stats.exp);
1181 strcat (retbuf, buf);
1182 }
1183
1184 1063
1185 switch (op->type) 1064 switch (op->type)
1186 { 1065 {
1187 case BOW: 1066 case BOW:
1188 case ARROW: 1067 case ARROW:
1189 case GIRDLE: 1068 case GIRDLE:
1190 case HELMET: 1069 case HELMET:
1191 case SHIELD: 1070 case SHIELD:
1192 case BOOTS: 1071 case BOOTS:
1193 case GLOVES: 1072 case GLOVES:
1194 case WEAPON: 1073 case WEAPON:
1195 case SKILL: 1074 case SKILL:
1196 case RING: 1075 case RING:
1197 case AMULET: 1076 case AMULET:
1198 case ARMOUR: 1077 case ARMOUR:
1199 case BRACERS: 1078 case BRACERS:
1200 case FORCE: 1079 case FORCE:
1201 case CLOAK: 1080 case CLOAK:
1202 if (op->stats.wc) 1081 if (op->stats.wc) buf.printf ("(wc%+d)", op->stats.wc);
1203 { 1082 if (op->stats.dam) buf.printf ("(dam%+d)", op->stats.dam);
1204 sprintf (buf, "(wc%+d)", op->stats.wc); 1083 if (op->stats.ac) buf.printf ("(ac%+d)", op->stats.ac);
1205 strcat (retbuf, buf); 1084
1206 }
1207 if (op->stats.dam)
1208 {
1209 sprintf (buf, "(dam%+d)", op->stats.dam);
1210 strcat (retbuf, buf);
1211 }
1212 if (op->stats.ac)
1213 {
1214 sprintf (buf, "(ac%+d)", op->stats.ac);
1215 strcat (retbuf, buf);
1216 }
1217 if ((op->type == WEAPON || op->type == BOW) && op->level > 0) 1085 if ((op->type == WEAPON || op->type == BOW) && op->level > 0)
1218 {
1219 sprintf (buf, "(improved %d/%d)", op->last_eat, op->level); 1086 buf.printf ("(improved %d/%d)", op->last_eat, op->level);
1220 strcat (retbuf, buf); 1087
1221 }
1222 break; 1088 break;
1223 1089
1224 default: 1090 default:
1225 break; 1091 break;
1226 } 1092 }
1227 if (QUERY_FLAG (op, FLAG_XRAYS)) 1093
1228 strcat (retbuf, "(xray-vision)"); 1094 if (QUERY_FLAG (op, FLAG_XRAYS)) buf << "(xray-vision)";
1229 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK)) 1095 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK)) buf << "(infravision)";
1230 strcat (retbuf, "(infravision)");
1231 1096
1232 /* levitate was what is was before, so we'll keep it */ 1097 /* levitate was what is was before, so we'll keep it */
1233 if (op->move_type & MOVE_FLY_LOW) 1098 if (op->move_type & MOVE_FLY_LOW) buf << "(levitate)";
1234 strcat (retbuf, "(levitate)");
1235
1236 if (op->move_type & MOVE_FLY_HIGH) 1099 if (op->move_type & MOVE_FLY_HIGH) buf << "(fly)";
1237 strcat (retbuf, "(fly)");
1238
1239 if (op->move_type & MOVE_SWIM) 1100 if (op->move_type & MOVE_SWIM) buf << "(swim)";
1240 strcat (retbuf, "(swim)");
1241 1101
1242 /* walking is presumed as 'normal', so doesn't need mentioning */ 1102 /* walking is presumed as 'normal', so doesn't need mentioning */
1243 1103
1244 if (op->item_power) 1104 if (op->item_power)
1245 {
1246 sprintf (buf, "(item_power %+d)", op->item_power); 1105 buf.printf ("(item_power %+d)", op->item_power);
1247 strcat (retbuf, buf);
1248 }
1249 } /* End if identified or applied */ 1106 } /* End if identified or applied */
1250 1107
1251 /* This blocks only deals with fully identified object. 1108 /* This blocks only deals with fully identified object.
1252 * it is intentional that this is not an 'else' from a above - 1109 * it is intentional that this is not an 'else' from a above -
1253 * in this way, information is added. 1110 * in this way, information is added.
… …
1256 { 1113 {
1257 int more_info = 0; 1114 int more_info = 0;
1258 1115
1259 switch (op->type) 1116 switch (op->type)
1260 { 1117 {
1261 case ROD: /* These use stats.sp for spell selection and stats.food */ 1118 case ROD: /* These use stats.sp for spell selection and stats.food */
1262 case HORN: /* and stats.hp for spell-point regeneration... */ 1119 case HORN: /* and stats.hp for spell-point regeneration... */
1263 case BOW: 1120 case BOW:
1264 case ARROW: 1121 case ARROW:
1265 case WAND: 1122 case WAND:
1266 case FOOD: 1123 case FOOD:
1267 case FLESH: 1124 case FLESH:
1268 case DRINK: 1125 case DRINK:
1269 more_info = 0; 1126 more_info = 0;
1270 break; 1127 break;
1271 1128
1272 /* Armor type objects */ 1129 /* Armor type objects */
1273 case ARMOUR: 1130 case ARMOUR:
1274 case HELMET: 1131 case HELMET:
1275 case SHIELD: 1132 case SHIELD:
1276 case BOOTS: 1133 case BOOTS:
1277 case GLOVES: 1134 case GLOVES:
1278 case GIRDLE: 1135 case GIRDLE:
1279 case BRACERS: 1136 case BRACERS:
1280 case CLOAK: 1137 case CLOAK:
1281 if (ARMOUR_SPEED (op)) 1138 if (ARMOUR_SPEED (op)) buf.printf ("(Max speed %1.2f)", ARMOUR_SPEED (op) / 10.0);
1282 { 1139 if (ARMOUR_SPELLS (op)) buf.printf ("(Spell regen penalty %d)", ARMOUR_SPELLS (op));
1283 sprintf (buf, "(Max speed %1.2f)", ARMOUR_SPEED (op) / 10.0);
1284 strcat (retbuf, buf);
1285 }
1286 if (ARMOUR_SPELLS (op))
1287 {
1288 sprintf (buf, "(Spell regen penalty %d)", ARMOUR_SPELLS (op));
1289 strcat (retbuf, buf);
1290 }
1291 more_info = 1; 1140 more_info = 1;
1292 break; 1141 break;
1293 1142
1294 case WEAPON: 1143 case WEAPON:
1295 /* Calculate it the same way fix_player does so the results 1144 /* Calculate it the same way fix_player does so the results
1296 * make sense. 1145 * make sense.
1297 */ 1146 */
1298 i = (WEAPON_SPEED (op) * 2 - op->magic) / 2; 1147 i = (WEAPON_SPEED (op) * 2 - op->magic) / 2;
1299 if (i < 0) 1148 if (i < 0)
1300 i = 0; 1149 i = 0;
1301 1150
1302 sprintf (buf, "(weapon speed %d)", i); 1151 buf.printf ("(weapon speed %d)", i);
1303 strcat (retbuf, buf);
1304 more_info = 1; 1152 more_info = 1;
1305 break; 1153 break;
1306
1307 } 1154 }
1155
1308 if (more_info) 1156 if (more_info)
1309 { 1157 {
1310 if (op->stats.food)
1311 {
1312 if (op->stats.food != 0)
1313 sprintf (buf, "(sustenance%+d)", op->stats.food); 1158 if (op->stats.food) buf.printf ("(sustenance%+d)", op->stats.food);
1314 strcat (retbuf, buf);
1315 }
1316 if (op->stats.grace)
1317 {
1318 sprintf (buf, "(grace%+d)", op->stats.grace); 1159 if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace);
1319 strcat (retbuf, buf); 1160 if (op->stats.sp) buf.printf ("(magic%+d)", op->stats.sp);
1320 }
1321 if (op->stats.sp)
1322 {
1323 sprintf (buf, "(magic%+d)", op->stats.sp);
1324 strcat (retbuf, buf);
1325 }
1326 if (op->stats.hp)
1327 {
1328 sprintf (buf, "(regeneration%+d)", op->stats.hp); 1161 if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp);
1329 strcat (retbuf, buf);
1330 }
1331 } 1162 }
1332 1163
1333 if (op->stats.luck) 1164 if (op->stats.luck)
1334 {
1335 sprintf (buf, "(luck%+d)", op->stats.luck); 1165 buf.printf ("(luck%+d)", op->stats.luck);
1336 strcat (retbuf, buf); 1166
1337 }
1338 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 1167 if (QUERY_FLAG (op, FLAG_LIFESAVE)) buf << "(lifesaving)";
1339 strcat (retbuf, "(lifesaving)"); 1168 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) buf << "(reflect spells)";
1340 if (QUERY_FLAG (op, FLAG_REFL_SPELL))
1341 strcat (retbuf, "(reflect spells)");
1342 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) 1169 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) buf << "(reflect missiles)";
1343 strcat (retbuf, "(reflect missiles)");
1344 if (QUERY_FLAG (op, FLAG_STEALTH)) 1170 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)";
1345 strcat (retbuf, "(stealth)"); 1171
1346 if (op->slaying != NULL && op->type != FOOD) 1172 if (op->slaying && op->type != FOOD)
1347 {
1348 sprintf (buf, "(slay %s)", &op->slaying); 1173 buf.printf ("(slay %s)", &op->slaying);
1349 strcat (retbuf, buf); 1174
1350 } 1175 if (op->type == SKILL_TOOL && op->skill)
1351 DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks"); 1176 buf.printf ("(%s)", &op->skill);
1177
1178 buf.add_abilities ("Attacks", op->attacktype);
1352 /* resistance on flesh is only visible for quetzals. If 1179 /* resistance on flesh is only visible for quetzals. If
1353 * non flesh, everyone can see its resistances 1180 * non flesh, everyone can see its resistances
1354 */ 1181 */
1355 if (op->type != FLESH || (owner && is_dragon_pl (owner))) 1182 if (op->type != FLESH || (owner && is_dragon_pl (owner)))
1356 strcat (retbuf, describe_resistance (op, 0)); 1183 buf << describe_resistance (op, 0);
1357 DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned");
1358 DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled");
1359 DESCRIBE_PATH (retbuf, op->path_denied, "Denied");
1360 }
1361 1184
1185 buf.add_paths ("Attuned", op->path_attuned);
1186 buf.add_paths ("Repelled", op->path_repelled);
1187 buf.add_paths ("Denied", op->path_denied);
1188 }
1189
1362 return retbuf; 1190 return buf;
1363} 1191}
1364 1192
1365std::string 1193std::string
1366object::describe_item (object *who) 1194object::describe_item (object *who)
1367{ 1195{
1368 return std::string (::describe_item (this, who)); 1196 return std::string (::describe_item (this, who));
1197}
1198
1199void
1200examine (object *op, object *tmp)
1201{
1202 std::string info = tmp->describe (op);
1203
1204 op->contr->infobox (MSG_CHANNEL ("examine"), info.c_str ());
1205}
1206
1207/*
1208 * inventory prints object's inventory. If inv==NULL then print player's
1209 * inventory.
1210 * [ Only items which are applied are showed. Tero.Haatanen@lut.fi ]
1211 */
1212const char *
1213object::query_inventory (object *who, const char *indent)
1214{
1215 static dynbuf_text buf; buf.clear ();
1216
1217 for (object *tmp = inv; tmp; tmp = tmp->below)
1218 if (who && QUERY_FLAG (who, FLAG_WIZ))
1219 buf.printf ("%s- %-28.28s (%5d) %-8s\n", indent, tmp->query_name (), tmp->count, tmp->query_weight ());
1220 else if (!tmp->invisible && (type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED)))
1221 buf.printf ("%s- %-36.36s %-8s\n", indent, tmp->query_name (), tmp->query_weight ());
1222
1223 if (buf.size ())
1224 buf.printf ("%s(total weight: %s)\n", indent, query_weight ());
1225 else
1226 buf.printf ("%s(empty)\n", indent);
1227
1228 return buf;
1369} 1229}
1370 1230
1371/* Return true if the item is magical. A magical item is one that 1231/* Return true if the item is magical. A magical item is one that
1372 * increases/decreases any abilities, provides a resistance, 1232 * increases/decreases any abilities, provides a resistance,
1373 * has a generic magical bonus, or is an artifact. 1233 * has a generic magical bonus, or is an artifact.
1374 * This function is used by detect_magic to determine if an item 1234 * This function is used by detect_magic to determine if an item
1375 * should be marked as magical. 1235 * should be marked as magical.
1376 */ 1236 */
1377
1378int 1237int
1379is_magical (const object *op) 1238is_magical (const object *op)
1380{ 1239{
1381 int i; 1240 int i;
1382 1241
… …
1502 * Supposed to fix face-values as well here, but later. 1361 * Supposed to fix face-values as well here, but later.
1503 */ 1362 */
1504void 1363void
1505identify (object *op) 1364identify (object *op)
1506{ 1365{
1507 object *pl;
1508
1509 SET_FLAG (op, FLAG_IDENTIFIED); 1366 SET_FLAG (op, FLAG_IDENTIFIED);
1510 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL); 1367 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);
1511 CLEAR_FLAG (op, FLAG_NO_SKILL_IDENT); 1368 CLEAR_FLAG (op, FLAG_NO_SKILL_IDENT);
1512 1369
1513 /* 1370 /*
… …
1520 { 1377 {
1521 if (op->inv && op->randomitems) 1378 if (op->inv && op->randomitems)
1522 op->title = op->inv->name; 1379 op->title = op->inv->name;
1523 else if (op->arch) 1380 else if (op->arch)
1524 { 1381 {
1525 op->name = op->arch->clone.name; 1382 op->name = op->arch->object::name;
1526 op->name_pl = op->arch->clone.name_pl; 1383 op->name_pl = op->arch->object::name_pl;
1527 } 1384 }
1528 } 1385 }
1529 1386
1530 /* If the object is on a map, make sure we update its face */ 1387 /* If the object is on a map, make sure we update its face */
1531 if (op->map) 1388 if (op->map)
1532 update_object (op, UP_OBJ_CHANGE); 1389 update_object (op, UP_OBJ_CHANGE);
1533 else 1390
1534 { 1391 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 1392 /* A lot of the values can change from an update - might as well send
1538 * it all. 1393 * it all.
1539 */ 1394 */
1540 esrv_send_item (pl, op); 1395 esrv_send_item (pl, op);
1541 }
1542} 1396}
1543 1397

Diff Legend

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