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.47 by root, Mon Apr 21 23:35:24 2008 UTC vs.
Revision 1.62 by root, Thu Nov 5 15:43:21 2009 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,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 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>
… …
169 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0}, 170 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0},
170 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0}, 171 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0},
171 {SPINNER, "spinner", "spinners", 0, 0}, 172 {SPINNER, "spinner", "spinners", 0, 0},
172 {GATE, "gate", "gates", 0, 0}, 173 {GATE, "gate", "gates", 0, 0},
173 {BUTTON, "button", "buttons", 0, 0}, 174 {BUTTON, "button", "buttons", 0, 0},
174 {CF_HANDLE, "cf handle", "cf handles", 0, 0}, 175 {T_HANDLE, "cf handle", "cf handles", 0, 0},
175 {HOLE, "hole", "holes", 0, 0}, 176 {HOLE, "hole", "holes", 0, 0},
176 {TRAPDOOR, "trapdoor", "trapdoors", 0, 0}, 177 {TRAPDOOR, "trapdoor", "trapdoors", 0, 0},
177 {SIGN, "sign", "signs", 0, 0}, 178 {SIGN, "sign", "signs", 0, 0},
178 {BOOTS, "boots", "boots", SK_SMITHERY, 0}, 179 {BOOTS, "boots", "boots", SK_SMITHERY, 0},
179 {GLOVES, "gloves", "gloves", SK_SMITHERY, 0}, 180 {GLOVES, "gloves", "gloves", SK_SMITHERY, 0},
… …
252}; 253};
253 254
254int 255int
255get_power_from_ench (int ench) 256get_power_from_ench (int ench)
256{ 257{
257 if (ench < 0) ench = 0;
258 if (ench > 20) ench = 20;
259
260 return enc_to_item_power[ench]; 258 return enc_to_item_power [clamp (ench, 0, 20)];
261} 259}
262 260
263/* This takes an object 'op' and figures out what its item_power 261/* This takes an object 'op' and figures out what its item_power
264 * rating should be. This should only really be used by the treasure 262 * rating should be. This should only really be used by the treasure
265 * generation code, and when loading legacy objects. It returns 263 * generation code, and when loading legacy objects. It returns
… …
299 if (op->type == WEAPON) 297 if (op->type == WEAPON)
300 { 298 {
301 for (i = 1; i < NROFATTACKS; i++) 299 for (i = 1; i < NROFATTACKS; i++)
302 if (op->attacktype & (1 << i)) 300 if (op->attacktype & (1 << i))
303 enc++; 301 enc++;
302
304 if (op->slaying) 303 if (op->slaying)
305 enc += 2; /* What it slays is probably more relevent */ 304 enc += 2; /* What it slays is probably more relevent */
306 } 305 }
306
307 /* Items the player can equip */ 307 /* Items the player can equip */
308 if ((op->type == WEAPON) || (op->type == ARMOUR) || (op->type == HELMET) || 308 if ((op->type == WEAPON) || (op->type == ARMOUR) || (op->type == HELMET) ||
309 (op->type == SHIELD) || (op->type == RING) || 309 (op->type == SHIELD) || (op->type == RING) ||
310 (op->type == BOOTS) || (op->type == GLOVES) || 310 (op->type == BOOTS) || (op->type == GLOVES) ||
311 (op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK)) 311 (op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK))
… …
314 enc += op->stats.hp; /* hp regen */ 314 enc += op->stats.hp; /* hp regen */
315 enc += op->stats.sp; /* mana regen */ 315 enc += op->stats.sp; /* mana regen */
316 enc += op->stats.grace; /* grace regen */ 316 enc += op->stats.grace; /* grace regen */
317 enc += op->stats.exp; /* speed bonus */ 317 enc += op->stats.exp; /* speed bonus */
318 } 318 }
319
319 enc += op->stats.luck; 320 enc += op->stats.luck;
320 321
321 /* Do spell paths now */ 322 /* Do spell paths now */
322 for (i = 1; i < NRSPELLPATHS; i++) 323 for (i = 1; i < NRSPELLPATHS; i++)
323 { 324 {
… …
327 enc -= 2; 328 enc -= 2;
328 else if (op->path_repelled & (1 << i)) 329 else if (op->path_repelled & (1 << i))
329 enc--; 330 enc--;
330 } 331 }
331 332
332 if (QUERY_FLAG (op, FLAG_LIFESAVE)) 333 if (op->flag [FLAG_LIFESAVE ]) enc += 5;
333 enc += 5; 334 if (op->flag [FLAG_REFL_SPELL ]) enc += 3;
334 if (QUERY_FLAG (op, FLAG_REFL_SPELL)) 335 if (op->flag [FLAG_REFL_MISSILE]) enc += 2;
335 enc += 3; 336 if (op->flag [FLAG_XRAYS ]) enc += 2;
336 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) 337 if (op->flag [FLAG_STEALTH ]) enc += 1;
337 enc += 2; 338 if (op->flag [FLAG_SEE_IN_DARK ]) enc += 1;
338 if (QUERY_FLAG (op, FLAG_STEALTH)) 339 if (op->flag [FLAG_MAKE_INVIS ]) enc += 1;
339 enc += 1;
340 if (QUERY_FLAG (op, FLAG_XRAYS))
341 enc += 2;
342 if (QUERY_FLAG (op, FLAG_SEE_IN_DARK))
343 enc += 1;
344 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
345 enc += 1;
346 340
347 return get_power_from_ench (enc); 341 return get_power_from_ench (enc);
348} 342}
349 343
350/* returns the typedata that has a number equal to itemtype, if there 344/* returns the typedata that has a number equal to itemtype, if there
351 * isn't one, returns NULL */ 345 * isn't one, returns NULL */
352const typedata * 346const typedata *
353get_typedata (int itemtype) 347get_typedata (int itemtype)
354{ 348{
355 int i;
356
357 for (i = 0; i < item_types_size; i++) 349 for (int i = 0; i < item_types_size; i++)
358 if (item_types[i].number == itemtype) 350 if (item_types[i].number == itemtype)
359 return &item_types[i]; 351 return &item_types[i];
352
360 return NULL; 353 return NULL;
361} 354}
362 355
363/* returns the typedata that has a name equal to itemtype, if there 356/* returns the typedata that has a name equal to itemtype, if there
364 * isn't one, return the plural name that matches, if there still isn't 357 * isn't one, return the plural name that matches, if there still isn't
365 * one return NULL */ 358 * one return NULL */
366const typedata * 359const typedata *
367get_typedata_by_name (const char *name) 360get_typedata_by_name (const char *name)
368{ 361{
369 int i;
370
371 for (i = 0; i < item_types_size; i++) 362 for (int i = 0; i < item_types_size; i++)
372 if (!strcmp (item_types[i].name, name)) 363 if (!strcmp (item_types[i].name, name))
373 return &item_types[i]; 364 return &item_types[i];
365
374 for (i = 0; i < item_types_size; i++) 366 for (int i = 0; i < item_types_size; i++)
375 if (!strcmp (item_types[i].name_pl, name)) 367 if (!strcmp (item_types[i].name_pl, name))
376 { 368 {
377 LOG (llevInfo, 369 LOG (llevInfo,
378 "get_typedata_by_name: I have been sent the plural %s, the singular form %s is preffered\n", name, item_types[i].name); 370 "get_typedata_by_name: I have been sent the plural %s, the singular form %s is prefered\n", name, item_types[i].name);
379 return &item_types[i]; 371 return &item_types[i];
380 } 372 }
373
381 return NULL; 374 return 0;
382} 375}
383 376
384/* describe_resistance generates the visible naming for resistances. 377/* describe_resistance generates the visible naming for resistances.
385 * returns a static array of the description. This can return 378 * returns a static array of the description. This can return
386 * a big buffer. 379 * a big buffer.
… …
388 * but do put a newline at the end. Useful when dumping to files 381 * but do put a newline at the end. Useful when dumping to files
389 */ 382 */
390const char * 383const char *
391describe_resistance (const object *op, int newline) 384describe_resistance (const object *op, int newline)
392{ 385{
393 static char buf[VERY_BIG_BUF]; 386 static dynbuf_text buf; buf.clear ();
394 char buf1[VERY_BIG_BUF];
395 int tmpvar;
396 387
397 buf[0] = 0; 388 for (int i = 0; i < NROFATTACKS; i++)
398 for (tmpvar = 0; tmpvar < NROFATTACKS; tmpvar++)
399 {
400 if (op->resist[tmpvar] && (op->type != FLESH || atnr_is_dragon_enabled (tmpvar) == 1)) 389 if (op->resist[i] && (op->type != FLESH || atnr_is_dragon_enabled (i) == 1))
401 { 390 buf.printf (newline ? "%s %d\n" : "(%s %+d)", resist_plus[i], op->resist[i]);
402 if (!newline)
403 sprintf (buf1, "(%s %+d)", resist_plus[tmpvar], op->resist[tmpvar]);
404 else
405 sprintf (buf1, "%s %d\n", resist_plus[tmpvar], op->resist[tmpvar]);
406 391
407 strcat (buf, buf1);
408 }
409 }
410 return buf; 392 return buf;
411} 393}
412
413 394
414/* 395/*
415 * query_weight(object) returns a character pointer to a static buffer 396 * query_weight(object) returns a character pointer to a static buffer
416 * containing the text-representation of the weight of the given object. 397 * containing the text-representation of the weight of the given object.
417 * The buffer will be overwritten by the next call to query_weight(). 398 * The buffer will be overwritten by the next call to query_weight().
399 *
400 * Seems to be used only by unimportant stuff. Remove?
418 */ 401 */
419const char * 402const char *
420query_weight (const object *op) 403query_weight (const object *op)
421{ 404{
422 static char buf[10]; 405 static char buf[10];
… …
448 return buf; 431 return buf;
449 } 432 }
450 433
451 if (i < 21) 434 if (i < 21)
452 return levelnumbers[i]; 435 return levelnumbers[i];
436
453 if (!(i % 10)) 437 if (!(i % 10))
454 return levelnumbers_10[i / 10]; 438 return levelnumbers_10[i / 10];
455 439
456 strcpy (buf, numbers_10[i / 10]); 440 strcpy (buf, numbers_10[i / 10]);
457 strcat (buf, levelnumbers[i % 10]); 441 strcat (buf, levelnumbers[i % 10]);
… …
533} 517}
534 518
535/* 519/*
536 * 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
537 * 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.
538 */ 524 */
539const char * 525const char *
540query_short_name (const object *op) 526query_short_name (const object *op)
541{ 527{
542 if (op->name == 0) 528 if (!op->name)
543 return "(null)"; 529 return "(null)";
544 530
545 if (!op->nrof 531 if (!op->nrof
546 && !op->weight 532 && !op->weight
547 && !op->title 533 && !op->title
… …
570 if (op->type != SPELLBOOK) 556 if (op->type != SPELLBOOK)
571 buf.printf (" (lvl %d)", op->level); 557 buf.printf (" (lvl %d)", op->level);
572 } 558 }
573 break; 559 break;
574 560
575 case ALTAR: 561 case ALTAR:
576 case TRIGGER_ALTAR: 562 case TRIGGER_ALTAR:
577 case IDENTIFY_ALTAR: 563 case IDENTIFY_ALTAR:
578 case CONVERTER: 564 case CONVERTER:
579 if (op->slaying == shstr_money) 565 if (op->slaying == shstr_money)
580 { 566 {
581 bool wrap = !!buf.size (); 567 bool wrap = !!buf.size ();
582 568
583 if (wrap) buf << " ["; 569 if (wrap) buf << " [";
584 570
585 archetype *coin = 0; 571 archetype *coin = 0;
586 572
587 for (char const *const *c = coins; *coins; ++c) 573 for (char const *const *c = coins; *coins; ++c)
588 if ((coin = archetype::find (*c))) 574 if ((coin = archetype::find (*c)))
589 if (op->stats.food % coin->value == 0) 575 if (op->stats.food % coin->value == 0)
590 break; 576 break;
591 577
592 sint32 coins = op->stats.food / coin->value; 578 sint32 coins = op->stats.food / coin->value;
593 579
594 buf.printf ("drop %d %s (or equivalent)", coins, coins == 1 ? &coin->name : &coin->name_pl); 580 buf.printf ("drop %d %s (or equivalent)", coins, coins == 1 ? &coin->name : &coin->name_pl);
595 581
596 if (wrap) buf << ']'; 582 if (wrap) buf << ']';
597 } 583 }
598 break; 584 break;
599 585
600 case SKILL: 586 case SKILL:
601 case AMULET: 587 case AMULET:
602 case RING: 588 case RING:
603 if (!op->title) 589 if (!op->title)
… …
626 * 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
627 * 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
628 * returned is good forever.) However, it makes printing statements that 614 * returned is good forever.) However, it makes printing statements that
629 * 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.)
630 * 616 *
617 * It is used extensively within messages, so should return only a prose
618 * and short description of the item.
631 */ 619 */
632const char * 620const char *
633query_name (const object *op) 621query_name (const object *op)
634{ 622{
635 int len = 0; 623 int len = 0;
… …
648 636
649 buf << query_short_name (op); 637 buf << query_short_name (op);
650 638
651 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 639 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
652 buf << " *"; 640 buf << " *";
653 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 641 if (op->is_open_container ())
654 buf << " (open)"; 642 buf << " (open)";
655 643
656 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 644 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
657 { 645 {
658 if (QUERY_FLAG (op, FLAG_DAMNED)) 646 if (QUERY_FLAG (op, FLAG_DAMNED))
… …
672 */ 660 */
673 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 661 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))
674 buf << " (magic)"; 662 buf << " (magic)";
675 663
676#if 0 664#if 0
677 /* item_power will be returned in desribe_item - it shouldn't really 665 /* item_power will be returned in describe_item - it shouldn't really
678 * be returned in the name. 666 * be returned in the name.
679 */ 667 */
680 if (op->item_power) 668 if (op->item_power)
681 sprintf (buf[use_buf] + strlen (buf[use_buf]), "(item_power %+d)", op->item_power); 669 sprintf (buf[use_buf] + strlen (buf[use_buf]), "(item_power %+d)", op->item_power);
682 670
… …
714 default: 702 default:
715 buf << " (applied)"; 703 buf << " (applied)";
716 } 704 }
717 } 705 }
718 706
707 switch (op->type)
708 {
709 case LAMP:
710 if (op->glow_radius)
711 buf << " (on)";
712 else if (op->stats.food <= 0)
713 buf << " (empty)";
714 else
715 buf << " (off)";
716 break;
717
718 case TORCH:
719 if (op->glow_radius)
720 buf << " (burning)";
721 else if (op->stats.food <= 0)
722 buf << " (burned out)";
723 break;
724 }
725
719 if (QUERY_FLAG (op, FLAG_UNPAID)) 726 if (QUERY_FLAG (op, FLAG_UNPAID))
720 buf << " (unpaid)"; 727 buf << " (unpaid)";
721 728
722 return buf; 729 return buf;
723} 730}
… …
728 * of the given object. The buffer will be overwritten at the next 735 * of the given object. The buffer will be overwritten at the next
729 * call to query_base_name(). This is a lot like query_name, but we 736 * call to query_base_name(). This is a lot like query_name, but we
730 * don't include the item count or item status. Used for inventory sorting 737 * don't include the item count or item status. Used for inventory sorting
731 * and sending to client. 738 * and sending to client.
732 * If plural is set, we generate the plural name of this. 739 * If plural is set, we generate the plural name of this.
740 *
741 * It is sometimes used to display messages, and usually only used to match stuff,
742 * so maybe this function should be removed.
733 */ 743 */
734const char * 744const char *
735query_base_name (const object *op, int plural) 745query_base_name (const object *op, int plural)
736{ 746{
737 if ((!plural && !op->name) || (plural && !op->name_pl)) 747 if ((!plural && !op->name) || (plural && !op->name_pl))
… …
807 */ 817 */
808 if (op->has_active_speed ()) 818 if (op->has_active_speed ())
809 switch ((int) ((FABS (op->speed)) * 15)) 819 switch ((int) ((FABS (op->speed)) * 15))
810 { 820 {
811 case 0: 821 case 0:
812 buf << "(very slow movement"; 822 buf << "(very slow movement)";
813 break; 823 break;
814 case 1: 824 case 1:
815 buf << "(slow movement)"; 825 buf << "(slow movement)";
816 break; 826 break;
817 case 2: 827 case 2:
… …
932 * wouldn't need to use the SEE_INVISIBLE flag to know it is 942 * wouldn't need to use the SEE_INVISIBLE flag to know it is
933 * a dragon player examining food. Could have things like 943 * a dragon player examining food. Could have things like
934 * a dwarven axe, in which the full abilities are only known to 944 * a dwarven axe, in which the full abilities are only known to
935 * dwarves, etc. 945 * dwarves, etc.
936 * 946 *
937 * This function is really much more complicated than it should
938 * be, because different objects have different meanings
939 * for the same field (eg, wands use 'food' for charges). This
940 * means these special cases need to be worked out.
941 *
942 * Add 'owner' who is the person examining this object. 947 * Add 'owner' who is the person examining this object.
943 * owner can be null if no one is being associated with this 948 * owner can be null if no one is being associated with this
944 * item (eg, debug dump or the like) 949 * item (eg, debug dump or the like)
945 */ 950 */
946const char * 951const char *
… …
1004 buf << "well charged."; 1009 buf << "well charged.";
1005 else if (op->stats.sp == op->stats.maxsp) 1010 else if (op->stats.sp == op->stats.maxsp)
1006 buf << "fully charged."; 1011 buf << "fully charged.";
1007 else 1012 else
1008 buf << "almost full."; 1013 buf << "almost full.";
1014 break;
1015
1016 case LAMP:
1017 {
1018 int percent = ((double) 100 / op->arch->stats.food) * op->stats.food;
1019 buf << "(fuel: ";
1020 if (percent == 0)
1021 buf << "empty";
1022 else if (percent < 10)
1023 buf << "very low";
1024 else if (percent < 25)
1025 buf << "low";
1026 else if (percent < 50)
1027 buf << "half empty";
1028 else if (percent < 75)
1029 buf << "half full";
1030 else if (percent < 95)
1031 buf << "well filled";
1032 else if (percent <= 100)
1033 buf << "full";
1034 buf << ")";
1035 }
1009 break; 1036 break;
1010 1037
1011 case FOOD: 1038 case FOOD:
1012 case FLESH: 1039 case FLESH:
1013 case DRINK: 1040 case DRINK:
… …
1169 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)"; 1196 if (QUERY_FLAG (op, FLAG_STEALTH)) buf << "(stealth)";
1170 1197
1171 if (op->slaying && op->type != FOOD) 1198 if (op->slaying && op->type != FOOD)
1172 buf.printf ("(slay %s)", &op->slaying); 1199 buf.printf ("(slay %s)", &op->slaying);
1173 1200
1201 if (op->type == SKILL_TOOL && op->skill)
1202 buf.printf ("(%s)", &op->skill);
1203
1174 buf.add_abilities ("Attacks", op->attacktype); 1204 buf.add_abilities ("Attacks", op->attacktype);
1175 /* resistance on flesh is only visible for quetzals. If 1205 /* resistance on flesh is only visible for quetzals. If
1176 * non flesh, everyone can see its resistances 1206 * non flesh, everyone can see its resistances
1177 */ 1207 */
1178 if (op->type != FLESH || (owner && is_dragon_pl (owner))) 1208 if (op->type != FLESH || (owner && is_dragon_pl (owner)))
… …
1194 1224
1195void 1225void
1196examine (object *op, object *tmp) 1226examine (object *op, object *tmp)
1197{ 1227{
1198 std::string info = tmp->describe (op); 1228 std::string info = tmp->describe (op);
1229
1199 op->contr->infobox (MSG_CHANNEL ("examine"), info.c_str ()); 1230 op->contr->infobox (MSG_CHANNEL ("examine"), info.c_str ());
1200} 1231}
1201 1232
1202/* 1233/*
1203 * inventory prints object's inventory. If inv==NULL then print player's 1234 * inventory prints object's inventory. If inv==NULL then print player's
… …
1209{ 1240{
1210 static dynbuf_text buf; buf.clear (); 1241 static dynbuf_text buf; buf.clear ();
1211 1242
1212 for (object *tmp = inv; tmp; tmp = tmp->below) 1243 for (object *tmp = inv; tmp; tmp = tmp->below)
1213 if (who && QUERY_FLAG (who, FLAG_WIZ)) 1244 if (who && QUERY_FLAG (who, FLAG_WIZ))
1214 buf.printf ("%s- %-28.28s (%5d) %-8s\n", indent, query_name (tmp), tmp->count, query_weight (tmp)); 1245 buf.printf ("%s- %-28.28s (%5d) %-8s\n", indent, tmp->query_name (), tmp->count, tmp->query_weight ());
1215 else if (!tmp->invisible && (type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) 1246 else if (!tmp->invisible && (type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED)))
1216 buf.printf ("%s- %-36.36s %-8s\n", indent, query_name (tmp), query_weight (tmp)); 1247 buf.printf ("%s- %-36.36s %-8s\n", indent, tmp->query_name (), tmp->query_weight ());
1217 1248
1218 if (buf.size ()) 1249 if (buf.size ())
1219 buf.printf ("%s(total weight: %s)\n", indent, query_weight (this)); 1250 buf.printf ("%s(total weight: %s)\n", indent, query_weight ());
1220 else 1251 else
1221 buf.printf ("%s(empty)\n", indent); 1252 buf.printf ("%s(empty)\n", indent);
1222 1253
1223 return buf; 1254 return buf;
1224} 1255}
… …
1356 * Supposed to fix face-values as well here, but later. 1387 * Supposed to fix face-values as well here, but later.
1357 */ 1388 */
1358void 1389void
1359identify (object *op) 1390identify (object *op)
1360{ 1391{
1361 object *pl;
1362
1363 SET_FLAG (op, FLAG_IDENTIFIED); 1392 SET_FLAG (op, FLAG_IDENTIFIED);
1364 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL); 1393 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);
1365 CLEAR_FLAG (op, FLAG_NO_SKILL_IDENT); 1394 CLEAR_FLAG (op, FLAG_NO_SKILL_IDENT);
1366 1395
1367 /* 1396 /*
… …
1374 { 1403 {
1375 if (op->inv && op->randomitems) 1404 if (op->inv && op->randomitems)
1376 op->title = op->inv->name; 1405 op->title = op->inv->name;
1377 else if (op->arch) 1406 else if (op->arch)
1378 { 1407 {
1379 op->name = op->arch->object::name; 1408 op->name = op->arch->object::name;
1380 op->name_pl = op->arch->object::name_pl; 1409 op->name_pl = op->arch->object::name_pl;
1381 } 1410 }
1382 } 1411 }
1383 1412
1384 /* If the object is on a map, make sure we update its face */ 1413 /* If the object is on a map, make sure we update its face */
1385 if (op->map) 1414 if (op->map)
1386 update_object (op, UP_OBJ_CHANGE); 1415 update_object (op, UP_OBJ_CHANGE);
1387 else 1416
1388 { 1417 if (object *pl = op->visible_to ())
1389 pl = op->in_player ();
1390 if (pl)
1391 /* A lot of the values can change from an update - might as well send 1418 /* A lot of the values can change from an update - might as well send
1392 * it all. 1419 * it all.
1393 */ 1420 */
1394 esrv_send_item (pl, op); 1421 esrv_send_item (pl, op);
1395 }
1396} 1422}
1397 1423

Diff Legend

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