--- deliantra/server/common/item.C 2009/11/10 04:38:45 1.67 +++ deliantra/server/common/item.C 2010/04/11 00:34:05 1.83 @@ -1,9 +1,9 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team - * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team - * Copyright (©) 1992,2007 Frank Tore Johansen + * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2002 Mark Wedel & Crossfire Development Team + * Copyright (©) 1992 Frank Tore Johansen * * Deliantra is free software: you can redistribute it and/or modify it under * the terms of the Affero GNU General Public License as published by the @@ -49,6 +49,7 @@ * Basically, for the use/nonuse, the code does something like: * "This item goes %s\n", with the use/nonuse values filling in the %s */ +// see include/object.h Body_Locations body_locations[NUM_BODY_LOCATIONS] = { {KW_body_skill , "You can use it as your skill" , "It is used as a skill"}, {KW_body_combat , "You can wield it as your weapon" , "It is used as a combat weapon"}, @@ -72,14 +73,14 @@ "eighty", "ninety" }; -static char levelnumbers[21][20] = { +static char ordnumbers[21][20] = { "zeroth", "first", "second", "third", "fourth", "fifth", "sixth", "seventh", "eighth", "ninth", "tenth", "eleventh", "twelfth", "thirteenth", - "fourteenth", "fifteenth", "sixteenth", "seventeenth", "eighteen", - "nineteen", "twentieth" + "fourteenth", "fifteenth", "sixteenth", "seventeenth", "eighteenth", + "nineteenth", "twentieth" }; -static char levelnumbers_10[11][20] = { +static char ordnumbers_10[11][20] = { "zeroth", "tenth", "twentieth", "thirtieth", "fortieth", "fiftieth", "sixtieth", "seventieth", "eightieth", "ninetieth" }; @@ -152,7 +153,7 @@ {SHOP_FLOOR, "shop floor", "shop floors", 0, 0}, {SHOP_MAT, "shop mat", "shop mats", 0, 0}, {RING, "ring", "rings", SK_JEWELER, 0}, - {FLOOR, "floor", "floors", 0, 0}, +// {FLOOR, "floor", "floors", 0, 0}, {FLESH, "flesh", "flesh", SK_WOODSMAN, 0}, {INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0}, {SKILL_TOOL, "skill tool", "skill tools", 0, 0}, @@ -388,25 +389,29 @@ * the number requested (of the form first, second, third...) */ const char * -get_levelnumber (int i) +ordinal (int i) { - static char buf[MAX_BUF]; - - if (i > 99) - { - sprintf (buf, "%d.", i); - return buf; - } + if (i < 0) + return format ("minus %s", ordinal (-i)); if (i < 21) - return levelnumbers[i]; + return ordnumbers[i]; - if (!(i % 10)) - return levelnumbers_10[i / 10]; + int digit = i % 10; - strcpy (buf, numbers_10[i / 10]); - strcat (buf, levelnumbers[i % 10]); - return buf; + if (i >= 100) + return format ( + digit == 1 ? "%dst" + : digit == 2 ? "%dnd" + : digit == 3 ? "%drd" + : "%dth", + i + ); + + if (digit == 0) + return ordnumbers_10[i / 10]; + else + return format ("%s%s", numbers_10[i / 10], ordnumbers[i % 10]); } /* @@ -428,7 +433,7 @@ static dynbuf_text buf; buf.clear (); int attr, val, len; - if (QUERY_FLAG (op, FLAG_IDENTIFIED)) + if (op->flag [FLAG_IDENTIFIED]) { for (attr = 0; attr < NUM_STATS; attr++) if ((val = op->stats.stat (attr))) @@ -447,10 +452,10 @@ if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp); if (op->stats.luck) buf.printf ("(luck%+d)", op->stats.luck); - if (QUERY_FLAG (op, FLAG_LIFESAVE)) buf << "(lifesaving)"; - if (QUERY_FLAG (op, FLAG_REFL_SPELL)) buf << "(reflect spells)"; - if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) buf << "(reflect missiles)"; - if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)"; + if (op->flag [FLAG_LIFESAVE]) buf << "(lifesaving)"; + if (op->flag [FLAG_REFL_SPELL]) buf << "(reflect spells)"; + if (op->flag [FLAG_REFL_MISSILE]) buf << "(reflect missiles)"; + if (op->flag [FLAG_STEALTH]) buf << "(stealth)"; buf.add_paths ("Attuned" , op->path_attuned); buf.add_paths ("Repelled", op->path_repelled); @@ -486,7 +491,7 @@ buf << (op->nrof <= 1 ? op->name : op->name_pl); - if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED)) + if (op->title && op->flag [FLAG_IDENTIFIED]) buf << ' ' << op->title; switch (op->type) @@ -495,7 +500,7 @@ case SCROLL: case WAND: case ROD: - if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) + if (op->flag [FLAG_IDENTIFIED] || op->flag [FLAG_BEEN_APPLIED]) { if (!op->title) buf << " of " << (op->inv ? &op->inv->name : "bug, please report"); @@ -544,7 +549,7 @@ break; default: - if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) + if (op->magic && ((op->flag [FLAG_BEEN_APPLIED] && need_identify (op)) || op->flag [FLAG_IDENTIFIED])) buf.printf (" %+d", op->magic); } @@ -563,6 +568,7 @@ * * It is used extensively within messages, so should return only a prose * and short description of the item. + * It is also used by examine/ex and similar functions. */ const char * query_name (const object *op) @@ -584,16 +590,16 @@ buf << query_short_name (op); - if (QUERY_FLAG (op, FLAG_INV_LOCKED)) + if (op->flag [FLAG_INV_LOCKED]) buf << " *"; if (op->is_open_container ()) buf << " (open)"; - if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) + if (op->flag [FLAG_KNOWN_CURSED]) { - if (QUERY_FLAG (op, FLAG_DAMNED)) + if (op->flag [FLAG_DAMNED]) buf << " (damned)"; - else if (QUERY_FLAG (op, FLAG_CURSED)) + else if (op->flag [FLAG_CURSED]) buf << " (cursed)"; } @@ -606,7 +612,7 @@ * if it has been applied. Equipping an item does not tell full * abilities, especially for artifact items. */ - if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) + if (op->flag [FLAG_KNOWN_MAGICAL] && !op->flag [FLAG_IDENTIFIED]) buf << " (magic)"; #if 0 @@ -618,7 +624,7 @@ #endif - if (QUERY_FLAG (op, FLAG_APPLIED)) + if (op->flag [FLAG_APPLIED]) { switch (op->type) { @@ -626,10 +632,10 @@ case WAND: case ROD: case HORN: - buf << (op->env && op->env->current_weapon == op ? " (readied)" : " (applied)"); + buf << " (applied)"; break; case WEAPON: - buf << (op->env && op->env->current_weapon == op ? " (wielded)" : " (applied)"); + buf << " (applied)"; break; case ARMOUR: case HELMET: @@ -671,7 +677,7 @@ break; } - if (QUERY_FLAG (op, FLAG_UNPAID)) + if (op->flag [FLAG_UNPAID]) buf << " (unpaid)"; return buf; @@ -688,6 +694,7 @@ * * It is sometimes used to display messages, and usually only used to match stuff, * so maybe this function should be removed. + * It is also used for client-side inventory/item descriptions. */ const char * query_base_name (const object *op, int plural) @@ -695,7 +702,8 @@ if ((!plural && !op->name) || (plural && !op->name_pl)) return "(null)"; - if (!op->nrof && !op->weight && !op->title && !is_magical (op)) + if (!op->nrof && !op->weight && !op->title && !is_magical (op) + && op->type != EXIT) return op->name; /* To speed things up (or make things slower?) */ static dynbuf_text buf; buf.clear (); @@ -708,7 +716,7 @@ buf << (plural ? op->name_pl : op->name); - if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED)) + if (op->title && op->flag [FLAG_IDENTIFIED]) buf << ' ' << op->title; switch (op->type) @@ -717,7 +725,7 @@ case SCROLL: case WAND: case ROD: - if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) + if (op->flag [FLAG_IDENTIFIED] || op->flag [FLAG_BEEN_APPLIED]) { if (!op->title) buf << " of " << (op->inv ? &op->inv->name : "bug, please report"); @@ -741,8 +749,16 @@ } break; + case EXIT: + // random map exits "unfortunately" get patched, so this only works before entering + if (EXIT_PATH (op) == shstr_random_map_exit) + buf << " (random map)"; + else if (!EXIT_PATH (op)) + buf << " (closed)"; + break; + default: - if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) + if (op->magic && ((op->flag [FLAG_BEEN_APPLIED] && need_identify (op)) || op->flag [FLAG_IDENTIFIED])) buf.printf (" %+d", op->magic); } @@ -765,7 +781,7 @@ * fall into the 'lightning fast movement' category. */ if (op->has_active_speed ()) - switch ((int)((fabs (op->speed)) * 15.)) + switch ((int)(op->speed * 15.)) { case 0: buf << "(very slow movement)"; @@ -795,20 +811,20 @@ break; } - if (QUERY_FLAG (op, FLAG_UNDEAD)) buf << "(undead)"; - if (QUERY_FLAG (op, FLAG_SEE_INVISIBLE)) buf << "(see invisible)"; - if (QUERY_FLAG (op, FLAG_USE_WEAPON)) buf << "(wield weapon)"; - if (QUERY_FLAG (op, FLAG_USE_BOW)) buf << "(archer)"; - if (QUERY_FLAG (op, FLAG_USE_ARMOUR)) buf << "(wear armour)"; - if (QUERY_FLAG (op, FLAG_USE_RING)) buf << "(wear ring)"; - if (QUERY_FLAG (op, FLAG_USE_SCROLL)) buf << "(read scroll)"; - if (QUERY_FLAG (op, FLAG_USE_RANGE)) buf << "(fires wand/rod/horn)"; - if (QUERY_FLAG (op, FLAG_CAN_USE_SKILL)) buf << "(skill user)"; - if (QUERY_FLAG (op, FLAG_CAST_SPELL)) buf << "(spellcaster)"; - if (QUERY_FLAG (op, FLAG_FRIENDLY)) buf << "(friendly)"; - if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE)) buf << "(unaggressive)"; - if (QUERY_FLAG (op, FLAG_HITBACK)) buf << "(hitback)"; - if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealthy)"; + if (op->flag [FLAG_UNDEAD]) buf << "(undead)"; + if (op->flag [FLAG_SEE_INVISIBLE]) buf << "(see invisible)"; + if (op->flag [FLAG_USE_WEAPON]) buf << "(wield weapon)"; + if (op->flag [FLAG_USE_BOW]) buf << "(archer)"; + if (op->flag [FLAG_USE_ARMOUR]) buf << "(wear armour)"; + if (op->flag [FLAG_USE_RING]) buf << "(wear ring)"; + if (op->flag [FLAG_USE_SCROLL]) buf << "(read scroll)"; + if (op->flag [FLAG_USE_RANGE]) buf << "(fires wand/rod/horn)"; + if (op->flag [FLAG_CAN_USE_SKILL]) buf << "(skill user)"; + if (op->flag [FLAG_CAST_SPELL]) buf << "(spellcaster)"; + if (op->flag [FLAG_FRIENDLY]) buf << "(friendly)"; + if (op->flag [FLAG_UNAGGRESSIVE]) buf << "(unaggressive)"; + if (op->flag [FLAG_HITBACK]) buf << "(hitback)"; + if (op->flag [FLAG_STEALTH]) buf << "(stealthy)"; if (op->randomitems) { @@ -845,7 +861,7 @@ } /* describe attacktypes */ - if (is_dragon_pl (op)) + if (op->is_dragon ()) { /* for dragon players display the attacktypes from clawing skill * Break apart the for loop - move the comparison checking down - @@ -900,7 +916,7 @@ const char * describe_item (const object *op, object *owner) { - if (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER) + if (op->flag [FLAG_MONSTER] || op->type == PLAYER) return describe_monster (op); static dynbuf_text buf; buf.clear (); @@ -909,7 +925,7 @@ /* figure this out once, instead of making multiple calls to need_identify. * also makes the code easier to read. */ - identified = !need_identify (op) || QUERY_FLAG (op, FLAG_IDENTIFIED); + identified = !need_identify (op) || op->flag [FLAG_IDENTIFIED]; if (!identified) buf << "(unidentified)"; @@ -938,28 +954,30 @@ i = (op->stats.maxsp % 1000) / 100; if (i) - buf.printf ("(capacity %d.%dk). It is ", op->stats.maxsp / 1000, i); + buf.printf ("(capacity %d.%dk; it is ", op->stats.maxsp / 1000, i); else - buf.printf ("(capacity %dk). It is ", op->stats.maxsp / 1000); + buf.printf ("(capacity %dk; it is ", op->stats.maxsp / 1000); } else - buf.printf ("(capacity %d). It is ", op->stats.maxsp); + buf.printf ("(capacity %d; it is ", op->stats.maxsp); i = (op->stats.sp * 10) / op->stats.maxsp; if (op->stats.sp == 0) - buf << "empty."; + buf << "empty"; else if (i == 0) - buf << "almost empty."; + buf << "almost empty"; else if (i < 3) - buf << "partially filled."; + buf << "partially filled"; else if (i < 6) - buf << "half full."; + buf << "half full"; else if (i < 9) - buf << "well charged."; + buf << "well charged"; else if (op->stats.sp == op->stats.maxsp) - buf << "fully charged."; + buf << "fully charged"; else - buf << "almost full."; + buf << "almost full"; + + buf << ')'; break; case LAMP: @@ -987,14 +1005,14 @@ case FOOD: case FLESH: case DRINK: - if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) + if (identified || op->flag [FLAG_BEEN_APPLIED]) { buf.printf ("(food+%d)", op->stats.food); if (op->type == FLESH && op->last_eat > 0 && atnr_is_dragon_enabled (op->last_eat)) buf.printf ("(%s metabolism)", change_resist_msg[op->last_eat]); - if (!QUERY_FLAG (op, FLAG_CURSED)) + if (!op->flag [FLAG_CURSED]) { if (op->stats.hp) buf << "(heals)"; if (op->stats.sp) buf << "(spellpoint regen)"; @@ -1025,7 +1043,7 @@ /* Down here, we more further describe equipment type items. * only describe them if they have been identified or the like. */ - if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) + if (identified || op->flag [FLAG_BEEN_APPLIED]) { int attr, val; @@ -1066,8 +1084,8 @@ break; } - if (QUERY_FLAG (op, FLAG_XRAYS)) buf << "(xray-vision)"; - if (QUERY_FLAG (op, FLAG_SEE_IN_DARK)) buf << "(infravision)"; + if (op->flag [FLAG_XRAYS]) buf << "(xray-vision)"; + if (op->flag [FLAG_SEE_IN_DARK]) buf << "(infravision)"; /* levitate was what is was before, so we'll keep it */ if (op->move_type & MOVE_FLY_LOW) buf << "(levitate)"; @@ -1139,10 +1157,10 @@ if (op->stats.luck) buf.printf ("(luck%+d)", op->stats.luck); - if (QUERY_FLAG (op, FLAG_LIFESAVE)) buf << "(lifesaving)"; - if (QUERY_FLAG (op, FLAG_REFL_SPELL)) buf << "(reflect spells)"; - if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) buf << "(reflect missiles)"; - if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)"; + if (op->flag [FLAG_LIFESAVE]) buf << "(lifesaving)"; + if (op->flag [FLAG_REFL_SPELL]) buf << "(reflect spells)"; + if (op->flag [FLAG_REFL_MISSILE]) buf << "(reflect missiles)"; + if (op->flag [FLAG_STEALTH]) buf << "(stealth)"; if (op->slaying && op->type != FOOD) buf.printf ("(slay %s)", &op->slaying); @@ -1154,7 +1172,7 @@ /* resistance on flesh is only visible for quetzals. If * non flesh, everyone can see its resistances */ - if (op->type != FLESH || (owner && is_dragon_pl (owner))) + if (op->type != FLESH || (owner && owner->is_dragon ())) buf << describe_resistance (op, 0); buf.add_paths ("Attuned", op->path_attuned); @@ -1171,6 +1189,178 @@ return std::string (::describe_item (this, who)); } +static void +describe_dump_object (dynbuf &buf, object *ob) +{ + char *txt = dump_object (ob); + for (char *p = txt; *p; ++p) if (*p == '\n') *p = '\r'; + buf << "\n" << txt << "\n"; + + if (!ob->is_arch ()) + describe_dump_object (buf, ob->arch); +} + +std::string +object::describe (object *who) +{ + dynbuf_text buf (1024, 1024); + + buf.printf ("That is: %s.\r", long_desc (who).c_str ()); + + if (custom_name) + buf.printf ("You call it %s.\r", &custom_name); + + switch (type) + { + case SPELLBOOK: + if (flag [FLAG_IDENTIFIED] && inv) + buf.printf ("%s is a %s level %s spell.\r", &inv->name, ordinal (inv->level), &inv->skill); + break; + + case BOOK: + if (msg) + buf << "Something is written in it.\r"; + break; + + case CONTAINER: + if (race) + { + if (weight_limit && stats.Str < 100) + buf.printf ("It can hold only %s and its weight limit is %.1f kg.\r", + &race, weight_limit / (10.0 * (100 - stats.Str))); + else + buf.printf ("It can hold only %s.\r", &race); + } + else if (weight_limit && stats.Str < 100) + buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str))); + break; + + case WAND: + if (flag [FLAG_IDENTIFIED]) + buf.printf ("It has %d %s left.\r", stats.food, stats.food == 1 ? "charge" : "charges"); + break; + } + + if (material != MATERIAL_NULL && !msg) + buf << (nrof > 1 ? "They are made of " : "It is made of ") + << material->description + << ".\r"; + + if (who) + /* Where to wear this item */ + for (int i = 0; i < NUM_BODY_LOCATIONS; i++) + if (slot[i].info) + { + buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name); + + if (slot[i].info < -1 && who->slot[i].info) + buf.printf ("(%d)", -slot[i].info); + + buf << ".\r"; + } + + if (weight) + buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0); + + if (flag [FLAG_STARTEQUIP]) + buf << (nrof > 1 ? "They were" : "It was") + << " given by a god and will vanish when dropped.\r"; + + if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who) + { + buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX)); + + if (who->is_in_shop ()) + { + if (flag [FLAG_UNPAID]) + buf.printf ("%s would cost you %s.\r", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP)); + else + buf.printf ("You are offered %s for %s.\r", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it"); + } + } + + if (flag [FLAG_MONSTER]) + buf << describe_monster (who); + + /* Is this item buildable? */ + if (flag [FLAG_IS_BUILDABLE]) + buf << "This is a buildable item.\r"; + + /* Does the object have a message? Don't show message for all object + * types - especially if the first entry is a match + */ + if (msg) + { + if (type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ()) + { + buf << '\r'; + + /* This is just a hack so when identifying the items, we print + * out the extra message + */ + if (need_identify (this) && flag [FLAG_IDENTIFIED]) + buf << "The object has a story:\r"; + + buf << msg << '\n'; + } + } + else if (inv && inv->type == SPELL && flag [FLAG_IDENTIFIED] + && (type == SPELLBOOK || type == ROD || type == WAND + || type == ROD || type == POTION || type == SCROLL)) + // for spellbooks and other stuff that contains spells, print the spell message, + // unless the object has a custom message handled above. + buf << '\r' << inv->msg << '\n'; + + // try to display the duration for some potions and scrolls + // this includes change ability potions and group spells, + // but does not handle protection potions + if (inv && inv->type == SPELL && flag [FLAG_IDENTIFIED] + && (type == POTION || type == SCROLL)) + { + object *spell = inv; + + if (spell->subtype == SP_PARTY_SPELL) + spell = spell->other_arch; + + if (spell->subtype == SP_CHANGE_ABILITY) + buf.printf ("\nH", + TICK2TIME (change_ability_duration (spell, this))); + } + + // some help text for skill tools + if (type == SKILL_TOOL) + buf << "\nH"; + + // Display a hint about inscribable items [empty books] + // This includes the amount of text they can hold. + if (type == INSCRIBABLE) + { + if (other_arch && other_arch->type == SCROLL) + buf.printf ("\nH"); + else + buf.printf ("\nH", + weight_limit); + } + + buf << '\n'; + + // the dungeon master additionally gets a complete dump + if (who && who->flag [FLAG_WIZLOOK]) + { + buf << "\nT\n"; + describe_dump_object (buf, this); + + if (inv) + { + buf << "\nT\n"; + describe_dump_object (buf, inv); + } + } + + return std::string (buf.linearise (), buf.size ()); +} + void examine (object *op, object *tmp) { @@ -1190,9 +1380,9 @@ static dynbuf_text buf; buf.clear (); for (object *tmp = inv; tmp; tmp = tmp->below) - if (who && QUERY_FLAG (who, FLAG_WIZ)) - buf.printf ("%s- %-28.28s (%5d) %-8s\n", indent, tmp->query_name (), tmp->count, tmp->query_weight ()); - else if (!tmp->invisible && (type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) + if (who && who->flag [FLAG_WIZ]) + buf.printf ("%s- %-28.28s %-8s (%9d) %s\n", indent, tmp->query_name (), tmp->query_weight (), tmp->count, tmp->uuid.c_str ()); + else if (!tmp->invisible && (type == CONTAINER || tmp->flag [FLAG_APPLIED])) buf.printf ("%s- %-36.36s %-8s\n", indent, tmp->query_name (), tmp->query_weight ()); if (buf.size ()) @@ -1215,7 +1405,7 @@ int i; /* living creatures are considered non magical */ - if (QUERY_FLAG (op, FLAG_ALIVE)) + if (op->flag [FLAG_ALIVE]) return 0; /* This is a test for it being an artifact, as artifacts have titles */ @@ -1231,15 +1421,15 @@ /* Check for stealty, speed, flying, or just plain magic in the boots */ /* Presume any boots that hvae a move_type are special. */ - if (op->type == BOOTS && ((QUERY_FLAG (op, FLAG_STEALTH) || op->move_type || op->stats.exp))) + if (op->type == BOOTS && ((op->flag [FLAG_STEALTH] || op->move_type || op->stats.exp))) return 1; /* Take care of amulet/shield that reflects spells/missiles */ - if ((op->type == AMULET || op->type == SHIELD) && (QUERY_FLAG (op, FLAG_REFL_SPELL) || QUERY_FLAG (op, FLAG_REFL_MISSILE))) + if ((op->type == AMULET || op->type == SHIELD) && (op->flag [FLAG_REFL_SPELL] || op->flag [FLAG_REFL_MISSILE])) return 1; /* Take care of helmet of xrays */ - if (op->type == HELMET && QUERY_FLAG (op, FLAG_XRAYS)) + if (op->type == HELMET && op->flag [FLAG_XRAYS]) return 1; /* Potions & rods are always magical. Wands/staves are also magical, @@ -1338,15 +1528,15 @@ void identify (object *op) { - SET_FLAG (op, FLAG_IDENTIFIED); - CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL); - CLEAR_FLAG (op, FLAG_NO_SKILL_IDENT); + op->set_flag (FLAG_IDENTIFIED); + op->clr_flag (FLAG_KNOWN_MAGICAL); + op->clr_flag (FLAG_NO_SKILL_IDENT); /* * We want autojoining of equal objects: */ - if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) - SET_FLAG (op, FLAG_KNOWN_CURSED); + if (op->flag [FLAG_CURSED] || op->flag [FLAG_DAMNED]) + op->set_flag (FLAG_KNOWN_CURSED); if (op->type == POTION) {