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.10 by root, Thu Sep 14 22:33:58 2006 UTC vs.
Revision 1.19 by root, Mon Dec 25 11:25:49 2006 UTC

… …
35 * The source argument can be 0 or the source object for this activation. 35 * The source argument can be 0 or the source object for this activation.
36 */ 36 */
37void 37void
38activate_connection_link (objectlink * ol, bool state, object *source = 0) 38activate_connection_link (objectlink * ol, bool state, object *source = 0)
39{ 39{
40 object *tmp = 0;
41
42 for (; ol; ol = ol->next) 40 for (; ol; ol = ol->next)
43 { 41 {
44 if (!ol->ob || ol->ob->count != ol->id) 42 if (!ol->ob)
45 { 43 {
46 LOG (llevError, "Internal error in activate_connection_link (%ld).\n", ol->id); 44 LOG (llevError, "Internal error in activate_connection_link.\n");
47 continue; 45 continue;
48 } 46 }
47
49 /* a button link object can become freed when the map is saving. As 48 /* a button link object can become freed when the map is saving. As
50 * a map is saved, objects are removed and freed, and if an object is 49 * a map is saved, objects are removed and freed, and if an object is
51 * on top of a button, this function is eventually called. If a map 50 * on top of a button, this function is eventually called. If a map
52 * is getting moved out of memory, the status of buttons and levers 51 * 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 52 * 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. 53 * re-loaded. As such, just exit this function if that is the case.
55 */ 54 */
56 55
57 if (QUERY_FLAG (ol->ob, FLAG_FREED)) 56 if (QUERY_FLAG (ol->ob, FLAG_FREED))
58 return; 57 return;
58
59 tmp = ol->ob; 59 object *tmp = ol->ob;
60 60
61 /* if the criteria isn't appropriate, don't do anything */ 61 /* if the criteria isn't appropriate, don't do anything */
62 if (state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_PUSH)) 62 if (state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_PUSH))
63 continue; 63 continue;
64 if (!state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_RELEASE)) 64 if (!state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_RELEASE))
65 continue; 65 continue;
66 66
67 switch (tmp->type) 67 switch (tmp->type)
68 { 68 {
69 case GATE: 69 case GATE:
70 case HOLE: 70 case HOLE:
71 tmp->value = tmp->stats.maxsp ? !state : state; 71 tmp->value = tmp->stats.maxsp ? !state : state;
72 tmp->speed = 0.5; 72 tmp->speed = 0.5;
73 update_ob_speed (tmp); 73 update_ob_speed (tmp);
74 break; 74 break;
75 75
76 case CF_HANDLE: 76 case CF_HANDLE:
77 SET_ANIMATION (tmp, (tmp->value = tmp->stats.maxsp ? !state : state)); 77 SET_ANIMATION (tmp, (tmp->value = tmp->stats.maxsp ? !state : state));
78 update_object (tmp, UP_OBJ_FACE); 78 update_object (tmp, UP_OBJ_FACE);
79 break; 79 break;
80 80
81 case SIGN: 81 case SIGN:
82 if (!tmp->stats.food || tmp->last_eat < tmp->stats.food) 82 if (!tmp->stats.food || tmp->last_eat < tmp->stats.food)
83 { 83 {
84 new_info_map (NDI_UNIQUE | NDI_NAVY, tmp->map, tmp->msg); 84 new_info_map (NDI_UNIQUE | NDI_NAVY, tmp->map, tmp->msg);
85 if (tmp->stats.food) 85 if (tmp->stats.food)
86 tmp->last_eat++; 86 tmp->last_eat++;
87 } 87 }
88 break; 88 break;
89 89
90 case ALTAR: 90 case ALTAR:
91 tmp->value = 1; 91 tmp->value = 1;
92 SET_ANIMATION (tmp, tmp->value); 92 SET_ANIMATION (tmp, tmp->value);
93 update_object (tmp, UP_OBJ_FACE); 93 update_object (tmp, UP_OBJ_FACE);
94 break; 94 break;
95 95
96 case BUTTON: 96 case BUTTON:
97 case PEDESTAL: 97 case PEDESTAL:
98 tmp->value = state; 98 tmp->value = state;
99 SET_ANIMATION (tmp, tmp->value); 99 SET_ANIMATION (tmp, tmp->value);
100 update_object (tmp, UP_OBJ_FACE); 100 update_object (tmp, UP_OBJ_FACE);
101 break; 101 break;
102 102
103 case MOOD_FLOOR: 103 case MOOD_FLOOR:
104 do_mood_floor (tmp, source); 104 do_mood_floor (tmp, source);
105 break; 105 break;
106 106
107 case TIMED_GATE: 107 case TIMED_GATE:
108 tmp->speed = tmp->arch->clone.speed; 108 tmp->speed = tmp->arch->clone.speed;
109 update_ob_speed (tmp); /* original values */ 109 update_ob_speed (tmp); /* original values */
110 tmp->value = tmp->arch->clone.value; 110 tmp->value = tmp->arch->clone.value;
111 tmp->stats.sp = 1; 111 tmp->stats.sp = 1;
112 tmp->stats.hp = tmp->stats.maxhp; 112 tmp->stats.hp = tmp->stats.maxhp;
113 /* Handle multipart gates. We copy the value for the other parts 113 /* Handle multipart gates. We copy the value for the other parts
114 * from the head - this ensures that the data will consistent 114 * from the head - this ensures that the data will consistent
115 */ 115 */
116 for (tmp = tmp->more; tmp != NULL; tmp = tmp->more) 116 for (tmp = tmp->more; tmp != NULL; tmp = tmp->more)
117 { 117 {
118 tmp->speed = tmp->head->speed; 118 tmp->speed = tmp->head->speed;
119 tmp->value = tmp->head->value; 119 tmp->value = tmp->head->value;
120 tmp->stats.sp = tmp->head->stats.sp; 120 tmp->stats.sp = tmp->head->stats.sp;
121 tmp->stats.hp = tmp->head->stats.hp; 121 tmp->stats.hp = tmp->head->stats.hp;
122 update_ob_speed (tmp); 122 update_ob_speed (tmp);
123 } 123 }
124 break; 124 break;
125 125
126 case DIRECTOR: 126 case DIRECTOR:
127 case FIREWALL: 127 case FIREWALL:
128 if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL) 128 if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL)
129 move_firewall (tmp); 129 move_firewall (tmp);
130 else 130 else
131 { 131 {
132 if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */ 132 if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */
133 tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1; 133 tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1;
134 animate_turning (tmp); 134 animate_turning (tmp);
135 } 135 }
136 break; 136 break;
137 137
138 case TELEPORTER: 138 case TELEPORTER:
139 move_teleporter (tmp); 139 move_teleporter (tmp);
140 break; 140 break;
141 141
142 case CREATOR: 142 case CREATOR:
143 move_creator (tmp); 143 move_creator (tmp);
144 break; 144 break;
145 145
146 case TRIGGER_MARKER: 146 case TRIGGER_MARKER:
147 move_marker (tmp); 147 move_marker (tmp);
148 break; 148 break;
149 149
150 case DUPLICATOR: 150 case DUPLICATOR:
151 move_duplicator (tmp); 151 move_duplicator (tmp);
152 break; 152 break;
153 } 153 }
154 } 154 }
155} 155}
156 156
157/* 157/*
… …
187 * the connection was 'state' or 'released'. So that you can activate objects 187 * the connection was 'state' or 'released'. So that you can activate objects
188 * who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly. 188 * who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly.
189 * 189 *
190 */ 190 */
191void 191void
192activate_connection (mapstruct *map, long connection, bool state) 192activate_connection (maptile *map, long connection, bool state)
193{ 193{
194 if (INVOKE_MAP (TRIGGER, map, ARG_INT64 (connection), ARG_INT (state))) 194 if (INVOKE_MAP (TRIGGER, map, ARG_INT64 (connection), ARG_INT (state)))
195 return; 195 return;
196 196
197 oblinkpt *obp = get_connection_links (map, connection); 197 oblinkpt *obp = get_connection_links (map, connection);
… …
204 * Updates everything connected with the button op. 204 * Updates everything connected with the button op.
205 * After changing the state of a button, this function must be called 205 * After changing the state of a button, this function must be called
206 * to make sure that all gates and other buttons connected to the 206 * to make sure that all gates and other buttons connected to the
207 * button reacts to the (eventual) change of state. 207 * button reacts to the (eventual) change of state.
208 */ 208 */
209
210void 209void
211update_button (object *op) 210update_button (object *op)
212{ 211{
213 object *ab, *tmp, *head; 212 object *ab, *tmp, *head;
214 int tot, any_down = 0, old_value = op->value; 213 int tot, any_down = 0, old_value = op->value;
… …
218 obp = get_button_links (op); 217 obp = get_button_links (op);
219 /* LOG(llevDebug, "update_button: %s (%d)\n", op->name, op->count); */ 218 /* LOG(llevDebug, "update_button: %s (%d)\n", op->name, op->count); */
220 if (obp) 219 if (obp)
221 for (ol = obp->link; ol; ol = ol->next) 220 for (ol = obp->link; ol; ol = ol->next)
222 { 221 {
223 if (!ol->ob || ol->ob->count != ol->id) 222 if (!ol->ob)
224 { 223 {
225 LOG (llevDebug, "Internal error in update_button (%s).\n", &op->name); 224 LOG (llevDebug, "Internal error in update_button (%s).\n", &op->name);
226 continue; 225 continue;
227 } 226 }
227
228 tmp = ol->ob; 228 tmp = ol->ob;
229 if (tmp->type == BUTTON) 229 if (tmp->type == BUTTON)
230 { 230 {
231 for (ab = tmp->above, tot = 0; ab != NULL; ab = ab->above) 231 for (ab = tmp->above, tot = 0; ab != NULL; ab = ab->above)
232 /* Bug? The pedestal code below looks for the head of 232 /* Bug? The pedestal code below looks for the head of
… …
281/* 281/*
282 * Updates every button on the map (by calling update_button() for them). 282 * Updates every button on the map (by calling update_button() for them).
283 */ 283 */
284 284
285void 285void
286update_buttons (mapstruct *m) 286update_buttons (maptile *m)
287{ 287{
288 objectlink *ol; 288 objectlink *ol;
289 oblinkpt *obp; 289 oblinkpt *obp;
290 290
291 for (obp = m->buttons; obp; obp = obp->next) 291 for (obp = m->buttons; obp; obp = obp->next)
292 for (ol = obp->link; ol; ol = ol->next) 292 for (ol = obp->link; ol; ol = ol->next)
293 { 293 {
294 if (!ol->ob || ol->ob->count != ol->id) 294 if (!ol->ob)
295 { 295 {
296 LOG (llevError, "Internal error in update_button (%s (%dx%d):%d, connected %ld).\n", 296 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
297 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, ol->id, obp->value); 297 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
298 continue; 298 continue;
299 } 299 }
300
300 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL) 301 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
301 { 302 {
302 update_button (ol->ob); 303 update_button (ol->ob);
303 break; 304 break;
304 } 305 }
… …
351 ARCH_SACRIFICE (altar) == sacrifice->name || 352 ARCH_SACRIFICE (altar) == sacrifice->name ||
352 ARCH_SACRIFICE (altar) == sacrifice->slaying || 353 ARCH_SACRIFICE (altar) == sacrifice->slaying ||
353 (!strcmp (ARCH_SACRIFICE (altar), query_base_name (sacrifice, 0)))) 354 (!strcmp (ARCH_SACRIFICE (altar), query_base_name (sacrifice, 0))))
354 && NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1)) 355 && NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1))
355 return 1; 356 return 1;
357
356 if (strcmp (ARCH_SACRIFICE (altar), "money") == 0 358 if (strcmp (ARCH_SACRIFICE (altar), "money") == 0
357 && sacrifice->type == MONEY && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar)) 359 && sacrifice->type == MONEY && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar))
358 return 1; 360 return 1;
359 } 361 }
362
360 return 0; 363 return 0;
361} 364}
362 365
363/* 366/*
364 * operate_altar checks if sacrifice was accepted and removes sacrificed 367 * operate_altar checks if sacrifice was accepted and removes sacrificed
… …
595 return 0; 598 return 0;
596 } 599 }
597} 600}
598 601
599void 602void
600add_button_link (object *button, mapstruct *map, int connected) 603add_button_link (object *button, maptile *map, int connected)
601{ 604{
602 oblinkpt *obp; 605 oblinkpt *obp;
603 objectlink *ol = get_objectlink (); 606 objectlink *ol = get_objectlink ();
604 607
605 if (!map) 608 if (!map)
606 { 609 {
607 LOG (llevError, "Tried to add button-link without map.\n"); 610 LOG (llevError, "Tried to add button-link without map.\n");
608 return; 611 return;
609 } 612 }
610 if (!editor) 613
611 button->path_attuned = connected; /* peterm: I need this so I can rebuild 614 button->path_attuned = connected; /* peterm: I need this so I can rebuild
612 a connected map from a template map. */ 615 a connected map from a template map. */
613
614/* LOG(llevDebug,"adding button %s (%d)\n", button->name, connected);*/
615 616
616 SET_FLAG (button, FLAG_IS_LINKED); 617 SET_FLAG (button, FLAG_IS_LINKED);
617 618
618 ol->ob = button; 619 ol->ob = button;
619 ol->id = button->count;
620 620
621 for (obp = map->buttons; obp && obp->value != connected; obp = obp->next); 621 for (obp = map->buttons; obp && obp->value != connected; obp = obp->next)
622 ;
622 623
623 if (obp) 624 if (obp)
624 { 625 {
625 ol->next = obp->link; 626 ol->next = obp->link;
626 obp->link = ol; 627 obp->link = ol;
… …
650 if (op->map == NULL) 651 if (op->map == NULL)
651 { 652 {
652 LOG (llevError, "remove_button_link() in object without map.\n"); 653 LOG (llevError, "remove_button_link() in object without map.\n");
653 return; 654 return;
654 } 655 }
656
655 if (!QUERY_FLAG (op, FLAG_IS_LINKED)) 657 if (!QUERY_FLAG (op, FLAG_IS_LINKED))
656 { 658 {
657 LOG (llevError, "remove_button_linked() in unlinked object.\n"); 659 LOG (llevError, "remove_button_linked() in unlinked object.\n");
658 return; 660 return;
659 } 661 }
662
660 for (obp = op->map->buttons; obp; obp = obp->next) 663 for (obp = op->map->buttons; obp; obp = obp->next)
661 for (olp = &obp->link; (ol = *olp); olp = &ol->next) 664 for (olp = &obp->link; (ol = *olp); olp = &ol->next)
662 if (ol->ob == op) 665 if (ol->ob == op)
663 { 666 {
664 667
665/* LOG(llevDebug, "Removed link %d in button %s and map %s.\n", 668/* LOG(llevDebug, "Removed link %d in button %s and map %s.\n",
666 obp->value, op->name, op->map->path); 669 obp->value, op->name, op->map->path);
667*/ 670*/
668 *olp = ol->next; 671 *olp = ol->next;
669 free (ol); 672 delete ol;
670 return; 673 return;
671 } 674 }
675
672 LOG (llevError, "remove_button_linked(): couldn't find object.\n"); 676 LOG (llevError, "remove_button_linked(): couldn't find object.\n");
673 CLEAR_FLAG (op, FLAG_IS_LINKED); 677 CLEAR_FLAG (op, FLAG_IS_LINKED);
674} 678}
675 679
676/* 680/*
677 * Gets the objectlink for this connection from the map. 681 * Gets the objectlink for this connection from the map.
678 */ 682 */
679oblinkpt * 683oblinkpt *
680get_connection_links (mapstruct *map, long connection) 684get_connection_links (maptile *map, long connection)
681{ 685{
682 for (oblinkpt * obp = map->buttons; obp; obp = obp->next) 686 for (oblinkpt * obp = map->buttons; obp; obp = obp->next)
683 if (obp->value == connection) 687 if (obp->value == connection)
684 return obp; 688 return obp;
689
685 return 0; 690 return 0;
686} 691}
687 692
688/* 693/*
689 * Return the first objectlink in the objects linked to this one 694 * Return the first objectlink in the objects linked to this one
… …
695 oblinkpt *obp; 700 oblinkpt *obp;
696 objectlink *ol; 701 objectlink *ol;
697 702
698 if (!button->map) 703 if (!button->map)
699 return NULL; 704 return NULL;
705
700 for (obp = button->map->buttons; obp; obp = obp->next) 706 for (obp = button->map->buttons; obp; obp = obp->next)
701 for (ol = obp->link; ol; ol = ol->next) 707 for (ol = obp->link; ol; ol = ol->next)
702 if (ol->ob == button && ol->id == button->count) 708 if (ol->ob == button)
703 return obp; 709 return obp;
710
704 return NULL; 711 return NULL;
705} 712}
706 713
707/* 714/*
708 * Made as a separate function to increase efficiency 715 * Made as a separate function to increase efficiency
… …
716 723
717 if (!button->map) 724 if (!button->map)
718 return 0; 725 return 0;
719 for (obp = button->map->buttons; obp; obp = obp->next) 726 for (obp = button->map->buttons; obp; obp = obp->next)
720 for (ol = obp->link; ol; ol = ol->next) 727 for (ol = obp->link; ol; ol = ol->next)
721 if (ol->ob == button && ol->id == button->count) 728 if (ol->ob == button)
722 return obp->value; 729 return obp->value;
723 return 0; 730 return 0;
724} 731}
725 732
726/* This routine makes monsters who are 733/* This routine makes monsters who are
… …
763 tmp->attack_movement = 0; 770 tmp->attack_movement = 0;
764 /* lots of checks here, but want to make sure we don't 771 /* lots of checks here, but want to make sure we don't
765 * dereference a null value 772 * dereference a null value
766 */ 773 */
767 if (tmp->type == GOLEM && tmp->owner && tmp->owner->type == PLAYER && tmp->owner->contr->ranges[range_golem] == tmp) 774 if (tmp->type == GOLEM && tmp->owner && tmp->owner->type == PLAYER && tmp->owner->contr->ranges[range_golem] == tmp)
768 {
769 tmp->owner->contr->ranges[range_golem] = NULL; 775 tmp->owner->contr->ranges[range_golem] = 0;
770 tmp->owner->contr->golem_count = 0; 776
771 }
772 tmp->owner = 0; 777 tmp->owner = 0;
773 } 778 }
774 break; 779 break;
775 case 1: /* angry -- get neutral monsters mad */ 780 case 1: /* angry -- get neutral monsters mad */
776 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY)) 781 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY))
… …
786 break; 791 break;
787 case 4: /* charm all monsters */ 792 case 4: /* charm all monsters */
788 if (op == source) 793 if (op == source)
789 break; /* only if 'connected' */ 794 break; /* only if 'connected' */
790 795
791 for (tmp2 = get_map_ob (source->map, source->x, source->y); /* finding an owner */ 796 for (tmp2 = GET_MAP_OB (source->map, source->x, source->y); /* finding an owner */
792 tmp2->type != PLAYER; tmp2 = tmp2->above) 797 tmp2->type != PLAYER; tmp2 = tmp2->above)
793 if (tmp2->above == NULL) 798 if (tmp2->above == NULL)
794 break; 799 break;
795 800
796 if (tmp2->type != PLAYER) 801 if (tmp2->type != PLAYER)
797 break; 802 break;
803
798 set_owner (tmp, tmp2); 804 tmp->set_owner (tmp2);
799 SET_FLAG (tmp, FLAG_MONSTER); 805 SET_FLAG (tmp, FLAG_MONSTER);
806
800 tmp->stats.exp = 0; 807 tmp->stats.exp = 0;
801 SET_FLAG (tmp, FLAG_FRIENDLY); 808 SET_FLAG (tmp, FLAG_FRIENDLY);
809
802 add_friendly_object (tmp); 810 add_friendly_object (tmp);
803 tmp->attack_movement = PETMOVE; 811 tmp->attack_movement = PETMOVE;
804 break; 812 break;
805 813
806 default: 814 default:
… …
812 * It will descend through containers to find the object. 820 * It will descend through containers to find the object.
813 * slaying = match object slaying flag 821 * slaying = match object slaying flag
814 * race = match object archetype name flag 822 * race = match object archetype name flag
815 * hp = match object type (excpt type '0'== PLAYER) 823 * hp = match object type (excpt type '0'== PLAYER)
816 */ 824 */
817
818object * 825object *
819check_inv_recursive (object *op, const object *trig) 826check_inv_recursive (object *op, const object *trig)
820{ 827{
821 object *tmp, *ret = NULL; 828 object *tmp, *ret = NULL;
822 829
823 /* First check the object itself. */ 830 /* First check the object itself. */
824 if ((trig->stats.hp && (op->type == trig->stats.hp)) 831 if ((trig->stats.hp && (op->type == trig->stats.hp))
825 || (trig->slaying && (op->slaying == trig->slaying)) || (trig->race && (op->arch->name == trig->race))) 832 || (trig->slaying && (op->slaying == trig->slaying))
833 || (trig->race && (op->arch->name == trig->race)))
826 return op; 834 return op;
827 835
828 for (tmp = op->inv; tmp; tmp = tmp->below) 836 for (tmp = op->inv; tmp; tmp = tmp->below)
829 { 837 {
830 if (tmp->inv) 838 if (tmp->inv)
… …
832 ret = check_inv_recursive (tmp, trig); 840 ret = check_inv_recursive (tmp, trig);
833 if (ret) 841 if (ret)
834 return ret; 842 return ret;
835 } 843 }
836 else if ((trig->stats.hp && (tmp->type == trig->stats.hp)) 844 else if ((trig->stats.hp && (tmp->type == trig->stats.hp))
837 || (trig->slaying && (tmp->slaying == trig->slaying)) || (trig->race && (tmp->arch->name == trig->race))) 845 || (trig->slaying && (tmp->slaying == trig->slaying))
846 || (trig->race && (tmp->arch->name == trig->race)))
838 return tmp; 847 return tmp;
839 } 848 }
840 return NULL; 849 return NULL;
841} 850}
842 851
… …
845 * the square will activate connected items. 854 * the square will activate connected items.
846 * Monsters can't trigger this square (for now) 855 * Monsters can't trigger this square (for now)
847 * Values are: last_sp = 1/0 obj/no obj triggers 856 * Values are: last_sp = 1/0 obj/no obj triggers
848 * last_heal = 1/0 remove/dont remove obj if triggered 857 * last_heal = 1/0 remove/dont remove obj if triggered
849 * -b.t. (thomas@nomad.astro.psu.edu 858 * -b.t. (thomas@nomad.astro.psu.edu
850 */ 859 *
851 860 * Tue Dec 19 15:34:00 CET 2006 elmex: changed the function to ignore op
861 * because the check-inventory semantic essentially only applies when
862 * something is above the inventory checker.
863 * The semantic prior this change was: trigger if something has moved on or off
864 * and has a matching item. Imagine what happens if someone steps on the inventory
865 * checker with a matching item, has it, activates the connection, throws the item
866 * away, and then leaves the inventory checker. That would've caused an always-enabled
867 * state in the inventory checker. This won't happen anymore now.
868 *
869 */
852void 870void
853check_inv (object *op, object *trig) 871check_inv (object *op, object *trig)
854{ 872{
855 object *match; 873 trig->value = 0; // deactivate if none of the following conditions apply
856 874
857 if (op->type != PLAYER) 875 if (object *pl = trig->ms ().player ())
858 return; 876 {
859 match = check_inv_recursive (op, trig); 877 object *match = check_inv_recursive (pl, trig);
860 if (match && trig->last_sp)
861 {
862 if (trig->last_heal)
863 decrease_ob (match);
864 use_trigger (trig);
865 }
866 else if (!match && !trig->last_sp)
867 use_trigger (trig);
868}
869 878
870 879 if (match && trig->last_sp) // match == having
871/* This does a minimal check of the button link consistency for object
872 * map. All it really does it much sure the object id link that is set
873 * matches what the object has.
874 */
875void
876verify_button_links (const mapstruct *map)
877{
878 oblinkpt *obp;
879 objectlink *ol;
880
881 if (!map)
882 return;
883
884 for (obp = map->buttons; obp; obp = obp->next)
885 {
886 for (ol = obp->link; ol; ol = ol->next)
887 { 880 {
888 if (ol->id != ol->ob->count) 881 if (trig->last_heal)
889 LOG (llevError, "verify_button_links: object %s on list is corrupt (%d!=%d)\n", &ol->ob->name, ol->id, ol->ob->count); 882 decrease_ob (match);
883
884 trig->value = 1;
890 } 885 }
886 else if (!match && !trig->last_sp) // match == not having
887 trig->value = 1;
891 } 888 }
889
890 push_button (trig);
892} 891}
892

Diff Legend

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