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.24 by elmex, Tue Jan 9 16:38:23 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
3 3
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 Copyright (C) 1992 Frank Tore Johansen
6 7
7 This program is free software; you can redistribute it and/or modify 8 This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 it under the terms of the GNU General Public License as published by
… …
35 * The source argument can be 0 or the source object for this activation. 36 * The source argument can be 0 or the source object for this activation.
36 */ 37 */
37void 38void
38activate_connection_link (objectlink * ol, bool state, object *source = 0) 39activate_connection_link (objectlink * ol, bool state, object *source = 0)
39{ 40{
40 object *tmp = 0;
41
42 for (; ol; ol = ol->next) 41 for (; ol; ol = ol->next)
43 { 42 {
44 if (!ol->ob || ol->ob->count != ol->id) 43 if (!ol->ob)
45 { 44 {
46 LOG (llevError, "Internal error in activate_connection_link (%ld).\n", ol->id); 45 LOG (llevError, "Internal error in activate_connection_link.\n");
47 continue; 46 continue;
48 } 47 }
48
49 /* a button link object can become freed when the map is saving. As 49 /* 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 50 * 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 51 * 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 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 (QUERY_FLAG (ol->ob, FLAG_FREED))
58 return; 58 return;
59
59 tmp = ol->ob; 60 object *tmp = ol->ob;
60 61
61 /* if the criteria isn't appropriate, don't do anything */ 62 /* if the criteria isn't appropriate, don't do anything */
62 if (state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_PUSH)) 63 if (state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_PUSH))
63 continue; 64 continue;
64 if (!state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_RELEASE)) 65 if (!state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_RELEASE))
65 continue; 66 continue;
66 67
67 switch (tmp->type) 68 switch (tmp->type)
68 { 69 {
69 case GATE: 70 case GATE:
70 case HOLE: 71 case HOLE:
71 tmp->value = tmp->stats.maxsp ? !state : state; 72 tmp->value = tmp->stats.maxsp ? !state : state;
72 tmp->speed = 0.5; 73 tmp->set_speed (0.5);
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->set_speed (tmp->arch->clone.speed);
109 update_ob_speed (tmp); /* original values */
110 tmp->value = tmp->arch->clone.value; 109 tmp->value = tmp->arch->clone.value;
111 tmp->stats.sp = 1; 110 tmp->stats.sp = 1;
112 tmp->stats.hp = tmp->stats.maxhp; 111 tmp->stats.hp = tmp->stats.maxhp;
113 /* Handle multipart gates. We copy the value for the other parts 112 /* Handle multipart gates. We copy the value for the other parts
114 * from the head - this ensures that the data will consistent 113 * from the head - this ensures that the data will consistent
115 */ 114 */
116 for (tmp = tmp->more; tmp != NULL; tmp = tmp->more) 115 for (tmp = tmp->more; tmp; tmp = tmp->more)
117 { 116 {
118 tmp->speed = tmp->head->speed;
119 tmp->value = tmp->head->value; 117 tmp->value = tmp->head->value;
120 tmp->stats.sp = tmp->head->stats.sp; 118 tmp->stats.sp = tmp->head->stats.sp;
121 tmp->stats.hp = tmp->head->stats.hp; 119 tmp->stats.hp = tmp->head->stats.hp;
122 update_ob_speed (tmp); 120 tmp->set_speed (tmp->head->speed);
123 } 121 }
124 break; 122 break;
125 123
126 case DIRECTOR: 124 case DIRECTOR:
127 case FIREWALL: 125 case FIREWALL:
128 if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL) 126 if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL)
129 move_firewall (tmp); 127 move_firewall (tmp);
130 else 128 else
131 { 129 {
132 if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */ 130 if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */
133 tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1; 131 tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1;
134 animate_turning (tmp); 132 animate_turning (tmp);
135 } 133 }
136 break; 134 break;
137 135
138 case TELEPORTER: 136 case TELEPORTER:
139 move_teleporter (tmp); 137 move_teleporter (tmp);
140 break; 138 break;
141 139
142 case CREATOR: 140 case CREATOR:
143 move_creator (tmp); 141 move_creator (tmp);
144 break; 142 break;
145 143
146 case TRIGGER_MARKER: 144 case TRIGGER_MARKER:
147 move_marker (tmp); 145 move_marker (tmp);
148 break; 146 break;
149 147
150 case DUPLICATOR: 148 case DUPLICATOR:
151 move_duplicator (tmp); 149 move_duplicator (tmp);
152 break; 150 break;
153 } 151 }
154 } 152 }
155} 153}
156 154
157/* 155/*
… …
187 * the connection was 'state' or 'released'. So that you can activate objects 185 * the connection was 'state' or 'released'. So that you can activate objects
188 * who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly. 186 * who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly.
189 * 187 *
190 */ 188 */
191void 189void
192activate_connection (mapstruct *map, long connection, bool state) 190activate_connection (maptile *map, long connection, bool state)
193{ 191{
194 if (INVOKE_MAP (TRIGGER, map, ARG_INT64 (connection), ARG_INT (state))) 192 if (INVOKE_MAP (TRIGGER, map, ARG_INT64 (connection), ARG_INT (state)))
195 return; 193 return;
196 194
197 oblinkpt *obp = get_connection_links (map, connection); 195 oblinkpt *obp = get_connection_links (map, connection);
… …
204 * Updates everything connected with the button op. 202 * Updates everything connected with the button op.
205 * After changing the state of a button, this function must be called 203 * 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 204 * to make sure that all gates and other buttons connected to the
207 * button reacts to the (eventual) change of state. 205 * button reacts to the (eventual) change of state.
208 */ 206 */
209
210void 207void
211update_button (object *op) 208update_button (object *op)
212{ 209{
213 object *ab, *tmp, *head; 210 object *ab, *tmp, *head;
214 int tot, any_down = 0, old_value = op->value; 211 int tot, any_down = 0, old_value = op->value;
… …
218 obp = get_button_links (op); 215 obp = get_button_links (op);
219 /* LOG(llevDebug, "update_button: %s (%d)\n", op->name, op->count); */ 216 /* LOG(llevDebug, "update_button: %s (%d)\n", op->name, op->count); */
220 if (obp) 217 if (obp)
221 for (ol = obp->link; ol; ol = ol->next) 218 for (ol = obp->link; ol; ol = ol->next)
222 { 219 {
223 if (!ol->ob || ol->ob->count != ol->id) 220 if (!ol->ob)
224 { 221 {
225 LOG (llevDebug, "Internal error in update_button (%s).\n", &op->name); 222 LOG (llevDebug, "Internal error in update_button (%s).\n", &op->name);
226 continue; 223 continue;
227 } 224 }
225
228 tmp = ol->ob; 226 tmp = ol->ob;
229 if (tmp->type == BUTTON) 227 if (tmp->type == BUTTON)
230 { 228 {
231 for (ab = tmp->above, tot = 0; ab != NULL; ab = ab->above) 229 for (ab = tmp->above, tot = 0; ab != NULL; ab = ab->above)
232 /* Bug? The pedestal code below looks for the head of 230 /* Bug? The pedestal code below looks for the head of
… …
276 update_object (op, UP_OBJ_FACE); 274 update_object (op, UP_OBJ_FACE);
277 push_button (op); /* Make all other buttons the same */ 275 push_button (op); /* Make all other buttons the same */
278 } 276 }
279} 277}
280 278
281/*
282 * Updates every button on the map (by calling update_button() for them).
283 */
284
285void
286update_buttons (mapstruct *m)
287{
288 objectlink *ol;
289 oblinkpt *obp;
290
291 for (obp = m->buttons; obp; obp = obp->next)
292 for (ol = obp->link; ol; ol = ol->next)
293 {
294 if (!ol->ob || ol->ob->count != ol->id)
295 {
296 LOG (llevError, "Internal error in update_button (%s (%dx%d):%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);
298 continue;
299 }
300 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
301 {
302 update_button (ol->ob);
303 break;
304 }
305 }
306}
307
308void 279void
309use_trigger (object *op) 280use_trigger (object *op)
310{ 281{
311
312 /* Toggle value */ 282 /* Toggle value */
313 op->value = !op->value; 283 op->value = !op->value;
314 push_button (op); 284 push_button (op);
315} 285}
316 286
317/* 287/*
318 * Note: animate_object should be used instead of this, 288 * Note: animate_object should be used instead of this,
319 * but it can't handle animations in the 8 directions 289 * but it can't handle animations in the 8 directions
320 */ 290 */
321
322void 291void
323animate_turning (object *op) /* only one part objects */ 292animate_turning (object *op) /* only one part objects */
324{ 293{
325 if (++op->state >= NUM_ANIMATIONS (op) / 8) 294 if (++op->state >= NUM_ANIMATIONS (op) / 8)
326 op->state = 0; 295 op->state = 0;
… …
351 ARCH_SACRIFICE (altar) == sacrifice->name || 320 ARCH_SACRIFICE (altar) == sacrifice->name ||
352 ARCH_SACRIFICE (altar) == sacrifice->slaying || 321 ARCH_SACRIFICE (altar) == sacrifice->slaying ||
353 (!strcmp (ARCH_SACRIFICE (altar), query_base_name (sacrifice, 0)))) 322 (!strcmp (ARCH_SACRIFICE (altar), query_base_name (sacrifice, 0))))
354 && NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1)) 323 && NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1))
355 return 1; 324 return 1;
325
356 if (strcmp (ARCH_SACRIFICE (altar), "money") == 0 326 if (strcmp (ARCH_SACRIFICE (altar), "money") == 0
357 && sacrifice->type == MONEY && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar)) 327 && sacrifice->type == MONEY && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar))
358 return 1; 328 return 1;
359 } 329 }
330
360 return 0; 331 return 0;
361} 332}
362 333
363/* 334/*
364 * operate_altar checks if sacrifice was accepted and removes sacrificed 335 * operate_altar checks if sacrifice was accepted and removes sacrificed
… …
411{ 382{
412 op->stats.wc = state; 383 op->stats.wc = state;
413 if (state) 384 if (state)
414 { 385 {
415 use_trigger (op); 386 use_trigger (op);
416 if (op->stats.exp > 0) /* check sanity */ 387 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; 388 op->speed_left = -1;
422 } 389 }
423 else 390 else
424 { 391 {
425 use_trigger (op); 392 use_trigger (op);
426 op->speed = 0; 393 op->set_speed (0);
427 update_ob_speed (op);
428 } 394 }
429} 395}
430 396
431 397
432/* 398/*
… …
567 trigger_move (op, 0); 533 trigger_move (op, 0);
568 else 534 else
569 { 535 {
570 op->stats.wc = 0; 536 op->stats.wc = 0;
571 op->value = !op->value; 537 op->value = !op->value;
572 op->speed = 0; 538 op->set_speed (0);
573 update_ob_speed (op);
574 } 539 }
575 } 540 }
576 return 0; 541 return 0;
577 542
578 case TRIGGER: 543 case TRIGGER:
579 if (cause) 544 if (cause)
580 { 545 {
581 if (in_movement) 546 if (in_movement)
582 return 0; 547 return 0;
548
583 push = 1; 549 push = 1;
584 } 550 }
551
585 if (NUM_ANIMATIONS (op) > 1) 552 if (NUM_ANIMATIONS (op) > 1)
586 { 553 {
587 SET_ANIMATION (op, push); 554 SET_ANIMATION (op, push);
588 update_object (op, UP_OBJ_FACE); 555 update_object (op, UP_OBJ_FACE);
589 } 556 }
557
590 trigger_move (op, push); 558 trigger_move (op, push);
591 return 1; 559 return 1;
592 560
593 default: 561 default:
594 LOG (llevDebug, "Unknown trigger type: %s (%d)\n", &op->name, op->type); 562 LOG (llevDebug, "Unknown trigger type: %s (%d)\n", &op->name, op->type);
595 return 0; 563 return 0;
596 } 564 }
597} 565}
598 566
599void 567void
600add_button_link (object *button, mapstruct *map, int connected) 568add_button_link (object *button, maptile *map, int connected)
601{ 569{
602 oblinkpt *obp; 570 oblinkpt *obp;
603 objectlink *ol = get_objectlink (); 571 objectlink *ol = get_objectlink ();
604 572
605 if (!map) 573 if (!map)
606 { 574 {
607 LOG (llevError, "Tried to add button-link without map.\n"); 575 LOG (llevError, "Tried to add button-link without map.\n");
608 return; 576 return;
609 } 577 }
610 if (!editor) 578
611 button->path_attuned = connected; /* peterm: I need this so I can rebuild 579 button->path_attuned = connected; /* peterm: I need this so I can rebuild
612 a connected map from a template map. */ 580 a connected map from a template map. */
613
614/* LOG(llevDebug,"adding button %s (%d)\n", button->name, connected);*/
615 581
616 SET_FLAG (button, FLAG_IS_LINKED); 582 SET_FLAG (button, FLAG_IS_LINKED);
617 583
618 ol->ob = button; 584 ol->ob = button;
619 ol->id = button->count;
620 585
621 for (obp = map->buttons; obp && obp->value != connected; obp = obp->next); 586 for (obp = map->buttons; obp && obp->value != connected; obp = obp->next)
587 ;
622 588
623 if (obp) 589 if (obp)
624 { 590 {
625 ol->next = obp->link; 591 ol->next = obp->link;
626 obp->link = ol; 592 obp->link = ol;
… …
650 if (op->map == NULL) 616 if (op->map == NULL)
651 { 617 {
652 LOG (llevError, "remove_button_link() in object without map.\n"); 618 LOG (llevError, "remove_button_link() in object without map.\n");
653 return; 619 return;
654 } 620 }
621
655 if (!QUERY_FLAG (op, FLAG_IS_LINKED)) 622 if (!QUERY_FLAG (op, FLAG_IS_LINKED))
656 { 623 {
657 LOG (llevError, "remove_button_linked() in unlinked object.\n"); 624 LOG (llevError, "remove_button_linked() in unlinked object.\n");
658 return; 625 return;
659 } 626 }
627
660 for (obp = op->map->buttons; obp; obp = obp->next) 628 for (obp = op->map->buttons; obp; obp = obp->next)
661 for (olp = &obp->link; (ol = *olp); olp = &ol->next) 629 for (olp = &obp->link; (ol = *olp); olp = &ol->next)
662 if (ol->ob == op) 630 if (ol->ob == op)
663 { 631 {
664 632
665/* LOG(llevDebug, "Removed link %d in button %s and map %s.\n", 633/* LOG(llevDebug, "Removed link %d in button %s and map %s.\n",
666 obp->value, op->name, op->map->path); 634 obp->value, op->name, op->map->path);
667*/ 635*/
668 *olp = ol->next; 636 *olp = ol->next;
669 free (ol); 637 delete ol;
670 return; 638 return;
671 } 639 }
640
672 LOG (llevError, "remove_button_linked(): couldn't find object.\n"); 641 LOG (llevError, "remove_button_linked(): couldn't find object.\n");
673 CLEAR_FLAG (op, FLAG_IS_LINKED); 642 CLEAR_FLAG (op, FLAG_IS_LINKED);
674} 643}
675 644
676/* 645/*
677 * Gets the objectlink for this connection from the map. 646 * Gets the objectlink for this connection from the map.
678 */ 647 */
679oblinkpt * 648oblinkpt *
680get_connection_links (mapstruct *map, long connection) 649get_connection_links (maptile *map, long connection)
681{ 650{
682 for (oblinkpt * obp = map->buttons; obp; obp = obp->next) 651 for (oblinkpt * obp = map->buttons; obp; obp = obp->next)
683 if (obp->value == connection) 652 if (obp->value == connection)
684 return obp; 653 return obp;
654
685 return 0; 655 return 0;
686} 656}
687 657
688/* 658/*
689 * Return the first objectlink in the objects linked to this one 659 * Return the first objectlink in the objects linked to this one
… …
695 oblinkpt *obp; 665 oblinkpt *obp;
696 objectlink *ol; 666 objectlink *ol;
697 667
698 if (!button->map) 668 if (!button->map)
699 return NULL; 669 return NULL;
670
700 for (obp = button->map->buttons; obp; obp = obp->next) 671 for (obp = button->map->buttons; obp; obp = obp->next)
701 for (ol = obp->link; ol; ol = ol->next) 672 for (ol = obp->link; ol; ol = ol->next)
702 if (ol->ob == button && ol->id == button->count) 673 if (ol->ob == button)
703 return obp; 674 return obp;
675
704 return NULL; 676 return NULL;
705} 677}
706 678
707/* 679/*
708 * Made as a separate function to increase efficiency 680 * Made as a separate function to increase efficiency
… …
716 688
717 if (!button->map) 689 if (!button->map)
718 return 0; 690 return 0;
719 for (obp = button->map->buttons; obp; obp = obp->next) 691 for (obp = button->map->buttons; obp; obp = obp->next)
720 for (ol = obp->link; ol; ol = ol->next) 692 for (ol = obp->link; ol; ol = ol->next)
721 if (ol->ob == button && ol->id == button->count) 693 if (ol->ob == button)
722 return obp->value; 694 return obp->value;
723 return 0; 695 return 0;
724} 696}
725 697
726/* This routine makes monsters who are 698/* This routine makes monsters who are
… …
763 tmp->attack_movement = 0; 735 tmp->attack_movement = 0;
764 /* lots of checks here, but want to make sure we don't 736 /* lots of checks here, but want to make sure we don't
765 * dereference a null value 737 * dereference a null value
766 */ 738 */
767 if (tmp->type == GOLEM && tmp->owner && tmp->owner->type == PLAYER && tmp->owner->contr->ranges[range_golem] == tmp) 739 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; 740 tmp->owner->contr->ranges[range_golem] = 0;
770 tmp->owner->contr->golem_count = 0; 741
771 }
772 tmp->owner = 0; 742 tmp->owner = 0;
773 } 743 }
774 break; 744 break;
775 case 1: /* angry -- get neutral monsters mad */ 745 case 1: /* angry -- get neutral monsters mad */
776 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY)) 746 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY))
… …
786 break; 756 break;
787 case 4: /* charm all monsters */ 757 case 4: /* charm all monsters */
788 if (op == source) 758 if (op == source)
789 break; /* only if 'connected' */ 759 break; /* only if 'connected' */
790 760
791 for (tmp2 = get_map_ob (source->map, source->x, source->y); /* finding an owner */ 761 for (tmp2 = GET_MAP_OB (source->map, source->x, source->y); /* finding an owner */
792 tmp2->type != PLAYER; tmp2 = tmp2->above) 762 tmp2->type != PLAYER; tmp2 = tmp2->above)
793 if (tmp2->above == NULL) 763 if (tmp2->above == NULL)
794 break; 764 break;
795 765
796 if (tmp2->type != PLAYER) 766 if (tmp2->type != PLAYER)
797 break; 767 break;
768
798 set_owner (tmp, tmp2); 769 tmp->set_owner (tmp2);
799 SET_FLAG (tmp, FLAG_MONSTER); 770 SET_FLAG (tmp, FLAG_MONSTER);
771
800 tmp->stats.exp = 0; 772 tmp->stats.exp = 0;
801 SET_FLAG (tmp, FLAG_FRIENDLY); 773
802 add_friendly_object (tmp); 774 add_friendly_object (tmp);
803 tmp->attack_movement = PETMOVE; 775 tmp->attack_movement = PETMOVE;
804 break; 776 break;
805 777
806 default: 778 default:
… …
812 * It will descend through containers to find the object. 784 * It will descend through containers to find the object.
813 * slaying = match object slaying flag 785 * slaying = match object slaying flag
814 * race = match object archetype name flag 786 * race = match object archetype name flag
815 * hp = match object type (excpt type '0'== PLAYER) 787 * hp = match object type (excpt type '0'== PLAYER)
816 */ 788 */
817
818object * 789object *
819check_inv_recursive (object *op, const object *trig) 790check_inv_recursive (object *op, const object *trig)
820{ 791{
821 object *tmp, *ret = NULL; 792 object *tmp, *ret = NULL;
822 793
823 /* First check the object itself. */ 794 /* First check the object itself. */
824 if ((trig->stats.hp && (op->type == trig->stats.hp)) 795 if ((trig->stats.hp && (op->type == trig->stats.hp))
825 || (trig->slaying && (op->slaying == trig->slaying)) || (trig->race && (op->arch->name == trig->race))) 796 || (trig->slaying && (op->slaying == trig->slaying))
797 || (trig->race && (op->arch->name == trig->race)))
826 return op; 798 return op;
827 799
828 for (tmp = op->inv; tmp; tmp = tmp->below) 800 for (tmp = op->inv; tmp; tmp = tmp->below)
829 { 801 {
830 if (tmp->inv) 802 if (tmp->inv)
… …
832 ret = check_inv_recursive (tmp, trig); 804 ret = check_inv_recursive (tmp, trig);
833 if (ret) 805 if (ret)
834 return ret; 806 return ret;
835 } 807 }
836 else if ((trig->stats.hp && (tmp->type == trig->stats.hp)) 808 else if ((trig->stats.hp && (tmp->type == trig->stats.hp))
837 || (trig->slaying && (tmp->slaying == trig->slaying)) || (trig->race && (tmp->arch->name == trig->race))) 809 || (trig->slaying && (tmp->slaying == trig->slaying))
810 || (trig->race && (tmp->arch->name == trig->race)))
838 return tmp; 811 return tmp;
839 } 812 }
840 return NULL; 813 return NULL;
841} 814}
842 815
… …
845 * the square will activate connected items. 818 * the square will activate connected items.
846 * Monsters can't trigger this square (for now) 819 * Monsters can't trigger this square (for now)
847 * Values are: last_sp = 1/0 obj/no obj triggers 820 * Values are: last_sp = 1/0 obj/no obj triggers
848 * last_heal = 1/0 remove/dont remove obj if triggered 821 * last_heal = 1/0 remove/dont remove obj if triggered
849 * -b.t. (thomas@nomad.astro.psu.edu 822 * -b.t. (thomas@nomad.astro.psu.edu
850 */ 823 *
851 824 * Tue Dec 19 15:34:00 CET 2006 elmex: changed the function to ignore op
825 * because the check-inventory semantic essentially only applies when
826 * something is above the inventory checker.
827 * The semantic prior this change was: trigger if something has moved on or off
828 * and has a matching item. Imagine what happens if someone steps on the inventory
829 * checker with a matching item, has it, activates the connection, throws the item
830 * away, and then leaves the inventory checker. That would've caused an always-enabled
831 * state in the inventory checker. This won't happen anymore now.
832 *
833 */
852void 834void
853check_inv (object *op, object *trig) 835check_inv (object *op, object *trig)
854{ 836{
855 object *match; 837 sint32 prev_state = trig->value;
838 trig->value = 0; // deactivate if none of the following conditions apply
856 839
857 if (op->type != PLAYER) 840 if (object *pl = trig->ms ().player ())
858 return; 841 {
859 match = check_inv_recursive (op, trig); 842 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 843
870 844 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 { 845 {
888 if (ol->id != ol->ob->count) 846 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); 847 decrease_ob (match);
848
849 trig->value = 1;
890 } 850 }
851 else if (!match && !trig->last_sp) // match == not having
852 trig->value = 1;
891 } 853 }
854
855 if (prev_state != trig->value)
856 push_button (trig);
892} 857}
858

Diff Legend

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