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

Diff Legend

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