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

Diff Legend

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