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

Diff Legend

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