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.20 by root, Tue Dec 26 08:54:58 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->set_speed (0.5);
73 update_ob_speed (tmp);
74 break; 73 break;
75 74
76 case CF_HANDLE: 75 case CF_HANDLE:
77 SET_ANIMATION (tmp, (tmp->value = tmp->stats.maxsp ? !state : state)); 76 SET_ANIMATION (tmp, (tmp->value = tmp->stats.maxsp ? !state : state));
78 update_object (tmp, UP_OBJ_FACE); 77 update_object (tmp, UP_OBJ_FACE);
79 break; 78 break;
80 79
81 case SIGN: 80 case SIGN:
82 if (!tmp->stats.food || tmp->last_eat < tmp->stats.food) 81 if (!tmp->stats.food || tmp->last_eat < tmp->stats.food)
83 { 82 {
84 new_info_map (NDI_UNIQUE | NDI_NAVY, tmp->map, tmp->msg); 83 new_info_map (NDI_UNIQUE | NDI_NAVY, tmp->map, tmp->msg);
85 if (tmp->stats.food) 84 if (tmp->stats.food)
86 tmp->last_eat++; 85 tmp->last_eat++;
87 } 86 }
88 break; 87 break;
89 88
90 case ALTAR: 89 case ALTAR:
91 tmp->value = 1; 90 tmp->value = 1;
92 SET_ANIMATION (tmp, tmp->value); 91 SET_ANIMATION (tmp, tmp->value);
93 update_object (tmp, UP_OBJ_FACE); 92 update_object (tmp, UP_OBJ_FACE);
94 break; 93 break;
95 94
96 case BUTTON: 95 case BUTTON:
97 case PEDESTAL: 96 case PEDESTAL:
98 tmp->value = state; 97 tmp->value = state;
99 SET_ANIMATION (tmp, tmp->value); 98 SET_ANIMATION (tmp, tmp->value);
100 update_object (tmp, UP_OBJ_FACE); 99 update_object (tmp, UP_OBJ_FACE);
101 break; 100 break;
102 101
103 case MOOD_FLOOR: 102 case MOOD_FLOOR:
104 do_mood_floor (tmp, source); 103 do_mood_floor (tmp, source);
105 break; 104 break;
106 105
107 case TIMED_GATE: 106 case TIMED_GATE:
108 tmp->speed = tmp->arch->clone.speed; 107 tmp->set_speed (tmp->arch->clone.speed);
109 update_ob_speed (tmp); /* original values */
110 tmp->value = tmp->arch->clone.value; 108 tmp->value = tmp->arch->clone.value;
111 tmp->stats.sp = 1; 109 tmp->stats.sp = 1;
112 tmp->stats.hp = tmp->stats.maxhp; 110 tmp->stats.hp = tmp->stats.maxhp;
113 /* Handle multipart gates. We copy the value for the other parts 111 /* Handle multipart gates. We copy the value for the other parts
114 * from the head - this ensures that the data will consistent 112 * from the head - this ensures that the data will consistent
115 */ 113 */
116 for (tmp = tmp->more; tmp != NULL; tmp = tmp->more) 114 for (tmp = tmp->more; tmp; tmp = tmp->more)
117 { 115 {
118 tmp->speed = tmp->head->speed;
119 tmp->value = tmp->head->value; 116 tmp->value = tmp->head->value;
120 tmp->stats.sp = tmp->head->stats.sp; 117 tmp->stats.sp = tmp->head->stats.sp;
121 tmp->stats.hp = tmp->head->stats.hp; 118 tmp->stats.hp = tmp->head->stats.hp;
122 update_ob_speed (tmp); 119 tmp->set_speed (tmp->head->speed);
123 } 120 }
124 break; 121 break;
125 122
126 case DIRECTOR: 123 case DIRECTOR:
127 case FIREWALL: 124 case FIREWALL:
128 if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL) 125 if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL)
129 move_firewall (tmp); 126 move_firewall (tmp);
130 else 127 else
131 { 128 {
132 if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */ 129 if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */
133 tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1; 130 tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1;
134 animate_turning (tmp); 131 animate_turning (tmp);
135 } 132 }
136 break; 133 break;
137 134
138 case TELEPORTER: 135 case TELEPORTER:
139 move_teleporter (tmp); 136 move_teleporter (tmp);
140 break; 137 break;
141 138
142 case CREATOR: 139 case CREATOR:
143 move_creator (tmp); 140 move_creator (tmp);
144 break; 141 break;
145 142
146 case TRIGGER_MARKER: 143 case TRIGGER_MARKER:
147 move_marker (tmp); 144 move_marker (tmp);
148 break; 145 break;
149 146
150 case DUPLICATOR: 147 case DUPLICATOR:
151 move_duplicator (tmp); 148 move_duplicator (tmp);
152 break; 149 break;
153 } 150 }
154 } 151 }
155} 152}
156 153
157/* 154/*
… …
187 * the connection was 'state' or 'released'. So that you can activate objects 184 * the connection was 'state' or 'released'. So that you can activate objects
188 * who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly. 185 * who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly.
189 * 186 *
190 */ 187 */
191void 188void
192activate_connection (mapstruct *map, long connection, bool state) 189activate_connection (maptile *map, long connection, bool state)
193{ 190{
194 if (INVOKE_MAP (TRIGGER, map, ARG_INT64 (connection), ARG_INT (state))) 191 if (INVOKE_MAP (TRIGGER, map, ARG_INT64 (connection), ARG_INT (state)))
195 return; 192 return;
196 193
197 oblinkpt *obp = get_connection_links (map, connection); 194 oblinkpt *obp = get_connection_links (map, connection);
… …
204 * Updates everything connected with the button op. 201 * Updates everything connected with the button op.
205 * After changing the state of a button, this function must be called 202 * 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 203 * to make sure that all gates and other buttons connected to the
207 * button reacts to the (eventual) change of state. 204 * button reacts to the (eventual) change of state.
208 */ 205 */
209
210void 206void
211update_button (object *op) 207update_button (object *op)
212{ 208{
213 object *ab, *tmp, *head; 209 object *ab, *tmp, *head;
214 int tot, any_down = 0, old_value = op->value; 210 int tot, any_down = 0, old_value = op->value;
… …
218 obp = get_button_links (op); 214 obp = get_button_links (op);
219 /* LOG(llevDebug, "update_button: %s (%d)\n", op->name, op->count); */ 215 /* LOG(llevDebug, "update_button: %s (%d)\n", op->name, op->count); */
220 if (obp) 216 if (obp)
221 for (ol = obp->link; ol; ol = ol->next) 217 for (ol = obp->link; ol; ol = ol->next)
222 { 218 {
223 if (!ol->ob || ol->ob->count != ol->id) 219 if (!ol->ob)
224 { 220 {
225 LOG (llevDebug, "Internal error in update_button (%s).\n", &op->name); 221 LOG (llevDebug, "Internal error in update_button (%s).\n", &op->name);
226 continue; 222 continue;
227 } 223 }
224
228 tmp = ol->ob; 225 tmp = ol->ob;
229 if (tmp->type == BUTTON) 226 if (tmp->type == BUTTON)
230 { 227 {
231 for (ab = tmp->above, tot = 0; ab != NULL; ab = ab->above) 228 for (ab = tmp->above, tot = 0; ab != NULL; ab = ab->above)
232 /* Bug? The pedestal code below looks for the head of 229 /* Bug? The pedestal code below looks for the head of
… …
281/* 278/*
282 * Updates every button on the map (by calling update_button() for them). 279 * Updates every button on the map (by calling update_button() for them).
283 */ 280 */
284 281
285void 282void
286update_buttons (mapstruct *m) 283update_buttons (maptile *m)
287{ 284{
288 objectlink *ol; 285 objectlink *ol;
289 oblinkpt *obp; 286 oblinkpt *obp;
290 287
291 for (obp = m->buttons; obp; obp = obp->next) 288 for (obp = m->buttons; obp; obp = obp->next)
292 for (ol = obp->link; ol; ol = ol->next) 289 for (ol = obp->link; ol; ol = ol->next)
293 { 290 {
294 if (!ol->ob || ol->ob->count != ol->id) 291 if (!ol->ob)
295 { 292 {
296 LOG (llevError, "Internal error in update_button (%s (%dx%d):%d, connected %ld).\n", 293 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); 294 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
298 continue; 295 continue;
299 } 296 }
297
300 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL) 298 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
301 { 299 {
302 update_button (ol->ob); 300 update_button (ol->ob);
303 break; 301 break;
304 } 302 }
… …
351 ARCH_SACRIFICE (altar) == sacrifice->name || 349 ARCH_SACRIFICE (altar) == sacrifice->name ||
352 ARCH_SACRIFICE (altar) == sacrifice->slaying || 350 ARCH_SACRIFICE (altar) == sacrifice->slaying ||
353 (!strcmp (ARCH_SACRIFICE (altar), query_base_name (sacrifice, 0)))) 351 (!strcmp (ARCH_SACRIFICE (altar), query_base_name (sacrifice, 0))))
354 && NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1)) 352 && NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1))
355 return 1; 353 return 1;
354
356 if (strcmp (ARCH_SACRIFICE (altar), "money") == 0 355 if (strcmp (ARCH_SACRIFICE (altar), "money") == 0
357 && sacrifice->type == MONEY && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar)) 356 && sacrifice->type == MONEY && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar))
358 return 1; 357 return 1;
359 } 358 }
359
360 return 0; 360 return 0;
361} 361}
362 362
363/* 363/*
364 * operate_altar checks if sacrifice was accepted and removes sacrificed 364 * operate_altar checks if sacrifice was accepted and removes sacrificed
… …
411{ 411{
412 op->stats.wc = state; 412 op->stats.wc = state;
413 if (state) 413 if (state)
414 { 414 {
415 use_trigger (op); 415 use_trigger (op);
416 if (op->stats.exp > 0) /* check sanity */ 416 op->set_speed (op->stats.exp > 0 ? 1. / op->stats.exp : 1.);
417 op->speed = 1.0 / op->stats.exp;
418 else
419 op->speed = 1.0;
420 update_ob_speed (op);
421 op->speed_left = -1; 417 op->speed_left = -1;
422 } 418 }
423 else 419 else
424 { 420 {
425 use_trigger (op); 421 use_trigger (op);
426 op->speed = 0; 422 op->set_speed (0);
427 update_ob_speed (op);
428 } 423 }
429} 424}
430 425
431 426
432/* 427/*
… …
567 trigger_move (op, 0); 562 trigger_move (op, 0);
568 else 563 else
569 { 564 {
570 op->stats.wc = 0; 565 op->stats.wc = 0;
571 op->value = !op->value; 566 op->value = !op->value;
572 op->speed = 0; 567 op->set_speed (0);
573 update_ob_speed (op);
574 } 568 }
575 } 569 }
576 return 0; 570 return 0;
577 571
578 case TRIGGER: 572 case TRIGGER:
579 if (cause) 573 if (cause)
580 { 574 {
581 if (in_movement) 575 if (in_movement)
582 return 0; 576 return 0;
577
583 push = 1; 578 push = 1;
584 } 579 }
580
585 if (NUM_ANIMATIONS (op) > 1) 581 if (NUM_ANIMATIONS (op) > 1)
586 { 582 {
587 SET_ANIMATION (op, push); 583 SET_ANIMATION (op, push);
588 update_object (op, UP_OBJ_FACE); 584 update_object (op, UP_OBJ_FACE);
589 } 585 }
586
590 trigger_move (op, push); 587 trigger_move (op, push);
591 return 1; 588 return 1;
592 589
593 default: 590 default:
594 LOG (llevDebug, "Unknown trigger type: %s (%d)\n", &op->name, op->type); 591 LOG (llevDebug, "Unknown trigger type: %s (%d)\n", &op->name, op->type);
595 return 0; 592 return 0;
596 } 593 }
597} 594}
598 595
599void 596void
600add_button_link (object *button, mapstruct *map, int connected) 597add_button_link (object *button, maptile *map, int connected)
601{ 598{
602 oblinkpt *obp; 599 oblinkpt *obp;
603 objectlink *ol = get_objectlink (); 600 objectlink *ol = get_objectlink ();
604 601
605 if (!map) 602 if (!map)
606 { 603 {
607 LOG (llevError, "Tried to add button-link without map.\n"); 604 LOG (llevError, "Tried to add button-link without map.\n");
608 return; 605 return;
609 } 606 }
610 if (!editor) 607
611 button->path_attuned = connected; /* peterm: I need this so I can rebuild 608 button->path_attuned = connected; /* peterm: I need this so I can rebuild
612 a connected map from a template map. */ 609 a connected map from a template map. */
613
614/* LOG(llevDebug,"adding button %s (%d)\n", button->name, connected);*/
615 610
616 SET_FLAG (button, FLAG_IS_LINKED); 611 SET_FLAG (button, FLAG_IS_LINKED);
617 612
618 ol->ob = button; 613 ol->ob = button;
619 ol->id = button->count;
620 614
621 for (obp = map->buttons; obp && obp->value != connected; obp = obp->next); 615 for (obp = map->buttons; obp && obp->value != connected; obp = obp->next)
616 ;
622 617
623 if (obp) 618 if (obp)
624 { 619 {
625 ol->next = obp->link; 620 ol->next = obp->link;
626 obp->link = ol; 621 obp->link = ol;
… …
650 if (op->map == NULL) 645 if (op->map == NULL)
651 { 646 {
652 LOG (llevError, "remove_button_link() in object without map.\n"); 647 LOG (llevError, "remove_button_link() in object without map.\n");
653 return; 648 return;
654 } 649 }
650
655 if (!QUERY_FLAG (op, FLAG_IS_LINKED)) 651 if (!QUERY_FLAG (op, FLAG_IS_LINKED))
656 { 652 {
657 LOG (llevError, "remove_button_linked() in unlinked object.\n"); 653 LOG (llevError, "remove_button_linked() in unlinked object.\n");
658 return; 654 return;
659 } 655 }
656
660 for (obp = op->map->buttons; obp; obp = obp->next) 657 for (obp = op->map->buttons; obp; obp = obp->next)
661 for (olp = &obp->link; (ol = *olp); olp = &ol->next) 658 for (olp = &obp->link; (ol = *olp); olp = &ol->next)
662 if (ol->ob == op) 659 if (ol->ob == op)
663 { 660 {
664 661
665/* LOG(llevDebug, "Removed link %d in button %s and map %s.\n", 662/* LOG(llevDebug, "Removed link %d in button %s and map %s.\n",
666 obp->value, op->name, op->map->path); 663 obp->value, op->name, op->map->path);
667*/ 664*/
668 *olp = ol->next; 665 *olp = ol->next;
669 free (ol); 666 delete ol;
670 return; 667 return;
671 } 668 }
669
672 LOG (llevError, "remove_button_linked(): couldn't find object.\n"); 670 LOG (llevError, "remove_button_linked(): couldn't find object.\n");
673 CLEAR_FLAG (op, FLAG_IS_LINKED); 671 CLEAR_FLAG (op, FLAG_IS_LINKED);
674} 672}
675 673
676/* 674/*
677 * Gets the objectlink for this connection from the map. 675 * Gets the objectlink for this connection from the map.
678 */ 676 */
679oblinkpt * 677oblinkpt *
680get_connection_links (mapstruct *map, long connection) 678get_connection_links (maptile *map, long connection)
681{ 679{
682 for (oblinkpt * obp = map->buttons; obp; obp = obp->next) 680 for (oblinkpt * obp = map->buttons; obp; obp = obp->next)
683 if (obp->value == connection) 681 if (obp->value == connection)
684 return obp; 682 return obp;
683
685 return 0; 684 return 0;
686} 685}
687 686
688/* 687/*
689 * Return the first objectlink in the objects linked to this one 688 * Return the first objectlink in the objects linked to this one
… …
695 oblinkpt *obp; 694 oblinkpt *obp;
696 objectlink *ol; 695 objectlink *ol;
697 696
698 if (!button->map) 697 if (!button->map)
699 return NULL; 698 return NULL;
699
700 for (obp = button->map->buttons; obp; obp = obp->next) 700 for (obp = button->map->buttons; obp; obp = obp->next)
701 for (ol = obp->link; ol; ol = ol->next) 701 for (ol = obp->link; ol; ol = ol->next)
702 if (ol->ob == button && ol->id == button->count) 702 if (ol->ob == button)
703 return obp; 703 return obp;
704
704 return NULL; 705 return NULL;
705} 706}
706 707
707/* 708/*
708 * Made as a separate function to increase efficiency 709 * Made as a separate function to increase efficiency
… …
716 717
717 if (!button->map) 718 if (!button->map)
718 return 0; 719 return 0;
719 for (obp = button->map->buttons; obp; obp = obp->next) 720 for (obp = button->map->buttons; obp; obp = obp->next)
720 for (ol = obp->link; ol; ol = ol->next) 721 for (ol = obp->link; ol; ol = ol->next)
721 if (ol->ob == button && ol->id == button->count) 722 if (ol->ob == button)
722 return obp->value; 723 return obp->value;
723 return 0; 724 return 0;
724} 725}
725 726
726/* This routine makes monsters who are 727/* This routine makes monsters who are
… …
763 tmp->attack_movement = 0; 764 tmp->attack_movement = 0;
764 /* lots of checks here, but want to make sure we don't 765 /* lots of checks here, but want to make sure we don't
765 * dereference a null value 766 * dereference a null value
766 */ 767 */
767 if (tmp->type == GOLEM && tmp->owner && tmp->owner->type == PLAYER && tmp->owner->contr->ranges[range_golem] == tmp) 768 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; 769 tmp->owner->contr->ranges[range_golem] = 0;
770 tmp->owner->contr->golem_count = 0; 770
771 }
772 tmp->owner = 0; 771 tmp->owner = 0;
773 } 772 }
774 break; 773 break;
775 case 1: /* angry -- get neutral monsters mad */ 774 case 1: /* angry -- get neutral monsters mad */
776 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY)) 775 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY))
… …
786 break; 785 break;
787 case 4: /* charm all monsters */ 786 case 4: /* charm all monsters */
788 if (op == source) 787 if (op == source)
789 break; /* only if 'connected' */ 788 break; /* only if 'connected' */
790 789
791 for (tmp2 = get_map_ob (source->map, source->x, source->y); /* finding an owner */ 790 for (tmp2 = GET_MAP_OB (source->map, source->x, source->y); /* finding an owner */
792 tmp2->type != PLAYER; tmp2 = tmp2->above) 791 tmp2->type != PLAYER; tmp2 = tmp2->above)
793 if (tmp2->above == NULL) 792 if (tmp2->above == NULL)
794 break; 793 break;
795 794
796 if (tmp2->type != PLAYER) 795 if (tmp2->type != PLAYER)
797 break; 796 break;
797
798 set_owner (tmp, tmp2); 798 tmp->set_owner (tmp2);
799 SET_FLAG (tmp, FLAG_MONSTER); 799 SET_FLAG (tmp, FLAG_MONSTER);
800
800 tmp->stats.exp = 0; 801 tmp->stats.exp = 0;
801 SET_FLAG (tmp, FLAG_FRIENDLY); 802 SET_FLAG (tmp, FLAG_FRIENDLY);
803
802 add_friendly_object (tmp); 804 add_friendly_object (tmp);
803 tmp->attack_movement = PETMOVE; 805 tmp->attack_movement = PETMOVE;
804 break; 806 break;
805 807
806 default: 808 default:
… …
812 * It will descend through containers to find the object. 814 * It will descend through containers to find the object.
813 * slaying = match object slaying flag 815 * slaying = match object slaying flag
814 * race = match object archetype name flag 816 * race = match object archetype name flag
815 * hp = match object type (excpt type '0'== PLAYER) 817 * hp = match object type (excpt type '0'== PLAYER)
816 */ 818 */
817
818object * 819object *
819check_inv_recursive (object *op, const object *trig) 820check_inv_recursive (object *op, const object *trig)
820{ 821{
821 object *tmp, *ret = NULL; 822 object *tmp, *ret = NULL;
822 823
823 /* First check the object itself. */ 824 /* First check the object itself. */
824 if ((trig->stats.hp && (op->type == trig->stats.hp)) 825 if ((trig->stats.hp && (op->type == trig->stats.hp))
825 || (trig->slaying && (op->slaying == trig->slaying)) || (trig->race && (op->arch->name == trig->race))) 826 || (trig->slaying && (op->slaying == trig->slaying))
827 || (trig->race && (op->arch->name == trig->race)))
826 return op; 828 return op;
827 829
828 for (tmp = op->inv; tmp; tmp = tmp->below) 830 for (tmp = op->inv; tmp; tmp = tmp->below)
829 { 831 {
830 if (tmp->inv) 832 if (tmp->inv)
… …
832 ret = check_inv_recursive (tmp, trig); 834 ret = check_inv_recursive (tmp, trig);
833 if (ret) 835 if (ret)
834 return ret; 836 return ret;
835 } 837 }
836 else if ((trig->stats.hp && (tmp->type == trig->stats.hp)) 838 else if ((trig->stats.hp && (tmp->type == trig->stats.hp))
837 || (trig->slaying && (tmp->slaying == trig->slaying)) || (trig->race && (tmp->arch->name == trig->race))) 839 || (trig->slaying && (tmp->slaying == trig->slaying))
840 || (trig->race && (tmp->arch->name == trig->race)))
838 return tmp; 841 return tmp;
839 } 842 }
840 return NULL; 843 return NULL;
841} 844}
842 845
… …
845 * the square will activate connected items. 848 * the square will activate connected items.
846 * Monsters can't trigger this square (for now) 849 * Monsters can't trigger this square (for now)
847 * Values are: last_sp = 1/0 obj/no obj triggers 850 * Values are: last_sp = 1/0 obj/no obj triggers
848 * last_heal = 1/0 remove/dont remove obj if triggered 851 * last_heal = 1/0 remove/dont remove obj if triggered
849 * -b.t. (thomas@nomad.astro.psu.edu 852 * -b.t. (thomas@nomad.astro.psu.edu
850 */ 853 *
851 854 * Tue Dec 19 15:34:00 CET 2006 elmex: changed the function to ignore op
855 * because the check-inventory semantic essentially only applies when
856 * something is above the inventory checker.
857 * The semantic prior this change was: trigger if something has moved on or off
858 * and has a matching item. Imagine what happens if someone steps on the inventory
859 * checker with a matching item, has it, activates the connection, throws the item
860 * away, and then leaves the inventory checker. That would've caused an always-enabled
861 * state in the inventory checker. This won't happen anymore now.
862 *
863 */
852void 864void
853check_inv (object *op, object *trig) 865check_inv (object *op, object *trig)
854{ 866{
855 object *match; 867 trig->value = 0; // deactivate if none of the following conditions apply
856 868
857 if (op->type != PLAYER) 869 if (object *pl = trig->ms ().player ())
858 return; 870 {
859 match = check_inv_recursive (op, trig); 871 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 872
870 873 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 { 874 {
888 if (ol->id != ol->ob->count) 875 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); 876 decrease_ob (match);
877
878 trig->value = 1;
890 } 879 }
880 else if (!match && !trig->last_sp) // match == not having
881 trig->value = 1;
891 } 882 }
883
884 push_button (trig);
892} 885}
886

Diff Legend

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