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.17 by elmex, Wed Jan 3 02:30:51 2007 UTC vs.
Revision 1.85 by root, Wed Apr 21 05:40:21 2010 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
10 (at your option) any later version. 11 * option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
18 along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 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
29const char *const coins[NUM_COINS + 1] = { "royalty", "platinacoin", "goldcoin", "silvercoin", 0 };
28 30
29/* the ordering of this is actually doesn't make a difference 31/* the ordering of this is actually doesn't make a difference
30 * However, for ease of use, new entries should go at the end 32 * However, for ease of use, new entries should go at the end
31 * so those people that debug the code that get used to something 33 * so those people that debug the code that get used to something
32 * being in the location 4 don't get confused. 34 * being in the location 4 don't get confused.
… …
45 * 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
46 * may be better. 48 * may be better.
47 * Basically, for the use/nonuse, the code does something like: 49 * Basically, for the use/nonuse, the code does something like:
48 * "This item goes %s\n", with the use/nonuse values filling in the %s 50 * "This item goes %s\n", with the use/nonuse values filling in the %s
49 */ 51 */
52// see include/object.h
50Body_Locations body_locations[NUM_BODY_LOCATIONS] = { 53Body_Locations body_locations[NUM_BODY_LOCATIONS] = {
51 {"body_range", "in your range slot", "in a human's range slot"}, 54 {KW_body_skill , "You can use it as your skill" , "It is used as a skill"},
52 {"body_arm", "on your arm", "on a human's arm"}, 55 {KW_body_combat , "You can wield it as your weapon" , "It is used as a combat weapon"},
53 {"body_torso", "on your body", "on a human's torso"}, 56 {KW_body_range , "You can use it as your range weapon" , "It is used as a range weapon"},
54 {"body_head", "on your head", "on a human's head"}, 57 {KW_body_shield , "You can wield it as a shield" , "It is used as a shield"},
55 {"body_neck", "around your neck", "around a humans neck"}, 58 {KW_body_arm , "You can put it on your arm" , "It goes on a human's arm"},
56 {"body_skill", "in your skill slot", "in a human's skill slot"}, 59 {KW_body_torso , "You can wear it on your body" , "It goes on a human's torso"},
57 {"body_finger", "on your finger", "on a human's finger"} , 60 {KW_body_head , "You can wear it on your head" , "It goes on a human's head"},
61 {KW_body_neck , "You can wear it around your neck" , "It goes around a human's neck"},
62 {KW_body_finger , "You can wear it on your finger" , "It goes on a human's finger"} ,
58 {"body_shoulder", "around your shoulders", "around a human's shoulders"}, 63 {KW_body_shoulder, "You can wear it around your shoulders", "It goes around a human's shoulders"},
59 {"body_foot", "on your feet", "on a human's feet"}, 64 {KW_body_foot , "You can put it on your foot" , "It goes on a human's foot"},
60 {"body_hand", "on your hands", "on a human's hands"}, 65 {KW_body_hand , "You can put it on your hand" , "It goes on a human's hand"},
61 {"body_wrist", "around your wrists", "around a human's wrist"}, 66 {KW_body_wrist , "You can wear it around your wrist" , "It goes around a human's wrist"},
62 {"body_waist", "around your waist", "around a human's waist"}, 67 {KW_body_waist , "You can wear it around your waist" , "It goes around a human's waist"},
63/*{"body_dragon_torso", "your body", "a dragon's body"} */ 68/*{"body_dragon_torso", "your body", "a dragon's body"} */
64};
65
66static char numbers[21][20] = {
67 "no", "", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten",
68 "eleven", "twelve", "thirteen", "fourteen", "fifteen", "sixteen", "seventeen",
69 "eighteen", "nineteen", "twenty"
70}; 69};
71 70
72static char numbers_10[10][20] = { 71static char numbers_10[10][20] = {
73 "zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy", 72 "zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy",
74 "eighty", "ninety" 73 "eighty", "ninety"
75}; 74};
76 75
77static char levelnumbers[21][20] = { 76static char ordnumbers[21][20] = {
78 "zeroth", "first", "second", "third", "fourth", "fifth", "sixth", "seventh", 77 "zeroth", "first", "second", "third", "fourth", "fifth", "sixth", "seventh",
79 "eighth", "ninth", "tenth", "eleventh", "twelfth", "thirteenth", 78 "eighth", "ninth", "tenth", "eleventh", "twelfth", "thirteenth",
80 "fourteenth", "fifteenth", "sixteenth", "seventeenth", "eighteen", 79 "fourteenth", "fifteenth", "sixteenth", "seventeenth", "eighteenth",
81 "nineteen", "twentieth" 80 "nineteenth", "twentieth"
82}; 81};
83 82
84static char levelnumbers_10[11][20] = { 83static char ordnumbers_10[11][20] = {
85 "zeroth", "tenth", "twentieth", "thirtieth", "fortieth", "fiftieth", "sixtieth", 84 "zeroth", "tenth", "twentieth", "thirtieth", "fortieth", "fiftieth", "sixtieth",
86 "seventieth", "eightieth", "ninetieth" 85 "seventieth", "eightieth", "ninetieth"
87}; 86};
88 87
89/* 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:
… …
152 {EXIT, "exit", "exits", 0, 0}, 151 {EXIT, "exit", "exits", 0, 0},
153 {ENCOUNTER, "encounter", "encounters", 0, 0}, 152 {ENCOUNTER, "encounter", "encounters", 0, 0},
154 {SHOP_FLOOR, "shop floor", "shop floors", 0, 0}, 153 {SHOP_FLOOR, "shop floor", "shop floors", 0, 0},
155 {SHOP_MAT, "shop mat", "shop mats", 0, 0}, 154 {SHOP_MAT, "shop mat", "shop mats", 0, 0},
156 {RING, "ring", "rings", SK_JEWELER, 0}, 155 {RING, "ring", "rings", SK_JEWELER, 0},
157 {FLOOR, "floor", "floors", 0, 0}, 156// {FLOOR, "floor", "floors", 0, 0},
158 {FLESH, "flesh", "flesh", SK_WOODSMAN, 0}, 157 {FLESH, "flesh", "flesh", SK_WOODSMAN, 0},
159 {INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0}, 158 {INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0},
160 {SKILL_TOOL, "skill tool", "skill tools", 0, 0}, 159 {SKILL_TOOL, "skill tool", "skill tools", 0, 0},
161 {LIGHTER, "lighter", "lighters", 0, 0}, 160 {LIGHTER, "lighter", "lighters", 0, 0},
162 {BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0}, 161 {BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0},
… …
166 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0}, 165 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0},
167 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0}, 166 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0},
168 {SPINNER, "spinner", "spinners", 0, 0}, 167 {SPINNER, "spinner", "spinners", 0, 0},
169 {GATE, "gate", "gates", 0, 0}, 168 {GATE, "gate", "gates", 0, 0},
170 {BUTTON, "button", "buttons", 0, 0}, 169 {BUTTON, "button", "buttons", 0, 0},
171 {CF_HANDLE, "cf handle", "cf handles", 0, 0}, 170 {T_HANDLE, "cf handle", "cf handles", 0, 0},
172 {HOLE, "hole", "holes", 0, 0}, 171 {HOLE, "hole", "holes", 0, 0},
173 {TRAPDOOR, "trapdoor", "trapdoors", 0, 0}, 172 {TRAPDOOR, "trapdoor", "trapdoors", 0, 0},
174 {SIGN, "sign", "signs", 0, 0}, 173 {SIGN, "sign", "signs", 0, 0},
175 {BOOTS, "boots", "boots", SK_SMITHERY, 0}, 174 {BOOTS, "boots", "boots", SK_SMITHERY, 0},
176 {GLOVES, "gloves", "gloves", SK_SMITHERY, 0}, 175 {GLOVES, "gloves", "gloves", SK_SMITHERY, 0},
… …
203 {BUILDER, "item builder", "item builders", 0, 0}, 202 {BUILDER, "item builder", "item builders", 0, 0},
204 {MATERIAL, "building material", "building materials", 0, 0}, 203 {MATERIAL, "building material", "building materials", 0, 0},
205 {ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0}, 204 {ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0},
206}; 205};
207 206
208const int item_types_size = sizeof (item_types) / sizeof (*item_types); 207static const int item_types_size = sizeof (item_types) / sizeof (*item_types);
209
210materialtype_t *materialt;
211
212/*
213materialtype material[NROFMATERIALS] = {
214 * P M F E C C A D W G P S P T F C D D C C G H B I *
215 * H A I L O O C R E H O L A U E A E E H O O O L N *
216 * Y G R E L N I A A O I O R R A N P A A U D L I T *
217 * S I E C D F D I P S S W A N R C L T O N Y N R *
218 * I C T U N O T O L E E H S T P D N *
219 {"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}},
220 {"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}},
221 {"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}},
222 {"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}},
223 {"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}},
224 {"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}},
225 {"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}},
226 {"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}},
227 {"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}},
228 {"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}},
229 {"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}},
230 {"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}},
231 {"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}}
232};
233*/
234 208
235/* 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
236 * 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
237 * wear whatever they want with no worries. Perhaps having the steep 211 * wear whatever they want with no worries. Perhaps having the steep
238 * curve is good (maybe even steeper), but allowing players to 212 * curve is good (maybe even steeper), but allowing players to
… …
240 * able to use 2-3 of the most powerful items. 214 * able to use 2-3 of the most powerful items.
241 * 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 -
242 * custom objects can use whatever they want. 216 * custom objects can use whatever they want.
243 */ 217 */
244static int enc_to_item_power[21] = { 218static int enc_to_item_power[21] = {
219 0,
245 0, 0, 1, 2, 3, 4, /* 5 */ 220 0, 1, 2, 3, 4, /* 5 */
246 5, 7, 9, 11, 13, /* 10 */ 221 5, 7, 9, 11, 13, /* 10 */
247 15, 18, 21, 24, 27, /* 15 */ 222 15, 18, 21, 24, 27, /* 15 */
248 30, 35, 40, 45, 50 /* 20 */ 223 30, 35, 40, 45, 50 /* 20 */
249}; 224};
250 225
251int 226int
252get_power_from_ench (int ench) 227get_power_from_ench (int ench)
253{ 228{
254 if (ench < 0)
255 ench = 0;
256 if (ench > 20)
257 ench = 20;
258 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];
259} 275}
260 276
261/* 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
262 * 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
263 * generation code, and when loading legacy objects. It returns 279 * generation code, and when loading legacy objects. It returns
… …
270{ 286{
271 int i, tmp, enc; 287 int i, tmp, enc;
272 288
273 enc = 0; 289 enc = 0;
274 for (i = 0; i < NUM_STATS; i++) 290 for (i = 0; i < NUM_STATS; i++)
275 enc += get_attr_value (&op->stats, i); 291 enc += op->stats.stat (i);
276 292
277 /* This protection logic is pretty flawed. 20% fire resistance 293 /* This protection logic is pretty flawed. 20% fire resistance
278 * is much more valuable than 20% confusion, or 20% slow, or 294 * is much more valuable than 20% confusion, or 20% slow, or
279 * several others. Start at 1 - ignore physical - all that normal 295 * several others. Start at 1 - ignore physical - all that normal
280 * armour shouldn't be counted against 296 * armour shouldn't be counted against
… …
297 if (op->type == WEAPON) 313 if (op->type == WEAPON)
298 { 314 {
299 for (i = 1; i < NROFATTACKS; i++) 315 for (i = 1; i < NROFATTACKS; i++)
300 if (op->attacktype & (1 << i)) 316 if (op->attacktype & (1 << i))
301 enc++; 317 enc++;
318
302 if (op->slaying) 319 if (op->slaying)
303 enc += 2; /* What it slays is probably more relevent */ 320 enc += 2; /* What it slays is probably more relevent */
304 } 321 }
322
305 /* Items the player can equip */ 323 /* Items the player can equip */
306 if ((op->type == WEAPON) || (op->type == ARMOUR) || (op->type == HELMET) || 324 if ((op->type == WEAPON) || (op->type == ARMOUR) || (op->type == HELMET) ||
307 (op->type == SHIELD) || (op->type == RING) || 325 (op->type == SHIELD) || (op->type == RING) ||
308 (op->type == BOOTS) || (op->type == GLOVES) || 326 (op->type == BOOTS) || (op->type == GLOVES) ||
309 (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))
… …
312 enc += op->stats.hp; /* hp regen */ 330 enc += op->stats.hp; /* hp regen */
313 enc += op->stats.sp; /* mana regen */ 331 enc += op->stats.sp; /* mana regen */
314 enc += op->stats.grace; /* grace regen */ 332 enc += op->stats.grace; /* grace regen */
315 enc += op->stats.exp; /* speed bonus */ 333 enc += op->stats.exp; /* speed bonus */
316 } 334 }
335
317 enc += op->stats.luck; 336 enc += op->stats.luck;
318 337
319 /* Do spell paths now */ 338 /* Do spell paths now */
320 for (i = 1; i < NRSPELLPATHS; i++) 339 for (i = 1; i < NRSPELLPATHS; i++)
321 {
322 if (op->path_attuned & (1 << i)) 340 if (op->path_attuned & (1 << i))
323 enc++; 341 enc++;
324 else if (op->path_denied & (1 << i)) 342 else if (op->path_denied & (1 << i))
325 enc -= 2; 343 enc -= 2;
326 else if (op->path_repelled & (1 << i)) 344 else if (op->path_repelled & (1 << i))
327 enc--; 345 enc--;
328 }
329 346
330 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 347 if (op->flag [FLAG_LIFESAVE ]) enc += 5;
331 enc += 5; 348 if (op->flag [FLAG_REFL_SPELL ]) enc += 3;
332 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) 349 if (op->flag [FLAG_REFL_MISSILE]) enc += 2;
333 enc += 3; 350 if (op->flag [FLAG_XRAYS ]) enc += 2;
334 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) 351 if (op->flag [FLAG_STEALTH ]) enc += 1;
335 enc += 2; 352 if (op->flag [FLAG_SEE_IN_DARK ]) enc += 1;
336 if (QUERY_FLAG (op, FLAG_STEALTH)) 353 if (op->flag [FLAG_MAKE_INVIS ]) enc += 1;
337 enc += 1;
338 if (QUERY_FLAG (op, FLAG_XRAYS))
339 enc += 2;
340 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK))
341 enc += 1;
342 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
343 enc += 1;
344 354
345 return get_power_from_ench (enc); 355 return get_power_from_ench (enc);
346
347} 356}
348 357
349/* returns the typedata that has a number equal to itemtype, if there 358/* returns the typedata that has a number equal to itemtype, if there
350 * isn't one, returns NULL */ 359 * isn't one, returns NULL */
351
352const typedata * 360const typedata *
353get_typedata (int itemtype) 361get_typedata (int itemtype)
354{ 362{
355 int i;
356
357 for (i = 0; i < item_types_size; i++) 363 for (int i = 0; i < item_types_size; i++)
358 if (item_types[i].number == itemtype) 364 if (item_types[i].number == itemtype)
359 return &item_types[i]; 365 return &item_types[i];
366
360 return NULL; 367 return NULL;
361} 368}
362 369
363/* returns the typedata that has a name equal to itemtype, if there 370/* 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 371 * isn't one, return the plural name that matches, if there still isn't
365 * one return NULL */ 372 * one return NULL */
366
367const typedata * 373const typedata *
368get_typedata_by_name (const char *name) 374get_typedata_by_name (const char *name)
369{ 375{
370 int i;
371
372 for (i = 0; i < item_types_size; i++) 376 for (int i = 0; i < item_types_size; i++)
373 if (!strcmp (item_types[i].name, name)) 377 if (!strcmp (item_types[i].name, name))
374 return &item_types[i]; 378 return &item_types[i];
379
375 for (i = 0; i < item_types_size; i++) 380 for (int i = 0; i < item_types_size; i++)
376 if (!strcmp (item_types[i].name_pl, name)) 381 if (!strcmp (item_types[i].name_pl, name))
377 { 382 {
378 LOG (llevInfo, 383 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); 384 "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]; 385 return &item_types[i];
381 } 386 }
387
382 return NULL; 388 return 0;
383} 389}
384 390
385/* describe_resistance generates the visible naming for resistances. 391/* describe_resistance generates the visible naming for resistances.
386 * returns a static array of the description. This can return 392 * returns a static array of the description. This can return
387 * a big buffer. 393 * a big buffer.
388 * if newline is true, we don't put parens around the description 394 * if newline is true, we don't put parens around the description
389 * but do put a newline at the end. Useful when dumping to files 395 * but do put a newline at the end. Useful when dumping to files
390 */ 396 */
391char * 397const char *
392describe_resistance (const object *op, int newline) 398describe_resistance (const object *op, int newline)
393{ 399{
394 static char buf[VERY_BIG_BUF]; 400 static dynbuf_text buf; buf.clear ();
395 char buf1[VERY_BIG_BUF];
396 int tmpvar;
397 401
398 buf[0] = 0; 402 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)) 403 if (op->resist[i] && (op->type != FLESH || atnr_is_dragon_enabled (i) == 1))
402 { 404 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 405
408 strcat (buf, buf1);
409 }
410 }
411 return buf; 406 return buf;
412} 407}
413
414 408
415/* 409/*
416 * query_weight(object) returns a character pointer to a static buffer 410 * query_weight(object) returns a character pointer to a static buffer
417 * containing the text-representation of the weight of the given object. 411 * containing the text-representation of the weight of the given object.
418 * The buffer will be overwritten by the next call to query_weight(). 412 * The buffer will be overwritten by the next call to query_weight().
419 */ 413 *
420 414 * Seems to be used only by unimportant stuff. Remove?
421char * 415 */
416const char *
422query_weight (const object *op) 417query_weight (const object *op)
423{ 418{
424 static char buf[10]; 419 static char buf[10];
425 sint32 i = (op->nrof ? op->nrof : 1) * op->weight + op->carrying; 420 sint32 i = op->total_weight ();
426 421
427 if (op->weight < 0) 422 if (op->weight < 0)
428 return " "; 423 return " ";
424
429 if (i % 1000) 425 if (i % 1000)
430 sprintf (buf, "%6.1f", i / 1000.0); 426 sprintf (buf, "%6.1f", i / 1000.0);
431 else 427 else
432 sprintf (buf, "%4d ", i / 1000); 428 sprintf (buf, "%4d ", i / 1000);
429
433 return buf; 430 return buf;
434} 431}
435 432
436/* 433/*
437 * Returns the pointer to a static buffer containing 434 * Returns the pointer to a static buffer containing
438 * the number requested (of the form first, second, third...) 435 * the number requested (of the form first, second, third...)
439 */ 436 */
440 437const char *
441char * 438ordinal (int i)
442get_levelnumber (int i)
443{ 439{
444 static char buf[MAX_BUF]; 440 if (i < 0)
441 return format ("minus %s", ordinal (-i));
445 442
446 if (i > 99)
447 {
448 sprintf (buf, "%d.", i);
449 return buf;
450 }
451 if (i < 21) 443 if (i < 21)
452 return levelnumbers[i];
453 if (!(i % 10))
454 return levelnumbers_10[i / 10];
455 strcpy (buf, numbers_10[i / 10]);
456 strcat (buf, levelnumbers[i % 10]);
457 return buf;
458}
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 */
467
468char *
469get_number (int i)
470{
471 if (i <= 20)
472 return numbers[i]; 444 return ordnumbers[i];
445
446 int digit = i % 10;
447
448 if (i >= 100)
449 return format (
450 digit == 1 ? "%dst"
451 : digit == 2 ? "%dnd"
452 : digit == 3 ? "%drd"
453 : "%dth",
454 i
455 );
456
457 if (digit == 0)
458 return ordnumbers_10[i / 10];
473 else 459 else
474 { 460 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} 461}
481 462
482/* 463/*
483 * Returns pointer to static buffer containing ring's or amulet's 464 * Returns pointer to static buffer containing ring's or amulet's
484 * abilities 465 * abilities
… …
490 */ 471 */
491 472
492/* Aug 95 modified this slightly so that Skill tools don't have magic bonus 473/* Aug 95 modified this slightly so that Skill tools don't have magic bonus
493 * from stats.sp - b.t. 474 * from stats.sp - b.t.
494 */ 475 */
495char * 476static const char *
496ring_desc (const object *op) 477ring_desc (const object *op)
497{ 478{
498 static char buf[VERY_BIG_BUF]; 479 static dynbuf_text buf; buf.clear ();
499 int attr, val, len; 480 int attr, val, len;
500 481
501 buf[0] = 0; 482 if (op->flag [FLAG_IDENTIFIED])
502 483 {
503 if (!QUERY_FLAG (op, FLAG_IDENTIFIED))
504 return buf;
505
506 for (attr = 0; attr < NUM_STATS; attr++) 484 for (attr = 0; attr < NUM_STATS; attr++)
507 { 485 if ((val = op->stats.stat (attr)))
508 if ((val = get_attr_value (&(op->stats), attr)) != 0)
509 {
510 sprintf (buf + strlen (buf), "(%s%+d)", short_stat_name[attr], val); 486 buf.printf ("(%s%+d)", short_stat_name[attr], val);
511 }
512 }
513 if (op->stats.exp)
514 sprintf (buf + strlen (buf), "(speed %+lld)", (long long) op->stats.exp);
515 if (op->stats.wc)
516 sprintf (buf + strlen (buf), "(wc%+d)", op->stats.wc);
517 if (op->stats.dam)
518 sprintf (buf + strlen (buf), "(dam%+d)", op->stats.dam);
519 if (op->stats.ac)
520 sprintf (buf + strlen (buf), "(ac%+d)", op->stats.ac);
521 487
488 if (op->stats.exp) buf.printf ("(speed %+lld)", (long long)op->stats.exp);
489 if (op->stats.wc) buf.printf ("(wc%+d)", op->stats.wc);
490 if (op->stats.dam) buf.printf ("(dam%+d)", op->stats.dam);
491 if (op->stats.ac) buf.printf ("(ac%+d)", op->stats.ac);
492
522 strcat (buf, describe_resistance (op, 0)); 493 buf << describe_resistance (op, 0);
523 494
524 if (op->stats.food != 0) 495 if (op->stats.food) buf.printf ("(sustenance%+d)", op->stats.food);
525 sprintf (buf + strlen (buf), "(sustenance%+d)", op->stats.food); 496 if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace);
526 /* else if (op->stats.food < 0) 497 if (op->stats.sp && op->type != SKILL) buf.printf ("(magic%+d)", op->stats.sp);
527 sprintf(buf+strlen(buf), "(hunger%+d)", op->stats.food); */ 498 if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp);
528 if (op->stats.grace) 499 if (op->stats.luck) buf.printf ("(luck%+d)", op->stats.luck);
529 sprintf (buf + strlen (buf), "(grace%+d)", op->stats.grace);
530 if (op->stats.sp && op->type != SKILL)
531 sprintf (buf + strlen (buf), "(magic%+d)", op->stats.sp);
532 if (op->stats.hp)
533 sprintf (buf + strlen (buf), "(regeneration%+d)", op->stats.hp);
534 if (op->stats.luck)
535 sprintf (buf + strlen (buf), "(luck%+d)", op->stats.luck);
536 if (QUERY_FLAG (op, FLAG_LIFESAVE))
537 strcat (buf, "(lifesaving)");
538 if (QUERY_FLAG (op, FLAG_REFL_SPELL))
539 strcat (buf, "(reflect spells)");
540 if (QUERY_FLAG (op, FLAG_REFL_MISSILE))
541 strcat (buf, "(reflect missiles)");
542 if (QUERY_FLAG (op, FLAG_STEALTH))
543 strcat (buf, "(stealth)");
544 /* Shorten some of the names, so they appear better in the windows */
545 len = strlen (buf);
546 DESCRIBE_PATH_SAFE (buf, op->path_attuned, "Attuned", &len, VERY_BIG_BUF);
547 DESCRIBE_PATH_SAFE (buf, op->path_repelled, "Repelled", &len, VERY_BIG_BUF);
548 DESCRIBE_PATH_SAFE (buf, op->path_denied, "Denied", &len, VERY_BIG_BUF);
549 500
550 /* if(op->item_power) 501 if (op->flag [FLAG_LIFESAVE]) buf << "(lifesaving)";
551 sprintf(buf+strlen(buf), "(item_power %+d)",op->item_power); 502 if (op->flag [FLAG_REFL_SPELL]) buf << "(reflect spells)";
552 */ 503 if (op->flag [FLAG_REFL_MISSILE]) buf << "(reflect missiles)";
553 if (buf[0] == 0 && op->type != SKILL) 504 if (op->flag [FLAG_STEALTH]) buf << "(stealth)";
554 strcpy (buf, "of adornment");
555 505
506 buf.add_paths ("Attuned" , op->path_attuned);
507 buf.add_paths ("Repelled", op->path_repelled);
508 buf.add_paths ("Denied" , op->path_denied);
509
510 if (buf.empty ())
511 buf << "of adornment";
512 }
556 513
557 return buf; 514 return buf;
558} 515}
559 516
560/* 517/*
561 * query_short_name(object) is similar to query_name, but doesn't 518 * query_short_name(object) is similar to query_name, but doesn't
562 * contain any information about object status (worn/cursed/etc.) 519 * contain any information about object status (worn/cursed/etc.)
520 *
521 * It is sometimes used when printing messages, so should fit well into a sentence.
563 */ 522 */
564const char * 523const char *
565query_short_name (const object *op) 524query_short_name (const object *op)
566{ 525{
567 static char buf[HUGE_BUF];
568 char buf2[HUGE_BUF];
569 int len = 0;
570
571 if (op->name == NULL) 526 if (!op->name)
572 return "(null)"; 527 return "(null)";
573 528
574 if (!op->nrof && !op->weight && !op->title && !is_magical (op)) 529 if (!op->nrof
530 && !op->weight
531 && !op->title
532 && !is_magical (op)
533 && op->slaying != shstr_money)
575 return op->name; /* To speed things up (or make things slower?) */ 534 return op->name; /* To speed things up (or make things slower?) */
576 535
577 if (op->nrof <= 1) 536 static dynbuf_text buf; buf.clear ();
578 safe_strcat (buf, op->name, &len, HUGE_BUF);
579 else
580 safe_strcat (buf, op->name_pl, &len, HUGE_BUF);
581 537
538 buf << (op->nrof <= 1 ? op->name : op->name_pl);
539
582 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED)) 540 if (op->title && op->flag [FLAG_IDENTIFIED])
583 { 541 buf << ' ' << op->title;
584 safe_strcat (buf, " ", &len, HUGE_BUF);
585 safe_strcat (buf, op->title, &len, HUGE_BUF);
586 }
587 542
588 switch (op->type) 543 switch (op->type)
589 { 544 {
590 case SPELLBOOK: 545 case SPELLBOOK:
591 case SCROLL: 546 case SCROLL:
592 case WAND: 547 case WAND:
593 case ROD: 548 case ROD:
594 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 549 if (op->flag [FLAG_IDENTIFIED] || op->flag [FLAG_BEEN_APPLIED])
595 { 550 {
596 if (!op->title) 551 if (!op->title)
597 { 552 buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
598 safe_strcat (buf, " of ", &len, HUGE_BUF); 553
599 if (op->inv)
600 safe_strcat (buf, op->inv->name, &len, HUGE_BUF);
601 else
602 LOG (llevError, "Spellbook %s lacks inventory\n", &op->name);
603 }
604 if (op->type != SPELLBOOK) 554 if (op->type != SPELLBOOK)
605 {
606 sprintf (buf2, " (lvl %d)", op->level); 555 buf.printf (" (lvl %d)", op->level);
607 safe_strcat (buf, buf2, &len, HUGE_BUF);
608 }
609 } 556 }
610 break; 557 break;
611 558
559 case ALTAR:
560 case TRIGGER_ALTAR:
561 case IDENTIFY_ALTAR:
562 case CONVERTER:
563 if (op->slaying == shstr_money)
564 {
565 bool wrap = !!buf.size ();
566
567 if (wrap) buf << " [";
568
569 archetype *coin = 0;
570
571 for (char const *const *c = coins; *coins; ++c)
572 if ((coin = archetype::find (*c)))
573 if (op->stats.food % coin->value == 0)
574 break;
575
576 sint32 coins = op->stats.food / coin->value;
577
578 buf.printf ("drop %d %s (or equivalent)", coins, coins == 1 ? &coin->name : &coin->name_pl);
579
580 if (wrap) buf << ']';
581 }
582 break;
583
612 case SKILL: 584 case SKILL:
613 case AMULET: 585 case AMULET:
614 case RING: 586 case RING:
615 if (!op->title) 587 if (!op->title)
616 { 588 {
617 /* If ring has a title, full description isn't so useful */ 589 /* If ring has a title, full description isn't so useful */
618 char *s = ring_desc (op); 590 const char *s = ring_desc (op);
619 591
620 if (s[0]) 592 if (s && *s)
621 { 593 buf << " " << s;
622 safe_strcat (buf, " ", &len, HUGE_BUF);
623 safe_strcat (buf, s, &len, HUGE_BUF);
624 }
625 } 594 }
626 break; 595 break;
596
627 default: 597 default:
628 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) 598 if (op->magic
629 { 599 && ((op->flag [FLAG_BEEN_APPLIED] && op->need_identify ())
600 || op->flag [FLAG_IDENTIFIED]))
630 sprintf (buf2, " %+d", op->magic); 601 buf.printf (" %+d", op->magic);
631 safe_strcat (buf, buf2, &len, HUGE_BUF);
632 }
633 } 602 }
603
634 return buf; 604 return buf;
635} 605}
636 606
637/* 607/*
638 * query_name(object) returns a character pointer pointing to a static 608 * query_name(object) returns a character pointer pointing to a static
… …
642 * you can make several calls to query_name before the bufs start getting 612 * you can make several calls to query_name before the bufs start getting
643 * overwritten. This may be a bad thing (it may be easier to assume the value 613 * overwritten. This may be a bad thing (it may be easier to assume the value
644 * returned is good forever.) However, it makes printing statements that 614 * returned is good forever.) However, it makes printing statements that
645 * use several names much easier (don't need to store them to temp variables.) 615 * use several names much easier (don't need to store them to temp variables.)
646 * 616 *
617 * It is used extensively within messages, so should return only a prose
618 * and short description of the item.
619 * It is also used by examine/ex and similar functions.
647 */ 620 */
648char * 621const char *
649query_name (const object *op) 622query_name (const object *op)
650{ 623{
651 static char buf[5][HUGE_BUF]; 624 int len = 0;
625 static dynbuf_text bufs[5];
652 static int use_buf = 0; 626 static int use_buf = 0;
653 int len = 0;
654
655#ifdef NEW_MATERIAL_CODE
656 materialtype_t *mt;
657#endif
658 627
659 use_buf++; 628 use_buf++;
660 use_buf %= 5; 629 use_buf %= 5;
661 630
662#ifdef NEW_MATERIAL_CODE 631 dynbuf_text &buf = bufs [use_buf];
632 buf.clear ();
633
634#if 0
663 if ((op->is_armor () || op->is_weapon ()) && op->materialname) 635 if ((op->is_armor () || op->is_weapon ()) && op->material)
664 { 636 buf << op->material->description << ' ';
665 mt = name_to_material (op->materialname);
666 if (mt)
667 {
668 safe_strcat (buf[use_buf], mt->description, &len, HUGE_BUF);
669 safe_strcat (buf[use_buf], " ", &len, HUGE_BUF);
670 }
671 }
672#endif 637#endif
673 638
674 safe_strcat (buf[use_buf], query_short_name (op), &len, HUGE_BUF); 639 buf << query_short_name (op);
675 640
676 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 641 if (op->flag [FLAG_INV_LOCKED])
677 safe_strcat (buf[use_buf], " *", &len, HUGE_BUF); 642 buf << " *";
678 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 643 if (op->is_open_container ())
679 safe_strcat (buf[use_buf], " (open)", &len, HUGE_BUF); 644 buf << " (open)";
680 645
681 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 646 if (op->flag [FLAG_KNOWN_CURSED])
682 {
683 if (QUERY_FLAG (op, FLAG_DAMNED))
684 safe_strcat (buf[use_buf], " (damned)", &len, HUGE_BUF);
685 else if (QUERY_FLAG (op, FLAG_CURSED))
686 safe_strcat (buf[use_buf], " (cursed)", &len, HUGE_BUF);
687 } 647 {
648 if (op->flag [FLAG_DAMNED])
649 buf << " (damned)";
650 else if (op->flag [FLAG_CURSED])
651 buf << " (cursed)";
652 }
653
688 /* 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),
689 * and it isn't identified, print out the fact that 655 * and it isn't identified, print out the fact that
690 * it is magical. Assume that the detect magical spell will only set 656 * it is magical. Assume that the detect magical spell will only set
691 * KNOWN_MAGICAL if the item actually is magical. 657 * KNOWN_MAGICAL if the item actually is magical.
692 * 658 *
693 * 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
694 * 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
695 * abilities, especially for artifact items. 661 * abilities, especially for artifact items.
696 */ 662 */
697 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 663 if (op->flag [FLAG_KNOWN_MAGICAL] && !op->flag [FLAG_IDENTIFIED])
698 safe_strcat (buf[use_buf], " (magic)", &len, HUGE_BUF); 664 buf << " (magic)";
699 665
700#if 0 666#if 0
701 /* 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
702 * be returned in the name. 668 * be returned in the name.
703 */ 669 */
704 if (op->item_power) 670 if (op->item_power)
705 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);
706 672
707#endif 673#endif
708 674
709 if (QUERY_FLAG (op, FLAG_APPLIED)) 675 if (op->flag [FLAG_APPLIED])
710 { 676 {
711 switch (op->type) 677 switch (op->type)
712 { 678 {
713 case BOW: 679 case BOW:
714 case WAND: 680 case WAND:
715 case ROD: 681 case ROD:
716 case HORN: 682 case HORN:
717 safe_strcat (buf[use_buf], " (readied)", &len, HUGE_BUF); 683 buf << " (applied)";
718 break; 684 break;
719 case WEAPON: 685 case WEAPON:
720 safe_strcat (buf[use_buf], " (wielded)", &len, HUGE_BUF); 686 buf << " (applied)";
721 break; 687 break;
722 case ARMOUR: 688 case ARMOUR:
723 case HELMET: 689 case HELMET:
724 case SHIELD: 690 case SHIELD:
725 case RING: 691 case RING:
726 case BOOTS: 692 case BOOTS:
727 case GLOVES: 693 case GLOVES:
728 case AMULET: 694 case AMULET:
729 case GIRDLE: 695 case GIRDLE:
730 case BRACERS: 696 case BRACERS:
731 case CLOAK: 697 case CLOAK:
732 safe_strcat (buf[use_buf], " (worn)", &len, HUGE_BUF); 698 buf << " (worn)";
733 break; 699 break;
734 case CONTAINER: 700 case CONTAINER:
735 safe_strcat (buf[use_buf], " (active)", &len, HUGE_BUF); 701 buf << " (active)";
736 break; 702 break;
737 case SKILL: 703 case SKILL:
738 default: 704 default:
739 safe_strcat (buf[use_buf], " (applied)", &len, HUGE_BUF); 705 buf << " (applied)";
740 } 706 }
741 } 707 }
742 if (QUERY_FLAG (op, FLAG_UNPAID))
743 safe_strcat (buf[use_buf], " (unpaid)", &len, HUGE_BUF);
744 708
745 return buf[use_buf]; 709 switch (op->type)
710 {
711 case LAMP:
712 if (op->glow_radius)
713 buf << " (on)";
714 else if (op->stats.food <= 0)
715 buf << " (empty)";
716 else
717 buf << " (off)";
718 break;
719
720 case TORCH:
721 if (op->glow_radius)
722 buf << " (burning)";
723 else if (op->stats.food <= 0)
724 buf << " (burned out)";
725 break;
726 }
727
728 if (op->flag [FLAG_UNPAID])
729 buf << " (unpaid)";
730
731 return buf;
746} 732}
747 733
748/* 734/*
749 * query_base_name(object) returns a character pointer pointing to a static 735 * query_base_name(object) returns a character pointer pointing to a static
750 * buffer which contains a verbose textual representation of the name 736 * buffer which contains a verbose textual representation of the name
751 * of the given object. The buffer will be overwritten at the next 737 * of the given object. The buffer will be overwritten at the next
752 * call to query_base_name(). This is a lot like query_name, but we 738 * call to query_base_name(). This is a lot like query_name, but we
753 * don't include the item count or item status. Used for inventory sorting 739 * don't include the item count or item status. Used for inventory sorting
754 * and sending to client. 740 * and sending to client.
755 * If plural is set, we generate the plural name of this. 741 * If plural is set, we generate the plural name of this.
742 *
743 * It is sometimes used to display messages, and usually only used to match stuff,
744 * so maybe this function should be removed.
745 * It is also used for client-side inventory/item descriptions.
756 */ 746 */
757const char * 747const char *
758query_base_name (const object *op, int plural) 748query_base_name (const object *op, int plural)
759{ 749{
760 static char buf[MAX_BUF], buf2[MAX_BUF];
761 int len;
762 materialtype_t *mt;
763
764 if ((!plural && !op->name) || (plural && !op->name_pl)) 750 if ((!plural && !op->name) || (plural && !op->name_pl))
765 return "(null)"; 751 return "(null)";
766 752
767 if (!op->nrof && !op->weight && !op->title && !is_magical (op)) 753 if (!op->nrof && !op->weight && !op->title && !is_magical (op)
754 && op->type != EXIT)
768 return op->name; /* To speed things up (or make things slower?) */ 755 return op->name; /* To speed things up (or make things slower?) */
769 756
757 static dynbuf_text buf; buf.clear ();
758
759#if 0
770 if ((op->is_armor () || op->is_weapon ()) && op->materialname) 760 if ((op->is_armor () || op->is_weapon ()) && op->material)
771 mt = name_to_material (op->materialname); 761 if (op->arch->material != op->material)
772 762 buf << op->material->description << ' ';
773#ifdef NEW_MATERIAL_CODE
774 if ((op->is_armor () || op->is_weapon ()) && op->materialname && mt &&
775 op->arch->clone.materialname != mt->name && !(op->material & M_SPECIAL))
776 {
777 strcpy (buf, mt->description);
778 len = strlen (buf);
779 safe_strcat (buf, " ", &len, MAX_BUF);
780 if (!plural)
781 safe_strcat (buf, op->name, &len, MAX_BUF);
782 else
783 safe_strcat (buf, op->name_pl, &len, MAX_BUF);
784 }
785 else
786 {
787#endif 763#endif
788 if (!plural)
789 strcpy (buf, op->name);
790 else
791 strcpy (buf, op->name_pl);
792 len = strlen (buf);
793#ifdef NEW_MATERIAL_CODE
794 }
795#endif
796 764
765 buf << (plural ? op->name_pl : op->name);
766
797 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED)) 767 if (op->title && op->flag [FLAG_IDENTIFIED])
798 { 768 buf << ' ' << op->title;
799 safe_strcat (buf, " ", &len, MAX_BUF);
800 safe_strcat (buf, op->title, &len, MAX_BUF);
801 }
802 769
803 switch (op->type) 770 switch (op->type)
804 { 771 {
805 case SPELLBOOK: 772 case SPELLBOOK:
806 case SCROLL: 773 case SCROLL:
807 case WAND: 774 case WAND:
808 case ROD: 775 case ROD:
809 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 776 if (op->flag [FLAG_IDENTIFIED] || op->flag [FLAG_BEEN_APPLIED])
810 { 777 {
811 if (!op->title) 778 if (!op->title)
812 { 779 buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
813 safe_strcat (buf, " of ", &len, MAX_BUF); 780
814 if (op->inv)
815 safe_strcat (buf, op->inv->name, &len, MAX_BUF);
816 else
817 LOG (llevError, "Spellbook %s lacks inventory\n", &op->name);
818 }
819 if (op->type != SPELLBOOK) 781 if (op->type != SPELLBOOK)
820 {
821 sprintf (buf2, " (lvl %d)", op->level); 782 buf.printf (" (lvl %d)", op->level);
822 safe_strcat (buf, buf2, &len, MAX_BUF);
823 }
824 } 783 }
825 break; 784 break;
826 785
827 786
828 case SKILL: 787 case SKILL:
829 case AMULET: 788 case AMULET:
830 case RING: 789 case RING:
831 if (!op->title) 790 if (!op->title)
832 { 791 {
833 /* If ring has a title, full description isn't so useful */ 792 /* If ring has a title, full description isn't so useful */
834 char *s = ring_desc (op); 793 const char *s = ring_desc (op);
835 794
836 if (s[0]) 795 if (s && *s)
837 { 796 buf << ' ' << s;
838 safe_strcat (buf, " ", &len, MAX_BUF);
839 safe_strcat (buf, s, &len, MAX_BUF);
840 }
841 } 797 }
842 break; 798 break;
799
800 case EXIT:
801 // random map exits "unfortunately" get patched, so this only works before entering
802 if (EXIT_PATH (op) == shstr_random_map_exit)
803 buf << " (random map)";
804 else if (!EXIT_PATH (op))
805 buf << " (closed)";
806 break;
807
843 default: 808 default:
844 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) 809 if (op->magic
845 { 810 && ((op->flag [FLAG_BEEN_APPLIED] && op->need_identify ())
846 sprintf (buf + strlen (buf), " %+d", op->magic); 811 || op->flag [FLAG_IDENTIFIED]))
847 } 812 buf.printf (" %+d", op->magic);
848 } 813 }
814
849 return buf; 815 return buf;
850} 816}
851 817
852/* Break this off from describe_item - that function was way 818/* Break this off from describe_item - that function was way
853 * too long, making it difficult to read. This function deals 819 * too long, making it difficult to read. This function deals
854 * with describing the monsters & players abilities. It should only 820 * with describing the monsters & players abilities. It should only
855 * be called with monster & player objects. Returns a description 821 * be called with monster & player objects. Returns a description
856 * in a static buffer. 822 * in a static buffer.
857 */ 823 */
858
859static char * 824static const char *
860describe_monster (const object *op) 825describe_monster (const object *op)
861{ 826{
862 char buf[MAX_BUF]; 827 static dynbuf_text buf; buf.clear ();
863 static char retbuf[VERY_BIG_BUF];
864 int i;
865
866 retbuf[0] = '\0';
867 828
868 /* Note that the resolution this provides for players really isn't 829 /* Note that the resolution this provides for players really isn't
869 * very good. Any player with a speed greater than .67 will 830 * very good. Any player with a speed greater than .67 will
870 * fall into the 'lightning fast movement' category. 831 * fall into the 'lightning fast movement' category.
871 */ 832 */
872 if (op->has_active_speed ()) 833 if (op->has_active_speed ())
873 { 834 switch ((int)(op->speed * 15.))
874 switch ((int) ((FABS (op->speed)) * 15))
875 { 835 {
876 case 0: 836 case 0:
877 strcat (retbuf, "(very slow movement)"); 837 buf << "(very slow movement)";
878 break; 838 break;
879 case 1: 839 case 1:
880 strcat (retbuf, "(slow movement)"); 840 buf << "(slow movement)";
881 break; 841 break;
882 case 2: 842 case 2:
883 strcat (retbuf, "(normal movement)"); 843 buf << "(normal movement)";
884 break; 844 break;
885 case 3: 845 case 3:
886 case 4: 846 case 4:
887 strcat (retbuf, "(fast movement)"); 847 buf << "(fast movement)";
888 break; 848 break;
889 case 5: 849 case 5:
890 case 6: 850 case 6:
891 strcat (retbuf, "(very fast movement)"); 851 buf << "(very fast movement)";
892 break; 852 break;
893 case 7: 853 case 7:
894 case 8: 854 case 8:
895 case 9: 855 case 9:
896 case 10: 856 case 10:
897 strcat (retbuf, "(extremely fast movement)"); 857 buf << "(extremely fast movement)";
898 break; 858 break;
899 default: 859 default:
900 strcat (retbuf, "(lightning fast movement)"); 860 buf << "(lightning fast movement)";
901 break; 861 break;
902 } 862 }
903 } 863
904 if (QUERY_FLAG (op, FLAG_UNDEAD)) 864 if (op->flag [FLAG_UNDEAD]) buf << "(undead)";
905 strcat (retbuf, "(undead)"); 865 if (op->flag [FLAG_SEE_INVISIBLE]) buf << "(see invisible)";
906 if (QUERY_FLAG (op, FLAG_SEE_INVISIBLE)) 866 if (op->flag [FLAG_USE_WEAPON]) buf << "(wield weapon)";
907 strcat (retbuf, "(see invisible)"); 867 if (op->flag [FLAG_USE_BOW]) buf << "(archer)";
908 if (QUERY_FLAG (op, FLAG_USE_WEAPON)) 868 if (op->flag [FLAG_USE_ARMOUR]) buf << "(wear armour)";
909 strcat (retbuf, "(wield weapon)"); 869 if (op->flag [FLAG_USE_RING]) buf << "(wear ring)";
910 if (QUERY_FLAG (op, FLAG_USE_BOW)) 870 if (op->flag [FLAG_USE_SCROLL]) buf << "(read scroll)";
911 strcat (retbuf, "(archer)"); 871 if (op->flag [FLAG_USE_RANGE]) buf << "(fires wand/rod/horn)";
912 if (QUERY_FLAG (op, FLAG_USE_ARMOUR)) 872 if (op->flag [FLAG_CAN_USE_SKILL]) buf << "(skill user)";
913 strcat (retbuf, "(wear armour)"); 873 if (op->flag [FLAG_CAST_SPELL]) buf << "(spellcaster)";
914 if (QUERY_FLAG (op, FLAG_USE_RING)) 874 if (op->flag [FLAG_FRIENDLY]) buf << "(friendly)";
915 strcat (retbuf, "(wear ring)"); 875 if (op->flag [FLAG_UNAGGRESSIVE]) buf << "(unaggressive)";
916 if (QUERY_FLAG (op, FLAG_USE_SCROLL)) 876 if (op->flag [FLAG_HITBACK]) buf << "(hitback)";
917 strcat (retbuf, "(read scroll)"); 877 if (op->flag [FLAG_STEALTH]) buf << "(stealthy)";
918 if (QUERY_FLAG (op, FLAG_USE_RANGE)) 878
919 strcat (retbuf, "(fires wand/rod/horn)");
920 if (QUERY_FLAG (op, FLAG_CAN_USE_SKILL))
921 strcat (retbuf, "(skill user)");
922 if (QUERY_FLAG (op, FLAG_CAST_SPELL))
923 strcat (retbuf, "(spellcaster)");
924 if (QUERY_FLAG (op, FLAG_FRIENDLY))
925 strcat (retbuf, "(friendly)");
926 if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE))
927 strcat (retbuf, "(unaggressive)");
928 if (QUERY_FLAG (op, FLAG_HITBACK))
929 strcat (retbuf, "(hitback)");
930 if (QUERY_FLAG (op, FLAG_STEALTH))
931 strcat (retbuf, "(stealthy)");
932 if (op->randomitems != NULL) 879 if (op->randomitems)
933 { 880 {
934 treasure *t;
935 int first = 1; 881 bool first = 1;
936 882
937 for (t = op->randomitems->items; t != NULL; t = t->next) 883 for (treasure *t = op->randomitems->items; t; t = t->next)
938 if (t->item && t->item->clone.type == SPELL) 884 if (t->item && t->item->type == SPELL)
939 { 885 {
940 if (first) 886 if (first)
941 { 887 buf << "(Spell abilities:)";
888
942 first = 0; 889 first = 0;
943 strcat (retbuf, "(Spell abilities:)"); 890
944 } 891 buf << '(' << t->item->object::name << ')';
945 strcat (retbuf, "(");
946 strcat (retbuf, t->item->clone.name);
947 strcat (retbuf, ")");
948 } 892 }
949 } 893 }
894
950 if (op->type == PLAYER) 895 if (op->type == PLAYER)
951 { 896 {
952 if (op->contr->digestion) 897 if (op->contr->digestion)
953 {
954 if (op->contr->digestion != 0)
955 sprintf (buf, "(sustenance%+d)", op->contr->digestion); 898 buf.printf ("(sustenance%+d)", op->contr->digestion);
956 strcat (retbuf, buf); 899
957 }
958 if (op->contr->gen_grace) 900 if (op->contr->gen_grace)
959 {
960 sprintf (buf, "(grace%+d)", op->contr->gen_grace); 901 buf.printf ("(grace%+d)", op->contr->gen_grace);
961 strcat (retbuf, buf); 902
962 }
963 if (op->contr->gen_sp) 903 if (op->contr->gen_sp)
964 {
965 sprintf (buf, "(magic%+d)", op->contr->gen_sp); 904 buf.printf ("(magic%+d)", op->contr->gen_sp);
966 strcat (retbuf, buf); 905
967 }
968 if (op->contr->gen_hp) 906 if (op->contr->gen_hp)
969 {
970 sprintf (buf, "(regeneration%+d)", op->contr->gen_hp); 907 buf.printf ("(regeneration%+d)", op->contr->gen_hp);
971 strcat (retbuf, buf); 908
972 }
973 if (op->stats.luck) 909 if (op->stats.luck)
974 {
975 sprintf (buf, "(luck%+d)", op->stats.luck); 910 buf.printf ("(luck%+d)", op->stats.luck);
976 strcat (retbuf, buf);
977 }
978 } 911 }
979 912
980 /* describe attacktypes */ 913 /* describe attacktypes */
981 if (is_dragon_pl (op)) 914 if (op->is_dragon ())
982 { 915 {
983 /* for dragon players display the attacktypes from clawing skill 916 /* for dragon players display the attacktypes from clawing skill
984 * Break apart the for loop - move the comparison checking down - 917 * Break apart the for loop - move the comparison checking down -
985 * this makes it more readable. 918 * this makes it more readable.
986 */ 919 */
987 object *tmp; 920 object *tmp;
988 921
989 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 922 for (tmp = op->inv; tmp; tmp = tmp->below)
990 if (tmp->type == SKILL && !strcmp (tmp->name, "clawing")) 923 if (tmp->type == SKILL && tmp->name == shstr_clawing)
991 break; 924 break;
992 925
993 if (tmp && tmp->attacktype != 0) 926 if (tmp && tmp->attacktype)
994 { 927 buf.add_abilities ("Claws", tmp->attacktype);
995 DESCRIBE_ABILITY (retbuf, tmp->attacktype, "Claws");
996 }
997 else 928 else
998 { 929 buf.add_abilities ("Attacks", op->attacktype);
999 DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks");
1000 }
1001 } 930 }
1002 else 931 else
1003 { 932 buf.add_abilities ("Attacks", op->attacktype);
1004 DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks"); 933
1005 } 934 buf.add_paths ("Attuned" , op->path_attuned);
1006 DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned"); 935 buf.add_paths ("Repelled", op->path_repelled);
1007 DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled"); 936 buf.add_paths ("Denied" , op->path_denied);
1008 DESCRIBE_PATH (retbuf, op->path_denied, "Denied"); 937
1009 for (i = 0; i < NROFATTACKS; i++) 938 for (int i = 0; i < NROFATTACKS; i++)
1010 {
1011 if (op->resist[i]) 939 if (op->resist[i])
1012 {
1013 sprintf (buf, "(%s %+d)", resist_plus[i], op->resist[i]); 940 buf.printf ("(%s %+d)", resist_plus[i], op->resist[i]);
1014 strcat (retbuf, buf); 941
1015 }
1016 }
1017 return retbuf; 942 return buf;
1018} 943}
1019
1020 944
1021/* 945/*
1022 * Returns a pointer to a static buffer which contains a 946 * Returns a pointer to a static buffer which contains a
1023 * description of the given object. 947 * description of the given object.
1024 * If it is a monster, lots of information about its abilities 948 * If it is a monster, lots of information about its abilities
… …
1033 * wouldn't need to use the SEE_INVISIBLE flag to know it is 957 * wouldn't need to use the SEE_INVISIBLE flag to know it is
1034 * a dragon player examining food. Could have things like 958 * a dragon player examining food. Could have things like
1035 * a dwarven axe, in which the full abilities are only known to 959 * a dwarven axe, in which the full abilities are only known to
1036 * dwarves, etc. 960 * dwarves, etc.
1037 * 961 *
1038 * This function is really much more complicated than it should
1039 * be, because different objects have different meanings
1040 * for the same field (eg, wands use 'food' for charges). This
1041 * means these special cases need to be worked out.
1042 *
1043 * Add 'owner' who is the person examining this object. 962 * Add 'owner' who is the person examining this object.
1044 * owner can be null if no one is being associated with this 963 * owner can be null if no one is being associated with this
1045 * item (eg, debug dump or the like) 964 * item (eg, debug dump or the like)
1046 */ 965 */
1047 966const char *
1048char *
1049describe_item (const object *op, object *owner) 967describe_item (const object *op, object *owner)
1050{ 968{
1051 char buf[MAX_BUF]; 969 if (op->flag [FLAG_MONSTER] || op->type == PLAYER)
1052 static char retbuf[VERY_BIG_BUF]; 970 return describe_monster (op);
971
972 static dynbuf_text buf; buf.clear ();
1053 int identified, i; 973 int identified, i;
1054 974
1055 retbuf[0] = '\0';
1056 if (QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER)
1057 {
1058 return describe_monster (op);
1059 }
1060 /* figure this out once, instead of making multiple calls to need_identify. 975 /* figure this out once, instead of making multiple calls to need_identify.
1061 * also makes the code easier to read. 976 * also makes the code easier to read.
1062 */ 977 */
1063 if (!need_identify (op) || QUERY_FLAG (op, FLAG_IDENTIFIED)) 978 identified = !op->need_identify () || op->flag [FLAG_IDENTIFIED];
1064 identified = 1; 979 if (!identified)
1065 else 980 buf << "(unidentified)";
1066 { 981
1067 strcpy (retbuf, "(unidentified)");
1068 identified = 0;
1069 }
1070 switch (op->type) 982 switch (op->type)
1071 { 983 {
1072 case BOW: 984 case BOW:
1073 case ARROW: 985 case ARROW:
1074 case WAND: 986 case WAND:
1075 case ROD: 987 case ROD:
1076 case HORN: 988 case HORN:
1077 case WEAPON: 989 case WEAPON:
1078 case ARMOUR: 990 case ARMOUR:
1079 case HELMET: 991 case HELMET:
1080 case SHIELD: 992 case SHIELD:
1081 case BOOTS: 993 case BOOTS:
1082 case GLOVES: 994 case GLOVES:
1083 case GIRDLE: 995 case GIRDLE:
1084 case BRACERS: 996 case BRACERS:
1085 case CLOAK: 997 case CLOAK:
1086 case SKILL_TOOL: 998 case SKILL_TOOL:
1087 break; /* We have more information to do below this switch */ 999 break; /* We have more information to do below this switch */
1088 1000
1089 case POWER_CRYSTAL: 1001 case POWER_CRYSTAL:
1090 if (op->stats.maxsp > 1000) 1002 if (op->stats.maxsp > 1000)
1091 { /*higher capacity crystals */ 1003 { /*higher capacity crystals */
1092 i = (op->stats.maxsp % 100) / 10; 1004 i = (op->stats.maxsp % 1000) / 100;
1005
1093 if (i) 1006 if (i)
1094 snprintf (buf, MAX_BUF, "(capacity %d.%dk). It is ", op->stats.maxsp / 100, i); 1007 buf.printf ("(capacity %d.%dk; it is ", op->stats.maxsp / 1000, i);
1095 else 1008 else
1096 snprintf (buf, MAX_BUF, "(capacity %dk). It is ", op->stats.maxsp / 100); 1009 buf.printf ("(capacity %dk; it is ", op->stats.maxsp / 1000);
1097 } 1010 }
1098 else 1011 else
1099 snprintf (buf, MAX_BUF, "(capacity %d). It is ", op->stats.maxsp); 1012 buf.printf ("(capacity %d; it is ", op->stats.maxsp);
1100 strcat (retbuf, buf); 1013
1101 i = (op->stats.sp * 10) / op->stats.maxsp; 1014 i = (op->stats.sp * 10) / op->stats.maxsp;
1102 if (op->stats.sp == 0) 1015 if (op->stats.sp == 0)
1103 strcat (retbuf, "empty."); 1016 buf << "empty";
1104 else if (i == 0) 1017 else if (i == 0)
1105 strcat (retbuf, "almost empty."); 1018 buf << "almost empty";
1106 else if (i < 3) 1019 else if (i < 3)
1107 strcat (retbuf, "partially filled."); 1020 buf << "partially filled";
1108 else if (i < 6) 1021 else if (i < 6)
1109 strcat (retbuf, "half full."); 1022 buf << "half full";
1110 else if (i < 9) 1023 else if (i < 9)
1111 strcat (retbuf, "well charged."); 1024 buf << "well charged";
1112 else if (op->stats.sp == op->stats.maxsp) 1025 else if (op->stats.sp == op->stats.maxsp)
1113 strcat (retbuf, "fully charged."); 1026 buf << "fully charged";
1114 else 1027 else
1115 strcat (retbuf, "almost full."); 1028 buf << "almost full";
1029
1030 buf << ')';
1116 break; 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 }
1053 break;
1054
1117 case FOOD: 1055 case FOOD:
1118 case FLESH: 1056 case FLESH:
1119 case DRINK: 1057 case DRINK:
1120 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 1058 if (identified || op->flag [FLAG_BEEN_APPLIED])
1121 { 1059 {
1122 sprintf (buf, "(food+%d)", op->stats.food); 1060 buf.printf ("(food+%d)", op->stats.food);
1123 strcat (retbuf, buf);
1124 1061
1125 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))
1063 buf.printf ("(%s metabolism)", change_resist_msg[op->last_eat]);
1064
1065 if (!op->flag [FLAG_CURSED])
1126 { 1066 {
1127 sprintf (buf, "(%s metabolism)", change_resist_msg[op->last_eat]); 1067 if (op->stats.hp) buf << "(heals)";
1128 strcat (retbuf, buf); 1068 if (op->stats.sp) buf << "(spellpoint regen)";
1129 } 1069 }
1130
1131 if (!QUERY_FLAG (op, FLAG_CURSED))
1132 {
1133 if (op->stats.hp)
1134 strcat (retbuf, "(heals)");
1135 if (op->stats.sp)
1136 strcat (retbuf, "(spellpoint regen)");
1137 }
1138 else 1070 else
1139 { 1071 {
1140 if (op->stats.hp) 1072 if (op->stats.hp) buf << "(damages)";
1141 strcat (retbuf, "(damages)");
1142 if (op->stats.sp)
1143 strcat (retbuf, "(spellpoint depletion)"); 1073 if (op->stats.sp) buf << "(spellpoint depletion)";
1144 } 1074 }
1145 } 1075 }
1146 break; 1076 break;
1147 1077
1148
1149 case SKILL: 1078 case SKILL:
1150 case RING: 1079 case RING:
1151 case AMULET: 1080 case AMULET:
1152 if (op->item_power) 1081 if (op->item_power)
1153 {
1154 sprintf (buf, "(item_power %+d)", op->item_power); 1082 buf.printf ("(item_power %+d)", op->item_power);
1155 strcat (retbuf, buf); 1083
1156 }
1157 if (op->title) 1084 if (op->title)
1158 strcat (retbuf, ring_desc (op)); 1085 buf << ring_desc (op);
1086
1159 return retbuf; 1087 return buf;
1160 1088
1161 default: 1089 default:
1162 return retbuf; 1090 return buf;
1163 } 1091 }
1164 1092
1165 /* Down here, we more further describe equipment type items. 1093 /* Down here, we more further describe equipment type items.
1166 * only describe them if they have been identified or the like. 1094 * only describe them if they have been identified or the like.
1167 */ 1095 */
1168 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 1096 if (identified || op->flag [FLAG_BEEN_APPLIED])
1169 { 1097 {
1170 int attr, val; 1098 int attr, val;
1171 1099
1172 for (attr = 0; attr < NUM_STATS; attr++) 1100 for (attr = 0; attr < NUM_STATS; attr++)
1173 { 1101 if ((val = op->stats.stat (attr)))
1174 if ((val = get_attr_value (&(op->stats), attr)) != 0)
1175 {
1176 sprintf (buf, "(%s%+d)", short_stat_name[attr], val); 1102 buf.printf ("(%s%+d)", short_stat_name[attr], val);
1177 strcat (retbuf, buf);
1178 }
1179 }
1180 1103
1181 if (op->stats.exp) 1104 if (op->stats.exp)
1182 {
1183 sprintf (buf, "(speed %+lld)", (long long) op->stats.exp); 1105 buf.printf ("(speed %+lld)", (long long) op->stats.exp);
1184 strcat (retbuf, buf);
1185 }
1186
1187 1106
1188 switch (op->type) 1107 switch (op->type)
1189 { 1108 {
1190 case BOW: 1109 case BOW:
1191 case ARROW: 1110 case ARROW:
1192 case GIRDLE: 1111 case GIRDLE:
1193 case HELMET: 1112 case HELMET:
1194 case SHIELD: 1113 case SHIELD:
1195 case BOOTS: 1114 case BOOTS:
1196 case GLOVES: 1115 case GLOVES:
1197 case WEAPON: 1116 case WEAPON:
1198 case SKILL: 1117 case SKILL:
1199 case RING: 1118 case RING:
1200 case AMULET: 1119 case AMULET:
1201 case ARMOUR: 1120 case ARMOUR:
1202 case BRACERS: 1121 case BRACERS:
1203 case FORCE: 1122 case FORCE:
1204 case CLOAK: 1123 case CLOAK:
1205 if (op->stats.wc) 1124 if (op->stats.wc) buf.printf ("(wc%+d)", op->stats.wc);
1206 { 1125 if (op->stats.dam) buf.printf ("(dam%+d)", op->stats.dam);
1207 sprintf (buf, "(wc%+d)", op->stats.wc); 1126 if (op->stats.ac) buf.printf ("(ac%+d)", op->stats.ac);
1208 strcat (retbuf, buf); 1127
1209 }
1210 if (op->stats.dam)
1211 {
1212 sprintf (buf, "(dam%+d)", op->stats.dam);
1213 strcat (retbuf, buf);
1214 }
1215 if (op->stats.ac)
1216 {
1217 sprintf (buf, "(ac%+d)", op->stats.ac);
1218 strcat (retbuf, buf);
1219 }
1220 if ((op->type == WEAPON || op->type == BOW) && op->level > 0) 1128 if ((op->type == WEAPON || op->type == BOW) && op->level > 0)
1221 {
1222 sprintf (buf, "(improved %d/%d)", op->last_eat, op->level); 1129 buf.printf ("(improved %d/%d)", op->last_eat, op->level);
1223 strcat (retbuf, buf); 1130
1224 }
1225 break; 1131 break;
1226 1132
1227 default: 1133 default:
1228 break; 1134 break;
1229 } 1135 }
1230 if (QUERY_FLAG (op, FLAG_XRAYS)) 1136
1231 strcat (retbuf, "(xray-vision)"); 1137 if (op->flag [FLAG_XRAYS]) buf << "(xray-vision)";
1232 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK)) 1138 if (op->flag [FLAG_SEE_IN_DARK]) buf << "(infravision)";
1233 strcat (retbuf, "(infravision)");
1234 1139
1235 /* levitate was what is was before, so we'll keep it */ 1140 /* levitate was what is was before, so we'll keep it */
1236 if (op->move_type & MOVE_FLY_LOW) 1141 if (op->move_type & MOVE_FLY_LOW) buf << "(levitate)";
1237 strcat (retbuf, "(levitate)");
1238
1239 if (op->move_type & MOVE_FLY_HIGH) 1142 if (op->move_type & MOVE_FLY_HIGH) buf << "(fly)";
1240 strcat (retbuf, "(fly)");
1241
1242 if (op->move_type & MOVE_SWIM) 1143 if (op->move_type & MOVE_SWIM) buf << "(swim)";
1243 strcat (retbuf, "(swim)");
1244 1144
1245 /* walking is presumed as 'normal', so doesn't need mentioning */ 1145 /* walking is presumed as 'normal', so doesn't need mentioning */
1246 1146
1247 if (op->item_power) 1147 if (op->item_power)
1248 {
1249 sprintf (buf, "(item_power %+d)", op->item_power); 1148 buf.printf ("(item_power %+d)", op->item_power);
1250 strcat (retbuf, buf);
1251 }
1252 } /* End if identified or applied */ 1149 } /* End if identified or applied */
1253 1150
1254 /* This blocks only deals with fully identified object. 1151 /* This blocks only deals with fully identified object.
1255 * it is intentional that this is not an 'else' from a above - 1152 * it is intentional that this is not an 'else' from a above -
1256 * in this way, information is added. 1153 * in this way, information is added.
… …
1259 { 1156 {
1260 int more_info = 0; 1157 int more_info = 0;
1261 1158
1262 switch (op->type) 1159 switch (op->type)
1263 { 1160 {
1264 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 */
1265 case HORN: /* and stats.hp for spell-point regeneration... */ 1162 case HORN: /* and stats.hp for spell-point regeneration... */
1266 case BOW: 1163 case BOW:
1267 case ARROW: 1164 case ARROW:
1268 case WAND: 1165 case WAND:
1269 case FOOD: 1166 case FOOD:
1270 case FLESH: 1167 case FLESH:
1271 case DRINK: 1168 case DRINK:
1272 more_info = 0; 1169 more_info = 0;
1273 break; 1170 break;
1274 1171
1275 /* Armor type objects */ 1172 /* Armor type objects */
1276 case ARMOUR: 1173 case ARMOUR:
1277 case HELMET: 1174 case HELMET:
1278 case SHIELD: 1175 case SHIELD:
1279 case BOOTS: 1176 case BOOTS:
1280 case GLOVES: 1177 case GLOVES:
1281 case GIRDLE: 1178 case GIRDLE:
1282 case BRACERS: 1179 case BRACERS:
1283 case CLOAK: 1180 case CLOAK:
1284 if (ARMOUR_SPEED (op)) 1181 if (ARMOUR_SPEED (op)) buf.printf ("(Max speed %1.2f)", ARMOUR_SPEED (op) / 10.0);
1285 { 1182 if (ARMOUR_SPELLS (op)) buf.printf ("(Spell regen penalty %d)", ARMOUR_SPELLS (op));
1286 sprintf (buf, "(Max speed %1.2f)", ARMOUR_SPEED (op) / 10.0);
1287 strcat (retbuf, buf);
1288 }
1289 if (ARMOUR_SPELLS (op))
1290 {
1291 sprintf (buf, "(Spell regen penalty %d)", ARMOUR_SPELLS (op));
1292 strcat (retbuf, buf);
1293 }
1294 more_info = 1; 1183 more_info = 1;
1295 break; 1184 break;
1296 1185
1297 case WEAPON: 1186 case WEAPON:
1298 /* Calculate it the same way fix_player does so the results 1187 /* Calculate it the same way fix_player does so the results
1299 * make sense. 1188 * make sense.
1300 */ 1189 */
1301 i = (WEAPON_SPEED (op) * 2 - op->magic) / 2; 1190 i = (WEAPON_SPEED (op) * 2 - op->magic) / 2;
1302 if (i < 0) 1191 if (i < 0)
1303 i = 0; 1192 i = 0;
1304 1193
1305 sprintf (buf, "(weapon speed %d)", i); 1194 buf.printf ("(weapon speed %d)", i);
1306 strcat (retbuf, buf);
1307 more_info = 1; 1195 more_info = 1;
1308 break; 1196 break;
1309
1310 } 1197 }
1198
1311 if (more_info) 1199 if (more_info)
1312 { 1200 {
1313 if (op->stats.food)
1314 {
1315 if (op->stats.food != 0)
1316 sprintf (buf, "(sustenance%+d)", op->stats.food); 1201 if (op->stats.food) buf.printf ("(sustenance%+d)", op->stats.food);
1317 strcat (retbuf, buf);
1318 }
1319 if (op->stats.grace)
1320 {
1321 sprintf (buf, "(grace%+d)", op->stats.grace); 1202 if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace);
1322 strcat (retbuf, buf); 1203 if (op->stats.sp) buf.printf ("(magic%+d)", op->stats.sp);
1323 }
1324 if (op->stats.sp)
1325 {
1326 sprintf (buf, "(magic%+d)", op->stats.sp);
1327 strcat (retbuf, buf);
1328 }
1329 if (op->stats.hp)
1330 {
1331 sprintf (buf, "(regeneration%+d)", op->stats.hp); 1204 if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp);
1332 strcat (retbuf, buf);
1333 }
1334 } 1205 }
1335 1206
1336 if (op->stats.luck) 1207 if (op->stats.luck)
1337 {
1338 sprintf (buf, "(luck%+d)", op->stats.luck); 1208 buf.printf ("(luck%+d)", op->stats.luck);
1339 strcat (retbuf, buf); 1209
1340 } 1210 if (op->flag [FLAG_LIFESAVE]) buf << "(lifesaving)";
1341 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 1211 if (op->flag [FLAG_REFL_SPELL]) buf << "(reflect spells)";
1342 strcat (retbuf, "(lifesaving)"); 1212 if (op->flag [FLAG_REFL_MISSILE]) buf << "(reflect missiles)";
1343 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) 1213 if (op->flag [FLAG_STEALTH]) buf << "(stealth)";
1344 strcat (retbuf, "(reflect spells)"); 1214
1345 if (QUERY_FLAG (op, FLAG_REFL_MISSILE))
1346 strcat (retbuf, "(reflect missiles)");
1347 if (QUERY_FLAG (op, FLAG_STEALTH))
1348 strcat (retbuf, "(stealth)");
1349 if (op->slaying != NULL && op->type != FOOD) 1215 if (op->slaying && op->type != FOOD)
1350 {
1351 sprintf (buf, "(slay %s)", &op->slaying); 1216 buf.printf ("(slay %s)", &op->slaying);
1352 strcat (retbuf, buf); 1217
1353 } 1218 if (op->type == SKILL_TOOL && op->skill)
1354 DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks"); 1219 buf.printf ("(%s)", &op->skill);
1220
1221 buf.add_abilities ("Attacks", op->attacktype);
1355 /* resistance on flesh is only visible for quetzals. If 1222 /* resistance on flesh is only visible for quetzals. If
1356 * non flesh, everyone can see its resistances 1223 * non flesh, everyone can see its resistances
1357 */ 1224 */
1358 if (op->type != FLESH || (owner && is_dragon_pl (owner))) 1225 if (op->type != FLESH || (owner && owner->is_dragon ()))
1359 strcat (retbuf, describe_resistance (op, 0)); 1226 buf << describe_resistance (op, 0);
1360 DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned");
1361 DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled");
1362 DESCRIBE_PATH (retbuf, op->path_denied, "Denied");
1363 }
1364 1227
1228 buf.add_paths ("Attuned", op->path_attuned);
1229 buf.add_paths ("Repelled", op->path_repelled);
1230 buf.add_paths ("Denied", op->path_denied);
1231 }
1232
1365 return retbuf; 1233 return buf;
1234}
1235
1236std::string
1237object::describe_item (object *who)
1238{
1239 return std::string (::describe_item (this, who));
1240}
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 == ROD || 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
1412void
1413examine (object *op, object *tmp)
1414{
1415 std::string info = tmp->describe (op);
1416
1417 op->contr->infobox (MSG_CHANNEL ("examine"), info.c_str ());
1418}
1419
1420/*
1421 * inventory prints object's inventory. If inv==NULL then print player's
1422 * inventory.
1423 * [ Only items which are applied are showed. Tero.Haatanen@lut.fi ]
1424 */
1425const char *
1426object::query_inventory (object *who, const char *indent)
1427{
1428 static dynbuf_text buf; buf.clear ();
1429
1430 for (object *tmp = inv; tmp; tmp = tmp->below)
1431 if (who && who->flag [FLAG_WIZ])
1432 buf.printf ("%s- %-28.28s %-8s (%9d) %s\n", indent, tmp->query_name (), tmp->query_weight (), tmp->count, tmp->uuid.c_str ());
1433 else if (!tmp->invisible && (type == CONTAINER || tmp->flag [FLAG_APPLIED]))
1434 buf.printf ("%s- %-36.36s %-8s\n", indent, tmp->query_name (), tmp->query_weight ());
1435
1436 if (buf.size ())
1437 buf.printf ("%s(total weight: %s)\n", indent, query_weight ());
1438 else
1439 buf.printf ("%s(empty)\n", indent);
1440
1441 return buf;
1366} 1442}
1367 1443
1368/* Return true if the item is magical. A magical item is one that 1444/* Return true if the item is magical. A magical item is one that
1369 * increases/decreases any abilities, provides a resistance, 1445 * increases/decreases any abilities, provides a resistance,
1370 * has a generic magical bonus, or is an artifact. 1446 * has a generic magical bonus, or is an artifact.
1371 * This function is used by detect_magic to determine if an item 1447 * This function is used by detect_magic to determine if an item
1372 * should be marked as magical. 1448 * should be marked as magical.
1373 */ 1449 */
1374
1375int 1450int
1376is_magical (const object *op) 1451is_magical (const object *op)
1377{ 1452{
1378 int i; 1453 int i;
1379 1454
1380 /* living creatures are considered non magical */ 1455 /* living creatures are considered non magical */
1381 if (QUERY_FLAG (op, FLAG_ALIVE)) 1456 if (op->flag [FLAG_ALIVE])
1382 return 0; 1457 return 0;
1383 1458
1384 /* 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 */
1385 if (op->title != NULL) 1460 if (op->title != NULL)
1386 return 1; 1461 return 1;
… …
1392 (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))
1393 return 1; 1468 return 1;
1394 1469
1395 /* 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 */
1396 /* Presume any boots that hvae a move_type are special. */ 1471 /* Presume any boots that hvae a move_type are special. */
1397 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)))
1398 return 1; 1473 return 1;
1399 1474
1400 /* Take care of amulet/shield that reflects spells/missiles */ 1475 /* Take care of amulet/shield that reflects spells/missiles */
1401 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]))
1402 return 1; 1477 return 1;
1403 1478
1404 /* Take care of helmet of xrays */ 1479 /* Take care of helmet of xrays */
1405 if (op->type == HELMET && QUERY_FLAG (op, FLAG_XRAYS)) 1480 if (op->type == HELMET && op->flag [FLAG_XRAYS])
1406 return 1; 1481 return 1;
1407 1482
1408 /* Potions & rods are always magical. Wands/staves are also magical, 1483 /* Potions & rods are always magical. Wands/staves are also magical,
1409 * assuming they still have any charges left. 1484 * assuming they still have any charges left.
1410 */ 1485 */
… …
1430 if (op->magic || op->type == POWER_CRYSTAL || op->type == SPELLBOOK || op->type == SCROLL || op->type == GIRDLE) 1505 if (op->magic || op->type == POWER_CRYSTAL || op->type == SPELLBOOK || op->type == SCROLL || op->type == GIRDLE)
1431 return 1; 1506 return 1;
1432 1507
1433 /* Check to see if it increases/decreases any stats */ 1508 /* Check to see if it increases/decreases any stats */
1434 for (i = 0; i < NUM_STATS; i++) 1509 for (i = 0; i < NUM_STATS; i++)
1435 if (get_attr_value (&(op->stats), i) != 0) 1510 if (op->stats.stat (i))
1436 return 1; 1511 return 1;
1437 1512
1438 /* If it doesn't fall into any of the above categories, must 1513 /* If it doesn't fall into any of the above categories, must
1439 * be non magical. 1514 * be non magical.
1440 */ 1515 */
1441 return 0; 1516 return 0;
1442} 1517}
1443 1518
1444/* need_identify returns true if the item should be identified. This
1445 * function really should not exist - by default, any item not identified
1446 * should need it.
1447 */
1448
1449int
1450need_identify (const object *op)
1451{
1452 switch (op->type)
1453 {
1454 case RING:
1455 case WAND:
1456 case ROD:
1457 case HORN:
1458 case SCROLL:
1459 case SKILL:
1460 case SKILLSCROLL:
1461 case SPELLBOOK:
1462 case FOOD:
1463 case POTION:
1464 case BOW:
1465 case ARROW:
1466 case WEAPON:
1467 case ARMOUR:
1468 case SHIELD:
1469 case HELMET:
1470 case AMULET:
1471 case BOOTS:
1472 case GLOVES:
1473 case BRACERS:
1474 case GIRDLE:
1475 case CONTAINER:
1476 case DRINK:
1477 case FLESH:
1478 case INORGANIC:
1479 case CLOSE_CON:
1480 case CLOAK:
1481 case GEM:
1482 case POWER_CRYSTAL:
1483 case POISON:
1484 case BOOK:
1485 case SKILL_TOOL:
1486 return 1;
1487 }
1488 /* Try to track down some stuff that may show up here. Thus, the
1489 * archetype file can be updated, and this function removed.
1490 */
1491#if 0
1492 LOG (llevDebug, "need_identify: %s does not need to be id'd\n", op->name);
1493#endif
1494 return 0;
1495}
1496
1497/* 1519/*
1498 * Supposed to fix face-values as well here, but later. 1520 * Supposed to fix face-values as well here, but later.
1499 */ 1521 */
1500void 1522void
1501identify (object *op) 1523identify (object *op)
1502{ 1524{
1503 object *pl; 1525 op->set_flag (FLAG_IDENTIFIED);
1504 1526 op->clr_flag (FLAG_KNOWN_MAGICAL);
1505 SET_FLAG (op, FLAG_IDENTIFIED); 1527 op->clr_flag (FLAG_NO_SKILL_IDENT);
1506 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);
1507 CLEAR_FLAG (op, FLAG_NO_SKILL_IDENT);
1508 1528
1509 /* 1529 /*
1510 * We want autojoining of equal objects: 1530 * We want autojoining of equal objects:
1511 */ 1531 */
1512 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 1532 if (op->flag [FLAG_CURSED] || op->flag [FLAG_DAMNED])
1513 SET_FLAG (op, FLAG_KNOWN_CURSED); 1533 op->set_flag (FLAG_KNOWN_CURSED);
1514 1534
1515 if (op->type == POTION) 1535 if (op->type == POTION)
1516 { 1536 {
1517 if (op->inv && op->randomitems) 1537 if (op->inv && op->randomitems)
1518 op->title = op->inv->name; 1538 op->title = op->inv->name;
1519 else if (op->arch) 1539 else if (op->arch)
1520 { 1540 {
1521 op->name = op->arch->clone.name; 1541 op->name = op->arch->object::name;
1522 op->name_pl = op->arch->clone.name_pl; 1542 op->name_pl = op->arch->object::name_pl;
1523 } 1543 }
1524 } 1544 }
1525 1545
1526 /* 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 */
1527 if (op->map) 1547 if (op->map)
1528 update_object (op, UP_OBJ_FACE); 1548 update_object (op, UP_OBJ_CHANGE);
1529 else 1549
1530 { 1550 if (object *pl = op->visible_to ())
1531 pl = op->in_player ();
1532 if (pl)
1533 /* 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
1534 * it all. 1552 * it all.
1535 */ 1553 */
1536 esrv_send_item (pl, op); 1554 esrv_send_item (pl, op);
1537 }
1538} 1555}
1539 1556

Diff Legend

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