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

Diff Legend

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