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.48 by root, Tue Apr 22 07:01:46 2008 UTC vs.
Revision 1.96 by root, Mon Oct 29 23:55:52 2012 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <living.h> 26#include <living.h>
46 * Note that using the term 'human' may not be very accurate, humanoid 47 * Note that using the term 'human' may not be very accurate, humanoid
47 * may be better. 48 * may be better.
48 * Basically, for the use/nonuse, the code does something like: 49 * 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 50 * "This item goes %s\n", with the use/nonuse values filling in the %s
50 */ 51 */
52// see include/object.h
51Body_Locations body_locations[NUM_BODY_LOCATIONS] = { 53Body_Locations body_locations[NUM_BODY_LOCATIONS] = {
52 {KW_body_skill , "You can use it as your skill" , "It is used as a skill"}, 54# define def(name, use, nonuse) { # name, KW_body_ ## name, use, nonuse },
53 {KW_body_combat , "You can wield it as your weapon" , "It is used as a combat weapon"}, 55# include "slotinc.h"
54 {KW_body_range , "You can use it as your range weapon" , "It is used as a range weapon"}, 56# undef def
55 {KW_body_shield , "You can wield it as a shield" , "It is used as a shield"},
56 {KW_body_arm , "You can put it on your arm" , "It goes on a human's arm"},
57 {KW_body_torso , "You can wear it on your body" , "It goes on a human's torso"},
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"} ,
61 {KW_body_shoulder, "You can wear it around your shoulders", "It goes around a human's shoulders"},
62 {KW_body_foot , "You can put it on your foot" , "It goes on a human's foot"},
63 {KW_body_hand , "You can put it on your hand" , "It goes on a human's hand"},
64 {KW_body_wrist , "You can wear it around your wrist" , "It goes around a human's wrist"},
65 {KW_body_waist , "You can wear it around your waist" , "It goes around a human's waist"},
66/*{"body_dragon_torso", "your body", "a dragon's body"} */
67};
68
69static char numbers[21][20] = {
70 "no", "", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten",
71 "eleven", "twelve", "thirteen", "fourteen", "fifteen", "sixteen", "seventeen",
72 "eighteen", "nineteen", "twenty"
73}; 57};
74 58
75static char numbers_10[10][20] = { 59static char numbers_10[10][20] = {
76 "zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy", 60 "zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy",
77 "eighty", "ninety" 61 "eighty", "ninety"
78}; 62};
79 63
80static char levelnumbers[21][20] = { 64static char ordnumbers[21][20] = {
81 "zeroth", "first", "second", "third", "fourth", "fifth", "sixth", "seventh", 65 "zeroth", "first", "second", "third", "fourth", "fifth", "sixth", "seventh",
82 "eighth", "ninth", "tenth", "eleventh", "twelfth", "thirteenth", 66 "eighth", "ninth", "tenth", "eleventh", "twelfth", "thirteenth",
83 "fourteenth", "fifteenth", "sixteenth", "seventeenth", "eighteen", 67 "fourteenth", "fifteenth", "sixteenth", "seventeenth", "eighteenth",
84 "nineteen", "twentieth" 68 "nineteenth", "twentieth"
85}; 69};
86 70
87static char levelnumbers_10[11][20] = { 71static char ordnumbers_10[11][20] = {
88 "zeroth", "tenth", "twentieth", "thirtieth", "fortieth", "fiftieth", "sixtieth", 72 "zeroth", "tenth", "twentieth", "thirtieth", "fortieth", "fiftieth", "sixtieth",
89 "seventieth", "eightieth", "ninetieth" 73 "seventieth", "eightieth", "ninetieth"
90}; 74};
91 75
92/* The following is a large table of item types, the fields are: 76/* The following is a large table of item types, the fields are:
155 {EXIT, "exit", "exits", 0, 0}, 139 {EXIT, "exit", "exits", 0, 0},
156 {ENCOUNTER, "encounter", "encounters", 0, 0}, 140 {ENCOUNTER, "encounter", "encounters", 0, 0},
157 {SHOP_FLOOR, "shop floor", "shop floors", 0, 0}, 141 {SHOP_FLOOR, "shop floor", "shop floors", 0, 0},
158 {SHOP_MAT, "shop mat", "shop mats", 0, 0}, 142 {SHOP_MAT, "shop mat", "shop mats", 0, 0},
159 {RING, "ring", "rings", SK_JEWELER, 0}, 143 {RING, "ring", "rings", SK_JEWELER, 0},
160 {FLOOR, "floor", "floors", 0, 0}, 144// {FLOOR, "floor", "floors", 0, 0},
161 {FLESH, "flesh", "flesh", SK_WOODSMAN, 0}, 145 {FLESH, "flesh", "flesh", SK_WOODSMAN, 0},
162 {INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0}, 146 {INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0},
163 {SKILL_TOOL, "skill tool", "skill tools", 0, 0}, 147 {SKILL_TOOL, "skill tool", "skill tools", 0, 0},
164 {LIGHTER, "lighter", "lighters", 0, 0}, 148 {LIGHTER, "lighter", "lighters", 0, 0},
165 {BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0}, 149 {BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0},
166 {MISC_OBJECT, "bric-a-brac", "bric-a-brac", 0, 0}, 150 {MISC_OBJECT, "bric-a-brac", "bric-a-brac", 0, 0},
151 {TORCH, "torch", "torches", 0, 0},
167 {LAMP, "lamp", "lamps", 0, 0}, 152 {LAMP, "lamp", "lamps", 0, 0},
168 {DUPLICATOR, "duplicator", "duplicators", 0, 0}, 153 {DUPLICATOR, "duplicator", "duplicators", 0, 0},
169 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0}, 154 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0},
170 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0}, 155 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0},
171 {SPINNER, "spinner", "spinners", 0, 0}, 156 {SPINNER, "spinner", "spinners", 0, 0},
172 {GATE, "gate", "gates", 0, 0}, 157 {GATE, "gate", "gates", 0, 0},
173 {BUTTON, "button", "buttons", 0, 0}, 158 {BUTTON, "button", "buttons", 0, 0},
174 {CF_HANDLE, "cf handle", "cf handles", 0, 0}, 159 {T_HANDLE, "cf handle", "cf handles", 0, 0},
175 {HOLE, "hole", "holes", 0, 0}, 160 {HOLE, "hole", "holes", 0, 0},
176 {TRAPDOOR, "trapdoor", "trapdoors", 0, 0}, 161 {TRAPDOOR, "trapdoor", "trapdoors", 0, 0},
177 {SIGN, "sign", "signs", 0, 0}, 162 {SIGN, "sign", "signs", 0, 0},
178 {BOOTS, "boots", "boots", SK_SMITHERY, 0}, 163 {BOOTS, "boots", "boots", SK_SMITHERY, 0},
179 {GLOVES, "gloves", "gloves", SK_SMITHERY, 0}, 164 {GLOVES, "gloves", "gloves", SK_SMITHERY, 0},
206 {BUILDER, "item builder", "item builders", 0, 0}, 191 {BUILDER, "item builder", "item builders", 0, 0},
207 {MATERIAL, "building material", "building materials", 0, 0}, 192 {MATERIAL, "building material", "building materials", 0, 0},
208 {ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0}, 193 {ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0},
209}; 194};
210 195
211const int item_types_size = sizeof (item_types) / sizeof (*item_types); 196static const int item_types_size = array_length (item_types);
212
213materialtype_t *materialt;
214
215/*
216materialtype material[NROFMATERIALS] = {
217 * P M F E C C A D W G P S P T F C D D C C G H B I *
218 * H A I L O O C R E H O L A U E A E E H O O O L N *
219 * Y G R E L N I A A O I O R R A N P A A U D L I T *
220 * S I E C D F D I P S S W A N R C L T O N Y N R *
221 * I C T U N O T O L E E H S T P D N *
222 {"paper", {15,10,17, 9, 5, 7,13, 0,20,15, 0,0,0,0,0,10,0,0,0,0,0,0,0,0}},
223 {"metal", { 2,12, 3,12, 2,10, 7, 0,20,15, 0,0,0,0,0,10,0,0,0,0,0,0,0,0}},
224 {"glass", {14,11, 8, 3,10, 5, 1, 0,20,15, 0,0,0,0,0, 0,0,0,0,0,0,0,0,0}},
225 {"leather", { 5,10,10, 3, 3,10,10, 0,20,15, 0,0,0,0,0,12,0,0,0,0,0,0,0,0}},
226 {"wood", {10,11,13, 2, 2,10, 9, 0,20,15, 0,0,0,0,0,12,0,0,0,0,0,0,0,0}},
227 {"organics", { 3,12, 9,11, 3,10, 9, 0,20,15, 0,0,0,0,0, 0,0,0,0,0,0,0,0,0}},
228 {"stone", { 2, 5, 2, 2, 2, 2, 1, 0,20,15, 0,0,0,0,0, 5,0,0,0,0,0,0,0,0}},
229 {"cloth", {14,11,13, 4, 4, 5,10, 0,20,15, 0,0,0,0,0, 5,0,0,0,0,0,0,0,0}},
230 {"adamant", { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,0,0,0, 0,0,0,0,0,0,0,0,0}},
231 {"liquid", { 0, 8, 9, 6,17, 0,15, 0,20,15,12,0,0,0,0,11,0,0,0,0,0,0,0,0}},
232 {"soft metal",{ 6,12, 6,14, 2,10, 1, 0,20,15, 0,0,0,0,0,10,0,0,0,0,0,0,0,0}},
233 {"bone", {10, 9, 4, 5, 3,10,10, 0,20,15, 0,0,0,0,0, 2,0,0,0,0,0,0,0,0}},
234 {"ice", {14,11,16, 5, 0, 5, 6, 0,20,15, 0,0,0,0,0, 7,0,0,0,0,0,0,0,0}}
235};
236*/
237 197
238/* This curve may be too steep. But the point is that there should 198/* This curve may be too steep. But the point is that there should
239 * be tough choices - there is no real point to this if everyone can 199 * be tough choices - there is no real point to this if everyone can
240 * wear whatever they want with no worries. Perhaps having the steep 200 * wear whatever they want with no worries. Perhaps having the steep
241 * curve is good (maybe even steeper), but allowing players to 201 * curve is good (maybe even steeper), but allowing players to
243 * able to use 2-3 of the most powerful items. 203 * able to use 2-3 of the most powerful items.
244 * note that this table is only really used for program generated items - 204 * note that this table is only really used for program generated items -
245 * custom objects can use whatever they want. 205 * custom objects can use whatever they want.
246 */ 206 */
247static int enc_to_item_power[21] = { 207static int enc_to_item_power[21] = {
208 0,
248 0, 0, 1, 2, 3, 4, /* 5 */ 209 0, 1, 2, 3, 4, // 5
249 5, 7, 9, 11, 13, /* 10 */ 210 5, 7, 9, 11, 13, // 10
250 15, 18, 21, 24, 27, /* 15 */ 211 15, 18, 21, 24, 27, // 15
251 30, 35, 40, 45, 50 /* 20 */ 212 30, 35, 40, 45, 50 // 20
252}; 213};
253 214
254int 215int
255get_power_from_ench (int ench) 216get_power_from_ench (int ench)
256{ 217{
257 if (ench < 0) ench = 0;
258 if (ench > 20) ench = 20;
259
260 return enc_to_item_power[ench]; 218 return enc_to_item_power [clamp (ench, 0, 20)];
219}
220
221static const struct need_identify_types : typeset
222{
223 need_identify_types ()
224 {
225 set (RING);
226 set (WAND);
227 set (ROD);
228 set (HORN);
229 set (SCROLL);
230 set (SKILL);
231 set (SKILLSCROLL);
232 set (SPELLBOOK);
233 set (FOOD);
234 set (POTION);
235 set (BOW);
236 set (ARROW);
237 set (WEAPON);
238 set (ARMOUR);
239 set (SHIELD);
240 set (HELMET);
241 set (AMULET);
242 set (BOOTS);
243 set (GLOVES);
244 set (BRACERS);
245 set (GIRDLE);
246 set (CONTAINER);
247 set (DRINK);
248 set (FLESH);
249 set (INORGANIC);
250 set (CLOSE_CON);
251 set (CLOAK);
252 set (GEM);
253 set (POWER_CRYSTAL);
254 set (POISON);
255 set (BOOK);
256 set (SKILL_TOOL);
257 }
258} need_identify_types;
259
260bool
261object::need_identify () const
262{
263 return need_identify_types [type];
261} 264}
262 265
263/* This takes an object 'op' and figures out what its item_power 266/* This takes an object 'op' and figures out what its item_power
264 * rating should be. This should only really be used by the treasure 267 * rating should be. This should only really be used by the treasure
265 * generation code, and when loading legacy objects. It returns 268 * generation code, and when loading legacy objects. It returns
299 if (op->type == WEAPON) 302 if (op->type == WEAPON)
300 { 303 {
301 for (i = 1; i < NROFATTACKS; i++) 304 for (i = 1; i < NROFATTACKS; i++)
302 if (op->attacktype & (1 << i)) 305 if (op->attacktype & (1 << i))
303 enc++; 306 enc++;
307
304 if (op->slaying) 308 if (op->slaying)
305 enc += 2; /* What it slays is probably more relevent */ 309 enc += 2; /* What it slays is probably more relevent */
306 } 310 }
311
307 /* Items the player can equip */ 312 /* Items the player can equip */
308 if ((op->type == WEAPON) || (op->type == ARMOUR) || (op->type == HELMET) || 313 if ((op->type == WEAPON) || (op->type == ARMOUR) || (op->type == HELMET) ||
309 (op->type == SHIELD) || (op->type == RING) || 314 (op->type == SHIELD) || (op->type == RING) ||
310 (op->type == BOOTS) || (op->type == GLOVES) || 315 (op->type == BOOTS) || (op->type == GLOVES) ||
311 (op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK)) 316 (op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK))
314 enc += op->stats.hp; /* hp regen */ 319 enc += op->stats.hp; /* hp regen */
315 enc += op->stats.sp; /* mana regen */ 320 enc += op->stats.sp; /* mana regen */
316 enc += op->stats.grace; /* grace regen */ 321 enc += op->stats.grace; /* grace regen */
317 enc += op->stats.exp; /* speed bonus */ 322 enc += op->stats.exp; /* speed bonus */
318 } 323 }
324
319 enc += op->stats.luck; 325 enc += op->stats.luck;
320 326
321 /* Do spell paths now */ 327 /* Do spell paths now */
322 for (i = 1; i < NRSPELLPATHS; i++) 328 for (i = 1; i < NRSPELLPATHS; i++)
323 {
324 if (op->path_attuned & (1 << i)) 329 if (op->path_attuned & (1 << i))
325 enc++; 330 enc++;
326 else if (op->path_denied & (1 << i)) 331 else if (op->path_denied & (1 << i))
327 enc -= 2; 332 enc -= 2;
328 else if (op->path_repelled & (1 << i)) 333 else if (op->path_repelled & (1 << i))
329 enc--; 334 enc--;
330 }
331 335
332 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 336 if (op->flag [FLAG_LIFESAVE ]) enc += 5;
333 enc += 5; 337 if (op->flag [FLAG_REFL_SPELL ]) enc += 3;
334 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) 338 if (op->flag [FLAG_REFL_MISSILE]) enc += 2;
335 enc += 3; 339 if (op->flag [FLAG_XRAYS ]) enc += 2;
336 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) 340 if (op->flag [FLAG_STEALTH ]) enc += 1;
337 enc += 2; 341 if (op->flag [FLAG_SEE_IN_DARK ]) enc += 1;
338 if (QUERY_FLAG (op, FLAG_STEALTH)) 342 if (op->flag [FLAG_MAKE_INVIS ]) enc += 1;
339 enc += 1;
340 if (QUERY_FLAG (op, FLAG_XRAYS))
341 enc += 2;
342 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK))
343 enc += 1;
344 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
345 enc += 1;
346 343
347 return get_power_from_ench (enc); 344 return get_power_from_ench (enc);
348} 345}
346
347static const struct get_typedata
348{
349 const typedata *data [NUM_TYPES];
350
351 get_typedata ()
352 {
353 for (int i = 0; i < item_types_size; i++)
354 data [item_types[i].number] = &item_types [i];
355 }
356
357 const typedata *operator ()(int itemtype) const
358 {
359 return data [itemtype];
360 }
361} get_typedata_;
349 362
350/* returns the typedata that has a number equal to itemtype, if there 363/* returns the typedata that has a number equal to itemtype, if there
351 * isn't one, returns NULL */ 364 * isn't one, returns NULL */
352const typedata * 365const typedata *
353get_typedata (int itemtype) 366get_typedata (int itemtype)
354{ 367{
355 int i; 368 return get_typedata_ (itemtype);
356
357 for (i = 0; i < item_types_size; i++)
358 if (item_types[i].number == itemtype)
359 return &item_types[i];
360 return NULL;
361} 369}
362 370
363/* returns the typedata that has a name equal to itemtype, if there 371/* returns the typedata that has a name equal to itemtype, if there
364 * isn't one, return the plural name that matches, if there still isn't 372 * isn't one, return the plural name that matches, if there still isn't
365 * one return NULL */ 373 * one return NULL */
366const typedata * 374const typedata *
367get_typedata_by_name (const char *name) 375get_typedata_by_name (const char *name)
368{ 376{
369 int i;
370
371 for (i = 0; i < item_types_size; i++) 377 for (int i = 0; i < item_types_size; i++)
372 if (!strcmp (item_types[i].name, name)) 378 if (!strcmp (item_types[i].name, name))
373 return &item_types[i]; 379 return &item_types[i];
380
374 for (i = 0; i < item_types_size; i++) 381 for (int i = 0; i < item_types_size; i++)
375 if (!strcmp (item_types[i].name_pl, name)) 382 if (!strcmp (item_types[i].name_pl, name))
376 { 383 {
377 LOG (llevInfo, 384 LOG (llevInfo,
378 "get_typedata_by_name: I have been sent the plural %s, the singular form %s is preffered\n", name, item_types[i].name); 385 "get_typedata_by_name: I have been sent the plural %s, the singular form %s is prefered\n", name, item_types[i].name);
379 return &item_types[i]; 386 return &item_types[i];
380 } 387 }
388
381 return NULL; 389 return 0;
382} 390}
383 391
384/* describe_resistance generates the visible naming for resistances. 392/* describe_resistance generates the visible naming for resistances.
385 * returns a static array of the description. This can return 393 * returns a static array of the description. This can return
386 * a big buffer. 394 * a big buffer.
388 * but do put a newline at the end. Useful when dumping to files 396 * but do put a newline at the end. Useful when dumping to files
389 */ 397 */
390const char * 398const char *
391describe_resistance (const object *op, int newline) 399describe_resistance (const object *op, int newline)
392{ 400{
393 static char buf[VERY_BIG_BUF]; 401 static dynbuf_text buf; buf.clear ();
394 char buf1[VERY_BIG_BUF];
395 int tmpvar;
396 402
397 buf[0] = 0; 403 for (int i = 0; i < NROFATTACKS; i++)
398 for (tmpvar = 0; tmpvar < NROFATTACKS; tmpvar++)
399 {
400 if (op->resist[tmpvar] && (op->type != FLESH || atnr_is_dragon_enabled (tmpvar) == 1)) 404 if (op->resist[i] && (op->type != FLESH || atnr_is_dragon_enabled (i) == 1))
401 { 405 buf.printf (newline ? "%s %d\n" : "(%s %+d)", resist_plus[i], op->resist[i]);
402 if (!newline)
403 sprintf (buf1, "(%s %+d)", resist_plus[tmpvar], op->resist[tmpvar]);
404 else
405 sprintf (buf1, "%s %d\n", resist_plus[tmpvar], op->resist[tmpvar]);
406 406
407 strcat (buf, buf1);
408 }
409 }
410 return buf; 407 return buf;
411} 408}
412
413 409
414/* 410/*
415 * query_weight(object) returns a character pointer to a static buffer 411 * query_weight(object) returns a character pointer to a static buffer
416 * containing the text-representation of the weight of the given object. 412 * containing the text-representation of the weight of the given object.
417 * The buffer will be overwritten by the next call to query_weight(). 413 * The buffer will be overwritten by the next call to query_weight().
414 *
415 * Seems to be used only by unimportant stuff. Remove?
418 */ 416 */
419const char * 417const char *
420query_weight (const object *op) 418query_weight (const object *op)
421{ 419{
422 static char buf[10]; 420 static char buf[10];
436/* 434/*
437 * Returns the pointer to a static buffer containing 435 * Returns the pointer to a static buffer containing
438 * the number requested (of the form first, second, third...) 436 * the number requested (of the form first, second, third...)
439 */ 437 */
440const char * 438const char *
441get_levelnumber (int i) 439ordinal (int i)
442{ 440{
443 static char buf[MAX_BUF]; 441 if (i < 0)
444 442 return format ("minus %s", ordinal (-i));
445 if (i > 99)
446 {
447 sprintf (buf, "%d.", i);
448 return buf;
449 }
450 443
451 if (i < 21) 444 if (i < 21)
452 return levelnumbers[i];
453 if (!(i % 10))
454 return levelnumbers_10[i / 10];
455
456 strcpy (buf, numbers_10[i / 10]);
457 strcat (buf, levelnumbers[i % 10]);
458 return buf;
459}
460
461/*
462 * get_number(integer) returns the text-representation of the given number
463 * in a static buffer. The buffer might be overwritten at the next
464 * call to get_number().
465 * It is currently only used by the query_name() function.
466 */
467const char *
468get_number (int i)
469{
470 if (i <= 20)
471 return numbers[i]; 445 return ordnumbers[i];
446
447 int digit = i % 10;
448
449 if (i >= 100)
450 return format (
451 digit == 1 ? "%dst"
452 : digit == 2 ? "%dnd"
453 : digit == 3 ? "%drd"
454 : "%dth",
455 i
456 );
457
458 if (digit == 0)
459 return ordnumbers_10[i / 10];
472 else 460 else
473 { 461 return format ("%s%s", numbers_10[i / 10], ordnumbers[i % 10]);
474 static char buf[MAX_BUF];
475
476 sprintf (buf, "%d", i);
477 return buf;
478 }
479} 462}
480 463
481/* 464/*
482 * Returns pointer to static buffer containing ring's or amulet's 465 * Returns pointer to static buffer containing ring's or amulet's
483 * abilities 466 * abilities
489 */ 472 */
490 473
491/* Aug 95 modified this slightly so that Skill tools don't have magic bonus 474/* Aug 95 modified this slightly so that Skill tools don't have magic bonus
492 * from stats.sp - b.t. 475 * from stats.sp - b.t.
493 */ 476 */
494const char * 477static const char *
495ring_desc (const object *op) 478ring_desc (const object *op)
496{ 479{
497 static dynbuf_text buf; buf.clear (); 480 static dynbuf_text buf; buf.clear ();
498 int attr, val, len; 481 int attr, val;
499 482
500 if (QUERY_FLAG (op, FLAG_IDENTIFIED)) 483 if (op->flag [FLAG_IDENTIFIED])
501 { 484 {
502 for (attr = 0; attr < NUM_STATS; attr++) 485 for (attr = 0; attr < NUM_STATS; attr++)
503 if ((val = op->stats.stat (attr))) 486 if ((val = op->stats.stat (attr)))
504 buf.printf ("(%s%+d)", short_stat_name[attr], val); 487 buf.printf ("(%s%+d)", short_stat_name[attr], val);
505 488
506 if (op->stats.exp) buf.printf ("(speed %+lld)", (long long)op->stats.exp); 489 if (op->stats.exp) buf.printf ("(speed %+d)", (int)op->stats.exp);
507 if (op->stats.wc) buf.printf ("(wc%+d)", op->stats.wc); 490 if (op->stats.wc) buf.printf ("(wc%+d)", op->stats.wc);
508 if (op->stats.dam) buf.printf ("(dam%+d)", op->stats.dam); 491 if (op->stats.dam) buf.printf ("(dam%+d)", op->stats.dam);
509 if (op->stats.ac) buf.printf ("(ac%+d)", op->stats.ac); 492 if (op->stats.ac) buf.printf ("(ac%+d)", op->stats.ac);
510 493
511 buf << describe_resistance (op, 0); 494 buf << describe_resistance (op, 0);
514 if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace); 497 if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace);
515 if (op->stats.sp && op->type != SKILL) buf.printf ("(magic%+d)", op->stats.sp); 498 if (op->stats.sp && op->type != SKILL) buf.printf ("(magic%+d)", op->stats.sp);
516 if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp); 499 if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp);
517 if (op->stats.luck) buf.printf ("(luck%+d)", op->stats.luck); 500 if (op->stats.luck) buf.printf ("(luck%+d)", op->stats.luck);
518 501
519 if (QUERY_FLAG (op, FLAG_LIFESAVE)) buf << "(lifesaving)"; 502 if (op->flag [FLAG_LIFESAVE]) buf << "(lifesaving)";
520 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) buf << "(reflect spells)"; 503 if (op->flag [FLAG_REFL_SPELL]) buf << "(reflect spells)";
521 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) buf << "(reflect missiles)"; 504 if (op->flag [FLAG_REFL_MISSILE]) buf << "(reflect missiles)";
522 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)"; 505 if (op->flag [FLAG_STEALTH]) buf << "(stealth)";
523 506
524 buf.add_paths ("Attuned" , op->path_attuned); 507 buf.add_paths ("Attuned" , op->path_attuned);
525 buf.add_paths ("Repelled", op->path_repelled); 508 buf.add_paths ("Repelled", op->path_repelled);
526 buf.add_paths ("Denied" , op->path_denied); 509 buf.add_paths ("Denied" , op->path_denied);
527 510
533} 516}
534 517
535/* 518/*
536 * query_short_name(object) is similar to query_name, but doesn't 519 * query_short_name(object) is similar to query_name, but doesn't
537 * contain any information about object status (worn/cursed/etc.) 520 * contain any information about object status (worn/cursed/etc.)
521 *
522 * It is sometimes used when printing messages, so should fit well into a sentence.
538 */ 523 */
539const char * 524const char *
540query_short_name (const object *op) 525query_short_name (const object *op)
541{ 526{
542 if (op->name == 0) 527 if (!op->name)
543 return "(null)"; 528 return "(null)";
544 529
545 if (!op->nrof 530 if (!op->nrof
546 && !op->weight 531 && !op->weight
547 && !op->title 532 && !op->title
551 536
552 static dynbuf_text buf; buf.clear (); 537 static dynbuf_text buf; buf.clear ();
553 538
554 buf << (op->nrof <= 1 ? op->name : op->name_pl); 539 buf << (op->nrof <= 1 ? op->name : op->name_pl);
555 540
556 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED)) 541 if (op->title && op->flag [FLAG_IDENTIFIED])
557 buf << ' ' << op->title; 542 buf << ' ' << op->title;
558 543
559 switch (op->type) 544 switch (op->type)
560 { 545 {
561 case SPELLBOOK: 546 case SPELLBOOK:
562 case SCROLL: 547 case SCROLL:
563 case WAND: 548 case WAND:
564 case ROD: 549 case ROD:
565 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 550 if (op->flag [FLAG_IDENTIFIED] || op->flag [FLAG_BEEN_APPLIED])
566 { 551 {
567 if (!op->title) 552 if (!op->title)
568 buf << " of " << (op->inv ? &op->inv->name : "bug, please report"); 553 buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
569 554
570 if (op->type != SPELLBOOK) 555 if (op->type != SPELLBOOK)
571 buf.printf (" (lvl %d)", op->level); 556 buf.printf (" (lvl %d)", op->level);
572 } 557 }
573 break; 558 break;
574 559
575 case ALTAR: 560 case ALTAR:
576 case TRIGGER_ALTAR: 561 case TRIGGER_ALTAR:
577 case IDENTIFY_ALTAR: 562 case IDENTIFY_ALTAR:
578 case CONVERTER: 563 case CONVERTER:
579 if (op->slaying == shstr_money) 564 if (op->slaying == shstr_money)
580 { 565 {
581 bool wrap = !!buf.size (); 566 bool wrap = !!buf.size ();
582 567
583 if (wrap) buf << " ["; 568 if (wrap) buf << " [";
584 569
585 archetype *coin = 0; 570 archetype *coin = 0;
586 571
587 for (char const *const *c = coins; *coins; ++c) 572 for (char const *const *c = coins; *coins; ++c)
588 if ((coin = archetype::find (*c))) 573 if ((coin = archetype::find (*c)))
589 if (op->stats.food % coin->value == 0) 574 if (op->stats.food % coin->value == 0)
590 break; 575 break;
591 576
592 sint32 coins = op->stats.food / coin->value; 577 sint32 coins = op->stats.food / coin->value;
593 578
594 buf.printf ("drop %d %s (or equivalent)", coins, coins == 1 ? &coin->name : &coin->name_pl); 579 buf.printf ("drop %d %s (or equivalent)", coins, coins == 1 ? &coin->name : &coin->name_pl);
595 580
596 if (wrap) buf << ']'; 581 if (wrap) buf << ']';
597 } 582 }
598 break; 583 break;
599 584
600 case SKILL: 585 case SKILL:
601 case AMULET: 586 case AMULET:
602 case RING: 587 case RING:
603 if (!op->title) 588 if (!op->title)
609 buf << " " << s; 594 buf << " " << s;
610 } 595 }
611 break; 596 break;
612 597
613 default: 598 default:
614 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) 599 if (op->magic
600 && ((op->flag [FLAG_BEEN_APPLIED] && op->need_identify ())
601 || op->flag [FLAG_IDENTIFIED]))
615 buf.printf (" %+d", op->magic); 602 buf.printf (" %+d", op->magic);
616 } 603 }
617 604
618 return buf; 605 return buf;
619} 606}
626 * you can make several calls to query_name before the bufs start getting 613 * you can make several calls to query_name before the bufs start getting
627 * overwritten. This may be a bad thing (it may be easier to assume the value 614 * overwritten. This may be a bad thing (it may be easier to assume the value
628 * returned is good forever.) However, it makes printing statements that 615 * returned is good forever.) However, it makes printing statements that
629 * use several names much easier (don't need to store them to temp variables.) 616 * use several names much easier (don't need to store them to temp variables.)
630 * 617 *
618 * It is used extensively within messages, so should return only a prose
619 * and short description of the item.
620 * It is also used by examine/ex and similar functions.
631 */ 621 */
632const char * 622const char *
633query_name (const object *op) 623query_name (const object *op)
634{ 624{
635 int len = 0;
636 static dynbuf_text bufs[5]; 625 static dynbuf_text bufs[5];
637 static int use_buf = 0; 626 static int use_buf = 0;
638 627
639 use_buf++; 628 use_buf++;
640 use_buf %= 5; 629 use_buf %= 5;
641 630
642 dynbuf_text &buf = bufs [use_buf]; 631 dynbuf_text &buf = bufs [use_buf];
643 buf.clear (); 632 buf.clear ();
644 633
634#if 0
645 if ((op->is_armor () || op->is_weapon ()) && op->materialname) 635 if ((op->is_armor () || op->is_weapon ()) && op->material)
646 if (materialtype_t *mt = name_to_material (op->materialname))
647 buf << mt->description << ' '; 636 buf << op->material->description << ' ';
637#endif
648 638
649 buf << query_short_name (op); 639 buf << query_short_name (op);
650 640
651 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 641 if (op->flag [FLAG_INV_LOCKED])
652 buf << " *"; 642 buf << " *";
653 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 643 if (op->is_open_container ())
654 buf << " (open)"; 644 buf << " (open)";
655 645
656 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 646 if (op->flag [FLAG_KNOWN_CURSED])
657 { 647 {
658 if (QUERY_FLAG (op, FLAG_DAMNED)) 648 if (op->flag [FLAG_DAMNED])
659 buf << " (damned)"; 649 buf << " (damned)";
660 else if (QUERY_FLAG (op, FLAG_CURSED)) 650 else if (op->flag [FLAG_CURSED])
661 buf << " (cursed)"; 651 buf << " (cursed)";
662 } 652 }
663 653
664 /* Basically, if the object is known magical (detect magic spell on it), 654 /* Basically, if the object is known magical (detect magic spell on it),
665 * and it isn't identified, print out the fact that 655 * and it isn't identified, print out the fact that
668 * 658 *
669 * Changed in V 0.91.4 - still print that the object is magical even 659 * Changed in V 0.91.4 - still print that the object is magical even
670 * if it has been applied. Equipping an item does not tell full 660 * if it has been applied. Equipping an item does not tell full
671 * abilities, especially for artifact items. 661 * abilities, especially for artifact items.
672 */ 662 */
673 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 663 if (op->flag [FLAG_KNOWN_MAGICAL] && !op->flag [FLAG_IDENTIFIED])
674 buf << " (magic)"; 664 buf << " (magic)";
675 665
676#if 0 666#if 0
677 /* item_power will be returned in desribe_item - it shouldn't really 667 /* item_power will be returned in describe_item - it shouldn't really
678 * be returned in the name. 668 * be returned in the name.
679 */ 669 */
680 if (op->item_power) 670 if (op->item_power)
681 sprintf (buf[use_buf] + strlen (buf[use_buf]), "(item_power %+d)", op->item_power); 671 sprintf (buf[use_buf] + strlen (buf[use_buf]), "(item_power %+d)", op->item_power);
682 672
683#endif 673#endif
684 674
685 if (QUERY_FLAG (op, FLAG_APPLIED)) 675 if (op->flag [FLAG_APPLIED])
686 { 676 {
687 switch (op->type) 677 switch (op->type)
688 { 678 {
679 case RANGED:
689 case BOW: 680 case BOW:
690 case WAND: 681 case WAND:
691 case ROD: 682 case ROD:
692 case HORN: 683 case HORN:
693 buf << (op->env && op->env->current_weapon == op ? " (readied)" : " (applied)");
694 break;
695 case WEAPON: 684 case WEAPON:
696 buf << (op->env && op->env->current_weapon == op ? " (wielded)" : " (applied)"); 685 buf << " (applied)";
697 break; 686 break;
698 case ARMOUR: 687 case ARMOUR:
699 case HELMET: 688 case HELMET:
700 case SHIELD: 689 case SHIELD:
701 case RING: 690 case RING:
714 default: 703 default:
715 buf << " (applied)"; 704 buf << " (applied)";
716 } 705 }
717 } 706 }
718 707
719 if (QUERY_FLAG (op, FLAG_UNPAID)) 708 switch (op->type)
709 {
710 case LAMP:
711 if (op->glow_radius)
712 buf << " (on)";
713 else if (op->stats.food <= 0)
714 buf << " (empty)";
715 else
716 buf << " (off)";
717 break;
718
719 case TORCH:
720 if (op->glow_radius)
721 buf << " (burning)";
722 else if (op->stats.food <= 0)
723 buf << " (burned out)";
724 break;
725 }
726
727 if (op->flag [FLAG_UNPAID])
720 buf << " (unpaid)"; 728 buf << " (unpaid)";
721 729
722 return buf; 730 return buf;
723} 731}
724 732
728 * of the given object. The buffer will be overwritten at the next 736 * of the given object. The buffer will be overwritten at the next
729 * call to query_base_name(). This is a lot like query_name, but we 737 * call to query_base_name(). This is a lot like query_name, but we
730 * don't include the item count or item status. Used for inventory sorting 738 * don't include the item count or item status. Used for inventory sorting
731 * and sending to client. 739 * and sending to client.
732 * If plural is set, we generate the plural name of this. 740 * If plural is set, we generate the plural name of this.
741 *
742 * It is sometimes used to display messages, and usually only used to match stuff,
743 * so maybe this function should be removed.
744 * It is also used for client-side inventory/item descriptions.
733 */ 745 */
734const char * 746const char *
735query_base_name (const object *op, int plural) 747query_base_name (const object *op, int plural)
736{ 748{
737 if ((!plural && !op->name) || (plural && !op->name_pl)) 749 if ((!plural && !op->name) || (plural && !op->name_pl))
738 return "(null)"; 750 return "(null)";
739 751
740 if (!op->nrof && !op->weight && !op->title && !is_magical (op)) 752 if (!op->nrof && !op->weight && !op->title && !is_magical (op)
753 && op->type != EXIT)
741 return op->name; /* To speed things up (or make things slower?) */ 754 return op->name; /* To speed things up (or make things slower?) */
742 755
743 static dynbuf_text buf; buf.clear (); 756 static dynbuf_text buf; buf.clear ();
744 757
758#if 0
745 if ((op->is_armor () || op->is_weapon ()) && op->materialname) 759 if ((op->is_armor () || op->is_weapon ()) && op->material)
746 if (materialtype_t *mt = name_to_material (op->materialname))
747 if (op->arch->materialname != mt->name) 760 if (op->arch->material != op->material)
748 buf << mt->description << ' '; 761 buf << op->material->description << ' ';
762#endif
749 763
750 buf << (plural ? op->name_pl : op->name); 764 buf << (plural ? op->name_pl : op->name);
751 765
752 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED)) 766 if (op->title && op->flag [FLAG_IDENTIFIED])
753 buf << ' ' << op->title; 767 buf << ' ' << op->title;
754 768
755 switch (op->type) 769 switch (op->type)
756 { 770 {
757 case SPELLBOOK: 771 case SPELLBOOK:
758 case SCROLL: 772 case SCROLL:
759 case WAND: 773 case WAND:
760 case ROD: 774 case ROD:
761 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 775 if (op->flag [FLAG_IDENTIFIED] || op->flag [FLAG_BEEN_APPLIED])
762 { 776 {
763 if (!op->title) 777 if (!op->title)
764 buf << " of " << (op->inv ? &op->inv->name : "bug, please report"); 778 buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
765 779
766 if (op->type != SPELLBOOK) 780 if (op->type != SPELLBOOK)
780 if (s && *s) 794 if (s && *s)
781 buf << ' ' << s; 795 buf << ' ' << s;
782 } 796 }
783 break; 797 break;
784 798
799 case EXIT:
800 // random map exits "unfortunately" get patched, so this only works before entering
801 if (EXIT_PATH (op) == shstr_random_map_exit)
802 buf << " (random map)";
803 else if (!EXIT_PATH (op))
804 buf << " (closed)";
805 break;
806
785 default: 807 default:
786 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) 808 if (op->magic
809 && ((op->flag [FLAG_BEEN_APPLIED] && op->need_identify ())
810 || op->flag [FLAG_IDENTIFIED]))
787 buf.printf (" %+d", op->magic); 811 buf.printf (" %+d", op->magic);
788 } 812 }
789 813
790 return buf; 814 return buf;
791} 815}
804 /* Note that the resolution this provides for players really isn't 828 /* Note that the resolution this provides for players really isn't
805 * very good. Any player with a speed greater than .67 will 829 * very good. Any player with a speed greater than .67 will
806 * fall into the 'lightning fast movement' category. 830 * fall into the 'lightning fast movement' category.
807 */ 831 */
808 if (op->has_active_speed ()) 832 if (op->has_active_speed ())
809 switch ((int) ((FABS (op->speed)) * 15)) 833 switch ((int)(op->speed * 15.))
810 { 834 {
811 case 0: 835 case 0:
812 buf << "(very slow movement"; 836 buf << "(very slow movement)";
813 break; 837 break;
814 case 1: 838 case 1:
815 buf << "(slow movement)"; 839 buf << "(slow movement)";
816 break; 840 break;
817 case 2: 841 case 2:
834 default: 858 default:
835 buf << "(lightning fast movement)"; 859 buf << "(lightning fast movement)";
836 break; 860 break;
837 } 861 }
838 862
839 if (QUERY_FLAG (op, FLAG_UNDEAD)) buf << "(undead)"; 863 if (op->flag [FLAG_UNDEAD]) buf << "(undead)";
840 if (QUERY_FLAG (op, FLAG_SEE_INVISIBLE)) buf << "(see invisible)"; 864 if (op->flag [FLAG_SEE_INVISIBLE]) buf << "(see invisible)";
841 if (QUERY_FLAG (op, FLAG_USE_WEAPON)) buf << "(wield weapon)"; 865 if (op->flag [FLAG_USE_WEAPON]) buf << "(wield weapon)";
842 if (QUERY_FLAG (op, FLAG_USE_BOW)) buf << "(archer)"; 866 if (op->flag [FLAG_USE_BOW]) buf << "(archer)";
843 if (QUERY_FLAG (op, FLAG_USE_ARMOUR)) buf << "(wear armour)"; 867 if (op->flag [FLAG_USE_ARMOUR]) buf << "(wear armour)";
844 if (QUERY_FLAG (op, FLAG_USE_RING)) buf << "(wear ring)"; 868 if (op->flag [FLAG_USE_RING]) buf << "(wear ring)";
845 if (QUERY_FLAG (op, FLAG_USE_SCROLL)) buf << "(read scroll)"; 869 if (op->flag [FLAG_USE_SCROLL]) buf << "(read scroll)";
846 if (QUERY_FLAG (op, FLAG_USE_RANGE)) buf << "(fires wand/rod/horn)"; 870 if (op->flag [FLAG_USE_RANGE]) buf << "(fires wand/rod/horn)";
847 if (QUERY_FLAG (op, FLAG_CAN_USE_SKILL)) buf << "(skill user)"; 871 if (op->flag [FLAG_CAN_USE_SKILL]) buf << "(skill user)";
848 if (QUERY_FLAG (op, FLAG_CAST_SPELL)) buf << "(spellcaster)"; 872 if (op->flag [FLAG_CAST_SPELL]) buf << "(spellcaster)";
849 if (QUERY_FLAG (op, FLAG_FRIENDLY)) buf << "(friendly)"; 873 if (op->flag [FLAG_FRIENDLY]) buf << "(friendly)";
850 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE)) buf << "(unaggressive)"; 874 if (op->flag [FLAG_UNAGGRESSIVE]) buf << "(unaggressive)";
851 if (QUERY_FLAG (op, FLAG_HITBACK)) buf << "(hitback)"; 875 if (op->flag [FLAG_HITBACK]) buf << "(hitback)";
852 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealthy)"; 876 if (op->flag [FLAG_STEALTH]) buf << "(stealthy)";
853 877
854 if (op->randomitems) 878 if (op->randomitems)
855 { 879 {
856 bool first = 1; 880 bool first = 1;
857 881
884 if (op->stats.luck) 908 if (op->stats.luck)
885 buf.printf ("(luck%+d)", op->stats.luck); 909 buf.printf ("(luck%+d)", op->stats.luck);
886 } 910 }
887 911
888 /* describe attacktypes */ 912 /* describe attacktypes */
889 if (is_dragon_pl (op)) 913 if (op->is_dragon ())
890 { 914 {
891 /* for dragon players display the attacktypes from clawing skill 915 /* for dragon players display the attacktypes from clawing skill
892 * Break apart the for loop - move the comparison checking down - 916 * Break apart the for loop - move the comparison checking down -
893 * this makes it more readable. 917 * this makes it more readable.
894 */ 918 */
932 * wouldn't need to use the SEE_INVISIBLE flag to know it is 956 * wouldn't need to use the SEE_INVISIBLE flag to know it is
933 * a dragon player examining food. Could have things like 957 * a dragon player examining food. Could have things like
934 * a dwarven axe, in which the full abilities are only known to 958 * a dwarven axe, in which the full abilities are only known to
935 * dwarves, etc. 959 * dwarves, etc.
936 * 960 *
937 * This function is really much more complicated than it should
938 * be, because different objects have different meanings
939 * for the same field (eg, wands use 'food' for charges). This
940 * means these special cases need to be worked out.
941 *
942 * Add 'owner' who is the person examining this object. 961 * Add 'owner' who is the person examining this object.
943 * owner can be null if no one is being associated with this 962 * owner can be null if no one is being associated with this
944 * item (eg, debug dump or the like) 963 * item (eg, debug dump or the like)
945 */ 964 */
946const char * 965const char *
947describe_item (const object *op, object *owner) 966describe_item (const object *op, object *owner)
948{ 967{
949 if (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER) 968 if (op->flag [FLAG_MONSTER] || op->type == PLAYER)
950 return describe_monster (op); 969 return describe_monster (op);
951 970
952 static dynbuf_text buf; buf.clear (); 971 static dynbuf_text buf; buf.clear ();
953 int identified, i; 972 int identified, i;
954 973
955 /* figure this out once, instead of making multiple calls to need_identify. 974 /* figure this out once, instead of making multiple calls to need_identify.
956 * also makes the code easier to read. 975 * also makes the code easier to read.
957 */ 976 */
958 identified = !need_identify (op) || QUERY_FLAG (op, FLAG_IDENTIFIED); 977 identified = !op->need_identify () || op->flag [FLAG_IDENTIFIED];
959 if (!identified) 978 if (!identified)
960 buf << "(unidentified)"; 979 buf << "(unidentified)";
961 980
962 switch (op->type) 981 switch (op->type)
963 { 982 {
983 case RANGED:
964 case BOW: 984 case BOW:
965 case ARROW: 985 case ARROW:
966 case WAND: 986 case WAND:
967 case ROD: 987 case ROD:
968 case HORN: 988 case HORN:
982 if (op->stats.maxsp > 1000) 1002 if (op->stats.maxsp > 1000)
983 { /*higher capacity crystals */ 1003 { /*higher capacity crystals */
984 i = (op->stats.maxsp % 1000) / 100; 1004 i = (op->stats.maxsp % 1000) / 100;
985 1005
986 if (i) 1006 if (i)
987 buf.printf ("(capacity %d.%dk). It is ", op->stats.maxsp / 1000, i); 1007 buf.printf ("(capacity %d.%dk; it is ", op->stats.maxsp / 1000, i);
988 else 1008 else
989 buf.printf ("(capacity %dk). It is ", op->stats.maxsp / 1000); 1009 buf.printf ("(capacity %dk; it is ", op->stats.maxsp / 1000);
990 } 1010 }
991 else 1011 else
992 buf.printf ("(capacity %d). It is ", op->stats.maxsp); 1012 buf.printf ("(capacity %d; it is ", op->stats.maxsp);
993 1013
994 i = (op->stats.sp * 10) / op->stats.maxsp; 1014 i = (op->stats.sp * 10) / op->stats.maxsp;
995 if (op->stats.sp == 0) 1015 if (op->stats.sp == 0)
996 buf << "empty."; 1016 buf << "empty";
997 else if (i == 0) 1017 else if (i == 0)
998 buf << "almost empty."; 1018 buf << "almost empty";
999 else if (i < 3) 1019 else if (i < 3)
1000 buf << "partially filled."; 1020 buf << "partially filled";
1001 else if (i < 6) 1021 else if (i < 6)
1002 buf << "half full."; 1022 buf << "half full";
1003 else if (i < 9) 1023 else if (i < 9)
1004 buf << "well charged."; 1024 buf << "well charged";
1005 else if (op->stats.sp == op->stats.maxsp) 1025 else if (op->stats.sp == op->stats.maxsp)
1006 buf << "fully charged."; 1026 buf << "fully charged";
1007 else 1027 else
1008 buf << "almost full."; 1028 buf << "almost full";
1029
1030 buf << ')';
1031 break;
1032
1033 case LAMP:
1034 {
1035 int percent = ((double) 100 / op->arch->stats.food) * op->stats.food;
1036 buf << "(fuel: ";
1037 if (percent == 0)
1038 buf << "empty";
1039 else if (percent < 10)
1040 buf << "very low";
1041 else if (percent < 25)
1042 buf << "low";
1043 else if (percent < 50)
1044 buf << "half empty";
1045 else if (percent < 75)
1046 buf << "half full";
1047 else if (percent < 95)
1048 buf << "well filled";
1049 else if (percent <= 100)
1050 buf << "full";
1051 buf << ")";
1052 }
1009 break; 1053 break;
1010 1054
1011 case FOOD: 1055 case FOOD:
1012 case FLESH: 1056 case FLESH:
1013 case DRINK: 1057 case DRINK:
1014 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 1058 if (identified || op->flag [FLAG_BEEN_APPLIED])
1015 { 1059 {
1016 buf.printf ("(food+%d)", op->stats.food); 1060 buf.printf ("(food+%d)", op->stats.food);
1017 1061
1018 if (op->type == FLESH && op->last_eat > 0 && atnr_is_dragon_enabled (op->last_eat)) 1062 if (op->type == FLESH && op->last_eat > 0 && atnr_is_dragon_enabled (op->last_eat))
1019 buf.printf ("(%s metabolism)", change_resist_msg[op->last_eat]); 1063 buf.printf ("(%s metabolism)", change_resist_msg[op->last_eat]);
1020 1064
1021 if (!QUERY_FLAG (op, FLAG_CURSED)) 1065 if (!op->flag [FLAG_CURSED])
1022 { 1066 {
1023 if (op->stats.hp) buf << "(heals)"; 1067 if (op->stats.hp) buf << "(heals)";
1024 if (op->stats.sp) buf << "(spellpoint regen)"; 1068 if (op->stats.sp) buf << "(spellpoint regen)";
1025 } 1069 }
1026 else 1070 else
1047 } 1091 }
1048 1092
1049 /* Down here, we more further describe equipment type items. 1093 /* Down here, we more further describe equipment type items.
1050 * only describe them if they have been identified or the like. 1094 * only describe them if they have been identified or the like.
1051 */ 1095 */
1052 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 1096 if (identified || op->flag [FLAG_BEEN_APPLIED])
1053 { 1097 {
1054 int attr, val;
1055
1056 for (attr = 0; attr < NUM_STATS; attr++) 1098 for (int attr = 0; attr < NUM_STATS; attr++)
1057 if ((val = op->stats.stat (attr))) 1099 if (int val = op->stats.stat (attr))
1058 buf.printf ("(%s%+d)", short_stat_name[attr], val); 1100 buf.printf ("(%s%+d)", short_stat_name[attr], val);
1059 1101
1060 if (op->stats.exp) 1102 if (op->stats.exp)
1061 buf.printf ("(speed %+lld)", (long long) op->stats.exp); 1103 buf.printf ("(speed %+lld)", (long long) op->stats.exp);
1062 1104
1063 switch (op->type) 1105 switch (op->type)
1064 { 1106 {
1107 case RANGED:
1065 case BOW: 1108 case BOW:
1066 case ARROW: 1109 case ARROW:
1067 case GIRDLE: 1110 case GIRDLE:
1068 case HELMET: 1111 case HELMET:
1069 case SHIELD: 1112 case SHIELD:
1088 1131
1089 default: 1132 default:
1090 break; 1133 break;
1091 } 1134 }
1092 1135
1093 if (QUERY_FLAG (op, FLAG_XRAYS)) buf << "(xray-vision)"; 1136 if (op->flag [FLAG_XRAYS]) buf << "(xray-vision)";
1094 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK)) buf << "(infravision)"; 1137 if (op->flag [FLAG_SEE_IN_DARK]) buf << "(infravision)";
1095 1138
1096 /* levitate was what is was before, so we'll keep it */ 1139 /* levitate was what is was before, so we'll keep it */
1097 if (op->move_type & MOVE_FLY_LOW) buf << "(levitate)"; 1140 if (op->move_type & MOVE_FLY_LOW) buf << "(levitate)";
1098 if (op->move_type & MOVE_FLY_HIGH) buf << "(fly)"; 1141 if (op->move_type & MOVE_FLY_HIGH) buf << "(fly)";
1099 if (op->move_type & MOVE_SWIM) buf << "(swim)"; 1142 if (op->move_type & MOVE_SWIM) buf << "(swim)";
1112 { 1155 {
1113 int more_info = 0; 1156 int more_info = 0;
1114 1157
1115 switch (op->type) 1158 switch (op->type)
1116 { 1159 {
1160 case RANGED:
1117 case ROD: /* These use stats.sp for spell selection and stats.food */ 1161 case ROD: /* These use stats.sp for spell selection and stats.food */
1118 case HORN: /* and stats.hp for spell-point regeneration... */ 1162 case HORN: /* and stats.hp for spell-point regeneration... */
1119 case BOW: 1163 case BOW:
1120 case ARROW: 1164 case ARROW:
1121 case WAND: 1165 case WAND:
1161 } 1205 }
1162 1206
1163 if (op->stats.luck) 1207 if (op->stats.luck)
1164 buf.printf ("(luck%+d)", op->stats.luck); 1208 buf.printf ("(luck%+d)", op->stats.luck);
1165 1209
1166 if (QUERY_FLAG (op, FLAG_LIFESAVE)) buf << "(lifesaving)"; 1210 if (op->flag [FLAG_LIFESAVE]) buf << "(lifesaving)";
1167 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) buf << "(reflect spells)"; 1211 if (op->flag [FLAG_REFL_SPELL]) buf << "(reflect spells)";
1168 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) buf << "(reflect missiles)"; 1212 if (op->flag [FLAG_REFL_MISSILE]) buf << "(reflect missiles)";
1169 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)"; 1213 if (op->flag [FLAG_STEALTH]) buf << "(stealth)";
1170 1214
1171 if (op->slaying && op->type != FOOD) 1215 if (op->slaying && op->type != FOOD)
1172 buf.printf ("(slay %s)", &op->slaying); 1216 buf.printf ("(slay %s)", &op->slaying);
1217
1218 if (op->type == SKILL_TOOL && op->skill)
1219 buf.printf ("(%s)", &op->skill);
1173 1220
1174 buf.add_abilities ("Attacks", op->attacktype); 1221 buf.add_abilities ("Attacks", op->attacktype);
1175 /* resistance on flesh is only visible for quetzals. If 1222 /* resistance on flesh is only visible for quetzals. If
1176 * non flesh, everyone can see its resistances 1223 * non flesh, everyone can see its resistances
1177 */ 1224 */
1178 if (op->type != FLESH || (owner && is_dragon_pl (owner))) 1225 if (op->type != FLESH || (owner && owner->is_dragon ()))
1179 buf << describe_resistance (op, 0); 1226 buf << describe_resistance (op, 0);
1180 1227
1181 buf.add_paths ("Attuned", op->path_attuned); 1228 buf.add_paths ("Attuned", op->path_attuned);
1182 buf.add_paths ("Repelled", op->path_repelled); 1229 buf.add_paths ("Repelled", op->path_repelled);
1183 buf.add_paths ("Denied", op->path_denied); 1230 buf.add_paths ("Denied", op->path_denied);
1190object::describe_item (object *who) 1237object::describe_item (object *who)
1191{ 1238{
1192 return std::string (::describe_item (this, who)); 1239 return std::string (::describe_item (this, who));
1193} 1240}
1194 1241
1242static void
1243describe_dump_object (dynbuf &buf, object *ob)
1244{
1245 char *txt = dump_object (ob);
1246 for (char *p = txt; *p; ++p) if (*p == '\n') *p = '\r';
1247 buf << "\n" << txt << "\n";
1248
1249 if (!ob->is_arch ())
1250 describe_dump_object (buf, ob->arch);
1251}
1252
1253std::string
1254object::describe (object *who)
1255{
1256 dynbuf_text buf (1024, 1024);
1257
1258 buf.printf ("That is: %s.\r", long_desc (who).c_str ());
1259
1260 if (custom_name)
1261 buf.printf ("You call it %s.\r", &custom_name);
1262
1263 switch (type)
1264 {
1265 case SPELLBOOK:
1266 if (flag [FLAG_IDENTIFIED] && inv)
1267 buf.printf ("%s is a %s level %s spell.\r", &inv->name, ordinal (inv->level), &inv->skill);
1268 break;
1269
1270 case BOOK:
1271 if (msg)
1272 buf << "Something is written in it.\r";
1273 break;
1274
1275 case CONTAINER:
1276 if (race)
1277 {
1278 if (weight_limit && stats.Str < 100)
1279 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\r",
1280 &race, weight_limit / (10.0 * (100 - stats.Str)));
1281 else
1282 buf.printf ("It can hold only %s.\r", &race);
1283 }
1284 else if (weight_limit && stats.Str < 100)
1285 buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str)));
1286 break;
1287
1288 case WAND:
1289 if (flag [FLAG_IDENTIFIED])
1290 buf.printf ("It has %d %s left.\r", stats.food, stats.food == 1 ? "charge" : "charges");
1291 break;
1292 }
1293
1294 if (material != MATERIAL_NULL && !msg)
1295 buf << (nrof > 1 ? "They are made of " : "It is made of ")
1296 << material->description
1297 << ".\r";
1298
1299 if (who)
1300 /* Where to wear this item */
1301 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1302 if (slot[i].info)
1303 {
1304 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1305
1306 if (slot[i].info < -1 && who->slot[i].info)
1307 buf.printf ("(%d)", -slot[i].info);
1308
1309 buf << ".\r";
1310 }
1311
1312 if (weight)
1313 buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0);
1314
1315 if (flag [FLAG_STARTEQUIP])
1316 buf << (nrof > 1 ? "They were" : "It was")
1317 << " given by a god and will vanish when dropped.\r";
1318
1319 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1320 {
1321 buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
1322
1323 if (who->is_in_shop ())
1324 {
1325 if (flag [FLAG_UNPAID])
1326 buf.printf ("%s would cost you %s.\r", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
1327 else
1328 buf.printf ("You are offered %s for %s.\r", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1329 }
1330 }
1331
1332 if (flag [FLAG_MONSTER])
1333 buf << describe_monster (who);
1334
1335 /* Is this item buildable? */
1336 if (flag [FLAG_IS_BUILDABLE])
1337 buf << "This is a buildable item.\r";
1338
1339 /* Does the object have a message? Don't show message for all object
1340 * types - especially if the first entry is a match
1341 */
1342 if (msg)
1343 {
1344 if (type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
1345 {
1346 if (!need_identify ())
1347 buf << '\r' << msg << '\n';
1348 else if (flag [FLAG_IDENTIFIED])
1349 buf << '\r' << "The object has a story:\r" << msg;
1350 }
1351 }
1352 else if (inv
1353 && inv->msg
1354 && inv->type == SPELL
1355 && flag [FLAG_IDENTIFIED]
1356 && (type == SPELLBOOK || type == ROD || type == WAND
1357 || type == POTION || type == SCROLL))
1358 // for spellbooks and other stuff that contains spells, print the spell message,
1359 // unless the object has a custom message handled above.
1360 buf << '\r' << inv->msg << '\n';
1361
1362 // try to display the duration for some potions and scrolls
1363 // this includes change ability potions and group spells,
1364 // but does not handle protection potions
1365 if (inv && inv->type == SPELL && flag [FLAG_IDENTIFIED]
1366 && (type == POTION || type == SCROLL))
1367 {
1368 object *spell = inv;
1369
1370 if (spell->subtype == SP_PARTY_SPELL)
1371 spell = spell->other_arch;
1372
1373 if (spell->subtype == SP_CHANGE_ABILITY)
1374 buf.printf ("\nH<The effect will last about %.10g seconds.>",
1375 TICK2TIME (change_ability_duration (spell, this)));
1376 }
1377
1378 // some help text for skill tools
1379 if (type == SKILL_TOOL)
1380 buf << "\nH<This item is a skill tool: as long as you have this item applied "
1381 "you can use the " << &skill << " skill as if you had learned it.>";
1382
1383 // Display a hint about inscribable items [empty books]
1384 // This includes the amount of text they can hold.
1385 if (type == INSCRIBABLE)
1386 {
1387 if (other_arch && other_arch->type == SCROLL)
1388 buf.printf ("\nH<You can use the inscription skill to inscribe a spell into it.>");
1389 else
1390 buf.printf ("\nH<You can use the inscription skill to inscribe text into it. It has room for up to %d characters.>",
1391 weight_limit);
1392 }
1393
1394 buf << '\n';
1395
1396 // the dungeon master additionally gets a complete dump
1397 if (who && who->flag [FLAG_WIZLOOK])
1398 {
1399 buf << "\nT<Object>\n";
1400 describe_dump_object (buf, this);
1401
1402 if (inv)
1403 {
1404 buf << "\nT<Top Inventory>\n";
1405 describe_dump_object (buf, inv);
1406 }
1407 }
1408
1409 return std::string (buf.linearise (), buf.size ());
1410}
1411
1195void 1412void
1196examine (object *op, object *tmp) 1413examine (object *op, object *tmp)
1197{ 1414{
1198 std::string info = tmp->describe (op); 1415 std::string info = tmp->describe (op);
1416
1199 op->contr->infobox (MSG_CHANNEL ("examine"), info.c_str ()); 1417 op->contr->infobox (MSG_CHANNEL ("examine"), info.c_str ());
1200} 1418}
1201 1419
1202/* 1420/*
1203 * inventory prints object's inventory. If inv==NULL then print player's 1421 * inventory prints object's inventory. If inv==NULL then print player's
1208object::query_inventory (object *who, const char *indent) 1426object::query_inventory (object *who, const char *indent)
1209{ 1427{
1210 static dynbuf_text buf; buf.clear (); 1428 static dynbuf_text buf; buf.clear ();
1211 1429
1212 for (object *tmp = inv; tmp; tmp = tmp->below) 1430 for (object *tmp = inv; tmp; tmp = tmp->below)
1213 if (who && QUERY_FLAG (who, FLAG_WIZ)) 1431 if (who && who->flag [FLAG_WIZ])
1214 buf.printf ("%s- %-28.28s (%5d) %-8s\n", indent, query_name (tmp), tmp->count, query_weight (tmp)); 1432 buf.printf ("%s- %-28.28s %-8s (%9d) %s\n", indent, tmp->query_name (), tmp->query_weight (), tmp->count, tmp->uuid.c_str ());
1215 else if (!tmp->invisible && (type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) 1433 else if (!tmp->invisible && (type == CONTAINER || tmp->flag [FLAG_APPLIED]))
1216 buf.printf ("%s- %-36.36s %-8s\n", indent, query_name (tmp), query_weight (tmp)); 1434 buf.printf ("%s- %-36.36s %-8s\n", indent, tmp->query_name (), tmp->query_weight ());
1217 1435
1218 if (buf.size ()) 1436 if (buf.size ())
1219 buf.printf ("%s(total weight: %s)\n", indent, query_weight (this)); 1437 buf.printf ("%s(total weight: %s)\n", indent, query_weight ());
1220 else 1438 else
1221 buf.printf ("%s(empty)\n", indent); 1439 buf.printf ("%s(empty)\n", indent);
1222 1440
1223 return buf; 1441 return buf;
1224} 1442}
1233is_magical (const object *op) 1451is_magical (const object *op)
1234{ 1452{
1235 int i; 1453 int i;
1236 1454
1237 /* living creatures are considered non magical */ 1455 /* living creatures are considered non magical */
1238 if (QUERY_FLAG (op, FLAG_ALIVE)) 1456 if (op->flag [FLAG_ALIVE])
1239 return 0; 1457 return 0;
1240 1458
1241 /* This is a test for it being an artifact, as artifacts have titles */ 1459 /* This is a test for it being an artifact, as artifacts have titles */
1242 if (op->title != NULL) 1460 if (op->title != NULL)
1243 return 1; 1461 return 1;
1249 (op->stats.ac || op->stats.food || op->stats.exp || op->stats.dam || op->stats.wc || op->stats.sp || op->stats.hp || op->stats.luck)) 1467 (op->stats.ac || op->stats.food || op->stats.exp || op->stats.dam || op->stats.wc || op->stats.sp || op->stats.hp || op->stats.luck))
1250 return 1; 1468 return 1;
1251 1469
1252 /* Check for stealty, speed, flying, or just plain magic in the boots */ 1470 /* Check for stealty, speed, flying, or just plain magic in the boots */
1253 /* Presume any boots that hvae a move_type are special. */ 1471 /* Presume any boots that hvae a move_type are special. */
1254 if (op->type == BOOTS && ((QUERY_FLAG (op, FLAG_STEALTH) || op->move_type || op->stats.exp))) 1472 if (op->type == BOOTS && ((op->flag [FLAG_STEALTH] || op->move_type || op->stats.exp)))
1255 return 1; 1473 return 1;
1256 1474
1257 /* Take care of amulet/shield that reflects spells/missiles */ 1475 /* Take care of amulet/shield that reflects spells/missiles */
1258 if ((op->type == AMULET || op->type == SHIELD) && (QUERY_FLAG (op, FLAG_REFL_SPELL) || QUERY_FLAG (op, FLAG_REFL_MISSILE))) 1476 if ((op->type == AMULET || op->type == SHIELD) && (op->flag [FLAG_REFL_SPELL] || op->flag [FLAG_REFL_MISSILE]))
1259 return 1; 1477 return 1;
1260 1478
1261 /* Take care of helmet of xrays */ 1479 /* Take care of helmet of xrays */
1262 if (op->type == HELMET && QUERY_FLAG (op, FLAG_XRAYS)) 1480 if (op->type == HELMET && op->flag [FLAG_XRAYS])
1263 return 1; 1481 return 1;
1264 1482
1265 /* Potions & rods are always magical. Wands/staves are also magical, 1483 /* Potions & rods are always magical. Wands/staves are also magical,
1266 * assuming they still have any charges left. 1484 * assuming they still have any charges left.
1267 */ 1485 */
1296 * be non magical. 1514 * be non magical.
1297 */ 1515 */
1298 return 0; 1516 return 0;
1299} 1517}
1300 1518
1301/* need_identify returns true if the item should be identified. This
1302 * function really should not exist - by default, any item not identified
1303 * should need it.
1304 */
1305
1306int
1307need_identify (const object *op)
1308{
1309 switch (op->type)
1310 {
1311 case RING:
1312 case WAND:
1313 case ROD:
1314 case HORN:
1315 case SCROLL:
1316 case SKILL:
1317 case SKILLSCROLL:
1318 case SPELLBOOK:
1319 case FOOD:
1320 case POTION:
1321 case BOW:
1322 case ARROW:
1323 case WEAPON:
1324 case ARMOUR:
1325 case SHIELD:
1326 case HELMET:
1327 case AMULET:
1328 case BOOTS:
1329 case GLOVES:
1330 case BRACERS:
1331 case GIRDLE:
1332 case CONTAINER:
1333 case DRINK:
1334 case FLESH:
1335 case INORGANIC:
1336 case CLOSE_CON:
1337 case CLOAK:
1338 case GEM:
1339 case POWER_CRYSTAL:
1340 case POISON:
1341 case BOOK:
1342 case SKILL_TOOL:
1343 return 1;
1344 }
1345
1346 /* Try to track down some stuff that may show up here. Thus, the
1347 * archetype file can be updated, and this function removed.
1348 */
1349#if 0
1350 LOG (llevDebug, "need_identify: %s does not need to be id'd\n", op->name);
1351#endif
1352 return 0;
1353}
1354
1355/* 1519/*
1356 * Supposed to fix face-values as well here, but later. 1520 * Supposed to fix face-values as well here, but later.
1357 */ 1521 */
1358void 1522void
1359identify (object *op) 1523identify (object *op)
1360{ 1524{
1361 SET_FLAG (op, FLAG_IDENTIFIED); 1525 op->set_flag (FLAG_IDENTIFIED);
1362 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL); 1526 op->clr_flag (FLAG_KNOWN_MAGICAL);
1363 CLEAR_FLAG (op, FLAG_NO_SKILL_IDENT); 1527 op->clr_flag (FLAG_NO_SKILL_IDENT);
1364 1528
1365 /* 1529 /*
1366 * We want autojoining of equal objects: 1530 * We want autojoining of equal objects:
1367 */ 1531 */
1368 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 1532 if (op->flag [FLAG_CURSED] || op->flag [FLAG_DAMNED])
1369 SET_FLAG (op, FLAG_KNOWN_CURSED); 1533 op->set_flag (FLAG_KNOWN_CURSED);
1370 1534
1371 if (op->type == POTION) 1535 if (op->type == POTION)
1372 { 1536 {
1373 if (op->inv && op->randomitems) 1537 if (op->inv && op->randomitems)
1374 op->title = op->inv->name; 1538 op->title = op->inv->name;
1380 } 1544 }
1381 1545
1382 /* If the object is on a map, make sure we update its face */ 1546 /* If the object is on a map, make sure we update its face */
1383 if (op->map) 1547 if (op->map)
1384 update_object (op, UP_OBJ_CHANGE); 1548 update_object (op, UP_OBJ_CHANGE);
1549
1385 else if (object *pl = op->visible_to ()) 1550 if (object *pl = op->visible_to ())
1386 /* A lot of the values can change from an update - might as well send 1551 /* A lot of the values can change from an update - might as well send
1387 * it all. 1552 * it all.
1388 */ 1553 */
1389 esrv_send_item (pl, op); 1554 esrv_send_item (pl, op);
1390} 1555}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines