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.9 by root, Wed Sep 13 23:42:23 2006 UTC vs.
Revision 1.23 by root, Mon Jan 8 01:19:02 2007 UTC

1
2/*
3 * static char *rcsid_button_c =
4 * "$Id: button.C,v 1.9 2006/09/13 23:42:23 root Exp $";
5 */
6
7/* 1/*
8 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
9 3
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
10 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
11 Copyright (C) 1992 Frank Tore Johansen 6 Copyright (C) 1992 Frank Tore Johansen
12 7
13 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
14 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
… …
22 17
23 You should have received a copy of the GNU General Public License 18 You should have received a copy of the GNU General Public License
24 along with this program; if not, write to the Free Software 19 along with this program; if not, write to the Free Software
25 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
26 21
27 The authors can be reached via e-mail at crossfire-devel@real-time.com 22 The authors can be reached via e-mail at <crossfire@schmorp.de>
28*/ 23*/
29 24
30#include <global.h> 25#include <global.h>
31#include <funcpoint.h> 26#include <funcpoint.h>
32 27
… …
41 * 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.
42 */ 37 */
43void 38void
44activate_connection_link (objectlink * ol, bool state, object *source = 0) 39activate_connection_link (objectlink * ol, bool state, object *source = 0)
45{ 40{
46 object *tmp = 0;
47
48 for (; ol; ol = ol->next) 41 for (; ol; ol = ol->next)
49 { 42 {
50 if (!ol->ob || ol->ob->count != ol->id) 43 if (!ol->ob)
51 { 44 {
52 LOG (llevError, "Internal error in activate_connection_link (%ld).\n", ol->id); 45 LOG (llevError, "Internal error in activate_connection_link.\n");
53 continue; 46 continue;
54 } 47 }
48
55 /* 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
56 * 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
57 * 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
58 * 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
59 * 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
60 * 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.
61 */ 55 */
62 56
63 if (QUERY_FLAG (ol->ob, FLAG_FREED)) 57 if (QUERY_FLAG (ol->ob, FLAG_FREED))
64 return; 58 return;
59
65 tmp = ol->ob; 60 object *tmp = ol->ob;
66 61
67 /* if the criteria isn't appropriate, don't do anything */ 62 /* if the criteria isn't appropriate, don't do anything */
68 if (state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_PUSH)) 63 if (state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_PUSH))
69 continue; 64 continue;
70 if (!state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_RELEASE)) 65 if (!state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_RELEASE))
71 continue; 66 continue;
72 67
73 switch (tmp->type) 68 switch (tmp->type)
74 { 69 {
75 case GATE: 70 case GATE:
76 case HOLE: 71 case HOLE:
77 tmp->value = tmp->stats.maxsp ? !state : state; 72 tmp->value = tmp->stats.maxsp ? !state : state;
78 tmp->speed = 0.5; 73 tmp->set_speed (0.5);
79 update_ob_speed (tmp);
80 break; 74 break;
81 75
82 case CF_HANDLE: 76 case CF_HANDLE:
83 SET_ANIMATION (tmp, (tmp->value = tmp->stats.maxsp ? !state : state)); 77 SET_ANIMATION (tmp, (tmp->value = tmp->stats.maxsp ? !state : state));
84 update_object (tmp, UP_OBJ_FACE); 78 update_object (tmp, UP_OBJ_FACE);
85 break; 79 break;
86 80
87 case SIGN: 81 case SIGN:
88 if (!tmp->stats.food || tmp->last_eat < tmp->stats.food) 82 if (!tmp->stats.food || tmp->last_eat < tmp->stats.food)
89 { 83 {
90 new_info_map (NDI_UNIQUE | NDI_NAVY, tmp->map, tmp->msg); 84 new_info_map (NDI_UNIQUE | NDI_NAVY, tmp->map, tmp->msg);
91 if (tmp->stats.food) 85 if (tmp->stats.food)
92 tmp->last_eat++; 86 tmp->last_eat++;
93 } 87 }
94 break; 88 break;
95 89
96 case ALTAR: 90 case ALTAR:
97 tmp->value = 1; 91 tmp->value = 1;
98 SET_ANIMATION (tmp, tmp->value); 92 SET_ANIMATION (tmp, tmp->value);
99 update_object (tmp, UP_OBJ_FACE); 93 update_object (tmp, UP_OBJ_FACE);
100 break; 94 break;
101 95
102 case BUTTON: 96 case BUTTON:
103 case PEDESTAL: 97 case PEDESTAL:
104 tmp->value = state; 98 tmp->value = state;
105 SET_ANIMATION (tmp, tmp->value); 99 SET_ANIMATION (tmp, tmp->value);
106 update_object (tmp, UP_OBJ_FACE); 100 update_object (tmp, UP_OBJ_FACE);
107 break; 101 break;
108 102
109 case MOOD_FLOOR: 103 case MOOD_FLOOR:
110 do_mood_floor (tmp, source); 104 do_mood_floor (tmp, source);
111 break; 105 break;
112 106
113 case TIMED_GATE: 107 case TIMED_GATE:
114 tmp->speed = tmp->arch->clone.speed; 108 tmp->set_speed (tmp->arch->clone.speed);
115 update_ob_speed (tmp); /* original values */
116 tmp->value = tmp->arch->clone.value; 109 tmp->value = tmp->arch->clone.value;
117 tmp->stats.sp = 1; 110 tmp->stats.sp = 1;
118 tmp->stats.hp = tmp->stats.maxhp; 111 tmp->stats.hp = tmp->stats.maxhp;
119 /* Handle multipart gates. We copy the value for the other parts 112 /* Handle multipart gates. We copy the value for the other parts
120 * from the head - this ensures that the data will consistent 113 * from the head - this ensures that the data will consistent
121 */ 114 */
122 for (tmp = tmp->more; tmp != NULL; tmp = tmp->more) 115 for (tmp = tmp->more; tmp; tmp = tmp->more)
123 { 116 {
124 tmp->speed = tmp->head->speed;
125 tmp->value = tmp->head->value; 117 tmp->value = tmp->head->value;
126 tmp->stats.sp = tmp->head->stats.sp; 118 tmp->stats.sp = tmp->head->stats.sp;
127 tmp->stats.hp = tmp->head->stats.hp; 119 tmp->stats.hp = tmp->head->stats.hp;
128 update_ob_speed (tmp); 120 tmp->set_speed (tmp->head->speed);
129 } 121 }
130 break; 122 break;
131 123
132 case DIRECTOR: 124 case DIRECTOR:
133 case FIREWALL: 125 case FIREWALL:
134 if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL) 126 if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL)
135 move_firewall (tmp); 127 move_firewall (tmp);
136 else 128 else
137 { 129 {
138 if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */ 130 if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */
139 tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1; 131 tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1;
140 animate_turning (tmp); 132 animate_turning (tmp);
141 } 133 }
142 break; 134 break;
143 135
144 case TELEPORTER: 136 case TELEPORTER:
145 move_teleporter (tmp); 137 move_teleporter (tmp);
146 break; 138 break;
147 139
148 case CREATOR: 140 case CREATOR:
149 move_creator (tmp); 141 move_creator (tmp);
150 break; 142 break;
151 143
152 case TRIGGER_MARKER: 144 case TRIGGER_MARKER:
153 move_marker (tmp); 145 move_marker (tmp);
154 break; 146 break;
155 147
156 case DUPLICATOR: 148 case DUPLICATOR:
157 move_duplicator (tmp); 149 move_duplicator (tmp);
158 break; 150 break;
159 } 151 }
160 } 152 }
161} 153}
162 154
163/* 155/*
… …
193 * 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
194 * who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly. 186 * who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly.
195 * 187 *
196 */ 188 */
197void 189void
198activate_connection (mapstruct *map, long connection, bool state) 190activate_connection (maptile *map, long connection, bool state)
199{ 191{
200 if (INVOKE_MAP (TRIGGER, map, ARG_INT64 (connection), ARG_INT (state))) 192 if (INVOKE_MAP (TRIGGER, map, ARG_INT64 (connection), ARG_INT (state)))
201 return; 193 return;
202 194
203 oblinkpt *obp = get_connection_links (map, connection); 195 oblinkpt *obp = get_connection_links (map, connection);
… …
210 * Updates everything connected with the button op. 202 * Updates everything connected with the button op.
211 * 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
212 * 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
213 * button reacts to the (eventual) change of state. 205 * button reacts to the (eventual) change of state.
214 */ 206 */
215
216void 207void
217update_button (object *op) 208update_button (object *op)
218{ 209{
219 object *ab, *tmp, *head; 210 object *ab, *tmp, *head;
220 int tot, any_down = 0, old_value = op->value; 211 int tot, any_down = 0, old_value = op->value;
… …
224 obp = get_button_links (op); 215 obp = get_button_links (op);
225 /* LOG(llevDebug, "update_button: %s (%d)\n", op->name, op->count); */ 216 /* LOG(llevDebug, "update_button: %s (%d)\n", op->name, op->count); */
226 if (obp) 217 if (obp)
227 for (ol = obp->link; ol; ol = ol->next) 218 for (ol = obp->link; ol; ol = ol->next)
228 { 219 {
229 if (!ol->ob || ol->ob->count != ol->id) 220 if (!ol->ob)
230 { 221 {
231 LOG (llevDebug, "Internal error in update_button (%s).\n", &op->name); 222 LOG (llevDebug, "Internal error in update_button (%s).\n", &op->name);
232 continue; 223 continue;
233 } 224 }
225
234 tmp = ol->ob; 226 tmp = ol->ob;
235 if (tmp->type == BUTTON) 227 if (tmp->type == BUTTON)
236 { 228 {
237 for (ab = tmp->above, tot = 0; ab != NULL; ab = ab->above) 229 for (ab = tmp->above, tot = 0; ab != NULL; ab = ab->above)
238 /* Bug? The pedestal code below looks for the head of 230 /* Bug? The pedestal code below looks for the head of
… …
282 update_object (op, UP_OBJ_FACE); 274 update_object (op, UP_OBJ_FACE);
283 push_button (op); /* Make all other buttons the same */ 275 push_button (op); /* Make all other buttons the same */
284 } 276 }
285} 277}
286 278
287/*
288 * Updates every button on the map (by calling update_button() for them).
289 */
290
291void
292update_buttons (mapstruct *m)
293{
294 objectlink *ol;
295 oblinkpt *obp;
296
297 for (obp = m->buttons; obp; obp = obp->next)
298 for (ol = obp->link; ol; ol = ol->next)
299 {
300 if (!ol->ob || ol->ob->count != ol->id)
301 {
302 LOG (llevError, "Internal error in update_button (%s (%dx%d):%d, connected %ld).\n",
303 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, ol->id, obp->value);
304 continue;
305 }
306 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
307 {
308 update_button (ol->ob);
309 break;
310 }
311 }
312}
313
314void 279void
315use_trigger (object *op) 280use_trigger (object *op)
316{ 281{
317
318 /* Toggle value */ 282 /* Toggle value */
319 op->value = !op->value; 283 op->value = !op->value;
320 push_button (op); 284 push_button (op);
321} 285}
322 286
323/* 287/*
324 * Note: animate_object should be used instead of this, 288 * Note: animate_object should be used instead of this,
325 * but it can't handle animations in the 8 directions 289 * but it can't handle animations in the 8 directions
326 */ 290 */
327
328void 291void
329animate_turning (object *op) /* only one part objects */ 292animate_turning (object *op) /* only one part objects */
330{ 293{
331 if (++op->state >= NUM_ANIMATIONS (op) / 8) 294 if (++op->state >= NUM_ANIMATIONS (op) / 8)
332 op->state = 0; 295 op->state = 0;
… …
357 ARCH_SACRIFICE (altar) == sacrifice->name || 320 ARCH_SACRIFICE (altar) == sacrifice->name ||
358 ARCH_SACRIFICE (altar) == sacrifice->slaying || 321 ARCH_SACRIFICE (altar) == sacrifice->slaying ||
359 (!strcmp (ARCH_SACRIFICE (altar), query_base_name (sacrifice, 0)))) 322 (!strcmp (ARCH_SACRIFICE (altar), query_base_name (sacrifice, 0))))
360 && NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1)) 323 && NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1))
361 return 1; 324 return 1;
325
362 if (strcmp (ARCH_SACRIFICE (altar), "money") == 0 326 if (strcmp (ARCH_SACRIFICE (altar), "money") == 0
363 && sacrifice->type == MONEY && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar)) 327 && sacrifice->type == MONEY && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar))
364 return 1; 328 return 1;
365 } 329 }
330
366 return 0; 331 return 0;
367} 332}
368 333
369/* 334/*
370 * operate_altar checks if sacrifice was accepted and removes sacrificed 335 * operate_altar checks if sacrifice was accepted and removes sacrificed
… …
417{ 382{
418 op->stats.wc = state; 383 op->stats.wc = state;
419 if (state) 384 if (state)
420 { 385 {
421 use_trigger (op); 386 use_trigger (op);
422 if (op->stats.exp > 0) /* check sanity */ 387 op->set_speed (op->stats.exp > 0 ? 1. / op->stats.exp : 1.);
423 op->speed = 1.0 / op->stats.exp;
424 else
425 op->speed = 1.0;
426 update_ob_speed (op);
427 op->speed_left = -1; 388 op->speed_left = -1;
428 } 389 }
429 else 390 else
430 { 391 {
431 use_trigger (op); 392 use_trigger (op);
432 op->speed = 0; 393 op->set_speed (0);
433 update_ob_speed (op);
434 } 394 }
435} 395}
436 396
437 397
438/* 398/*
… …
573 trigger_move (op, 0); 533 trigger_move (op, 0);
574 else 534 else
575 { 535 {
576 op->stats.wc = 0; 536 op->stats.wc = 0;
577 op->value = !op->value; 537 op->value = !op->value;
578 op->speed = 0; 538 op->set_speed (0);
579 update_ob_speed (op);
580 } 539 }
581 } 540 }
582 return 0; 541 return 0;
583 542
584 case TRIGGER: 543 case TRIGGER:
585 if (cause) 544 if (cause)
586 { 545 {
587 if (in_movement) 546 if (in_movement)
588 return 0; 547 return 0;
548
589 push = 1; 549 push = 1;
590 } 550 }
551
591 if (NUM_ANIMATIONS (op) > 1) 552 if (NUM_ANIMATIONS (op) > 1)
592 { 553 {
593 SET_ANIMATION (op, push); 554 SET_ANIMATION (op, push);
594 update_object (op, UP_OBJ_FACE); 555 update_object (op, UP_OBJ_FACE);
595 } 556 }
557
596 trigger_move (op, push); 558 trigger_move (op, push);
597 return 1; 559 return 1;
598 560
599 default: 561 default:
600 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);
601 return 0; 563 return 0;
602 } 564 }
603} 565}
604 566
605void 567void
606add_button_link (object *button, mapstruct *map, int connected) 568add_button_link (object *button, maptile *map, int connected)
607{ 569{
608 oblinkpt *obp; 570 oblinkpt *obp;
609 objectlink *ol = get_objectlink (); 571 objectlink *ol = get_objectlink ();
610 572
611 if (!map) 573 if (!map)
612 { 574 {
613 LOG (llevError, "Tried to add button-link without map.\n"); 575 LOG (llevError, "Tried to add button-link without map.\n");
614 return; 576 return;
615 } 577 }
616 if (!editor) 578
617 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
618 a connected map from a template map. */ 580 a connected map from a template map. */
619
620/* LOG(llevDebug,"adding button %s (%d)\n", button->name, connected);*/
621 581
622 SET_FLAG (button, FLAG_IS_LINKED); 582 SET_FLAG (button, FLAG_IS_LINKED);
623 583
624 ol->ob = button; 584 ol->ob = button;
625 ol->id = button->count;
626 585
627 for (obp = map->buttons; obp && obp->value != connected; obp = obp->next); 586 for (obp = map->buttons; obp && obp->value != connected; obp = obp->next)
587 ;
628 588
629 if (obp) 589 if (obp)
630 { 590 {
631 ol->next = obp->link; 591 ol->next = obp->link;
632 obp->link = ol; 592 obp->link = ol;
… …
656 if (op->map == NULL) 616 if (op->map == NULL)
657 { 617 {
658 LOG (llevError, "remove_button_link() in object without map.\n"); 618 LOG (llevError, "remove_button_link() in object without map.\n");
659 return; 619 return;
660 } 620 }
621
661 if (!QUERY_FLAG (op, FLAG_IS_LINKED)) 622 if (!QUERY_FLAG (op, FLAG_IS_LINKED))
662 { 623 {
663 LOG (llevError, "remove_button_linked() in unlinked object.\n"); 624 LOG (llevError, "remove_button_linked() in unlinked object.\n");
664 return; 625 return;
665 } 626 }
627
666 for (obp = op->map->buttons; obp; obp = obp->next) 628 for (obp = op->map->buttons; obp; obp = obp->next)
667 for (olp = &obp->link; (ol = *olp); olp = &ol->next) 629 for (olp = &obp->link; (ol = *olp); olp = &ol->next)
668 if (ol->ob == op) 630 if (ol->ob == op)
669 { 631 {
670 632
671/* 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",
672 obp->value, op->name, op->map->path); 634 obp->value, op->name, op->map->path);
673*/ 635*/
674 *olp = ol->next; 636 *olp = ol->next;
675 free (ol); 637 delete ol;
676 return; 638 return;
677 } 639 }
640
678 LOG (llevError, "remove_button_linked(): couldn't find object.\n"); 641 LOG (llevError, "remove_button_linked(): couldn't find object.\n");
679 CLEAR_FLAG (op, FLAG_IS_LINKED); 642 CLEAR_FLAG (op, FLAG_IS_LINKED);
680} 643}
681 644
682/* 645/*
683 * Gets the objectlink for this connection from the map. 646 * Gets the objectlink for this connection from the map.
684 */ 647 */
685oblinkpt * 648oblinkpt *
686get_connection_links (mapstruct *map, long connection) 649get_connection_links (maptile *map, long connection)
687{ 650{
688 for (oblinkpt * obp = map->buttons; obp; obp = obp->next) 651 for (oblinkpt * obp = map->buttons; obp; obp = obp->next)
689 if (obp->value == connection) 652 if (obp->value == connection)
690 return obp; 653 return obp;
654
691 return 0; 655 return 0;
692} 656}
693 657
694/* 658/*
695 * Return the first objectlink in the objects linked to this one 659 * Return the first objectlink in the objects linked to this one
… …
701 oblinkpt *obp; 665 oblinkpt *obp;
702 objectlink *ol; 666 objectlink *ol;
703 667
704 if (!button->map) 668 if (!button->map)
705 return NULL; 669 return NULL;
670
706 for (obp = button->map->buttons; obp; obp = obp->next) 671 for (obp = button->map->buttons; obp; obp = obp->next)
707 for (ol = obp->link; ol; ol = ol->next) 672 for (ol = obp->link; ol; ol = ol->next)
708 if (ol->ob == button && ol->id == button->count) 673 if (ol->ob == button)
709 return obp; 674 return obp;
675
710 return NULL; 676 return NULL;
711} 677}
712 678
713/* 679/*
714 * Made as a separate function to increase efficiency 680 * Made as a separate function to increase efficiency
… …
722 688
723 if (!button->map) 689 if (!button->map)
724 return 0; 690 return 0;
725 for (obp = button->map->buttons; obp; obp = obp->next) 691 for (obp = button->map->buttons; obp; obp = obp->next)
726 for (ol = obp->link; ol; ol = ol->next) 692 for (ol = obp->link; ol; ol = ol->next)
727 if (ol->ob == button && ol->id == button->count) 693 if (ol->ob == button)
728 return obp->value; 694 return obp->value;
729 return 0; 695 return 0;
730} 696}
731 697
732/* This routine makes monsters who are 698/* This routine makes monsters who are
… …
769 tmp->attack_movement = 0; 735 tmp->attack_movement = 0;
770 /* 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
771 * dereference a null value 737 * dereference a null value
772 */ 738 */
773 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)
774 {
775 tmp->owner->contr->ranges[range_golem] = NULL; 740 tmp->owner->contr->ranges[range_golem] = 0;
776 tmp->owner->contr->golem_count = 0; 741
777 }
778 tmp->owner = 0; 742 tmp->owner = 0;
779 } 743 }
780 break; 744 break;
781 case 1: /* angry -- get neutral monsters mad */ 745 case 1: /* angry -- get neutral monsters mad */
782 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY)) 746 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY))
… …
792 break; 756 break;
793 case 4: /* charm all monsters */ 757 case 4: /* charm all monsters */
794 if (op == source) 758 if (op == source)
795 break; /* only if 'connected' */ 759 break; /* only if 'connected' */
796 760
797 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 */
798 tmp2->type != PLAYER; tmp2 = tmp2->above) 762 tmp2->type != PLAYER; tmp2 = tmp2->above)
799 if (tmp2->above == NULL) 763 if (tmp2->above == NULL)
800 break; 764 break;
801 765
802 if (tmp2->type != PLAYER) 766 if (tmp2->type != PLAYER)
803 break; 767 break;
768
804 set_owner (tmp, tmp2); 769 tmp->set_owner (tmp2);
805 SET_FLAG (tmp, FLAG_MONSTER); 770 SET_FLAG (tmp, FLAG_MONSTER);
771
806 tmp->stats.exp = 0; 772 tmp->stats.exp = 0;
807 SET_FLAG (tmp, FLAG_FRIENDLY); 773
808 add_friendly_object (tmp); 774 add_friendly_object (tmp);
809 tmp->attack_movement = PETMOVE; 775 tmp->attack_movement = PETMOVE;
810 break; 776 break;
811 777
812 default: 778 default:
… …
818 * It will descend through containers to find the object. 784 * It will descend through containers to find the object.
819 * slaying = match object slaying flag 785 * slaying = match object slaying flag
820 * race = match object archetype name flag 786 * race = match object archetype name flag
821 * hp = match object type (excpt type '0'== PLAYER) 787 * hp = match object type (excpt type '0'== PLAYER)
822 */ 788 */
823
824object * 789object *
825check_inv_recursive (object *op, const object *trig) 790check_inv_recursive (object *op, const object *trig)
826{ 791{
827 object *tmp, *ret = NULL; 792 object *tmp, *ret = NULL;
828 793
829 /* First check the object itself. */ 794 /* First check the object itself. */
830 if ((trig->stats.hp && (op->type == trig->stats.hp)) 795 if ((trig->stats.hp && (op->type == trig->stats.hp))
831 || (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)))
832 return op; 798 return op;
833 799
834 for (tmp = op->inv; tmp; tmp = tmp->below) 800 for (tmp = op->inv; tmp; tmp = tmp->below)
835 { 801 {
836 if (tmp->inv) 802 if (tmp->inv)
… …
838 ret = check_inv_recursive (tmp, trig); 804 ret = check_inv_recursive (tmp, trig);
839 if (ret) 805 if (ret)
840 return ret; 806 return ret;
841 } 807 }
842 else if ((trig->stats.hp && (tmp->type == trig->stats.hp)) 808 else if ((trig->stats.hp && (tmp->type == trig->stats.hp))
843 || (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)))
844 return tmp; 811 return tmp;
845 } 812 }
846 return NULL; 813 return NULL;
847} 814}
848 815
… …
851 * the square will activate connected items. 818 * the square will activate connected items.
852 * Monsters can't trigger this square (for now) 819 * Monsters can't trigger this square (for now)
853 * Values are: last_sp = 1/0 obj/no obj triggers 820 * Values are: last_sp = 1/0 obj/no obj triggers
854 * last_heal = 1/0 remove/dont remove obj if triggered 821 * last_heal = 1/0 remove/dont remove obj if triggered
855 * -b.t. (thomas@nomad.astro.psu.edu 822 * -b.t. (thomas@nomad.astro.psu.edu
856 */ 823 *
857 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 */
858void 834void
859check_inv (object *op, object *trig) 835check_inv (object *op, object *trig)
860{ 836{
861 object *match; 837 trig->value = 0; // deactivate if none of the following conditions apply
862 838
863 if (op->type != PLAYER) 839 if (object *pl = trig->ms ().player ())
864 return; 840 {
865 match = check_inv_recursive (op, trig); 841 object *match = check_inv_recursive (pl, trig);
866 if (match && trig->last_sp)
867 {
868 if (trig->last_heal)
869 decrease_ob (match);
870 use_trigger (trig);
871 }
872 else if (!match && !trig->last_sp)
873 use_trigger (trig);
874}
875 842
876 843 if (match && trig->last_sp) // match == having
877/* This does a minimal check of the button link consistency for object
878 * map. All it really does it much sure the object id link that is set
879 * matches what the object has.
880 */
881void
882verify_button_links (const mapstruct *map)
883{
884 oblinkpt *obp;
885 objectlink *ol;
886
887 if (!map)
888 return;
889
890 for (obp = map->buttons; obp; obp = obp->next)
891 {
892 for (ol = obp->link; ol; ol = ol->next)
893 { 844 {
894 if (ol->id != ol->ob->count) 845 if (trig->last_heal)
895 LOG (llevError, "verify_button_links: object %s on list is corrupt (%d!=%d)\n", &ol->ob->name, ol->id, ol->ob->count); 846 decrease_ob (match);
847
848 trig->value = 1;
896 } 849 }
850 else if (!match && !trig->last_sp) // match == not having
851 trig->value = 1;
897 } 852 }
853
854 push_button (trig);
898} 855}
856

Diff Legend

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