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.24 by root, Wed Mar 14 04:12:27 2007 UTC vs.
Revision 1.36 by root, Mon May 28 21:21:40 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
9 * it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
10 * the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
11 * (at your option) any later version. 11 * any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful, but
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16 * GNU General Public License for more details. 16 * for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License along
19 * along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <funcpoint.h> 26#include <funcpoint.h>
27#include <living.h> 27#include <living.h>
47 * may be better. 47 * may be better.
48 * Basically, for the use/nonuse, the code does something like: 48 * Basically, for the use/nonuse, the code does something like:
49 * "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
50 */ 50 */
51Body_Locations body_locations[NUM_BODY_LOCATIONS] = { 51Body_Locations body_locations[NUM_BODY_LOCATIONS] = {
52 {"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"},
53 {"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"},
54 {"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"},
55 {"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"},
56 {"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"},
57 {"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"},
58 {"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"} ,
59 {"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"},
60 {"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"},
61 {"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"},
62 {"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"},
63 {"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"},
64/*{"body_dragon_torso", "your body", "a dragon's body"} */ 66/*{"body_dragon_torso", "your body", "a dragon's body"} */
65}; 67};
66 68
67static char numbers[21][20] = { 69static char numbers[21][20] = {
68 "no", "", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten", 70 "no", "", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten",
250}; 252};
251 253
252int 254int
253get_power_from_ench (int ench) 255get_power_from_ench (int ench)
254{ 256{
255 if (ench < 0) 257 if (ench < 0) ench = 0;
256 ench = 0; 258 if (ench > 20) ench = 20;
257 if (ench > 20) 259
258 ench = 20;
259 return enc_to_item_power[ench]; 260 return enc_to_item_power[ench];
260} 261}
261 262
262/* 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
263 * 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
271{ 272{
272 int i, tmp, enc; 273 int i, tmp, enc;
273 274
274 enc = 0; 275 enc = 0;
275 for (i = 0; i < NUM_STATS; i++) 276 for (i = 0; i < NUM_STATS; i++)
276 enc += get_attr_value (&op->stats, i); 277 enc += op->stats.stat (i);
277 278
278 /* This protection logic is pretty flawed. 20% fire resistance 279 /* This protection logic is pretty flawed. 20% fire resistance
279 * is much more valuable than 20% confusion, or 20% slow, or 280 * is much more valuable than 20% confusion, or 20% slow, or
280 * several others. Start at 1 - ignore physical - all that normal 281 * several others. Start at 1 - ignore physical - all that normal
281 * armour shouldn't be counted against 282 * armour shouldn't be counted against
342 enc += 1; 343 enc += 1;
343 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 344 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
344 enc += 1; 345 enc += 1;
345 346
346 return get_power_from_ench (enc); 347 return get_power_from_ench (enc);
347
348} 348}
349 349
350/* 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
351 * isn't one, returns NULL */ 351 * isn't one, returns NULL */
352
353const typedata * 352const typedata *
354get_typedata (int itemtype) 353get_typedata (int itemtype)
355{ 354{
356 int i; 355 int i;
357 356
362} 361}
363 362
364/* returns the typedata that has a name equal to itemtype, if there 363/* returns the typedata that has a name equal to itemtype, if there
365 * isn't one, return the plural name that matches, if there still isn't 364 * isn't one, return the plural name that matches, if there still isn't
366 * one return NULL */ 365 * one return NULL */
367
368const typedata * 366const typedata *
369get_typedata_by_name (const char *name) 367get_typedata_by_name (const char *name)
370{ 368{
371 int i; 369 int i;
372 370
387 * returns a static array of the description. This can return 385 * returns a static array of the description. This can return
388 * a big buffer. 386 * a big buffer.
389 * if newline is true, we don't put parens around the description 387 * if newline is true, we don't put parens around the description
390 * but do put a newline at the end. Useful when dumping to files 388 * but do put a newline at the end. Useful when dumping to files
391 */ 389 */
392char * 390const char *
393describe_resistance (const object *op, int newline) 391describe_resistance (const object *op, int newline)
394{ 392{
395 static char buf[VERY_BIG_BUF]; 393 static char buf[VERY_BIG_BUF];
396 char buf1[VERY_BIG_BUF]; 394 char buf1[VERY_BIG_BUF];
397 int tmpvar; 395 int tmpvar;
416/* 414/*
417 * query_weight(object) returns a character pointer to a static buffer 415 * query_weight(object) returns a character pointer to a static buffer
418 * containing the text-representation of the weight of the given object. 416 * containing the text-representation of the weight of the given object.
419 * The buffer will be overwritten by the next call to query_weight(). 417 * The buffer will be overwritten by the next call to query_weight().
420 */ 418 */
421 419const char *
422char *
423query_weight (const object *op) 420query_weight (const object *op)
424{ 421{
425 static char buf[10]; 422 static char buf[10];
426 sint32 i = (op->nrof ? op->nrof : 1) * op->weight + op->carrying; 423 sint32 i = (op->nrof ? op->nrof : 1) * op->weight + op->carrying;
427 424
428 if (op->weight < 0) 425 if (op->weight < 0)
429 return " "; 426 return " ";
427
430 if (i % 1000) 428 if (i % 1000)
431 sprintf (buf, "%6.1f", i / 1000.0); 429 sprintf (buf, "%6.1f", i / 1000.0);
432 else 430 else
433 sprintf (buf, "%4d ", i / 1000); 431 sprintf (buf, "%4d ", i / 1000);
432
434 return buf; 433 return buf;
435} 434}
436 435
437/* 436/*
438 * Returns the pointer to a static buffer containing 437 * Returns the pointer to a static buffer containing
439 * the number requested (of the form first, second, third...) 438 * the number requested (of the form first, second, third...)
440 */ 439 */
441 440const char *
442char *
443get_levelnumber (int i) 441get_levelnumber (int i)
444{ 442{
445 static char buf[MAX_BUF]; 443 static char buf[MAX_BUF];
446 444
447 if (i > 99) 445 if (i > 99)
448 { 446 {
449 sprintf (buf, "%d.", i); 447 sprintf (buf, "%d.", i);
450 return buf; 448 return buf;
451 } 449 }
450
452 if (i < 21) 451 if (i < 21)
453 return levelnumbers[i]; 452 return levelnumbers[i];
454 if (!(i % 10)) 453 if (!(i % 10))
455 return levelnumbers_10[i / 10]; 454 return levelnumbers_10[i / 10];
455
456 strcpy (buf, numbers_10[i / 10]); 456 strcpy (buf, numbers_10[i / 10]);
457 strcat (buf, levelnumbers[i % 10]); 457 strcat (buf, levelnumbers[i % 10]);
458 return buf; 458 return buf;
459} 459}
460 460
462 * get_number(integer) returns the text-representation of the given number 462 * get_number(integer) returns the text-representation of the given number
463 * in a static buffer. The buffer might be overwritten at the next 463 * in a static buffer. The buffer might be overwritten at the next
464 * call to get_number(). 464 * call to get_number().
465 * It is currently only used by the query_name() function. 465 * It is currently only used by the query_name() function.
466 */ 466 */
467char * 467const char *
468get_number (int i) 468get_number (int i)
469{ 469{
470 if (i <= 20) 470 if (i <= 20)
471 return numbers[i]; 471 return numbers[i];
472 else 472 else
489 */ 489 */
490 490
491/* Aug 95 modified this slightly so that Skill tools don't have magic bonus 491/* Aug 95 modified this slightly so that Skill tools don't have magic bonus
492 * from stats.sp - b.t. 492 * from stats.sp - b.t.
493 */ 493 */
494char * 494const char *
495ring_desc (const object *op) 495ring_desc (const object *op)
496{ 496{
497 static char buf[VERY_BIG_BUF]; 497 static char buf[VERY_BIG_BUF];
498 int attr, val, len; 498 int attr, val, len;
499 499
502 if (!QUERY_FLAG (op, FLAG_IDENTIFIED)) 502 if (!QUERY_FLAG (op, FLAG_IDENTIFIED))
503 return buf; 503 return buf;
504 504
505 for (attr = 0; attr < NUM_STATS; attr++) 505 for (attr = 0; attr < NUM_STATS; attr++)
506 { 506 {
507 if ((val = get_attr_value (&(op->stats), attr)) != 0) 507 if ((val = op->stats.stat (attr)))
508 {
509 sprintf (buf + strlen (buf), "(%s%+d)", short_stat_name[attr], val); 508 sprintf (buf + strlen (buf), "(%s%+d)", short_stat_name[attr], val);
510 }
511 } 509 }
510
512 if (op->stats.exp) 511 if (op->stats.exp)
513 sprintf (buf + strlen (buf), "(speed %+lld)", (long long) op->stats.exp); 512 sprintf (buf + strlen (buf), "(speed %+lld)", (long long) op->stats.exp);
514 if (op->stats.wc) 513 if (op->stats.wc)
515 sprintf (buf + strlen (buf), "(wc%+d)", op->stats.wc); 514 sprintf (buf + strlen (buf), "(wc%+d)", op->stats.wc);
516 if (op->stats.dam) 515 if (op->stats.dam)
538 strcat (buf, "(reflect spells)"); 537 strcat (buf, "(reflect spells)");
539 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) 538 if (QUERY_FLAG (op, FLAG_REFL_MISSILE))
540 strcat (buf, "(reflect missiles)"); 539 strcat (buf, "(reflect missiles)");
541 if (QUERY_FLAG (op, FLAG_STEALTH)) 540 if (QUERY_FLAG (op, FLAG_STEALTH))
542 strcat (buf, "(stealth)"); 541 strcat (buf, "(stealth)");
542
543 /* Shorten some of the names, so they appear better in the windows */ 543 /* Shorten some of the names, so they appear better in the windows */
544 len = strlen (buf); 544 len = strlen (buf);
545 DESCRIBE_PATH_SAFE (buf, op->path_attuned, "Attuned", &len, VERY_BIG_BUF); 545 DESCRIBE_PATH_SAFE (buf, op->path_attuned, "Attuned", &len, VERY_BIG_BUF);
546 DESCRIBE_PATH_SAFE (buf, op->path_repelled, "Repelled", &len, VERY_BIG_BUF); 546 DESCRIBE_PATH_SAFE (buf, op->path_repelled, "Repelled", &len, VERY_BIG_BUF);
547 DESCRIBE_PATH_SAFE (buf, op->path_denied, "Denied", &len, VERY_BIG_BUF); 547 DESCRIBE_PATH_SAFE (buf, op->path_denied, "Denied", &len, VERY_BIG_BUF);
612 case AMULET: 612 case AMULET:
613 case RING: 613 case RING:
614 if (!op->title) 614 if (!op->title)
615 { 615 {
616 /* If ring has a title, full description isn't so useful */ 616 /* If ring has a title, full description isn't so useful */
617 char *s = ring_desc (op); 617 const char *s = ring_desc (op);
618 618
619 if (s[0]) 619 if (s[0])
620 { 620 {
621 safe_strcat (buf, " ", &len, HUGE_BUF); 621 safe_strcat (buf, " ", &len, HUGE_BUF);
622 safe_strcat (buf, s, &len, HUGE_BUF); 622 safe_strcat (buf, s, &len, HUGE_BUF);
642 * overwritten. This may be a bad thing (it may be easier to assume the value 642 * overwritten. This may be a bad thing (it may be easier to assume the value
643 * returned is good forever.) However, it makes printing statements that 643 * returned is good forever.) However, it makes printing statements that
644 * use several names much easier (don't need to store them to temp variables.) 644 * use several names much easier (don't need to store them to temp variables.)
645 * 645 *
646 */ 646 */
647char * 647const char *
648query_name (const object *op) 648query_name (const object *op)
649{ 649{
650 static char buf[5][HUGE_BUF]; // OMFG 650 static char buf[5][HUGE_BUF]; // OMFG
651 static int use_buf = 0; 651 static int use_buf = 0;
652 int len = 0; 652 int len = 0;
712 { 712 {
713 case BOW: 713 case BOW:
714 case WAND: 714 case WAND:
715 case ROD: 715 case ROD:
716 case HORN: 716 case HORN:
717 safe_strcat (buf[use_buf], " (readied)", &len, HUGE_BUF); 717 safe_strcat (buf[use_buf], op->env && op->env->current_weapon == op ? " (readied)" : " (applied)", &len, HUGE_BUF);
718 break; 718 break;
719 case WEAPON: 719 case WEAPON:
720 safe_strcat (buf[use_buf], " (wielded)", &len, HUGE_BUF); 720 safe_strcat (buf[use_buf], op->env && op->env->current_weapon == op ? " (wielded)" : " (applied)", &len, HUGE_BUF);
721 break; 721 break;
722 case ARMOUR: 722 case ARMOUR:
723 case HELMET: 723 case HELMET:
724 case SHIELD: 724 case SHIELD:
725 case RING: 725 case RING:
831 case AMULET: 831 case AMULET:
832 case RING: 832 case RING:
833 if (!op->title) 833 if (!op->title)
834 { 834 {
835 /* If ring has a title, full description isn't so useful */ 835 /* If ring has a title, full description isn't so useful */
836 char *s = ring_desc (op); 836 const char *s = ring_desc (op);
837 837
838 if (s[0]) 838 if (s[0])
839 { 839 {
840 safe_strcat (buf, " ", &len, MAX_BUF); 840 safe_strcat (buf, " ", &len, MAX_BUF);
841 safe_strcat (buf, s, &len, MAX_BUF); 841 safe_strcat (buf, s, &len, MAX_BUF);
842 } 842 }
843 } 843 }
844 break; 844 break;
845
845 default: 846 default:
846 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) 847 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED)))
847 {
848 sprintf (buf + strlen (buf), " %+d", op->magic); 848 sprintf (buf + strlen (buf), " %+d", op->magic);
849 }
850 } 849 }
851 850
852 return buf; 851 return buf;
853} 852}
854 853
1039 * 1038 *
1040 * Add 'owner' who is the person examining this object. 1039 * Add 'owner' who is the person examining this object.
1041 * owner can be null if no one is being associated with this 1040 * owner can be null if no one is being associated with this
1042 * item (eg, debug dump or the like) 1041 * item (eg, debug dump or the like)
1043 */ 1042 */
1044 1043const char *
1045char *
1046describe_item (const object *op, object *owner) 1044describe_item (const object *op, object *owner)
1047{ 1045{
1048 char buf[MAX_BUF]; 1046 char buf[MAX_BUF];
1049 static char retbuf[VERY_BIG_BUF]; 1047 static char retbuf[VERY_BIG_BUF];
1050 int identified, i; 1048 int identified, i;
1084 break; /* We have more information to do below this switch */ 1082 break; /* We have more information to do below this switch */
1085 1083
1086 case POWER_CRYSTAL: 1084 case POWER_CRYSTAL:
1087 if (op->stats.maxsp > 1000) 1085 if (op->stats.maxsp > 1000)
1088 { /*higher capacity crystals */ 1086 { /*higher capacity crystals */
1089 i = (op->stats.maxsp % 100) / 10; 1087 i = (op->stats.maxsp % 1000) / 100;
1088
1090 if (i) 1089 if (i)
1091 snprintf (buf, MAX_BUF, "(capacity %d.%dk). It is ", op->stats.maxsp / 100, i); 1090 snprintf (buf, MAX_BUF, "(capacity %d.%dk). It is ", op->stats.maxsp / 1000, i);
1092 else 1091 else
1093 snprintf (buf, MAX_BUF, "(capacity %dk). It is ", op->stats.maxsp / 100); 1092 snprintf (buf, MAX_BUF, "(capacity %dk). It is ", op->stats.maxsp / 1000);
1094 } 1093 }
1095 else 1094 else
1096 snprintf (buf, MAX_BUF, "(capacity %d). It is ", op->stats.maxsp); 1095 snprintf (buf, MAX_BUF, "(capacity %d). It is ", op->stats.maxsp);
1096
1097 strcat (retbuf, buf); 1097 strcat (retbuf, buf);
1098 i = (op->stats.sp * 10) / op->stats.maxsp; 1098 i = (op->stats.sp * 10) / op->stats.maxsp;
1099 if (op->stats.sp == 0) 1099 if (op->stats.sp == 0)
1100 strcat (retbuf, "empty."); 1100 strcat (retbuf, "empty.");
1101 else if (i == 0) 1101 else if (i == 0)
1166 { 1166 {
1167 int attr, val; 1167 int attr, val;
1168 1168
1169 for (attr = 0; attr < NUM_STATS; attr++) 1169 for (attr = 0; attr < NUM_STATS; attr++)
1170 { 1170 {
1171 if ((val = get_attr_value (&(op->stats), attr)) != 0) 1171 if ((val = op->stats.stat (attr)))
1172 { 1172 {
1173 sprintf (buf, "(%s%+d)", short_stat_name[attr], val); 1173 sprintf (buf, "(%s%+d)", short_stat_name[attr], val);
1174 strcat (retbuf, buf); 1174 strcat (retbuf, buf);
1175 } 1175 }
1176 } 1176 }
1360 } 1360 }
1361 1361
1362 return retbuf; 1362 return retbuf;
1363} 1363}
1364 1364
1365std::string
1366object::describe_item (object *who)
1367{
1368 return std::string (::describe_item (this, who));
1369}
1370
1365/* Return true if the item is magical. A magical item is one that 1371/* Return true if the item is magical. A magical item is one that
1366 * increases/decreases any abilities, provides a resistance, 1372 * increases/decreases any abilities, provides a resistance,
1367 * has a generic magical bonus, or is an artifact. 1373 * has a generic magical bonus, or is an artifact.
1368 * This function is used by detect_magic to determine if an item 1374 * This function is used by detect_magic to determine if an item
1369 * should be marked as magical. 1375 * should be marked as magical.
1427 if (op->magic || op->type == POWER_CRYSTAL || op->type == SPELLBOOK || op->type == SCROLL || op->type == GIRDLE) 1433 if (op->magic || op->type == POWER_CRYSTAL || op->type == SPELLBOOK || op->type == SCROLL || op->type == GIRDLE)
1428 return 1; 1434 return 1;
1429 1435
1430 /* Check to see if it increases/decreases any stats */ 1436 /* Check to see if it increases/decreases any stats */
1431 for (i = 0; i < NUM_STATS; i++) 1437 for (i = 0; i < NUM_STATS; i++)
1432 if (get_attr_value (&(op->stats), i) != 0) 1438 if (op->stats.stat (i))
1433 return 1; 1439 return 1;
1434 1440
1435 /* If it doesn't fall into any of the above categories, must 1441 /* If it doesn't fall into any of the above categories, must
1436 * be non magical. 1442 * be non magical.
1437 */ 1443 */
1446int 1452int
1447need_identify (const object *op) 1453need_identify (const object *op)
1448{ 1454{
1449 switch (op->type) 1455 switch (op->type)
1450 { 1456 {
1451 case RING: 1457 case RING:
1452 case WAND: 1458 case WAND:
1453 case ROD: 1459 case ROD:
1454 case HORN: 1460 case HORN:
1455 case SCROLL: 1461 case SCROLL:
1456 case SKILL: 1462 case SKILL:
1457 case SKILLSCROLL: 1463 case SKILLSCROLL:
1458 case SPELLBOOK: 1464 case SPELLBOOK:
1459 case FOOD: 1465 case FOOD:
1460 case POTION: 1466 case POTION:
1461 case BOW: 1467 case BOW:
1462 case ARROW: 1468 case ARROW:
1463 case WEAPON: 1469 case WEAPON:
1464 case ARMOUR: 1470 case ARMOUR:
1465 case SHIELD: 1471 case SHIELD:
1466 case HELMET: 1472 case HELMET:
1467 case AMULET: 1473 case AMULET:
1468 case BOOTS: 1474 case BOOTS:
1469 case GLOVES: 1475 case GLOVES:
1470 case BRACERS: 1476 case BRACERS:
1471 case GIRDLE: 1477 case GIRDLE:
1472 case CONTAINER: 1478 case CONTAINER:
1473 case DRINK: 1479 case DRINK:
1474 case FLESH: 1480 case FLESH:
1475 case INORGANIC: 1481 case INORGANIC:
1476 case CLOSE_CON: 1482 case CLOSE_CON:
1477 case CLOAK: 1483 case CLOAK:
1478 case GEM: 1484 case GEM:
1479 case POWER_CRYSTAL: 1485 case POWER_CRYSTAL:
1480 case POISON: 1486 case POISON:
1481 case BOOK: 1487 case BOOK:
1482 case SKILL_TOOL: 1488 case SKILL_TOOL:
1483 return 1; 1489 return 1;
1484 } 1490 }
1491
1485 /* Try to track down some stuff that may show up here. Thus, the 1492 /* Try to track down some stuff that may show up here. Thus, the
1486 * archetype file can be updated, and this function removed. 1493 * archetype file can be updated, and this function removed.
1487 */ 1494 */
1488#if 0 1495#if 0
1489 LOG (llevDebug, "need_identify: %s does not need to be id'd\n", op->name); 1496 LOG (llevDebug, "need_identify: %s does not need to be id'd\n", op->name);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines