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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines