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.65 by root, Fri Mar 26 01:04:43 2010 UTC vs.
Revision 1.66 by root, Sun Apr 11 00:34:05 2010 UTC

… …
52 * is getting moved out of memory, the status of buttons and levers 52 * is getting moved out of memory, the status of buttons and levers
53 * probably isn't important - it will get sorted out when the map is 53 * probably isn't important - it will get sorted out when the map is
54 * re-loaded. As such, just exit this function if that is the case. 54 * re-loaded. As such, just exit this function if that is the case.
55 */ 55 */
56 56
57 if (QUERY_FLAG (ol->ob, FLAG_FREED)) 57 if (ol->ob->flag [FLAG_FREED])
58 return; 58 return;
59 59
60 object *tmp = ol->ob; 60 object *tmp = ol->ob;
61 61
62 /* if the criteria isn't appropriate, don't do anything */ 62 /* if the criteria isn't appropriate, don't do anything */
63 if (state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_PUSH)) 63 if (state && !tmp->flag [FLAG_ACTIVATE_ON_PUSH])
64 continue; 64 continue;
65 65
66 if (!state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_RELEASE)) 66 if (!state && !tmp->flag [FLAG_ACTIVATE_ON_RELEASE])
67 continue; 67 continue;
68 68
69 switch (tmp->type) 69 switch (tmp->type)
70 { 70 {
71 case GATE: 71 case GATE:
… …
137 } 137 }
138 break; 138 break;
139 139
140 case DIRECTOR: 140 case DIRECTOR:
141 case FIREWALL: 141 case FIREWALL:
142 if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL) 142 if (!tmp->flag [FLAG_ANIMATE] && tmp->type == FIREWALL)
143 move_firewall (tmp); 143 move_firewall (tmp);
144 else 144 else
145 { 145 {
146 tmp->stats.sp = absdir (tmp->stats.sp + tmp->stats.maxsp); /* next direction */ 146 tmp->stats.sp = absdir (tmp->stats.sp + tmp->stats.maxsp); /* next direction */
147 animate_turning (tmp); 147 animate_turning (tmp);
… …
355 return 0; 355 return 0;
356 356
357 if (is_match_expr (ARCH_SACRIFICE (altar))) 357 if (is_match_expr (ARCH_SACRIFICE (altar)))
358 return match (ARCH_SACRIFICE (altar), altar, originator); 358 return match (ARCH_SACRIFICE (altar), altar, originator);
359 359
360 if (!QUERY_FLAG (sacrifice, FLAG_ALIVE) 360 if (!sacrifice->flag [FLAG_ALIVE]
361 && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED) 361 && !sacrifice->flag [FLAG_IS_LINKED]
362 && sacrifice->type != PLAYER) 362 && sacrifice->type != PLAYER)
363 { 363 {
364 if (ARCH_SACRIFICE (altar) == shstr_money 364 if (ARCH_SACRIFICE (altar) == shstr_money
365 && sacrifice->type == MONEY 365 && sacrifice->type == MONEY
366 && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar)) 366 && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar))
… …
760 return; 760 return;
761 761
762 object *tmp; 762 object *tmp;
763 763
764 for (tmp = ms.top; tmp; tmp = tmp->below) 764 for (tmp = ms.top; tmp; tmp = tmp->below)
765 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 765 if (tmp->flag [FLAG_MONSTER])
766 break; 766 break;
767 767
768 /* doesn't effect players, and if there is a player on this space, won't also 768 /* doesn't effect players, and if there is a player on this space, won't also
769 * be a monster here. 769 * be a monster here.
770 */ 770 */
… …
773 return; 773 return;
774 774
775 switch (op->last_sp) 775 switch (op->last_sp)
776 { 776 {
777 case 0: /* furious--make all monsters mad */ 777 case 0: /* furious--make all monsters mad */
778 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) 778 if (tmp->flag [FLAG_UNAGGRESSIVE])
779 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); 779 tmp->clr_flag (FLAG_UNAGGRESSIVE);
780 780
781 if (QUERY_FLAG (tmp, FLAG_FRIENDLY)) 781 if (tmp->flag [FLAG_FRIENDLY])
782 { 782 {
783 tmp->attack_movement = 0; 783 tmp->attack_movement = 0;
784 /* lots of checks here, but want to make sure we don't 784 /* lots of checks here, but want to make sure we don't
785 * dereference a null value 785 * dereference a null value
786 */ 786 */
… …
795 remove_friendly_object (tmp); 795 remove_friendly_object (tmp);
796 } 796 }
797 break; 797 break;
798 798
799 case 1: /* angry -- get neutral monsters mad */ 799 case 1: /* angry -- get neutral monsters mad */
800 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY)) 800 if (tmp->flag [FLAG_UNAGGRESSIVE] && !tmp->flag [FLAG_FRIENDLY])
801 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); 801 tmp->clr_flag (FLAG_UNAGGRESSIVE);
802 break; 802 break;
803 803
804 case 2: /* calm -- pacify unfriendly monsters */ 804 case 2: /* calm -- pacify unfriendly monsters */
805 SET_FLAG (tmp, FLAG_UNAGGRESSIVE); 805 tmp->set_flag (FLAG_UNAGGRESSIVE);
806 break; 806 break;
807 807
808 case 3: /* make all monsters fall asleep */ 808 case 3: /* make all monsters fall asleep */
809 SET_FLAG (tmp, FLAG_SLEEP); 809 tmp->set_flag (FLAG_SLEEP);
810 break; 810 break;
811 811
812 case 4: /* charm all monsters */ 812 case 4: /* charm all monsters */
813 if (op == source) 813 if (op == source)
814 break; /* only if 'connected' */ 814 break; /* only if 'connected' */
815 815
816 if (object *pl = source->ms ().player ()) 816 if (object *pl = source->ms ().player ())
817 { 817 {
818 tmp->set_owner (pl); 818 tmp->set_owner (pl);
819 SET_FLAG (tmp, FLAG_MONSTER); 819 tmp->set_flag (FLAG_MONSTER);
820 820
821 tmp->stats.exp = 0; 821 tmp->stats.exp = 0;
822 822
823 add_friendly_object (tmp); 823 add_friendly_object (tmp);
824 tmp->attack_movement = PETMOVE; 824 tmp->attack_movement = PETMOVE;
825 } 825 }
826 break; 826 break;
827 827
828 case 6: // kill monsters 828 case 6: // kill monsters
829 if (!QUERY_FLAG (tmp, FLAG_FRIENDLY)) 829 if (!tmp->flag [FLAG_FRIENDLY])
830 break; 830 break;
831 831
832 // FALL THROUGH 832 // FALL THROUGH
833 case 5: // kill all alives 833 case 5: // kill all alives
834 if (!tmp->flag [FLAG_PRECIOUS]) 834 if (!tmp->flag [FLAG_PRECIOUS])

Diff Legend

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