ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/button.C
(Generate patch)

Comparing deliantra/server/common/button.C (file contents):
Revision 1.27 by pippijn, Mon Jan 15 21:06:18 2007 UTC vs.
Revision 1.28 by root, Mon Jan 29 15:36:25 2007 UTC

705 */ 705 */
706 706
707void 707void
708do_mood_floor (object *op, object *source) 708do_mood_floor (object *op, object *source)
709{ 709{
710 object *tmp;
711 object *tmp2;
712
713 if (!source) 710 if (!source)
714 source = op; 711 source = op;
715 712
716 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above) 713 mapspace &ms = op->ms ();
714
715 if (!(ms.flags () & P_IS_ALIVE))
716 return;
717
718 object *tmp;
719
720 for (tmp = ms.top; tmp; tmp = tmp->below)
717 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 721 if (QUERY_FLAG (tmp, FLAG_MONSTER))
718 break; 722 break;
719 723
720 /* doesn't effect players, and if there is a player on this space, won't also 724 /* doesn't effect players, and if there is a player on this space, won't also
721 * be a monster here. 725 * be a monster here.
722 */ 726 */
727 //TODO: have players really FLAG_MONSTER? kept it for safety
723 if (!tmp || tmp->type == PLAYER) 728 if (!tmp || tmp->type == PLAYER)
724 return; 729 return;
725 730
726 switch (op->last_sp) 731 switch (op->last_sp)
727 { 732 {
728 case 0: /* furious--make all monsters mad */ 733 case 0: /* furious--make all monsters mad */
729 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) 734 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
730 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); 735 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
736
731 if (QUERY_FLAG (tmp, FLAG_FRIENDLY)) 737 if (QUERY_FLAG (tmp, FLAG_FRIENDLY))
732 { 738 {
733 CLEAR_FLAG (tmp, FLAG_FRIENDLY);
734 remove_friendly_object (tmp); 739 remove_friendly_object (tmp);
740
735 tmp->attack_movement = 0; 741 tmp->attack_movement = 0;
736 /* lots of checks here, but want to make sure we don't 742 /* lots of checks here, but want to make sure we don't
737 * dereference a null value 743 * dereference a null value
738 */ 744 */
739 if (tmp->type == GOLEM && tmp->owner && tmp->owner->type == PLAYER && tmp->owner->contr->ranges[range_golem] == tmp) 745 if (tmp->type == GOLEM && tmp->owner && tmp->owner->type == PLAYER && tmp->owner->contr->ranges[range_golem] == tmp)
740 tmp->owner->contr->ranges[range_golem] = 0; 746 tmp->owner->contr->ranges[range_golem] = 0;
741 747
742 tmp->owner = 0; 748 tmp->owner = 0;
743 } 749 }
744 break; 750 break;
751
745 case 1: /* angry -- get neutral monsters mad */ 752 case 1: /* angry -- get neutral monsters mad */
746 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY)) 753 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY))
747 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); 754 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
748 break; 755 break;
756
749 case 2: /* calm -- pacify unfriendly monsters */ 757 case 2: /* calm -- pacify unfriendly monsters */
750 if (!QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
751 SET_FLAG (tmp, FLAG_UNAGGRESSIVE); 758 SET_FLAG (tmp, FLAG_UNAGGRESSIVE);
752 break; 759 break;
760
753 case 3: /* make all monsters fall asleep */ 761 case 3: /* make all monsters fall asleep */
754 if (!QUERY_FLAG (tmp, FLAG_SLEEP))
755 SET_FLAG (tmp, FLAG_SLEEP); 762 SET_FLAG (tmp, FLAG_SLEEP);
756 break; 763 break;
764
757 case 4: /* charm all monsters */ 765 case 4: /* charm all monsters */
758 if (op == source) 766 if (op == source)
759 break; /* only if 'connected' */ 767 break; /* only if 'connected' */
760 768
761 for (tmp2 = GET_MAP_OB (source->map, source->x, source->y); /* finding an owner */ 769 if (object *pl = source->ms ().player ())
762 tmp2->type != PLAYER; tmp2 = tmp2->above) 770 {
763 if (tmp2->above == NULL) 771 tmp->set_owner (pl);
772 SET_FLAG (tmp, FLAG_MONSTER);
773
774 tmp->stats.exp = 0;
775
776 add_friendly_object (tmp);
777 tmp->attack_movement = PETMOVE;
778 }
764 break; 779 break;
765 780
766 if (tmp2->type != PLAYER) 781 case 6:
782 if (!QUERY_FLAG (tmp, FLAG_FRIENDLY))
767 break; 783 break;
768 784
769 tmp->set_owner (tmp2); 785 // FALL THROUGH
770 SET_FLAG (tmp, FLAG_MONSTER); 786 case 5:
771 787 get_archetype ("burnout")->insert_at (tmp, source);
772 tmp->stats.exp = 0; 788 tmp->destroy ();
773
774 add_friendly_object (tmp);
775 tmp->attack_movement = PETMOVE;
776 break; 789 break;
777 790
778 default: 791 default:
779 break; 792 break;
780 } 793 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines