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.19 by root, Mon Dec 25 11:25:49 2006 UTC vs.
Revision 1.37 by root, Tue Jul 31 17:33:14 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#include <funcpoint.h> 25#include <funcpoint.h>
26 26
27/* 27/*
… …
59 object *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
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 tmp->play_sound (tmp->sound);
84 new_info_map (NDI_UNIQUE | NDI_NAVY, tmp->map, tmp->msg); 85 new_info_map (NDI_UNIQUE | NDI_NAVY, tmp->map, tmp->msg);
85 if (tmp->stats.food) 86 if (tmp->stats.food)
86 tmp->last_eat++; 87 tmp->last_eat++;
87 } 88 }
88 break; 89 break;
… …
103 case MOOD_FLOOR: 104 case MOOD_FLOOR:
104 do_mood_floor (tmp, source); 105 do_mood_floor (tmp, source);
105 break; 106 break;
106 107
107 case TIMED_GATE: 108 case TIMED_GATE:
108 tmp->speed = tmp->arch->clone.speed; 109 tmp->set_speed (tmp->arch->speed);
109 update_ob_speed (tmp); /* original values */
110 tmp->value = tmp->arch->clone.value; 110 tmp->value = tmp->arch->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 (object *part = tmp->more; part; part = part->more)
117 { 117 {
118 tmp->speed = tmp->head->speed; 118 part->value = tmp->value;
119 tmp->value = tmp->head->value; 119 part->stats.sp = tmp->stats.sp;
120 tmp->stats.sp = tmp->head->stats.sp; 120 part->stats.hp = tmp->stats.hp;
121 tmp->stats.hp = tmp->head->stats.hp;
122 update_ob_speed (tmp); 121 part->set_speed (tmp->speed);
123 } 122 }
124 break; 123 break;
125 124
126 case DIRECTOR: 125 case DIRECTOR:
127 case FIREWALL: 126 case FIREWALL:
… …
129 move_firewall (tmp); 128 move_firewall (tmp);
130 else 129 else
131 { 130 {
132 if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */ 131 if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */
133 tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1; 132 tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1;
133
134 animate_turning (tmp); 134 animate_turning (tmp);
135 } 135 }
136 break; 136 break;
137 137
138 case TELEPORTER: 138 case TELEPORTER:
… …
252 else if (tmp->type == PEDESTAL) 252 else if (tmp->type == PEDESTAL)
253 { 253 {
254 tmp->value = 0; 254 tmp->value = 0;
255 for (ab = tmp->above; ab != NULL; ab = ab->above) 255 for (ab = tmp->above; ab != NULL; ab = ab->above)
256 { 256 {
257 head = ab->head ? ab->head : ab; 257 head = ab->head_ ();
258 /* Same note regarding move_type for buttons above apply here. */ 258 /* Same note regarding move_type for buttons above apply here. */
259 if (((head->move_type & tmp->move_on) || ab->move_type == 0) && 259 if (((head->move_type & tmp->move_on) || ab->move_type == 0) &&
260 (head->race == tmp->slaying || 260 (head->race == tmp->slaying ||
261 ((head->type == SPECIAL_KEY) && (head->slaying == tmp->slaying)) || 261 ((head->type == SPECIAL_KEY) && (head->slaying == tmp->slaying)) ||
262 (!strcmp (tmp->slaying, "player") && head->type == PLAYER))) 262 (!strcmp (tmp->slaying, "player") && head->type == PLAYER)))
263 tmp->value = 1; 263 tmp->value = 1;
264 } 264 }
265
265 if (tmp->value) 266 if (tmp->value)
266 any_down = 1; 267 any_down = 1;
267 } 268 }
268 } 269 }
269 if (any_down) /* If any other buttons were down, force this to remain down */ 270 if (any_down) /* If any other buttons were down, force this to remain down */
… …
276 update_object (op, UP_OBJ_FACE); 277 update_object (op, UP_OBJ_FACE);
277 push_button (op); /* Make all other buttons the same */ 278 push_button (op); /* Make all other buttons the same */
278 } 279 }
279} 280}
280 281
281/*
282 * Updates every button on the map (by calling update_button() for them).
283 */
284
285void
286update_buttons (maptile *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)
295 {
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, obp->value);
298 continue;
299 }
300
301 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
302 {
303 update_button (ol->ob);
304 break;
305 }
306 }
307}
308
309void 282void
310use_trigger (object *op) 283use_trigger (object *op)
311{ 284{
312
313 /* Toggle value */ 285 /* Toggle value */
314 op->value = !op->value; 286 op->value = !op->value;
315 push_button (op); 287 push_button (op);
316} 288}
317 289
318/* 290/*
319 * Note: animate_object should be used instead of this, 291 * Note: animate_object should be used instead of this,
320 * but it can't handle animations in the 8 directions 292 * but it can't handle animations in the 8 directions
321 */ 293 */
322
323void 294void
324animate_turning (object *op) /* only one part objects */ 295animate_turning (object *op) /* only one part objects */
325{ 296{
326 if (++op->state >= NUM_ANIMATIONS (op) / 8) 297 if (++op->state >= NUM_ANIMATIONS (op) / 8)
327 op->state = 0; 298 op->state = 0;
… …
346int 317int
347check_altar_sacrifice (const object *altar, const object *sacrifice) 318check_altar_sacrifice (const object *altar, const object *sacrifice)
348{ 319{
349 if (!QUERY_FLAG (sacrifice, FLAG_ALIVE) && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED) && sacrifice->type != PLAYER) 320 if (!QUERY_FLAG (sacrifice, FLAG_ALIVE) && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED) && sacrifice->type != PLAYER)
350 { 321 {
351 if ((ARCH_SACRIFICE (altar) == sacrifice->arch->name || 322 if ((ARCH_SACRIFICE (altar) == sacrifice->arch->archname
352 ARCH_SACRIFICE (altar) == sacrifice->name || 323 || ARCH_SACRIFICE (altar) == sacrifice->name
353 ARCH_SACRIFICE (altar) == sacrifice->slaying || 324 || ARCH_SACRIFICE (altar) == sacrifice->slaying
354 (!strcmp (ARCH_SACRIFICE (altar), query_base_name (sacrifice, 0)))) 325 || (!strcmp (ARCH_SACRIFICE (altar), query_base_name (sacrifice, 0))))
355 && NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1)) 326 && NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1))
356 return 1; 327 return 1;
357 328
358 if (strcmp (ARCH_SACRIFICE (altar), "money") == 0 329 if (strcmp (ARCH_SACRIFICE (altar), "money") == 0
359 && sacrifice->type == MONEY && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar)) 330 && sacrifice->type == MONEY && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar))
… …
414{ 385{
415 op->stats.wc = state; 386 op->stats.wc = state;
416 if (state) 387 if (state)
417 { 388 {
418 use_trigger (op); 389 use_trigger (op);
419 if (op->stats.exp > 0) /* check sanity */ 390 op->set_speed (op->stats.exp > 0 ? 1. / op->stats.exp : 1.);
420 op->speed = 1.0 / op->stats.exp;
421 else
422 op->speed = 1.0;
423 update_ob_speed (op);
424 op->speed_left = -1; 391 op->speed_left = -1;
425 } 392 }
426 else 393 else
427 { 394 {
428 use_trigger (op); 395 use_trigger (op);
429 op->speed = 0; 396 op->set_speed (0);
430 update_ob_speed (op);
431 } 397 }
432} 398}
433 399
434 400
435/* 401/*
… …
491 case TRIGGER_PEDESTAL: 457 case TRIGGER_PEDESTAL:
492 if (cause) 458 if (cause)
493 { 459 {
494 for (tmp = op->above; tmp; tmp = tmp->above) 460 for (tmp = op->above; tmp; tmp = tmp->above)
495 { 461 {
496 object *head = tmp->head ? tmp->head : tmp; 462 object *head = tmp->head_ ();
497 463
498 /* See comment in TRIGGER_BUTTON about move_types */ 464 /* See comment in TRIGGER_BUTTON about move_types */
499 if (((head->move_type & op->move_on) || head->move_type == 0) 465 if (((head->move_type & op->move_on) || head->move_type == 0)
500 && (head->race == op->slaying || (!strcmp (op->slaying, "player") && head->type == PLAYER))) 466 && (head->race == op->slaying || (!strcmp (op->slaying, "player") && head->type == PLAYER)))
501 { 467 {
502 push = 1; 468 push = 1;
503 break; 469 break;
504 } 470 }
505 } 471 }
472
506 if (op->stats.ac == push) 473 if (op->stats.ac == push)
507 return 0; 474 return 0;
475
508 op->stats.ac = push; 476 op->stats.ac = push;
477
509 if (NUM_ANIMATIONS (op) > 1) 478 if (NUM_ANIMATIONS (op) > 1)
510 { 479 {
511 SET_ANIMATION (op, push); 480 SET_ANIMATION (op, push);
512 update_object (op, UP_OBJ_FACE); 481 update_object (op, UP_OBJ_FACE);
513 } 482 }
483
514 update_object (op, UP_OBJ_FACE); 484 update_object (op, UP_OBJ_FACE);
485
515 if (in_movement || !push) 486 if (in_movement || !push)
516 return 0; 487 return 0;
517 } 488 }
489
518 trigger_move (op, push); 490 trigger_move (op, push);
519 return 0; 491 return 0;
520 492
521 case TRIGGER_ALTAR: 493 case TRIGGER_ALTAR:
522 if (cause) 494 if (cause)
523 { 495 {
524 if (in_movement) 496 if (in_movement)
525 return 0; 497 return 0;
498
526 if (operate_altar (op, &cause)) 499 if (operate_altar (op, &cause))
527 { 500 {
528 if (NUM_ANIMATIONS (op) > 1) 501 if (NUM_ANIMATIONS (op) > 1)
529 { 502 {
530 SET_ANIMATION (op, 1); 503 SET_ANIMATION (op, 1);
531 update_object (op, UP_OBJ_FACE); 504 update_object (op, UP_OBJ_FACE);
532 } 505 }
506
533 if (op->last_sp >= 0) 507 if (op->last_sp >= 0)
534 { 508 {
535 trigger_move (op, 1); 509 trigger_move (op, 1);
536 if (op->last_sp > 0) 510 if (op->last_sp > 0)
537 op->last_sp = -op->last_sp; 511 op->last_sp = -op->last_sp;
… …
544 op->value = !op->value; 518 op->value = !op->value;
545 trigger_move (op, 1); 519 trigger_move (op, 1);
546 op->last_sp = -op->last_sp; 520 op->last_sp = -op->last_sp;
547 op->value = !op->value; 521 op->value = !op->value;
548 } 522 }
523
549 return cause == NULL; 524 return cause == NULL;
550 } 525 }
551 else 526 else
552 {
553 return 0; 527 return 0;
554 }
555 } 528 }
556 else 529 else
557 { 530 {
558 if (NUM_ANIMATIONS (op) > 1) 531 if (NUM_ANIMATIONS (op) > 1)
559 { 532 {
… …
570 trigger_move (op, 0); 543 trigger_move (op, 0);
571 else 544 else
572 { 545 {
573 op->stats.wc = 0; 546 op->stats.wc = 0;
574 op->value = !op->value; 547 op->value = !op->value;
575 op->speed = 0; 548 op->set_speed (0);
576 update_ob_speed (op);
577 } 549 }
578 } 550 }
579 return 0; 551 return 0;
580 552
581 case TRIGGER: 553 case TRIGGER:
582 if (cause) 554 if (cause)
583 { 555 {
584 if (in_movement) 556 if (in_movement)
585 return 0; 557 return 0;
558
586 push = 1; 559 push = 1;
587 } 560 }
561
588 if (NUM_ANIMATIONS (op) > 1) 562 if (NUM_ANIMATIONS (op) > 1)
589 { 563 {
590 SET_ANIMATION (op, push); 564 SET_ANIMATION (op, push);
591 update_object (op, UP_OBJ_FACE); 565 update_object (op, UP_OBJ_FACE);
592 } 566 }
567
593 trigger_move (op, push); 568 trigger_move (op, push);
594 return 1; 569 return 1;
595 570
596 default: 571 default:
597 LOG (llevDebug, "Unknown trigger type: %s (%d)\n", &op->name, op->type); 572 LOG (llevDebug, "Unknown trigger type: %s (%d)\n", &op->name, op->type);
… …
740 */ 715 */
741 716
742void 717void
743do_mood_floor (object *op, object *source) 718do_mood_floor (object *op, object *source)
744{ 719{
745 object *tmp;
746 object *tmp2;
747
748 if (!source) 720 if (!source)
749 source = op; 721 source = op;
750 722
751 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above) 723 mapspace &ms = op->ms ();
724
725 if (!(ms.flags () & P_IS_ALIVE))
726 return;
727
728 object *tmp;
729
730 for (tmp = ms.top; tmp; tmp = tmp->below)
752 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 731 if (QUERY_FLAG (tmp, FLAG_MONSTER))
753 break; 732 break;
754 733
755 /* doesn't effect players, and if there is a player on this space, won't also 734 /* doesn't effect players, and if there is a player on this space, won't also
756 * be a monster here. 735 * be a monster here.
757 */ 736 */
737 //TODO: have players really FLAG_MONSTER? kept it for safety
758 if (!tmp || tmp->type == PLAYER) 738 if (!tmp || tmp->type == PLAYER)
759 return; 739 return;
760 740
761 switch (op->last_sp) 741 switch (op->last_sp)
762 { 742 {
763 case 0: /* furious--make all monsters mad */ 743 case 0: /* furious--make all monsters mad */
764 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) 744 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
765 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); 745 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
746
766 if (QUERY_FLAG (tmp, FLAG_FRIENDLY)) 747 if (QUERY_FLAG (tmp, FLAG_FRIENDLY))
767 { 748 {
768 CLEAR_FLAG (tmp, FLAG_FRIENDLY);
769 remove_friendly_object (tmp);
770 tmp->attack_movement = 0; 749 tmp->attack_movement = 0;
771 /* lots of checks here, but want to make sure we don't 750 /* lots of checks here, but want to make sure we don't
772 * dereference a null value 751 * dereference a null value
773 */ 752 */
774 if (tmp->type == GOLEM && tmp->owner && tmp->owner->type == PLAYER && tmp->owner->contr->ranges[range_golem] == tmp) 753 if (tmp->type == GOLEM
754 && tmp->owner
755 && tmp->owner->type == PLAYER
756 && tmp->owner->contr->golem == tmp)
775 tmp->owner->contr->ranges[range_golem] = 0; 757 tmp->owner->contr->golem = 0;
776 758
777 tmp->owner = 0; 759 tmp->owner = 0;
760
761 remove_friendly_object (tmp);
778 } 762 }
779 break; 763 break;
764
780 case 1: /* angry -- get neutral monsters mad */ 765 case 1: /* angry -- get neutral monsters mad */
781 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY)) 766 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY))
782 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); 767 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
783 break; 768 break;
769
784 case 2: /* calm -- pacify unfriendly monsters */ 770 case 2: /* calm -- pacify unfriendly monsters */
785 if (!QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
786 SET_FLAG (tmp, FLAG_UNAGGRESSIVE); 771 SET_FLAG (tmp, FLAG_UNAGGRESSIVE);
787 break; 772 break;
773
788 case 3: /* make all monsters fall asleep */ 774 case 3: /* make all monsters fall asleep */
789 if (!QUERY_FLAG (tmp, FLAG_SLEEP))
790 SET_FLAG (tmp, FLAG_SLEEP); 775 SET_FLAG (tmp, FLAG_SLEEP);
791 break; 776 break;
777
792 case 4: /* charm all monsters */ 778 case 4: /* charm all monsters */
793 if (op == source) 779 if (op == source)
794 break; /* only if 'connected' */ 780 break; /* only if 'connected' */
795 781
796 for (tmp2 = GET_MAP_OB (source->map, source->x, source->y); /* finding an owner */ 782 if (object *pl = source->ms ().player ())
797 tmp2->type != PLAYER; tmp2 = tmp2->above) 783 {
798 if (tmp2->above == NULL) 784 tmp->set_owner (pl);
785 SET_FLAG (tmp, FLAG_MONSTER);
786
787 tmp->stats.exp = 0;
788
789 add_friendly_object (tmp);
790 tmp->attack_movement = PETMOVE;
791 }
799 break; 792 break;
800 793
801 if (tmp2->type != PLAYER) 794 case 6: // kill monsters
795 if (!QUERY_FLAG (tmp, FLAG_FRIENDLY))
802 break; 796 break;
803 797
804 tmp->set_owner (tmp2); 798 // FALL THROUGH
805 SET_FLAG (tmp, FLAG_MONSTER); 799 case 5: // kill all alives
806 800 if (!tmp->flag [FLAG_PRECIOUS])
807 tmp->stats.exp = 0; 801 {
808 SET_FLAG (tmp, FLAG_FRIENDLY); 802 get_archetype ("burnout")->insert_at (tmp, source);
809 803 tmp->destroy ();
810 add_friendly_object (tmp); 804 }
811 tmp->attack_movement = PETMOVE;
812 break; 805 break;
813 806
814 default: 807 default:
815 break; 808 break;
816 } 809 }
… …
828 object *tmp, *ret = NULL; 821 object *tmp, *ret = NULL;
829 822
830 /* First check the object itself. */ 823 /* First check the object itself. */
831 if ((trig->stats.hp && (op->type == trig->stats.hp)) 824 if ((trig->stats.hp && (op->type == trig->stats.hp))
832 || (trig->slaying && (op->slaying == trig->slaying)) 825 || (trig->slaying && (op->slaying == trig->slaying))
833 || (trig->race && (op->arch->name == trig->race))) 826 || (trig->race && (op->arch->archname == trig->race)))
834 return op; 827 return op;
835 828
836 for (tmp = op->inv; tmp; tmp = tmp->below) 829 for (tmp = op->inv; tmp; tmp = tmp->below)
837 { 830 {
838 if (tmp->inv) 831 if (tmp->inv)
… …
841 if (ret) 834 if (ret)
842 return ret; 835 return ret;
843 } 836 }
844 else if ((trig->stats.hp && (tmp->type == trig->stats.hp)) 837 else if ((trig->stats.hp && (tmp->type == trig->stats.hp))
845 || (trig->slaying && (tmp->slaying == trig->slaying)) 838 || (trig->slaying && (tmp->slaying == trig->slaying))
846 || (trig->race && (tmp->arch->name == trig->race))) 839 || (trig->race && (tmp->arch->archname == trig->race)))
847 return tmp; 840 return tmp;
848 } 841 }
849 return NULL; 842 return NULL;
850} 843}
851 844
… …
864 * and has a matching item. Imagine what happens if someone steps on the inventory 857 * 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 858 * 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 859 * 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. 860 * state in the inventory checker. This won't happen anymore now.
868 * 861 *
862 * Wed Jan 10 11:34:26 CET 2007 elmex: fixed this function, we now check
863 * whether op is on this mapspace or not, because the value (1|0) depends
864 * on this information. also make sure to only push_button if op has
865 * a matching item (because when we do a push_button with value=0 timed gates
866 * will still open)! (i hope i got the semantics right this time)
867 *
869 */ 868 */
870void 869void
871check_inv (object *op, object *trig) 870check_inv (object *op, object *trig)
872{ 871{
873 trig->value = 0; // deactivate if none of the following conditions apply 872 trig->value = 0; // deactivate if none of the following conditions apply
874 873
875 if (object *pl = trig->ms ().player ()) 874 object *pl = trig->ms ().player ();
876 {
877 object *match = check_inv_recursive (pl, trig); 875 object *match = check_inv_recursive (op, trig);
878 876
877 // elmex: a note about (pl == op):
878 // if pl == 0 then the player has left this space
879 // if pl != 0 then a player is on this mapspace, but then
880 // we still have to check whether it's the player that triggered
881 // this inv-checker, because if not, then the op left this inv-checker
882 // and we have to set the value to 0
883
879 if (match && trig->last_sp) // match == having 884 if (match && trig->last_sp) // match == having
880 { 885 {
881 if (trig->last_heal) 886 if (trig->last_heal)
882 decrease_ob (match); 887 decrease_ob (match);
883 888
884 trig->value = 1; 889 trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left
885 } 890 push_button (trig);
891 }
886 else if (!match && !trig->last_sp) // match == not having 892 else if (!match && !trig->last_sp) // match == not having
887 trig->value = 1;
888 } 893 {
889 894 trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left
890 push_button (trig); 895 push_button (trig);
896 }
891} 897}
892 898

Diff Legend

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