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.99 by root, Sun Jan 29 02:47:04 2017 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,2011,2012,2013,2014,2015,2016 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# define def(name, use, nonuse) { # name, KW_body_ ## name, use, nonuse },
52 {"body_arm", "on your arm", "on a human's arm"}, 55# include "slotinc.h"
53 {"body_torso", "on your body", "on a human's torso"}, 56# undef def
54 {"body_head", "on your head", "on a human's head"},
55 {"body_neck", "around your neck", "around a humans neck"},
56 {"body_skill", "in your skill slot", "in a human's skill slot"},
57 {"body_finger", "on your finger", "on a human's finger"} ,
58 {"body_shoulder", "around your shoulders", "around a human's shoulders"},
59 {"body_foot", "on your feet", "on a human's feet"},
60 {"body_hand", "on your hands", "on a human's hands"},
61 {"body_wrist", "around your wrists", "around a human's wrist"},
62 {"body_waist", "around your waist", "around a human's waist"},
63/*{"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}; 57};
71 58
72static char numbers_10[10][20] = { 59static char numbers_10[10][20] = {
73 "zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy", 60 "zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy",
74 "eighty", "ninety" 61 "eighty", "ninety"
75}; 62};
76 63
77static char levelnumbers[21][20] = { 64static char ordnumbers[21][20] = {
78 "zeroth", "first", "second", "third", "fourth", "fifth", "sixth", "seventh", 65 "zeroth", "first", "second", "third", "fourth", "fifth", "sixth", "seventh",
79 "eighth", "ninth", "tenth", "eleventh", "twelfth", "thirteenth", 66 "eighth", "ninth", "tenth", "eleventh", "twelfth", "thirteenth",
80 "fourteenth", "fifteenth", "sixteenth", "seventeenth", "eighteen", 67 "fourteenth", "fifteenth", "sixteenth", "seventeenth", "eighteenth",
81 "nineteen", "twentieth" 68 "nineteenth", "twentieth"
82}; 69};
83 70
84static char levelnumbers_10[11][20] = { 71static char ordnumbers_10[11][20] = {
85 "zeroth", "tenth", "twentieth", "thirtieth", "fortieth", "fiftieth", "sixtieth", 72 "zeroth", "tenth", "twentieth", "thirtieth", "fortieth", "fiftieth", "sixtieth",
86 "seventieth", "eightieth", "ninetieth" 73 "seventieth", "eightieth", "ninetieth"
87}; 74};
88 75
89/* 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:
90 * item number, item name, item name (plural), and two numbers that are the skills 77 * item number, item name, item name (plural), and two numbers that are the skills
91 * used to identify them. Anytime a new item type is added or removed, this list 78 * used to identify them. Anytime a new item type is added or removed, this list
92 * should be altered to reflect that. The defines for the numerical values are in 79 * should be altered to reflect that. The defines for the numerical values are in
93 * define.h 80 * define.h
94 */ 81 */
95static const typedata item_types[] = { 82static const typedata item_types[] = {
96 {PLAYER, "player", "players", 0, 0}, 83 {PLAYER, "player", "players", 0, 0},
97 {ROD, "rod", "rods", SK_THAUMATURGY, 0}, 84 {ROD, "rod", "rods", SK_THAUMATURGY, 0},
98 {TREASURE, "treasure", "treasure", 0, 0}, 85 {TREASURE, "treasure", "treasure", 0, 0},
… …
152 {EXIT, "exit", "exits", 0, 0}, 139 {EXIT, "exit", "exits", 0, 0},
153 {ENCOUNTER, "encounter", "encounters", 0, 0}, 140 {ENCOUNTER, "encounter", "encounters", 0, 0},
154 {SHOP_FLOOR, "shop floor", "shop floors", 0, 0}, 141 {SHOP_FLOOR, "shop floor", "shop floors", 0, 0},
155 {SHOP_MAT, "shop mat", "shop mats", 0, 0}, 142 {SHOP_MAT, "shop mat", "shop mats", 0, 0},
156 {RING, "ring", "rings", SK_JEWELER, 0}, 143 {RING, "ring", "rings", SK_JEWELER, 0},
157 {FLOOR, "floor", "floors", 0, 0}, 144// {FLOOR, "floor", "floors", 0, 0},
158 {FLESH, "flesh", "flesh", SK_WOODSMAN, 0}, 145 {FLESH, "flesh", "flesh", SK_WOODSMAN, 0},
159 {INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0}, 146 {INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0},
160 {SKILL_TOOL, "skill tool", "skill tools", 0, 0}, 147 {SKILL_TOOL, "skill tool", "skill tools", 0, 0},
161 {LIGHTER, "lighter", "lighters", 0, 0}, 148 {LIGHTER, "lighter", "lighters", 0, 0},
162 {BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0}, 149 {BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0},
163 {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},
164 {LAMP, "lamp", "lamps", 0, 0}, 152 {LAMP, "lamp", "lamps", 0, 0},
165 {DUPLICATOR, "duplicator", "duplicators", 0, 0}, 153 {DUPLICATOR, "duplicator", "duplicators", 0, 0},
166 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0}, 154 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0},
167 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0}, 155 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0},
168 {SPINNER, "spinner", "spinners", 0, 0}, 156 {SPINNER, "spinner", "spinners", 0, 0},
169 {GATE, "gate", "gates", 0, 0}, 157 {GATE, "gate", "gates", 0, 0},
170 {BUTTON, "button", "buttons", 0, 0}, 158 {BUTTON, "button", "buttons", 0, 0},
171 {CF_HANDLE, "cf handle", "cf handles", 0, 0}, 159 {T_HANDLE, "cf handle", "cf handles", 0, 0},
172 {HOLE, "hole", "holes", 0, 0}, 160 {HOLE, "hole", "holes", 0, 0},
173 {TRAPDOOR, "trapdoor", "trapdoors", 0, 0}, 161 {TRAPDOOR, "trapdoor", "trapdoors", 0, 0},
174 {SIGN, "sign", "signs", 0, 0}, 162 {SIGN, "sign", "signs", 0, 0},
175 {BOOTS, "boots", "boots", SK_SMITHERY, 0}, 163 {BOOTS, "boots", "boots", SK_SMITHERY, 0},
176 {GLOVES, "gloves", "gloves", SK_SMITHERY, 0}, 164 {GLOVES, "gloves", "gloves", SK_SMITHERY, 0},
… …
203 {BUILDER, "item builder", "item builders", 0, 0}, 191 {BUILDER, "item builder", "item builders", 0, 0},
204 {MATERIAL, "building material", "building materials", 0, 0}, 192 {MATERIAL, "building material", "building materials", 0, 0},
205 {ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0}, 193 {ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0},
206}; 194};
207 195
208const int item_types_size = sizeof (item_types) / sizeof (*item_types); 196static const int item_types_size = array_length (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 197
235/* 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
236 * 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
237 * wear whatever they want with no worries. Perhaps having the steep 200 * wear whatever they want with no worries. Perhaps having the steep
238 * curve is good (maybe even steeper), but allowing players to 201 * curve is good (maybe even steeper), but allowing players to
… …
240 * able to use 2-3 of the most powerful items. 203 * able to use 2-3 of the most powerful items.
241 * 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 -
242 * custom objects can use whatever they want. 205 * custom objects can use whatever they want.
243 */ 206 */
244static int enc_to_item_power[21] = { 207static int enc_to_item_power[21] = {
208 0,
245 0, 0, 1, 2, 3, 4, /* 5 */ 209 0, 1, 2, 3, 4, // 5
246 5, 7, 9, 11, 13, /* 10 */ 210 5, 7, 9, 11, 13, // 10
247 15, 18, 21, 24, 27, /* 15 */ 211 15, 18, 21, 24, 27, // 15
248 30, 35, 40, 45, 50 /* 20 */ 212 30, 35, 40, 45, 50 // 20
249}; 213};
250 214
251int 215int
252get_power_from_ench (int ench) 216get_power_from_ench (int ench)
253{ 217{
254 if (ench < 0)
255 ench = 0;
256 if (ench > 20)
257 ench = 20;
258 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];
259} 264}
260 265
261/* 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
262 * 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
263 * generation code, and when loading legacy objects. It returns 268 * generation code, and when loading legacy objects. It returns
… …
270{ 275{
271 int i, tmp, enc; 276 int i, tmp, enc;
272 277
273 enc = 0; 278 enc = 0;
274 for (i = 0; i < NUM_STATS; i++) 279 for (i = 0; i < NUM_STATS; i++)
275 enc += get_attr_value (&op->stats, i); 280 enc += op->stats.stat (i);
276 281
277 /* This protection logic is pretty flawed. 20% fire resistance 282 /* This protection logic is pretty flawed. 20% fire resistance
278 * is much more valuable than 20% confusion, or 20% slow, or 283 * is much more valuable than 20% confusion, or 20% slow, or
279 * several others. Start at 1 - ignore physical - all that normal 284 * several others. Start at 1 - ignore physical - all that normal
280 * armour shouldn't be counted against 285 * armour shouldn't be counted against
281 */ 286 */
282 tmp = 0; 287 tmp = 0;
283 for (i = 1; i < NROFATTACKS; i++) 288 for (i = 1; i < NROFATTACKS; i++)
284 tmp += op->resist[i]; 289 tmp += op->resist[i];
285 290
… …
297 if (op->type == WEAPON) 302 if (op->type == WEAPON)
298 { 303 {
299 for (i = 1; i < NROFATTACKS; i++) 304 for (i = 1; i < NROFATTACKS; i++)
300 if (op->attacktype & (1 << i)) 305 if (op->attacktype & (1 << i))
301 enc++; 306 enc++;
307
302 if (op->slaying) 308 if (op->slaying)
303 enc += 2; /* What it slays is probably more relevent */ 309 enc += 2; /* What it slays is probably more relevent */
304 } 310 }
311
305 /* Items the player can equip */ 312 /* Items the player can equip */
306 if ((op->type == WEAPON) || (op->type == ARMOUR) || (op->type == HELMET) || 313 if ((op->type == WEAPON) || (op->type == ARMOUR) || (op->type == HELMET) ||
307 (op->type == SHIELD) || (op->type == RING) || 314 (op->type == SHIELD) || (op->type == RING) ||
308 (op->type == BOOTS) || (op->type == GLOVES) || 315 (op->type == BOOTS) || (op->type == GLOVES) ||
309 (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))
… …
312 enc += op->stats.hp; /* hp regen */ 319 enc += op->stats.hp; /* hp regen */
313 enc += op->stats.sp; /* mana regen */ 320 enc += op->stats.sp; /* mana regen */
314 enc += op->stats.grace; /* grace regen */ 321 enc += op->stats.grace; /* grace regen */
315 enc += op->stats.exp; /* speed bonus */ 322 enc += op->stats.exp; /* speed bonus */
316 } 323 }
324
317 enc += op->stats.luck; 325 enc += op->stats.luck;
318 326
319 /* Do spell paths now */ 327 /* Do spell paths now */
320 for (i = 1; i < NRSPELLPATHS; i++) 328 for (i = 1; i < NRSPELLPATHS; i++)
321 {
322 if (op->path_attuned & (1 << i)) 329 if (op->path_attuned & (1 << i))
323 enc++; 330 enc++;
324 else if (op->path_denied & (1 << i)) 331 else if (op->path_denied & (1 << i))
325 enc -= 2; 332 enc -= 2;
326 else if (op->path_repelled & (1 << i)) 333 else if (op->path_repelled & (1 << i))
327 enc--; 334 enc--;
328 }
329 335
330 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 336 if (op->flag [FLAG_LIFESAVE ]) enc += 5;
331 enc += 5; 337 if (op->flag [FLAG_REFL_SPELL ]) enc += 3;
332 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) 338 if (op->flag [FLAG_REFL_MISSILE]) enc += 2;
333 enc += 3; 339 if (op->flag [FLAG_XRAYS ]) enc += 2;
334 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) 340 if (op->flag [FLAG_STEALTH ]) enc += 1;
335 enc += 2; 341 if (op->flag [FLAG_SEE_IN_DARK ]) enc += 1;
336 if (QUERY_FLAG (op, FLAG_STEALTH)) 342 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 343
345 return get_power_from_ench (enc); 344 return get_power_from_ench (enc);
346
347} 345}
348 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_;
362
349/* 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
350 * isn't one, returns NULL */ 364 * isn't one, returns NULL */
351
352const typedata * 365const typedata *
353get_typedata (int itemtype) 366get_typedata (int itemtype)
354{ 367{
355 int i; 368 return get_typedata_ (itemtype);
356
357 for (i = 0; i < item_types_size; i++)
358 if (item_types[i].number == itemtype)
359 return &item_types[i];
360 return NULL;
361} 369}
362 370
363/* returns the typedata that has a name equal to itemtype, if there 371/* returns the typedata that has a name equal to itemtype, if there
364 * isn't one, return the plural name that matches, if there still isn't 372 * isn't one, return the plural name that matches, if there still isn't
365 * one return NULL */ 373 * one return NULL */
366
367const typedata * 374const typedata *
368get_typedata_by_name (const char *name) 375get_typedata_by_name (const char *name)
369{ 376{
370 int i;
371
372 for (i = 0; i < item_types_size; i++) 377 for (int i = 0; i < item_types_size; i++)
373 if (!strcmp (item_types[i].name, name)) 378 if (!strcmp (item_types[i].name, name))
374 return &item_types[i]; 379 return &item_types[i];
380
375 for (i = 0; i < item_types_size; i++) 381 for (int i = 0; i < item_types_size; i++)
376 if (!strcmp (item_types[i].name_pl, name)) 382 if (!strcmp (item_types[i].name_pl, name))
377 { 383 {
378 LOG (llevInfo, 384 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); 385 "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]; 386 return &item_types[i];
381 } 387 }
388
382 return NULL; 389 return 0;
383} 390}
384 391
385/* describe_resistance generates the visible naming for resistances. 392/* describe_resistance generates the visible naming for resistances.
386 * returns a static array of the description. This can return 393 * returns a static array of the description. This can return
387 * a big buffer. 394 * a big buffer.
388 * 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
389 * 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
390 */ 397 */
391char * 398const char *
392describe_resistance (const object *op, int newline) 399describe_resistance (const object *op, int newline)
393{ 400{
394 static char buf[VERY_BIG_BUF]; 401 static dynbuf_text buf; buf.clear ();
395 char buf1[VERY_BIG_BUF];
396 int tmpvar;
397 402
398 buf[0] = 0; 403 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)) 404 if (op->resist[i] && (op->type != FLESH || atnr_is_dragon_enabled (i) == 1))
402 { 405 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 406
408 strcat (buf, buf1);
409 }
410 }
411 return buf; 407 return buf;
412} 408}
413
414 409
415/* 410/*
416 * query_weight(object) returns a character pointer to a static buffer 411 * query_weight(object) returns a character pointer to a static buffer
417 * containing the text-representation of the weight of the given object. 412 * containing the text-representation of the weight of the given object.
418 * 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().
419 */ 414 *
420 415 * Seems to be used only by unimportant stuff. Remove?
421char * 416 */
417const char *
422query_weight (const object *op) 418query_weight (const object *op)
423{ 419{
424 static char buf[10]; 420 static char buf[10];
425 sint32 i = (op->nrof ? op->nrof : 1) * op->weight + op->carrying; 421 sint32 i = op->total_weight ();
426 422
427 if (op->weight < 0) 423 if (op->weight < 0)
428 return " "; 424 return " ";
425
429 if (i % 1000) 426 if (i % 1000)
430 sprintf (buf, "%6.1f", i / 1000.0); 427 sprintf (buf, "%6.1f", i / 1000.0);
431 else 428 else
432 sprintf (buf, "%4d ", i / 1000); 429 sprintf (buf, "%4d ", i / 1000);
430
433 return buf; 431 return buf;
434} 432}
435 433
436/* 434/*
437 * Returns the pointer to a static buffer containing 435 * Returns the pointer to a static buffer containing
438 * the number requested (of the form first, second, third...) 436 * the number requested (of the form first, second, third...)
439 */ 437 */
440 438const char *
441char * 439ordinal (int i)
442get_levelnumber (int i)
443{ 440{
444 static char buf[MAX_BUF]; 441 if (i < 0)
442 return format ("minus %s", ordinal (-i));
445 443
446 if (i > 99)
447 {
448 sprintf (buf, "%d.", i);
449 return buf;
450 }
451 if (i < 21) 444 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]; 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];
473 else 460 else
474 { 461 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} 462}
481 463
482/* 464/*
483 * Returns pointer to static buffer containing ring's or amulet's 465 * Returns pointer to static buffer containing ring's or amulet's
484 * abilities 466 * abilities
… …
490 */ 472 */
491 473
492/* 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
493 * from stats.sp - b.t. 475 * from stats.sp - b.t.
494 */ 476 */
495char * 477static const char *
496ring_desc (const object *op) 478ring_desc (const object *op)
497{ 479{
498 static char buf[VERY_BIG_BUF]; 480 static dynbuf_text buf; buf.clear ();
499 int attr, val, len; 481 int attr, val;
500 482
501 buf[0] = 0; 483 if (op->flag [FLAG_IDENTIFIED])
502 484 {
503 if (!QUERY_FLAG (op, FLAG_IDENTIFIED))
504 return buf;
505
506 for (attr = 0; attr < NUM_STATS; attr++) 485 for (attr = 0; attr < NUM_STATS; attr++)
507 { 486 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); 487 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 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
522 strcat (buf, describe_resistance (op, 0)); 494 buf << describe_resistance (op, 0);
523 495
524 if (op->stats.food != 0) 496 if (op->stats.food) buf.printf ("(sustenance%+d)", op->stats.food);
525 sprintf (buf + strlen (buf), "(sustenance%+d)", op->stats.food); 497 if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace);
526 /* else if (op->stats.food < 0) 498 if (op->stats.sp && op->type != SKILL) buf.printf ("(magic%+d)", op->stats.sp);
527 sprintf(buf+strlen(buf), "(hunger%+d)", op->stats.food); */ 499 if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp);
528 if (op->stats.grace) 500 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 501
550 /* if(op->item_power) 502 if (op->flag [FLAG_LIFESAVE]) buf << "(lifesaving)";
551 sprintf(buf+strlen(buf), "(item_power %+d)",op->item_power); 503 if (op->flag [FLAG_REFL_SPELL]) buf << "(reflect spells)";
552 */ 504 if (op->flag [FLAG_REFL_MISSILE]) buf << "(reflect missiles)";
553 if (buf[0] == 0 && op->type != SKILL) 505 if (op->flag [FLAG_STEALTH]) buf << "(stealth)";
554 strcpy (buf, "of adornment");
555 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 }
556 514
557 return buf; 515 return buf;
558} 516}
559 517
560/* 518/*
561 * 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
562 * 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.
563 */ 523 */
564const char * 524const char *
565query_short_name (const object *op) 525query_short_name (const object *op)
566{ 526{
567 static char buf[HUGE_BUF];
568 char buf2[HUGE_BUF];
569 int len = 0;
570
571 if (op->name == NULL) 527 if (!op->name)
572 return "(null)"; 528 return "(null)";
573 529
574 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)
575 return op->name; /* To speed things up (or make things slower?) */ 535 return op->name; /* To speed things up (or make things slower?) */
576 536
577 if (op->nrof <= 1) 537 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 538
539 buf << (op->nrof <= 1 ? op->name : op->name_pl);
540
582 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED)) 541 if (op->title && op->flag [FLAG_IDENTIFIED])
583 { 542 buf << ' ' << op->title;
584 safe_strcat (buf, " ", &len, HUGE_BUF);
585 safe_strcat (buf, op->title, &len, HUGE_BUF);
586 }
587 543
588 switch (op->type) 544 switch (op->type)
589 { 545 {
590 case SPELLBOOK: 546 case SPELLBOOK:
591 case SCROLL: 547 case SCROLL:
592 case WAND: 548 case WAND:
593 case ROD: 549 case ROD:
594 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 550 if (op->flag [FLAG_IDENTIFIED] || op->flag [FLAG_BEEN_APPLIED])
595 { 551 {
596 if (!op->title) 552 if (!op->title)
597 { 553 buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
598 safe_strcat (buf, " of ", &len, HUGE_BUF); 554
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) 555 if (op->type != SPELLBOOK)
605 {
606 sprintf (buf2, " (lvl %d)", op->level); 556 buf.printf (" (lvl %d)", op->level);
607 safe_strcat (buf, buf2, &len, HUGE_BUF);
608 }
609 } 557 }
610 break; 558 break;
611 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
612 case SKILL: 585 case SKILL:
613 case AMULET: 586 case AMULET:
614 case RING: 587 case RING:
615 if (!op->title) 588 if (!op->title)
616 { 589 {
617 /* If ring has a title, full description isn't so useful */ 590 /* If ring has a title, full description isn't so useful */
618 char *s = ring_desc (op); 591 const char *s = ring_desc (op);
619 592
620 if (s[0]) 593 if (s && *s)
621 { 594 buf << " " << s;
622 safe_strcat (buf, " ", &len, HUGE_BUF);
623 safe_strcat (buf, s, &len, HUGE_BUF);
624 }
625 } 595 }
626 break; 596 break;
597
627 default: 598 default:
628 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) 599 if (op->magic
629 { 600 && ((op->flag [FLAG_BEEN_APPLIED] && op->need_identify ())
601 || op->flag [FLAG_IDENTIFIED]))
630 sprintf (buf2, " %+d", op->magic); 602 buf.printf (" %+d", op->magic);
631 safe_strcat (buf, buf2, &len, HUGE_BUF);
632 }
633 } 603 }
604
634 return buf; 605 return buf;
635} 606}
636 607
637/* 608/*
638 * query_name(object) returns a character pointer pointing to a static 609 * 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 613 * 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 614 * 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 615 * 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.) 616 * use several names much easier (don't need to store them to temp variables.)
646 * 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.
647 */ 621 */
648char * 622const char *
649query_name (const object *op) 623query_name (const object *op)
650{ 624{
651 static char buf[5][HUGE_BUF]; 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 {
679 case RANGED:
713 case BOW: 680 case BOW:
714 case WAND: 681 case WAND:
715 case ROD: 682 case ROD:
716 case HORN: 683 case HORN:
717 safe_strcat (buf[use_buf], " (readied)", &len, HUGE_BUF);
718 break;
719 case WEAPON: 684 case WEAPON:
720 safe_strcat (buf[use_buf], " (wielded)", &len, HUGE_BUF); 685 buf << " (applied)";
721 break; 686 break;
722 case ARMOUR: 687 case ARMOUR:
723 case HELMET: 688 case HELMET:
724 case SHIELD: 689 case SHIELD:
725 case RING: 690 case RING:
726 case BOOTS: 691 case BOOTS:
727 case GLOVES: 692 case GLOVES:
728 case AMULET: 693 case AMULET:
729 case GIRDLE: 694 case GIRDLE:
730 case BRACERS: 695 case BRACERS:
731 case CLOAK: 696 case CLOAK:
732 safe_strcat (buf[use_buf], " (worn)", &len, HUGE_BUF); 697 buf << " (worn)";
733 break; 698 break;
734 case CONTAINER: 699 case CONTAINER:
735 safe_strcat (buf[use_buf], " (active)", &len, HUGE_BUF); 700 buf << " (active)";
736 break; 701 break;
737 case SKILL: 702 case SKILL:
738 default: 703 default:
739 safe_strcat (buf[use_buf], " (applied)", &len, HUGE_BUF); 704 buf << " (applied)";
740 } 705 }
741 } 706 }
742 if (QUERY_FLAG (op, FLAG_UNPAID))
743 safe_strcat (buf[use_buf], " (unpaid)", &len, HUGE_BUF);
744 707
745 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;
746} 731}
747 732
748/* 733/*
749 * 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
750 * buffer which contains a verbose textual representation of the name 735 * buffer which contains a verbose textual representation of the name
751 * 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
752 * 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
753 * 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
754 * and sending to client. 739 * and sending to client.
755 * 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.
756 */ 745 */
757const char * 746const char *
758query_base_name (const object *op, int plural) 747query_base_name (const object *op, int plural)
759{ 748{
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)) 749 if ((!plural && !op->name) || (plural && !op->name_pl))
765 return "(null)"; 750 return "(null)";
766 751
767 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)
768 return op->name; /* To speed things up (or make things slower?) */ 754 return op->name; /* To speed things up (or make things slower?) */
769 755
756 static dynbuf_text buf; buf.clear ();
757
758#if 0
770 if ((op->is_armor () || op->is_weapon ()) && op->materialname) 759 if ((op->is_armor () || op->is_weapon ()) && op->material)
771 mt = name_to_material (op->materialname); 760 if (op->arch->material != op->material)
772 761 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 762#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 763
764 buf << (plural ? op->name_pl : op->name);
765
797 if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED)) 766 if (op->title && op->flag [FLAG_IDENTIFIED])
798 { 767 buf << ' ' << op->title;
799 safe_strcat (buf, " ", &len, MAX_BUF);
800 safe_strcat (buf, op->title, &len, MAX_BUF);
801 }
802 768
803 switch (op->type) 769 switch (op->type)
804 { 770 {
805 case SPELLBOOK: 771 case SPELLBOOK:
806 case SCROLL: 772 case SCROLL:
807 case WAND: 773 case WAND:
808 case ROD: 774 case ROD:
809 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 775 if (op->flag [FLAG_IDENTIFIED] || op->flag [FLAG_BEEN_APPLIED])
810 { 776 {
811 if (!op->title) 777 if (!op->title)
812 { 778 buf << " of " << (op->inv ? &op->inv->name : "bug, please report");
813 safe_strcat (buf, " of ", &len, MAX_BUF); 779
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) 780 if (op->type != SPELLBOOK)
820 {
821 sprintf (buf2, " (lvl %d)", op->level); 781 buf.printf (" (lvl %d)", op->level);
822 safe_strcat (buf, buf2, &len, MAX_BUF);
823 }
824 } 782 }
825 break; 783 break;
826 784
827 785
828 case SKILL: 786 case SKILL:
829 case AMULET: 787 case AMULET:
830 case RING: 788 case RING:
831 if (!op->title) 789 if (!op->title)
832 { 790 {
833 /* If ring has a title, full description isn't so useful */ 791 /* If ring has a title, full description isn't so useful */
834 char *s = ring_desc (op); 792 const char *s = ring_desc (op);
835 793
836 if (s[0]) 794 if (s && *s)
837 { 795 buf << ' ' << s;
838 safe_strcat (buf, " ", &len, MAX_BUF);
839 safe_strcat (buf, s, &len, MAX_BUF);
840 }
841 } 796 }
842 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
843 default: 807 default:
844 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) 808 if (op->magic
845 { 809 && ((op->flag [FLAG_BEEN_APPLIED] && op->need_identify ())
846 sprintf (buf + strlen (buf), " %+d", op->magic); 810 || op->flag [FLAG_IDENTIFIED]))
847 } 811 buf.printf (" %+d", op->magic);
848 } 812 }
813
849 return buf; 814 return buf;
850} 815}
851 816
852/* Break this off from describe_item - that function was way 817/* Break this off from describe_item - that function was way
853 * too long, making it difficult to read. This function deals 818 * too long, making it difficult to read. This function deals
854 * with describing the monsters & players abilities. It should only 819 * with describing the monsters & players abilities. It should only
855 * be called with monster & player objects. Returns a description 820 * be called with monster & player objects. Returns a description
856 * in a static buffer. 821 * in a static buffer.
857 */ 822 */
858
859static char * 823static const char *
860describe_monster (const object *op) 824describe_monster (const object *op)
861{ 825{
862 char buf[MAX_BUF]; 826 static dynbuf_text buf; buf.clear ();
863 static char retbuf[VERY_BIG_BUF];
864 int i;
865
866 retbuf[0] = '\0';
867 827
868 /* Note that the resolution this provides for players really isn't 828 /* Note that the resolution this provides for players really isn't
869 * very good. Any player with a speed greater than .67 will 829 * very good. Any player with a speed greater than .67 will
870 * fall into the 'lightning fast movement' category. 830 * fall into the 'lightning fast movement' category.
871 */ 831 */
872 if (op->has_active_speed ()) 832 if (op->has_active_speed ())
873 { 833 switch ((int)(op->speed * 15.))
874 switch ((int) ((FABS (op->speed)) * 15))
875 { 834 {
876 case 0: 835 case 0:
877 strcat (retbuf, "(very slow movement)"); 836 buf << "(very slow movement)";
878 break; 837 break;
879 case 1: 838 case 1:
880 strcat (retbuf, "(slow movement)"); 839 buf << "(slow movement)";
881 break; 840 break;
882 case 2: 841 case 2:
883 strcat (retbuf, "(normal movement)"); 842 buf << "(normal movement)";
884 break; 843 break;
885 case 3: 844 case 3:
886 case 4: 845 case 4:
887 strcat (retbuf, "(fast movement)"); 846 buf << "(fast movement)";
888 break; 847 break;
889 case 5: 848 case 5:
890 case 6: 849 case 6:
891 strcat (retbuf, "(very fast movement)"); 850 buf << "(very fast movement)";
892 break; 851 break;
893 case 7: 852 case 7:
894 case 8: 853 case 8:
895 case 9: 854 case 9:
896 case 10: 855 case 10:
897 strcat (retbuf, "(extremely fast movement)"); 856 buf << "(extremely fast movement)";
898 break; 857 break;
899 default: 858 default:
900 strcat (retbuf, "(lightning fast movement)"); 859 buf << "(lightning fast movement)";
901 break; 860 break;
902 } 861 }
903 } 862
904 if (QUERY_FLAG (op, FLAG_UNDEAD)) 863 if (op->flag [FLAG_UNDEAD]) buf << "(undead)";
905 strcat (retbuf, "(undead)"); 864 if (op->flag [FLAG_SEE_INVISIBLE]) buf << "(see invisible)";
906 if (QUERY_FLAG (op, FLAG_SEE_INVISIBLE)) 865 if (op->flag [FLAG_USE_WEAPON]) buf << "(wield weapon)";
907 strcat (retbuf, "(see invisible)"); 866 if (op->flag [FLAG_USE_BOW]) buf << "(archer)";
908 if (QUERY_FLAG (op, FLAG_USE_WEAPON)) 867 if (op->flag [FLAG_USE_ARMOUR]) buf << "(wear armour)";
909 strcat (retbuf, "(wield weapon)"); 868 if (op->flag [FLAG_USE_RING]) buf << "(wear ring)";
910 if (QUERY_FLAG (op, FLAG_USE_BOW)) 869 if (op->flag [FLAG_USE_SCROLL]) buf << "(read scroll)";
911 strcat (retbuf, "(archer)"); 870 if (op->flag [FLAG_USE_RANGE]) buf << "(fires wand/rod/horn)";
912 if (QUERY_FLAG (op, FLAG_USE_ARMOUR)) 871 if (op->flag [FLAG_CAN_USE_SKILL]) buf << "(skill user)";
913 strcat (retbuf, "(wear armour)"); 872 if (op->flag [FLAG_CAST_SPELL]) buf << "(spellcaster)";
914 if (QUERY_FLAG (op, FLAG_USE_RING)) 873 if (op->flag [FLAG_FRIENDLY]) buf << "(friendly)";
915 strcat (retbuf, "(wear ring)"); 874 if (op->flag [FLAG_UNAGGRESSIVE]) buf << "(unaggressive)";
916 if (QUERY_FLAG (op, FLAG_USE_SCROLL)) 875 if (op->flag [FLAG_HITBACK]) buf << "(hitback)";
917 strcat (retbuf, "(read scroll)"); 876 if (op->flag [FLAG_STEALTH]) buf << "(stealthy)";
918 if (QUERY_FLAG (op, FLAG_USE_RANGE)) 877
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) 878 if (op->randomitems)
933 { 879 {
934 treasure *t;
935 int first = 1; 880 bool first = 1;
936 881
937 for (t = op->randomitems->items; t != NULL; t = t->next) 882 for (treasure *t = op->randomitems->items; t; t = t->next)
938 if (t->item && t->item->clone.type == SPELL) 883 if (t->item && t->item->type == SPELL)
939 { 884 {
940 if (first) 885 if (first)
941 { 886 buf << "(Spell abilities:)";
887
942 first = 0; 888 first = 0;
943 strcat (retbuf, "(Spell abilities:)"); 889
944 } 890 buf << '(' << t->item->object::name << ')';
945 strcat (retbuf, "(");
946 strcat (retbuf, t->item->clone.name);
947 strcat (retbuf, ")");
948 } 891 }
949 } 892 }
893
950 if (op->type == PLAYER) 894 if (op->type == PLAYER)
951 { 895 {
952 if (op->contr->digestion) 896 if (op->contr->digestion)
953 {
954 if (op->contr->digestion != 0)
955 sprintf (buf, "(sustenance%+d)", op->contr->digestion); 897 buf.printf ("(sustenance%+d)", op->contr->digestion);
956 strcat (retbuf, buf); 898
957 }
958 if (op->contr->gen_grace) 899 if (op->contr->gen_grace)
959 {
960 sprintf (buf, "(grace%+d)", op->contr->gen_grace); 900 buf.printf ("(grace%+d)", op->contr->gen_grace);
961 strcat (retbuf, buf); 901
962 }
963 if (op->contr->gen_sp) 902 if (op->contr->gen_sp)
964 {
965 sprintf (buf, "(magic%+d)", op->contr->gen_sp); 903 buf.printf ("(magic%+d)", op->contr->gen_sp);
966 strcat (retbuf, buf); 904
967 }
968 if (op->contr->gen_hp) 905 if (op->contr->gen_hp)
969 {
970 sprintf (buf, "(regeneration%+d)", op->contr->gen_hp); 906 buf.printf ("(regeneration%+d)", op->contr->gen_hp);
971 strcat (retbuf, buf); 907
972 }
973 if (op->stats.luck) 908 if (op->stats.luck)
974 {
975 sprintf (buf, "(luck%+d)", op->stats.luck); 909 buf.printf ("(luck%+d)", op->stats.luck);
976 strcat (retbuf, buf);
977 }
978 } 910 }
979 911
980 /* describe attacktypes */ 912 /* describe attacktypes */
981 if (is_dragon_pl (op)) 913 if (op->is_dragon ())
982 { 914 {
983 /* for dragon players display the attacktypes from clawing skill 915 /* for dragon players display the attacktypes from clawing skill
984 * Break apart the for loop - move the comparison checking down - 916 * Break apart the for loop - move the comparison checking down -
985 * this makes it more readable. 917 * this makes it more readable.
986 */ 918 */
987 object *tmp; 919 object *tmp;
988 920
989 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 921 for (tmp = op->inv; tmp; tmp = tmp->below)
990 if (tmp->type == SKILL && !strcmp (tmp->name, "clawing")) 922 if (tmp->type == SKILL && tmp->name == shstr_clawing)
991 break; 923 break;
992 924
993 if (tmp && tmp->attacktype != 0) 925 if (tmp && tmp->attacktype)
994 { 926 buf.add_abilities ("Claws", tmp->attacktype);
995 DESCRIBE_ABILITY (retbuf, tmp->attacktype, "Claws");
996 }
997 else 927 else
998 { 928 buf.add_abilities ("Attacks", op->attacktype);
999 DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks");
1000 }
1001 } 929 }
1002 else 930 else
1003 { 931 buf.add_abilities ("Attacks", op->attacktype);
1004 DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks"); 932
1005 } 933 buf.add_paths ("Attuned" , op->path_attuned);
1006 DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned"); 934 buf.add_paths ("Repelled", op->path_repelled);
1007 DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled"); 935 buf.add_paths ("Denied" , op->path_denied);
1008 DESCRIBE_PATH (retbuf, op->path_denied, "Denied"); 936
1009 for (i = 0; i < NROFATTACKS; i++) 937 for (int i = 0; i < NROFATTACKS; i++)
1010 {
1011 if (op->resist[i]) 938 if (op->resist[i])
1012 {
1013 sprintf (buf, "(%s %+d)", resist_plus[i], op->resist[i]); 939 buf.printf ("(%s %+d)", resist_plus[i], op->resist[i]);
1014 strcat (retbuf, buf); 940
1015 }
1016 }
1017 return retbuf; 941 return buf;
1018} 942}
1019
1020 943
1021/* 944/*
1022 * Returns a pointer to a static buffer which contains a 945 * Returns a pointer to a static buffer which contains a
1023 * description of the given object. 946 * description of the given object.
1024 * If it is a monster, lots of information about its abilities 947 * 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 956 * wouldn't need to use the SEE_INVISIBLE flag to know it is
1034 * a dragon player examining food. Could have things like 957 * a dragon player examining food. Could have things like
1035 * 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
1036 * dwarves, etc. 959 * dwarves, etc.
1037 * 960 *
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. 961 * Add 'owner' who is the person examining this object.
1044 * 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
1045 * item (eg, debug dump or the like) 963 * item (eg, debug dump or the like)
1046 */ 964 */
1047 965const char *
1048char *
1049describe_item (const object *op, object *owner) 966describe_item (const object *op, object *owner)
1050{ 967{
1051 char buf[MAX_BUF]; 968 if (op->flag [FLAG_MONSTER] || op->type == PLAYER)
1052 static char retbuf[VERY_BIG_BUF]; 969 return describe_monster (op);
970
971 static dynbuf_text buf; buf.clear ();
1053 int identified, i; 972 int identified, i;
1054 973
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. 974 /* figure this out once, instead of making multiple calls to need_identify.
1061 * also makes the code easier to read. 975 * also makes the code easier to read.
1062 */ 976 */
1063 if (!need_identify (op) || QUERY_FLAG (op, FLAG_IDENTIFIED)) 977 identified = !op->need_identify () || op->flag [FLAG_IDENTIFIED];
1064 identified = 1; 978 if (!identified)
1065 else 979 buf << "(unidentified)";
1066 { 980
1067 strcpy (retbuf, "(unidentified)");
1068 identified = 0;
1069 }
1070 switch (op->type) 981 switch (op->type)
1071 { 982 {
983 case RANGED:
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 / max (op->stats.maxsp, 1);
1102 if (op->stats.sp == 0) 1015
1103 strcat (retbuf, "empty."); 1016 if (op->stats.sp == 0) buf << "empty";
1104 else if (i == 0) 1017 else if (i <= 0) buf << "almost empty";
1105 strcat (retbuf, "almost empty."); 1018 else if (i <= 2) buf << "partially filled";
1106 else if (i < 3) 1019 else if (i <= 5) buf << "half full";
1107 strcat (retbuf, "partially filled."); 1020 else if (i <= 8) buf << "well charged";
1108 else if (i < 6)
1109 strcat (retbuf, "half full.");
1110 else if (i < 9)
1111 strcat (retbuf, "well charged.");
1112 else if (op->stats.sp == op->stats.maxsp) 1021 else if (op->stats.sp < op->stats.maxsp) buf << "almost full";
1113 strcat (retbuf, "fully charged."); 1022 else buf << "fully charged";
1114 else 1023
1115 strcat (retbuf, "almost full."); 1024 buf << ')';
1116 break; 1025 break;
1026
1027 case LAMP:
1028 {
1029 int percent = ((double) 100 / op->arch->stats.food) * op->stats.food;
1030 buf << "(fuel: ";
1031 if (percent == 0)
1032 buf << "empty";
1033 else if (percent < 10)
1034 buf << "very low";
1035 else if (percent < 25)
1036 buf << "low";
1037 else if (percent < 50)
1038 buf << "half empty";
1039 else if (percent < 75)
1040 buf << "half full";
1041 else if (percent < 95)
1042 buf << "well filled";
1043 else if (percent <= 100)
1044 buf << "full";
1045 buf << ")";
1046 }
1047 break;
1048
1117 case FOOD: 1049 case FOOD:
1118 case FLESH: 1050 case FLESH:
1119 case DRINK: 1051 case DRINK:
1120 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 1052 if (identified || op->flag [FLAG_BEEN_APPLIED])
1121 { 1053 {
1122 sprintf (buf, "(food+%d)", op->stats.food); 1054 buf.printf ("(food+%d)", op->stats.food);
1123 strcat (retbuf, buf);
1124 1055
1125 if (op->type == FLESH && op->last_eat > 0 && atnr_is_dragon_enabled (op->last_eat)) 1056 if (op->type == FLESH && op->last_eat > 0 && atnr_is_dragon_enabled (op->last_eat))
1057 buf.printf ("(%s metabolism)", change_resist_msg[op->last_eat]);
1058
1059 if (!op->flag [FLAG_CURSED])
1126 { 1060 {
1127 sprintf (buf, "(%s metabolism)", change_resist_msg[op->last_eat]); 1061 if (op->stats.hp) buf << "(heals)";
1128 strcat (retbuf, buf); 1062 if (op->stats.sp) buf << "(spellpoint regen)";
1129 } 1063 }
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 1064 else
1139 { 1065 {
1140 if (op->stats.hp) 1066 if (op->stats.hp) buf << "(damages)";
1141 strcat (retbuf, "(damages)");
1142 if (op->stats.sp)
1143 strcat (retbuf, "(spellpoint depletion)"); 1067 if (op->stats.sp) buf << "(spellpoint depletion)";
1144 } 1068 }
1145 } 1069 }
1146 break; 1070 break;
1147 1071
1148
1149 case SKILL: 1072 case SKILL:
1150 case RING: 1073 case RING:
1151 case AMULET: 1074 case AMULET:
1152 if (op->item_power) 1075 if (op->item_power)
1153 {
1154 sprintf (buf, "(item_power %+d)", op->item_power); 1076 buf.printf ("(item_power %+d)", op->item_power);
1155 strcat (retbuf, buf); 1077
1156 }
1157 if (op->title) 1078 if (op->title)
1158 strcat (retbuf, ring_desc (op)); 1079 buf << ring_desc (op);
1080
1159 return retbuf; 1081 return buf;
1160 1082
1161 default: 1083 default:
1162 return retbuf; 1084 return buf;
1163 } 1085 }
1164 1086
1165 /* Down here, we more further describe equipment type items. 1087 /* Down here, we more further describe equipment type items.
1166 * only describe them if they have been identified or the like. 1088 * only describe them if they have been identified or the like.
1167 */ 1089 */
1168 if (identified || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 1090 if (identified || op->flag [FLAG_BEEN_APPLIED])
1169 { 1091 {
1170 int attr, val;
1171
1172 for (attr = 0; attr < NUM_STATS; attr++) 1092 for (int attr = 0; attr < NUM_STATS; attr++)
1173 { 1093 if (int 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); 1094 buf.printf ("(%s%+d)", short_stat_name[attr], val);
1177 strcat (retbuf, buf);
1178 }
1179 }
1180 1095
1181 if (op->stats.exp) 1096 if (op->stats.exp)
1182 {
1183 sprintf (buf, "(speed %+lld)", (long long) op->stats.exp); 1097 buf.printf ("(speed %+lld)", (long long) op->stats.exp);
1184 strcat (retbuf, buf);
1185 }
1186
1187 1098
1188 switch (op->type) 1099 switch (op->type)
1189 { 1100 {
1101 case RANGED:
1190 case BOW: 1102 case BOW:
1191 case ARROW: 1103 case ARROW:
1192 case GIRDLE: 1104 case GIRDLE:
1193 case HELMET: 1105 case HELMET:
1194 case SHIELD: 1106 case SHIELD:
1195 case BOOTS: 1107 case BOOTS:
1196 case GLOVES: 1108 case GLOVES:
1197 case WEAPON: 1109 case WEAPON:
1198 case SKILL: 1110 case SKILL:
1199 case RING: 1111 case RING:
1200 case AMULET: 1112 case AMULET:
1201 case ARMOUR: 1113 case ARMOUR:
1202 case BRACERS: 1114 case BRACERS:
1203 case FORCE: 1115 case FORCE:
1204 case CLOAK: 1116 case CLOAK:
1205 if (op->stats.wc) 1117 if (op->stats.wc) buf.printf ("(wc%+d)", op->stats.wc);
1206 { 1118 if (op->stats.dam) buf.printf ("(dam%+d)", op->stats.dam);
1207 sprintf (buf, "(wc%+d)", op->stats.wc); 1119 if (op->stats.ac) buf.printf ("(ac%+d)", op->stats.ac);
1208 strcat (retbuf, buf); 1120
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) 1121 if ((op->type == WEAPON || op->type == BOW) && op->level > 0)
1221 {
1222 sprintf (buf, "(improved %d/%d)", op->last_eat, op->level); 1122 buf.printf ("(improved %d/%d)", op->last_eat, op->level);
1223 strcat (retbuf, buf); 1123
1224 }
1225 break; 1124 break;
1226 1125
1227 default: 1126 default:
1228 break; 1127 break;
1229 } 1128 }
1230 if (QUERY_FLAG (op, FLAG_XRAYS)) 1129
1231 strcat (retbuf, "(xray-vision)"); 1130 if (op->flag [FLAG_XRAYS]) buf << "(xray-vision)";
1232 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK)) 1131 if (op->flag [FLAG_SEE_IN_DARK]) buf << "(infravision)";
1233 strcat (retbuf, "(infravision)");
1234 1132
1235 /* levitate was what is was before, so we'll keep it */ 1133 /* levitate was what is was before, so we'll keep it */
1236 if (op->move_type & MOVE_FLY_LOW) 1134 if (op->move_type & MOVE_FLY_LOW) buf << "(levitate)";
1237 strcat (retbuf, "(levitate)");
1238
1239 if (op->move_type & MOVE_FLY_HIGH) 1135 if (op->move_type & MOVE_FLY_HIGH) buf << "(fly)";
1240 strcat (retbuf, "(fly)");
1241
1242 if (op->move_type & MOVE_SWIM) 1136 if (op->move_type & MOVE_SWIM) buf << "(swim)";
1243 strcat (retbuf, "(swim)");
1244 1137
1245 /* walking is presumed as 'normal', so doesn't need mentioning */ 1138 /* walking is presumed as 'normal', so doesn't need mentioning */
1246 1139
1247 if (op->item_power) 1140 if (op->item_power)
1248 {
1249 sprintf (buf, "(item_power %+d)", op->item_power); 1141 buf.printf ("(item_power %+d)", op->item_power);
1250 strcat (retbuf, buf);
1251 }
1252 } /* End if identified or applied */ 1142 } /* End if identified or applied */
1253 1143
1254 /* This blocks only deals with fully identified object. 1144 /* This blocks only deals with fully identified object.
1255 * it is intentional that this is not an 'else' from a above - 1145 * it is intentional that this is not an 'else' from a above -
1256 * in this way, information is added. 1146 * in this way, information is added.
… …
1259 { 1149 {
1260 int more_info = 0; 1150 int more_info = 0;
1261 1151
1262 switch (op->type) 1152 switch (op->type)
1263 { 1153 {
1154 case RANGED:
1264 case ROD: /* These use stats.sp for spell selection and stats.food */ 1155 case ROD: /* These use stats.sp for spell selection and stats.food */
1265 case HORN: /* and stats.hp for spell-point regeneration... */ 1156 case HORN: /* and stats.hp for spell-point regeneration... */
1266 case BOW: 1157 case BOW:
1267 case ARROW: 1158 case ARROW:
1268 case WAND: 1159 case WAND:
1269 case FOOD: 1160 case FOOD:
1270 case FLESH: 1161 case FLESH:
1271 case DRINK: 1162 case DRINK:
1272 more_info = 0; 1163 more_info = 0;
1273 break; 1164 break;
1274 1165
1275 /* Armor type objects */ 1166 /* Armor type objects */
1276 case ARMOUR: 1167 case ARMOUR:
1277 case HELMET: 1168 case HELMET:
1278 case SHIELD: 1169 case SHIELD:
1279 case BOOTS: 1170 case BOOTS:
1280 case GLOVES: 1171 case GLOVES:
1281 case GIRDLE: 1172 case GIRDLE:
1282 case BRACERS: 1173 case BRACERS:
1283 case CLOAK: 1174 case CLOAK:
1284 if (ARMOUR_SPEED (op)) 1175 if (ARMOUR_SPEED (op)) buf.printf ("(Max speed %1.2f)", ARMOUR_SPEED (op) / 10.0);
1285 { 1176 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; 1177 more_info = 1;
1295 break; 1178 break;
1296 1179
1297 case WEAPON: 1180 case WEAPON:
1298 /* Calculate it the same way fix_player does so the results 1181 /* Calculate it the same way fix_player does so the results
1299 * make sense. 1182 * make sense.
1300 */ 1183 */
1301 i = (WEAPON_SPEED (op) * 2 - op->magic) / 2; 1184 i = (WEAPON_SPEED (op) * 2 - op->magic) / 2;
1302 if (i < 0) 1185 if (i < 0)
1303 i = 0; 1186 i = 0;
1304 1187
1305 sprintf (buf, "(weapon speed %d)", i); 1188 buf.printf ("(weapon speed %d)", i);
1306 strcat (retbuf, buf);
1307 more_info = 1; 1189 more_info = 1;
1308 break; 1190 break;
1309
1310 } 1191 }
1192
1311 if (more_info) 1193 if (more_info)
1312 { 1194 {
1313 if (op->stats.food)
1314 {
1315 if (op->stats.food != 0)
1316 sprintf (buf, "(sustenance%+d)", op->stats.food); 1195 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); 1196 if (op->stats.grace) buf.printf ("(grace%+d)", op->stats.grace);
1322 strcat (retbuf, buf); 1197 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); 1198 if (op->stats.hp) buf.printf ("(regeneration%+d)", op->stats.hp);
1332 strcat (retbuf, buf);
1333 }
1334 } 1199 }
1335 1200
1336 if (op->stats.luck) 1201 if (op->stats.luck)
1337 {
1338 sprintf (buf, "(luck%+d)", op->stats.luck); 1202 buf.printf ("(luck%+d)", op->stats.luck);
1339 strcat (retbuf, buf); 1203
1340 } 1204 if (op->flag [FLAG_LIFESAVE]) buf << "(lifesaving)";
1341 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 1205 if (op->flag [FLAG_REFL_SPELL]) buf << "(reflect spells)";
1342 strcat (retbuf, "(lifesaving)"); 1206 if (op->flag [FLAG_REFL_MISSILE]) buf << "(reflect missiles)";
1343 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) 1207 if (op->flag [FLAG_STEALTH]) buf << "(stealth)";
1344 strcat (retbuf, "(reflect spells)"); 1208
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) 1209 if (op->slaying && op->type != FOOD)
1350 {
1351 sprintf (buf, "(slay %s)", &op->slaying); 1210 buf.printf ("(slay %s)", &op->slaying);
1352 strcat (retbuf, buf); 1211
1353 } 1212 if (op->type == SKILL_TOOL && op->skill)
1354 DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks"); 1213 buf.printf ("(%s)", &op->skill);
1214
1215 buf.add_abilities ("Attacks", op->attacktype);
1355 /* resistance on flesh is only visible for quetzals. If 1216 /* resistance on flesh is only visible for quetzals. If
1356 * non flesh, everyone can see its resistances 1217 * non flesh, everyone can see its resistances
1357 */ 1218 */
1358 if (op->type != FLESH || (owner && is_dragon_pl (owner))) 1219 if (op->type != FLESH || (owner && owner->is_dragon ()))
1359 strcat (retbuf, describe_resistance (op, 0)); 1220 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 1221
1222 buf.add_paths ("Attuned", op->path_attuned);
1223 buf.add_paths ("Repelled", op->path_repelled);
1224 buf.add_paths ("Denied", op->path_denied);
1225 }
1226
1365 return retbuf; 1227 return buf;
1228}
1229
1230std::string
1231object::describe_item (object *who)
1232{
1233 return std::string (::describe_item (this, who));
1234}
1235
1236static void
1237describe_dump_object (dynbuf &buf, object *ob)
1238{
1239 char *txt = dump_object (ob);
1240 for (char *p = txt; *p; ++p) if (*p == '\n') *p = '\r';
1241 buf << "\n" << txt << "\n";
1242
1243 if (!ob->is_arch ())
1244 describe_dump_object (buf, ob->arch);
1245}
1246
1247std::string
1248object::describe (object *who)
1249{
1250 dynbuf_text buf (1024, 1024);
1251
1252 buf.printf ("That is: %s.\r", long_desc (who).c_str ());
1253
1254 if (custom_name)
1255 buf.printf ("You call it %s.\r", &custom_name);
1256
1257 switch (type)
1258 {
1259 case SPELLBOOK:
1260 if (flag [FLAG_IDENTIFIED] && inv)
1261 buf.printf ("%s is a %s level %s spell.\r", &inv->name, ordinal (inv->level), &inv->skill);
1262 break;
1263
1264 case BOOK:
1265 if (msg)
1266 buf << "Something is written in it.\r";
1267 break;
1268
1269 case CONTAINER:
1270 if (race)
1271 {
1272 if (weight_limit && stats.Str < 100)
1273 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\r",
1274 &race, weight_limit / (10.0 * (100 - stats.Str)));
1275 else
1276 buf.printf ("It can hold only %s.\r", &race);
1277 }
1278 else if (weight_limit && stats.Str < 100)
1279 buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str)));
1280 break;
1281
1282 case WAND:
1283 if (flag [FLAG_IDENTIFIED])
1284 buf.printf ("It has %d %s left.\r", stats.food, stats.food == 1 ? "charge" : "charges");
1285 break;
1286 }
1287
1288 if (material != MATERIAL_NULL && !msg)
1289 buf << (nrof > 1 ? "They are made of " : "It is made of ")
1290 << material->description
1291 << ".\r";
1292
1293 if (who)
1294 /* Where to wear this item */
1295 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1296 if (slot[i].info)
1297 {
1298 buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1299
1300 if (slot[i].info < -1 && who->slot[i].info)
1301 buf.printf ("(%d)", -slot[i].info);
1302
1303 buf << ".\r";
1304 }
1305
1306 if (weight)
1307 buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0);
1308
1309 if (flag [FLAG_STARTEQUIP])
1310 buf << (nrof > 1 ? "They were" : "It was")
1311 << " given by a god and will vanish when dropped.\r";
1312
1313 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1314 {
1315 buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
1316
1317 if (who->is_in_shop ())
1318 {
1319 if (flag [FLAG_UNPAID])
1320 buf.printf ("%s would cost you %s.\r", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
1321 else
1322 buf.printf ("You are offered %s for %s.\r", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1323 }
1324 }
1325
1326 if (flag [FLAG_MONSTER])
1327 buf << describe_monster (who);
1328
1329 /* Is this item buildable? */
1330 if (flag [FLAG_IS_BUILDABLE])
1331 buf << "This is a buildable item.\r";
1332
1333 /* Does the object have a message? Don't show message for all object
1334 * types - especially if the first entry is a match
1335 */
1336 if (msg)
1337 {
1338 if (type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
1339 {
1340 if (!need_identify ())
1341 buf << '\r' << msg << '\n';
1342 else if (flag [FLAG_IDENTIFIED])
1343 buf << '\r' << "The object has a story:\r" << msg;
1344 }
1345 }
1346 else if (inv
1347 && inv->msg
1348 && inv->type == SPELL
1349 && flag [FLAG_IDENTIFIED]
1350 && (type == SPELLBOOK || type == ROD || type == WAND
1351 || type == POTION || type == SCROLL))
1352 // for spellbooks and other stuff that contains spells, print the spell message,
1353 // unless the object has a custom message handled above.
1354 buf << '\r' << inv->msg << '\n';
1355
1356 // try to display the duration for some potions and scrolls
1357 // this includes change ability potions and group spells,
1358 // but does not handle protection potions
1359 if (inv && inv->type == SPELL && flag [FLAG_IDENTIFIED]
1360 && (type == POTION || type == SCROLL))
1361 {
1362 object *spell = inv;
1363
1364 if (spell->subtype == SP_PARTY_SPELL)
1365 spell = spell->other_arch;
1366
1367 if (spell->subtype == SP_CHANGE_ABILITY)
1368 buf.printf ("\nH<The effect will last about %.10g seconds.>",
1369 TICK2TIME (change_ability_duration (spell, this)));
1370 }
1371
1372 // some help text for skill tools
1373 if (type == SKILL_TOOL)
1374 buf << "\nH<This item is a skill tool: as long as you have this item applied "
1375 "you can use the " << &skill << " skill as if you had learned it.>";
1376
1377 // Display a hint about inscribable items [empty books]
1378 // This includes the amount of text they can hold.
1379 if (type == INSCRIBABLE)
1380 {
1381 if (other_arch && other_arch->type == SCROLL)
1382 buf.printf ("\nH<You can use the inscription skill to inscribe a spell into it.>");
1383 else
1384 buf.printf ("\nH<You can use the inscription skill to inscribe text into it. It has room for up to %d characters.>",
1385 weight_limit);
1386 }
1387
1388 buf << '\n';
1389
1390 // the dungeon master additionally gets a complete dump
1391 if (who && who->flag [FLAG_WIZLOOK])
1392 {
1393 buf << "\nT<Object>\n";
1394 describe_dump_object (buf, this);
1395
1396 if (inv)
1397 {
1398 buf << "\nT<Top Inventory>\n";
1399 describe_dump_object (buf, inv);
1400 }
1401 }
1402
1403 return std::string (buf.linearise (), buf.size ());
1404}
1405
1406void
1407examine (object *op, object *tmp)
1408{
1409 std::string info = tmp->describe (op);
1410
1411 op->contr->infobox (MSG_CHANNEL ("examine"), info.c_str ());
1412}
1413
1414/*
1415 * inventory prints object's inventory. If inv==NULL then print player's
1416 * inventory.
1417 * [ Only items which are applied are showed. Tero.Haatanen@lut.fi ]
1418 */
1419const char *
1420object::query_inventory (object *who, const char *indent)
1421{
1422 static dynbuf_text buf; buf.clear ();
1423
1424 for (object *tmp = inv; tmp; tmp = tmp->below)
1425 if (who && who->flag [FLAG_WIZ])
1426 buf.printf ("%s- %-28.28s %-8s (%9d) %s\n", indent, tmp->query_name (), tmp->query_weight (), tmp->count, tmp->uuid.c_str ());
1427 else if (!tmp->invisible && (type == CONTAINER || tmp->flag [FLAG_APPLIED]))
1428 buf.printf ("%s- %-36.36s %-8s\n", indent, tmp->query_name (), tmp->query_weight ());
1429
1430 if (buf.size ())
1431 buf.printf ("%s(total weight: %s)\n", indent, query_weight ());
1432 else
1433 buf.printf ("%s(empty)\n", indent);
1434
1435 return buf;
1366} 1436}
1367 1437
1368/* Return true if the item is magical. A magical item is one that 1438/* Return true if the item is magical. A magical item is one that
1369 * increases/decreases any abilities, provides a resistance, 1439 * increases/decreases any abilities, provides a resistance,
1370 * has a generic magical bonus, or is an artifact. 1440 * has a generic magical bonus, or is an artifact.
1371 * This function is used by detect_magic to determine if an item 1441 * This function is used by detect_magic to determine if an item
1372 * should be marked as magical. 1442 * should be marked as magical.
1373 */ 1443 */
1374
1375int 1444int
1376is_magical (const object *op) 1445is_magical (const object *op)
1377{ 1446{
1378 int i; 1447 int i;
1379 1448
1380 /* living creatures are considered non magical */ 1449 /* living creatures are considered non magical */
1381 if (QUERY_FLAG (op, FLAG_ALIVE)) 1450 if (op->flag [FLAG_ALIVE])
1382 return 0; 1451 return 0;
1383 1452
1384 /* This is a test for it being an artifact, as artifacts have titles */ 1453 /* This is a test for it being an artifact, as artifacts have titles */
1385 if (op->title != NULL) 1454 if (op->title != NULL)
1386 return 1; 1455 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)) 1461 (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; 1462 return 1;
1394 1463
1395 /* Check for stealty, speed, flying, or just plain magic in the boots */ 1464 /* Check for stealty, speed, flying, or just plain magic in the boots */
1396 /* Presume any boots that hvae a move_type are special. */ 1465 /* 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))) 1466 if (op->type == BOOTS && ((op->flag [FLAG_STEALTH] || op->move_type || op->stats.exp)))
1398 return 1; 1467 return 1;
1399 1468
1400 /* Take care of amulet/shield that reflects spells/missiles */ 1469 /* 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))) 1470 if ((op->type == AMULET || op->type == SHIELD) && (op->flag [FLAG_REFL_SPELL] || op->flag [FLAG_REFL_MISSILE]))
1402 return 1; 1471 return 1;
1403 1472
1404 /* Take care of helmet of xrays */ 1473 /* Take care of helmet of xrays */
1405 if (op->type == HELMET && QUERY_FLAG (op, FLAG_XRAYS)) 1474 if (op->type == HELMET && op->flag [FLAG_XRAYS])
1406 return 1; 1475 return 1;
1407 1476
1408 /* Potions & rods are always magical. Wands/staves are also magical, 1477 /* Potions & rods are always magical. Wands/staves are also magical,
1409 * assuming they still have any charges left. 1478 * assuming they still have any charges left.
1410 */ 1479 */
… …
1430 if (op->magic || op->type == POWER_CRYSTAL || op->type == SPELLBOOK || op->type == SCROLL || op->type == GIRDLE) 1499 if (op->magic || op->type == POWER_CRYSTAL || op->type == SPELLBOOK || op->type == SCROLL || op->type == GIRDLE)
1431 return 1; 1500 return 1;
1432 1501
1433 /* Check to see if it increases/decreases any stats */ 1502 /* Check to see if it increases/decreases any stats */
1434 for (i = 0; i < NUM_STATS; i++) 1503 for (i = 0; i < NUM_STATS; i++)
1435 if (get_attr_value (&(op->stats), i) != 0) 1504 if (op->stats.stat (i))
1436 return 1; 1505 return 1;
1437 1506
1438 /* If it doesn't fall into any of the above categories, must 1507 /* If it doesn't fall into any of the above categories, must
1439 * be non magical. 1508 * be non magical.
1440 */ 1509 */
1441 return 0; 1510 return 0;
1442} 1511}
1443 1512
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/* 1513/*
1498 * Supposed to fix face-values as well here, but later. 1514 * Supposed to fix face-values as well here, but later.
1499 */ 1515 */
1500void 1516void
1501identify (object *op) 1517identify (object *op)
1502{ 1518{
1503 object *pl; 1519 op->set_flag (FLAG_IDENTIFIED);
1504 1520 op->clr_flag (FLAG_KNOWN_MAGICAL);
1505 SET_FLAG (op, FLAG_IDENTIFIED); 1521 op->clr_flag (FLAG_NO_SKILL_IDENT);
1506 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);
1507 CLEAR_FLAG (op, FLAG_NO_SKILL_IDENT);
1508 1522
1509 /* 1523 /*
1510 * We want autojoining of equal objects: 1524 * We want autojoining of equal objects:
1511 */ 1525 */
1512 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 1526 if (op->flag [FLAG_CURSED] || op->flag [FLAG_DAMNED])
1513 SET_FLAG (op, FLAG_KNOWN_CURSED); 1527 op->set_flag (FLAG_KNOWN_CURSED);
1514 1528
1515 if (op->type == POTION) 1529 if (op->type == POTION)
1516 { 1530 {
1517 if (op->inv && op->randomitems) 1531 if (op->inv && op->randomitems)
1518 op->title = op->inv->name; 1532 op->title = op->inv->name;
1519 else if (op->arch) 1533 else if (op->arch)
1520 { 1534 {
1521 op->name = op->arch->clone.name; 1535 op->name = op->arch->object::name;
1522 op->name_pl = op->arch->clone.name_pl; 1536 op->name_pl = op->arch->object::name_pl;
1523 } 1537 }
1524 } 1538 }
1525 1539
1526 /* If the object is on a map, make sure we update its face */ 1540 /* If the object is on a map, make sure we update its face */
1527 if (op->map) 1541 if (op->map)
1528 update_object (op, UP_OBJ_FACE); 1542 update_object (op, UP_OBJ_CHANGE);
1529 else 1543
1530 { 1544 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 1545 /* A lot of the values can change from an update - might as well send
1534 * it all. 1546 * it all.
1535 */ 1547 */
1536 esrv_send_item (pl, op); 1548 esrv_send_item (pl, op);
1537 }
1538} 1549}
1539 1550

Diff Legend

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