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.22 by pippijn, Sat Jan 6 14:42:28 2007 UTC vs.
Revision 1.24 by elmex, Tue Jan 9 16:38:23 2007 UTC

… …
768 768
769 tmp->set_owner (tmp2); 769 tmp->set_owner (tmp2);
770 SET_FLAG (tmp, FLAG_MONSTER); 770 SET_FLAG (tmp, FLAG_MONSTER);
771 771
772 tmp->stats.exp = 0; 772 tmp->stats.exp = 0;
773 SET_FLAG (tmp, FLAG_FRIENDLY);
774 773
775 add_friendly_object (tmp); 774 add_friendly_object (tmp);
776 tmp->attack_movement = PETMOVE; 775 tmp->attack_movement = PETMOVE;
777 break; 776 break;
778 777
… …
833 * 832 *
834 */ 833 */
835void 834void
836check_inv (object *op, object *trig) 835check_inv (object *op, object *trig)
837{ 836{
837 sint32 prev_state = trig->value;
838 trig->value = 0; // deactivate if none of the following conditions apply 838 trig->value = 0; // deactivate if none of the following conditions apply
839 839
840 if (object *pl = trig->ms ().player ()) 840 if (object *pl = trig->ms ().player ())
841 { 841 {
842 object *match = check_inv_recursive (pl, trig); 842 object *match = check_inv_recursive (pl, trig);
… …
850 } 850 }
851 else if (!match && !trig->last_sp) // match == not having 851 else if (!match && !trig->last_sp) // match == not having
852 trig->value = 1; 852 trig->value = 1;
853 } 853 }
854 854
855 if (prev_state != trig->value)
855 push_button (trig); 856 push_button (trig);
856} 857}
857 858

Diff Legend

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