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.41 by root, Thu Nov 8 19:43:23 2007 UTC vs.
Revision 1.91 by root, Sat Apr 23 04:56:45 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines