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.19 by pippijn, Mon Jan 15 21:06:18 2007 UTC vs.
Revision 1.30 by root, Mon May 7 03:05:57 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 * 7 *
… …
48 * Basically, for the use/nonuse, the code does something like: 48 * Basically, for the use/nonuse, the code does something like:
49 * "This item goes %s\n", with the use/nonuse values filling in the %s 49 * "This item goes %s\n", with the use/nonuse values filling in the %s
50 */ 50 */
51Body_Locations body_locations[NUM_BODY_LOCATIONS] = { 51Body_Locations body_locations[NUM_BODY_LOCATIONS] = {
52 {"body_range", "in your range slot", "in a human's range slot"}, 52 {"body_range", "in your range slot", "in a human's range slot"},
53 {"body_shield", "as a shield", "as a protective shield"},
54 {"body_combat", "as a combat weapon", "as a combat weapon"},
53 {"body_arm", "on your arm", "on a human's arm"}, 55 {"body_arm", "on your arm", "on a human's arm"},
54 {"body_torso", "on your body", "on a human's torso"}, 56 {"body_torso", "on your body", "on a human's torso"},
55 {"body_head", "on your head", "on a human's head"}, 57 {"body_head", "on your head", "on a human's head"},
56 {"body_neck", "around your neck", "around a humans neck"}, 58 {"body_neck", "around your neck", "around a humans neck"},
57 {"body_skill", "in your skill slot", "in a human's skill slot"}, 59 {"body_skill", "in your skill slot", "in a human's skill slot"},
… …
250}; 252};
251 253
252int 254int
253get_power_from_ench (int ench) 255get_power_from_ench (int ench)
254{ 256{
255 if (ench < 0) 257 if (ench < 0) ench = 0;
256 ench = 0; 258 if (ench > 20) ench = 20;
257 if (ench > 20) 259
258 ench = 20;
259 return enc_to_item_power[ench]; 260 return enc_to_item_power[ench];
260} 261}
261 262
262/* This takes an object 'op' and figures out what its item_power 263/* 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 264 * rating should be. This should only really be used by the treasure
… …
342 enc += 1; 343 enc += 1;
343 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 344 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
344 enc += 1; 345 enc += 1;
345 346
346 return get_power_from_ench (enc); 347 return get_power_from_ench (enc);
347
348} 348}
349 349
350/* returns the typedata that has a number equal to itemtype, if there 350/* returns the typedata that has a number equal to itemtype, if there
351 * isn't one, returns NULL */ 351 * isn't one, returns NULL */
352
353const typedata * 352const typedata *
354get_typedata (int itemtype) 353get_typedata (int itemtype)
355{ 354{
356 int i; 355 int i;
357 356
… …
362} 361}
363 362
364/* returns the typedata that has a name equal to itemtype, if there 363/* 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 364 * isn't one, return the plural name that matches, if there still isn't
366 * one return NULL */ 365 * one return NULL */
367
368const typedata * 366const typedata *
369get_typedata_by_name (const char *name) 367get_typedata_by_name (const char *name)
370{ 368{
371 int i; 369 int i;
372 370
… …
387 * returns a static array of the description. This can return 385 * returns a static array of the description. This can return
388 * a big buffer. 386 * a big buffer.
389 * if newline is true, we don't put parens around the description 387 * if newline is true, we don't put parens around the description
390 * but do put a newline at the end. Useful when dumping to files 388 * but do put a newline at the end. Useful when dumping to files
391 */ 389 */
392char * 390const char *
393describe_resistance (const object *op, int newline) 391describe_resistance (const object *op, int newline)
394{ 392{
395 static char buf[VERY_BIG_BUF]; 393 static char buf[VERY_BIG_BUF];
396 char buf1[VERY_BIG_BUF]; 394 char buf1[VERY_BIG_BUF];
397 int tmpvar; 395 int tmpvar;
… …
416/* 414/*
417 * query_weight(object) returns a character pointer to a static buffer 415 * query_weight(object) returns a character pointer to a static buffer
418 * containing the text-representation of the weight of the given object. 416 * containing the text-representation of the weight of the given object.
419 * The buffer will be overwritten by the next call to query_weight(). 417 * The buffer will be overwritten by the next call to query_weight().
420 */ 418 */
421 419const char *
422char *
423query_weight (const object *op) 420query_weight (const object *op)
424{ 421{
425 static char buf[10]; 422 static char buf[10];
426 sint32 i = (op->nrof ? op->nrof : 1) * op->weight + op->carrying; 423 sint32 i = (op->nrof ? op->nrof : 1) * op->weight + op->carrying;
427 424
428 if (op->weight < 0) 425 if (op->weight < 0)
429 return " "; 426 return " ";
427
430 if (i % 1000) 428 if (i % 1000)
431 sprintf (buf, "%6.1f", i / 1000.0); 429 sprintf (buf, "%6.1f", i / 1000.0);
432 else 430 else
433 sprintf (buf, "%4d ", i / 1000); 431 sprintf (buf, "%4d ", i / 1000);
432
434 return buf; 433 return buf;
435} 434}
436 435
437/* 436/*
438 * Returns the pointer to a static buffer containing 437 * Returns the pointer to a static buffer containing
439 * the number requested (of the form first, second, third...) 438 * the number requested (of the form first, second, third...)
440 */ 439 */
441 440const char *
442char *
443get_levelnumber (int i) 441get_levelnumber (int i)
444{ 442{
445 static char buf[MAX_BUF]; 443 static char buf[MAX_BUF];
446 444
447 if (i > 99) 445 if (i > 99)
448 { 446 {
449 sprintf (buf, "%d.", i); 447 sprintf (buf, "%d.", i);
450 return buf; 448 return buf;
451 } 449 }
450
452 if (i < 21) 451 if (i < 21)
453 return levelnumbers[i]; 452 return levelnumbers[i];
454 if (!(i % 10)) 453 if (!(i % 10))
455 return levelnumbers_10[i / 10]; 454 return levelnumbers_10[i / 10];
455
456 strcpy (buf, numbers_10[i / 10]); 456 strcpy (buf, numbers_10[i / 10]);
457 strcat (buf, levelnumbers[i % 10]); 457 strcat (buf, levelnumbers[i % 10]);
458 return buf; 458 return buf;
459} 459}
460
461 460
462/* 461/*
463 * get_number(integer) returns the text-representation of the given number 462 * get_number(integer) returns the text-representation of the given number
464 * in a static buffer. The buffer might be overwritten at the next 463 * in a static buffer. The buffer might be overwritten at the next
465 * call to get_number(). 464 * call to get_number().
466 * It is currently only used by the query_name() function. 465 * It is currently only used by the query_name() function.
467 */ 466 */
468 467const char *
469char *
470get_number (int i) 468get_number (int i)
471{ 469{
472 if (i <= 20) 470 if (i <= 20)
473 return numbers[i]; 471 return numbers[i];
474 else 472 else
… …
491 */ 489 */
492 490
493/* Aug 95 modified this slightly so that Skill tools don't have magic bonus 491/* Aug 95 modified this slightly so that Skill tools don't have magic bonus
494 * from stats.sp - b.t. 492 * from stats.sp - b.t.
495 */ 493 */
496char * 494const char *
497ring_desc (const object *op) 495ring_desc (const object *op)
498{ 496{
499 static char buf[VERY_BIG_BUF]; 497 static char buf[VERY_BIG_BUF];
500 int attr, val, len; 498 int attr, val, len;
501 499
… …
509 if ((val = get_attr_value (&(op->stats), attr)) != 0) 507 if ((val = get_attr_value (&(op->stats), attr)) != 0)
510 { 508 {
511 sprintf (buf + strlen (buf), "(%s%+d)", short_stat_name[attr], val); 509 sprintf (buf + strlen (buf), "(%s%+d)", short_stat_name[attr], val);
512 } 510 }
513 } 511 }
512
514 if (op->stats.exp) 513 if (op->stats.exp)
515 sprintf (buf + strlen (buf), "(speed %+lld)", (long long) op->stats.exp); 514 sprintf (buf + strlen (buf), "(speed %+lld)", (long long) op->stats.exp);
516 if (op->stats.wc) 515 if (op->stats.wc)
517 sprintf (buf + strlen (buf), "(wc%+d)", op->stats.wc); 516 sprintf (buf + strlen (buf), "(wc%+d)", op->stats.wc);
518 if (op->stats.dam) 517 if (op->stats.dam)
… …
540 strcat (buf, "(reflect spells)"); 539 strcat (buf, "(reflect spells)");
541 if (QUERY_FLAG (op, FLAG_REFL_MISSILE)) 540 if (QUERY_FLAG (op, FLAG_REFL_MISSILE))
542 strcat (buf, "(reflect missiles)"); 541 strcat (buf, "(reflect missiles)");
543 if (QUERY_FLAG (op, FLAG_STEALTH)) 542 if (QUERY_FLAG (op, FLAG_STEALTH))
544 strcat (buf, "(stealth)"); 543 strcat (buf, "(stealth)");
544
545 /* Shorten some of the names, so they appear better in the windows */ 545 /* Shorten some of the names, so they appear better in the windows */
546 len = strlen (buf); 546 len = strlen (buf);
547 DESCRIBE_PATH_SAFE (buf, op->path_attuned, "Attuned", &len, VERY_BIG_BUF); 547 DESCRIBE_PATH_SAFE (buf, op->path_attuned, "Attuned", &len, VERY_BIG_BUF);
548 DESCRIBE_PATH_SAFE (buf, op->path_repelled, "Repelled", &len, VERY_BIG_BUF); 548 DESCRIBE_PATH_SAFE (buf, op->path_repelled, "Repelled", &len, VERY_BIG_BUF);
549 DESCRIBE_PATH_SAFE (buf, op->path_denied, "Denied", &len, VERY_BIG_BUF); 549 DESCRIBE_PATH_SAFE (buf, op->path_denied, "Denied", &len, VERY_BIG_BUF);
… …
614 case AMULET: 614 case AMULET:
615 case RING: 615 case RING:
616 if (!op->title) 616 if (!op->title)
617 { 617 {
618 /* If ring has a title, full description isn't so useful */ 618 /* If ring has a title, full description isn't so useful */
619 char *s = ring_desc (op); 619 const char *s = ring_desc (op);
620 620
621 if (s[0]) 621 if (s[0])
622 { 622 {
623 safe_strcat (buf, " ", &len, HUGE_BUF); 623 safe_strcat (buf, " ", &len, HUGE_BUF);
624 safe_strcat (buf, s, &len, HUGE_BUF); 624 safe_strcat (buf, s, &len, HUGE_BUF);
… …
644 * overwritten. This may be a bad thing (it may be easier to assume the value 644 * overwritten. This may be a bad thing (it may be easier to assume the value
645 * returned is good forever.) However, it makes printing statements that 645 * returned is good forever.) However, it makes printing statements that
646 * use several names much easier (don't need to store them to temp variables.) 646 * use several names much easier (don't need to store them to temp variables.)
647 * 647 *
648 */ 648 */
649char * 649const char *
650query_name (const object *op) 650query_name (const object *op)
651{ 651{
652 static char buf[5][HUGE_BUF]; 652 static char buf[5][HUGE_BUF]; // OMFG
653 static int use_buf = 0; 653 static int use_buf = 0;
654 int len = 0; 654 int len = 0;
655 655
656#ifdef NEW_MATERIAL_CODE 656#ifdef NEW_MATERIAL_CODE
657 materialtype_t *mt; 657 materialtype_t *mt;
… …
684 if (QUERY_FLAG (op, FLAG_DAMNED)) 684 if (QUERY_FLAG (op, FLAG_DAMNED))
685 safe_strcat (buf[use_buf], " (damned)", &len, HUGE_BUF); 685 safe_strcat (buf[use_buf], " (damned)", &len, HUGE_BUF);
686 else if (QUERY_FLAG (op, FLAG_CURSED)) 686 else if (QUERY_FLAG (op, FLAG_CURSED))
687 safe_strcat (buf[use_buf], " (cursed)", &len, HUGE_BUF); 687 safe_strcat (buf[use_buf], " (cursed)", &len, HUGE_BUF);
688 } 688 }
689
689 /* Basically, if the object is known magical (detect magic spell on it), 690 /* Basically, if the object is known magical (detect magic spell on it),
690 * and it isn't identified, print out the fact that 691 * and it isn't identified, print out the fact that
691 * it is magical. Assume that the detect magical spell will only set 692 * it is magical. Assume that the detect magical spell will only set
692 * KNOWN_MAGICAL if the item actually is magical. 693 * KNOWN_MAGICAL if the item actually is magical.
693 * 694 *
… …
709 710
710 if (QUERY_FLAG (op, FLAG_APPLIED)) 711 if (QUERY_FLAG (op, FLAG_APPLIED))
711 { 712 {
712 switch (op->type) 713 switch (op->type)
713 { 714 {
714 case BOW: 715 case BOW:
715 case WAND: 716 case WAND:
716 case ROD: 717 case ROD:
717 case HORN: 718 case HORN:
718 safe_strcat (buf[use_buf], " (readied)", &len, HUGE_BUF); 719 safe_strcat (buf[use_buf], op->env && op->env->current_weapon == op ? " (readied)" : " (applied)", &len, HUGE_BUF);
719 break; 720 break;
720 case WEAPON: 721 case WEAPON:
721 safe_strcat (buf[use_buf], " (wielded)", &len, HUGE_BUF); 722 safe_strcat (buf[use_buf], op->env && op->env->current_weapon == op ? " (wielded)" : " (applied)", &len, HUGE_BUF);
722 break; 723 break;
723 case ARMOUR: 724 case ARMOUR:
724 case HELMET: 725 case HELMET:
725 case SHIELD: 726 case SHIELD:
726 case RING: 727 case RING:
727 case BOOTS: 728 case BOOTS:
728 case GLOVES: 729 case GLOVES:
729 case AMULET: 730 case AMULET:
730 case GIRDLE: 731 case GIRDLE:
731 case BRACERS: 732 case BRACERS:
732 case CLOAK: 733 case CLOAK:
733 safe_strcat (buf[use_buf], " (worn)", &len, HUGE_BUF); 734 safe_strcat (buf[use_buf], " (worn)", &len, HUGE_BUF);
734 break; 735 break;
735 case CONTAINER: 736 case CONTAINER:
736 safe_strcat (buf[use_buf], " (active)", &len, HUGE_BUF); 737 safe_strcat (buf[use_buf], " (active)", &len, HUGE_BUF);
737 break; 738 break;
738 case SKILL: 739 case SKILL:
739 default: 740 default:
740 safe_strcat (buf[use_buf], " (applied)", &len, HUGE_BUF); 741 safe_strcat (buf[use_buf], " (applied)", &len, HUGE_BUF);
741 } 742 }
742 } 743 }
744
743 if (QUERY_FLAG (op, FLAG_UNPAID)) 745 if (QUERY_FLAG (op, FLAG_UNPAID))
744 safe_strcat (buf[use_buf], " (unpaid)", &len, HUGE_BUF); 746 safe_strcat (buf[use_buf], " (unpaid)", &len, HUGE_BUF);
745 747
746 return buf[use_buf]; 748 return buf [use_buf];
747} 749}
748 750
749/* 751/*
750 * query_base_name(object) returns a character pointer pointing to a static 752 * query_base_name(object) returns a character pointer pointing to a static
751 * buffer which contains a verbose textual representation of the name 753 * buffer which contains a verbose textual representation of the name
… …
785 } 787 }
786 else 788 else
787 { 789 {
788#endif 790#endif
789 if (!plural) 791 if (!plural)
790 strcpy (buf, op->name); 792 assign (buf, op->name);
791 else 793 else
792 strcpy (buf, op->name_pl); 794 assign (buf, op->name_pl);
795
793 len = strlen (buf); 796 len = strlen (buf);
794#ifdef NEW_MATERIAL_CODE 797#ifdef NEW_MATERIAL_CODE
795 } 798 }
796#endif 799#endif
797 800
… …
801 safe_strcat (buf, op->title, &len, MAX_BUF); 804 safe_strcat (buf, op->title, &len, MAX_BUF);
802 } 805 }
803 806
804 switch (op->type) 807 switch (op->type)
805 { 808 {
806 case SPELLBOOK: 809 case SPELLBOOK:
807 case SCROLL: 810 case SCROLL:
808 case WAND: 811 case WAND:
809 case ROD: 812 case ROD:
810 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 813 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED))
811 { 814 {
812 if (!op->title) 815 if (!op->title)
813 { 816 {
814 safe_strcat (buf, " of ", &len, MAX_BUF); 817 safe_strcat (buf, " of ", &len, MAX_BUF);
815 if (op->inv) 818 if (op->inv)
816 safe_strcat (buf, op->inv->name, &len, MAX_BUF); 819 safe_strcat (buf, op->inv->name, &len, MAX_BUF);
817 else 820 else
818 LOG (llevError, "Spellbook %s lacks inventory\n", &op->name); 821 LOG (llevError, "Spellbook %s lacks inventory\n", &op->name);
819 } 822 }
820 if (op->type != SPELLBOOK) 823 if (op->type != SPELLBOOK)
821 { 824 {
822 sprintf (buf2, " (lvl %d)", op->level); 825 sprintf (buf2, " (lvl %d)", op->level);
823 safe_strcat (buf, buf2, &len, MAX_BUF); 826 safe_strcat (buf, buf2, &len, MAX_BUF);
824 } 827 }
825 } 828 }
826 break; 829 break;
827 830
828 831
829 case SKILL: 832 case SKILL:
830 case AMULET: 833 case AMULET:
831 case RING: 834 case RING:
832 if (!op->title) 835 if (!op->title)
833 { 836 {
834 /* If ring has a title, full description isn't so useful */ 837 /* If ring has a title, full description isn't so useful */
835 char *s = ring_desc (op); 838 const char *s = ring_desc (op);
836 839
837 if (s[0]) 840 if (s[0])
838 { 841 {
839 safe_strcat (buf, " ", &len, MAX_BUF); 842 safe_strcat (buf, " ", &len, MAX_BUF);
840 safe_strcat (buf, s, &len, MAX_BUF); 843 safe_strcat (buf, s, &len, MAX_BUF);
841 } 844 }
842 } 845 }
843 break; 846 break;
847
844 default: 848 default:
845 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) 849 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED)))
846 {
847 sprintf (buf + strlen (buf), " %+d", op->magic); 850 sprintf (buf + strlen (buf), " %+d", op->magic);
848 }
849 } 851 }
852
850 return buf; 853 return buf;
851} 854}
852 855
853/* Break this off from describe_item - that function was way 856/* Break this off from describe_item - that function was way
854 * too long, making it difficult to read. This function deals 857 * too long, making it difficult to read. This function deals
855 * with describing the monsters & players abilities. It should only 858 * with describing the monsters & players abilities. It should only
856 * be called with monster & player objects. Returns a description 859 * be called with monster & player objects. Returns a description
857 * in a static buffer. 860 * in a static buffer.
858 */ 861 */
859
860static char * 862static char *
861describe_monster (const object *op) 863describe_monster (const object *op)
862{ 864{
863 char buf[MAX_BUF]; 865 char buf[MAX_BUF];
864 static char retbuf[VERY_BIG_BUF]; 866 static char retbuf[VERY_BIG_BUF];
… …
990 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 992 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
991 if (tmp->type == SKILL && !strcmp (tmp->name, "clawing")) 993 if (tmp->type == SKILL && !strcmp (tmp->name, "clawing"))
992 break; 994 break;
993 995
994 if (tmp && tmp->attacktype != 0) 996 if (tmp && tmp->attacktype != 0)
995 {
996 DESCRIBE_ABILITY (retbuf, tmp->attacktype, "Claws"); 997 { DESCRIBE_ABILITY (retbuf, tmp->attacktype, "Claws") }
997 }
998 else 998 else
999 {
1000 DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks"); 999 { DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks") }
1001 }
1002 } 1000 }
1003 else 1001 else
1004 {
1005 DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks"); 1002 { DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks") }
1006 } 1003
1007 DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned"); 1004 DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned");
1008 DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled"); 1005 DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled");
1009 DESCRIBE_PATH (retbuf, op->path_denied, "Denied"); 1006 DESCRIBE_PATH (retbuf, op->path_denied, "Denied");
1007
1010 for (i = 0; i < NROFATTACKS; i++) 1008 for (i = 0; i < NROFATTACKS; i++)
1011 {
1012 if (op->resist[i]) 1009 if (op->resist[i])
1013 { 1010 {
1014 sprintf (buf, "(%s %+d)", resist_plus[i], op->resist[i]); 1011 sprintf (buf, "(%s %+d)", resist_plus[i], op->resist[i]);
1015 strcat (retbuf, buf); 1012 strcat (retbuf, buf);
1016 } 1013 }
1017 } 1014
1018 return retbuf; 1015 return retbuf;
1019} 1016}
1020 1017
1021 1018
1022/* 1019/*
… …
1043 * 1040 *
1044 * Add 'owner' who is the person examining this object. 1041 * Add 'owner' who is the person examining this object.
1045 * owner can be null if no one is being associated with this 1042 * owner can be null if no one is being associated with this
1046 * item (eg, debug dump or the like) 1043 * item (eg, debug dump or the like)
1047 */ 1044 */
1048 1045const char *
1049char *
1050describe_item (const object *op, object *owner) 1046describe_item (const object *op, object *owner)
1051{ 1047{
1052 char buf[MAX_BUF]; 1048 char buf[MAX_BUF];
1053 static char retbuf[VERY_BIG_BUF]; 1049 static char retbuf[VERY_BIG_BUF];
1054 int identified, i; 1050 int identified, i;
… …
1364 } 1360 }
1365 1361
1366 return retbuf; 1362 return retbuf;
1367} 1363}
1368 1364
1365std::string
1366object::describe_item (object *who)
1367{
1368 return std::string (::describe_item (this, who));
1369}
1370
1369/* Return true if the item is magical. A magical item is one that 1371/* Return true if the item is magical. A magical item is one that
1370 * increases/decreases any abilities, provides a resistance, 1372 * increases/decreases any abilities, provides a resistance,
1371 * has a generic magical bonus, or is an artifact. 1373 * has a generic magical bonus, or is an artifact.
1372 * This function is used by detect_magic to determine if an item 1374 * This function is used by detect_magic to determine if an item
1373 * should be marked as magical. 1375 * should be marked as magical.
… …
1524 } 1526 }
1525 } 1527 }
1526 1528
1527 /* If the object is on a map, make sure we update its face */ 1529 /* If the object is on a map, make sure we update its face */
1528 if (op->map) 1530 if (op->map)
1529 update_object (op, UP_OBJ_FACE); 1531 update_object (op, UP_OBJ_CHANGE);
1530 else 1532 else
1531 { 1533 {
1532 pl = op->in_player (); 1534 pl = op->in_player ();
1533 if (pl) 1535 if (pl)
1534 /* A lot of the values can change from an update - might as well send 1536 /* A lot of the values can change from an update - might as well send

Diff Legend

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