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

Diff Legend

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