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 (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
4 | * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team |
5 | Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
6 | Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
7 | |
7 | * |
8 | 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 |
9 | 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 |
10 | the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation, either version 3 of the License, or |
11 | (at your option) any later version. |
11 | * (at your option) any later version. |
12 | |
12 | * |
13 | 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, |
14 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
17 | |
17 | * |
18 | 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 |
19 | along with this program; if not, write to the Free Software |
19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
20 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * |
21 | |
|
|
22 | 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> |
23 | */ |
22 | */ |
24 | |
23 | |
25 | #include <global.h> |
24 | #include <global.h> |
26 | #include <funcpoint.h> |
25 | #include <funcpoint.h> |
27 | |
26 | |
28 | /* |
27 | /* |
… | |
… | |
60 | object *tmp = ol->ob; |
59 | object *tmp = ol->ob; |
61 | |
60 | |
62 | /* if the criteria isn't appropriate, don't do anything */ |
61 | /* if the criteria isn't appropriate, don't do anything */ |
63 | if (state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_PUSH)) |
62 | if (state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_PUSH)) |
64 | continue; |
63 | continue; |
|
|
64 | |
65 | if (!state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_RELEASE)) |
65 | if (!state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_RELEASE)) |
66 | continue; |
66 | continue; |
67 | |
67 | |
68 | switch (tmp->type) |
68 | switch (tmp->type) |
69 | { |
69 | { |
… | |
… | |
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->set_speed (tmp->arch->clone.speed); |
109 | tmp->set_speed (tmp->arch->speed); |
109 | tmp->value = tmp->arch->clone.value; |
110 | tmp->value = tmp->arch->value; |
110 | tmp->stats.sp = 1; |
111 | tmp->stats.sp = 1; |
111 | tmp->stats.hp = tmp->stats.maxhp; |
112 | tmp->stats.hp = tmp->stats.maxhp; |
112 | /* Handle multipart gates. We copy the value for the other parts |
113 | /* Handle multipart gates. We copy the value for the other parts |
113 | * from the head - this ensures that the data will consistent |
114 | * from the head - this ensures that the data will consistent |
114 | */ |
115 | */ |
115 | for (tmp = tmp->more; tmp; tmp = tmp->more) |
116 | for (object *part = tmp->more; part; part = part->more) |
116 | { |
117 | { |
117 | tmp->value = tmp->head->value; |
118 | part->value = tmp->value; |
118 | tmp->stats.sp = tmp->head->stats.sp; |
119 | part->stats.sp = tmp->stats.sp; |
119 | tmp->stats.hp = tmp->head->stats.hp; |
120 | part->stats.hp = tmp->stats.hp; |
120 | tmp->set_speed (tmp->head->speed); |
121 | part->set_speed (tmp->speed); |
121 | } |
122 | } |
122 | break; |
123 | break; |
123 | |
124 | |
124 | case DIRECTOR: |
125 | case DIRECTOR: |
125 | case FIREWALL: |
126 | case FIREWALL: |
… | |
… | |
127 | move_firewall (tmp); |
128 | move_firewall (tmp); |
128 | else |
129 | else |
129 | { |
130 | { |
130 | if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */ |
131 | if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */ |
131 | tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1; |
132 | tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1; |
|
|
133 | |
132 | animate_turning (tmp); |
134 | animate_turning (tmp); |
133 | } |
135 | } |
134 | break; |
136 | break; |
135 | |
137 | |
136 | case TELEPORTER: |
138 | case TELEPORTER: |
… | |
… | |
250 | else if (tmp->type == PEDESTAL) |
252 | else if (tmp->type == PEDESTAL) |
251 | { |
253 | { |
252 | tmp->value = 0; |
254 | tmp->value = 0; |
253 | for (ab = tmp->above; ab != NULL; ab = ab->above) |
255 | for (ab = tmp->above; ab != NULL; ab = ab->above) |
254 | { |
256 | { |
255 | head = ab->head ? ab->head : ab; |
257 | head = ab->head_ (); |
256 | /* Same note regarding move_type for buttons above apply here. */ |
258 | /* Same note regarding move_type for buttons above apply here. */ |
257 | if (((head->move_type & tmp->move_on) || ab->move_type == 0) && |
259 | if (((head->move_type & tmp->move_on) || ab->move_type == 0) && |
258 | (head->race == tmp->slaying || |
260 | (head->race == tmp->slaying || |
259 | ((head->type == SPECIAL_KEY) && (head->slaying == tmp->slaying)) || |
261 | ((head->type == SPECIAL_KEY) && (head->slaying == tmp->slaying)) || |
260 | (!strcmp (tmp->slaying, "player") && head->type == PLAYER))) |
262 | (!strcmp (tmp->slaying, "player") && head->type == PLAYER))) |
261 | tmp->value = 1; |
263 | tmp->value = 1; |
262 | } |
264 | } |
|
|
265 | |
263 | if (tmp->value) |
266 | if (tmp->value) |
264 | any_down = 1; |
267 | any_down = 1; |
265 | } |
268 | } |
266 | } |
269 | } |
267 | 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 */ |
… | |
… | |
312 | */ |
315 | */ |
313 | |
316 | |
314 | int |
317 | int |
315 | check_altar_sacrifice (const object *altar, const object *sacrifice) |
318 | check_altar_sacrifice (const object *altar, const object *sacrifice) |
316 | { |
319 | { |
317 | if (!QUERY_FLAG (sacrifice, FLAG_ALIVE) && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED) && sacrifice->type != PLAYER) |
320 | if (!QUERY_FLAG (sacrifice, FLAG_ALIVE) |
|
|
321 | && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED) |
|
|
322 | && sacrifice->type != PLAYER) |
318 | { |
323 | { |
|
|
324 | if (strcmp (ARCH_SACRIFICE (altar), "money") == 0 |
|
|
325 | && sacrifice->type == MONEY |
|
|
326 | && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar)) |
|
|
327 | return 1; |
|
|
328 | |
319 | if ((ARCH_SACRIFICE (altar) == sacrifice->arch->name || |
329 | if ((ARCH_SACRIFICE (altar) == sacrifice->arch->archname |
320 | ARCH_SACRIFICE (altar) == sacrifice->name || |
330 | || ARCH_SACRIFICE (altar) == sacrifice->name |
321 | ARCH_SACRIFICE (altar) == sacrifice->slaying || |
331 | || ARCH_SACRIFICE (altar) == sacrifice->slaying |
322 | (!strcmp (ARCH_SACRIFICE (altar), query_base_name (sacrifice, 0)))) |
332 | || strstr (query_base_name (sacrifice, 0), ARCH_SACRIFICE (altar))) |
323 | && NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1)) |
333 | && NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1)) |
324 | return 1; |
|
|
325 | |
|
|
326 | if (strcmp (ARCH_SACRIFICE (altar), "money") == 0 |
|
|
327 | && sacrifice->type == MONEY && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar)) |
|
|
328 | return 1; |
334 | return 1; |
329 | } |
335 | } |
330 | |
336 | |
331 | return 0; |
337 | return 0; |
332 | } |
338 | } |
… | |
… | |
454 | case TRIGGER_PEDESTAL: |
460 | case TRIGGER_PEDESTAL: |
455 | if (cause) |
461 | if (cause) |
456 | { |
462 | { |
457 | for (tmp = op->above; tmp; tmp = tmp->above) |
463 | for (tmp = op->above; tmp; tmp = tmp->above) |
458 | { |
464 | { |
459 | object *head = tmp->head ? tmp->head : tmp; |
465 | object *head = tmp->head_ (); |
460 | |
466 | |
461 | /* See comment in TRIGGER_BUTTON about move_types */ |
467 | /* See comment in TRIGGER_BUTTON about move_types */ |
462 | if (((head->move_type & op->move_on) || head->move_type == 0) |
468 | if (((head->move_type & op->move_on) || head->move_type == 0) |
463 | && (head->race == op->slaying || (!strcmp (op->slaying, "player") && head->type == PLAYER))) |
469 | && (head->race == op->slaying || (!strcmp (op->slaying, "player") && head->type == PLAYER))) |
464 | { |
470 | { |
465 | push = 1; |
471 | push = 1; |
466 | break; |
472 | break; |
467 | } |
473 | } |
468 | } |
474 | } |
|
|
475 | |
469 | if (op->stats.ac == push) |
476 | if (op->stats.ac == push) |
470 | return 0; |
477 | return 0; |
|
|
478 | |
471 | op->stats.ac = push; |
479 | op->stats.ac = push; |
|
|
480 | |
472 | if (NUM_ANIMATIONS (op) > 1) |
481 | if (NUM_ANIMATIONS (op) > 1) |
473 | { |
482 | { |
474 | SET_ANIMATION (op, push); |
483 | SET_ANIMATION (op, push); |
475 | update_object (op, UP_OBJ_FACE); |
484 | update_object (op, UP_OBJ_FACE); |
476 | } |
485 | } |
|
|
486 | |
477 | update_object (op, UP_OBJ_FACE); |
487 | update_object (op, UP_OBJ_FACE); |
|
|
488 | |
478 | if (in_movement || !push) |
489 | if (in_movement || !push) |
479 | return 0; |
490 | return 0; |
480 | } |
491 | } |
|
|
492 | |
481 | trigger_move (op, push); |
493 | trigger_move (op, push); |
482 | return 0; |
494 | return 0; |
483 | |
495 | |
484 | case TRIGGER_ALTAR: |
496 | case TRIGGER_ALTAR: |
485 | if (cause) |
497 | if (cause) |
486 | { |
498 | { |
487 | if (in_movement) |
499 | if (in_movement) |
488 | return 0; |
500 | return 0; |
|
|
501 | |
489 | if (operate_altar (op, &cause)) |
502 | if (operate_altar (op, &cause)) |
490 | { |
503 | { |
491 | if (NUM_ANIMATIONS (op) > 1) |
504 | if (NUM_ANIMATIONS (op) > 1) |
492 | { |
505 | { |
493 | SET_ANIMATION (op, 1); |
506 | SET_ANIMATION (op, 1); |
494 | update_object (op, UP_OBJ_FACE); |
507 | update_object (op, UP_OBJ_FACE); |
495 | } |
508 | } |
|
|
509 | |
496 | if (op->last_sp >= 0) |
510 | if (op->last_sp >= 0) |
497 | { |
511 | { |
498 | trigger_move (op, 1); |
512 | trigger_move (op, 1); |
499 | if (op->last_sp > 0) |
513 | if (op->last_sp > 0) |
500 | op->last_sp = -op->last_sp; |
514 | op->last_sp = -op->last_sp; |
… | |
… | |
507 | op->value = !op->value; |
521 | op->value = !op->value; |
508 | trigger_move (op, 1); |
522 | trigger_move (op, 1); |
509 | op->last_sp = -op->last_sp; |
523 | op->last_sp = -op->last_sp; |
510 | op->value = !op->value; |
524 | op->value = !op->value; |
511 | } |
525 | } |
|
|
526 | |
512 | return cause == NULL; |
527 | return cause == NULL; |
513 | } |
528 | } |
514 | else |
529 | else |
515 | { |
|
|
516 | return 0; |
530 | return 0; |
517 | } |
|
|
518 | } |
531 | } |
519 | else |
532 | else |
520 | { |
533 | { |
521 | if (NUM_ANIMATIONS (op) > 1) |
534 | if (NUM_ANIMATIONS (op) > 1) |
522 | { |
535 | { |
… | |
… | |
705 | */ |
718 | */ |
706 | |
719 | |
707 | void |
720 | void |
708 | do_mood_floor (object *op, object *source) |
721 | do_mood_floor (object *op, object *source) |
709 | { |
722 | { |
710 | object *tmp; |
|
|
711 | object *tmp2; |
|
|
712 | |
|
|
713 | if (!source) |
723 | if (!source) |
714 | source = op; |
724 | source = op; |
715 | |
725 | |
716 | for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above) |
726 | mapspace &ms = op->ms (); |
|
|
727 | |
|
|
728 | if (!(ms.flags () & P_IS_ALIVE)) |
|
|
729 | return; |
|
|
730 | |
|
|
731 | object *tmp; |
|
|
732 | |
|
|
733 | for (tmp = ms.top; tmp; tmp = tmp->below) |
717 | if (QUERY_FLAG (tmp, FLAG_MONSTER)) |
734 | if (QUERY_FLAG (tmp, FLAG_MONSTER)) |
718 | break; |
735 | break; |
719 | |
736 | |
720 | /* doesn't effect players, and if there is a player on this space, won't also |
737 | /* doesn't effect players, and if there is a player on this space, won't also |
721 | * be a monster here. |
738 | * be a monster here. |
722 | */ |
739 | */ |
|
|
740 | //TODO: have players really FLAG_MONSTER? kept it for safety |
723 | if (!tmp || tmp->type == PLAYER) |
741 | if (!tmp || tmp->type == PLAYER) |
724 | return; |
742 | return; |
725 | |
743 | |
726 | switch (op->last_sp) |
744 | switch (op->last_sp) |
727 | { |
745 | { |
728 | case 0: /* furious--make all monsters mad */ |
746 | case 0: /* furious--make all monsters mad */ |
729 | if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) |
747 | if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) |
730 | CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); |
748 | CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); |
|
|
749 | |
731 | if (QUERY_FLAG (tmp, FLAG_FRIENDLY)) |
750 | if (QUERY_FLAG (tmp, FLAG_FRIENDLY)) |
732 | { |
751 | { |
733 | CLEAR_FLAG (tmp, FLAG_FRIENDLY); |
|
|
734 | remove_friendly_object (tmp); |
|
|
735 | tmp->attack_movement = 0; |
752 | tmp->attack_movement = 0; |
736 | /* lots of checks here, but want to make sure we don't |
753 | /* lots of checks here, but want to make sure we don't |
737 | * dereference a null value |
754 | * dereference a null value |
738 | */ |
755 | */ |
739 | if (tmp->type == GOLEM && tmp->owner && tmp->owner->type == PLAYER && tmp->owner->contr->ranges[range_golem] == tmp) |
756 | if (tmp->type == GOLEM |
|
|
757 | && tmp->owner |
|
|
758 | && tmp->owner->type == PLAYER |
|
|
759 | && tmp->owner->contr->golem == tmp) |
740 | tmp->owner->contr->ranges[range_golem] = 0; |
760 | tmp->owner->contr->golem = 0; |
741 | |
761 | |
742 | tmp->owner = 0; |
762 | tmp->owner = 0; |
|
|
763 | |
|
|
764 | remove_friendly_object (tmp); |
743 | } |
765 | } |
744 | break; |
766 | break; |
|
|
767 | |
745 | case 1: /* angry -- get neutral monsters mad */ |
768 | case 1: /* angry -- get neutral monsters mad */ |
746 | if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY)) |
769 | if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY)) |
747 | CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); |
770 | CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); |
748 | break; |
771 | break; |
|
|
772 | |
749 | case 2: /* calm -- pacify unfriendly monsters */ |
773 | case 2: /* calm -- pacify unfriendly monsters */ |
750 | if (!QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) |
|
|
751 | SET_FLAG (tmp, FLAG_UNAGGRESSIVE); |
774 | SET_FLAG (tmp, FLAG_UNAGGRESSIVE); |
752 | break; |
775 | break; |
|
|
776 | |
753 | case 3: /* make all monsters fall asleep */ |
777 | case 3: /* make all monsters fall asleep */ |
754 | if (!QUERY_FLAG (tmp, FLAG_SLEEP)) |
|
|
755 | SET_FLAG (tmp, FLAG_SLEEP); |
778 | SET_FLAG (tmp, FLAG_SLEEP); |
756 | break; |
779 | break; |
|
|
780 | |
757 | case 4: /* charm all monsters */ |
781 | case 4: /* charm all monsters */ |
758 | if (op == source) |
782 | if (op == source) |
759 | break; /* only if 'connected' */ |
783 | break; /* only if 'connected' */ |
760 | |
784 | |
761 | for (tmp2 = GET_MAP_OB (source->map, source->x, source->y); /* finding an owner */ |
785 | if (object *pl = source->ms ().player ()) |
762 | tmp2->type != PLAYER; tmp2 = tmp2->above) |
786 | { |
763 | if (tmp2->above == NULL) |
787 | tmp->set_owner (pl); |
|
|
788 | SET_FLAG (tmp, FLAG_MONSTER); |
|
|
789 | |
|
|
790 | tmp->stats.exp = 0; |
|
|
791 | |
|
|
792 | add_friendly_object (tmp); |
|
|
793 | tmp->attack_movement = PETMOVE; |
|
|
794 | } |
764 | break; |
795 | break; |
765 | |
796 | |
766 | if (tmp2->type != PLAYER) |
797 | case 6: // kill monsters |
|
|
798 | if (!QUERY_FLAG (tmp, FLAG_FRIENDLY)) |
767 | break; |
799 | break; |
768 | |
800 | |
769 | tmp->set_owner (tmp2); |
801 | // FALL THROUGH |
770 | SET_FLAG (tmp, FLAG_MONSTER); |
802 | case 5: // kill all alives |
771 | |
803 | if (!tmp->flag [FLAG_PRECIOUS]) |
772 | tmp->stats.exp = 0; |
804 | { |
773 | |
805 | get_archetype ("burnout")->insert_at (tmp, source); |
774 | add_friendly_object (tmp); |
806 | tmp->destroy (); |
775 | tmp->attack_movement = PETMOVE; |
807 | } |
776 | break; |
808 | break; |
777 | |
809 | |
778 | default: |
810 | default: |
779 | break; |
811 | break; |
780 | } |
812 | } |
… | |
… | |
792 | object *tmp, *ret = NULL; |
824 | object *tmp, *ret = NULL; |
793 | |
825 | |
794 | /* First check the object itself. */ |
826 | /* First check the object itself. */ |
795 | if ((trig->stats.hp && (op->type == trig->stats.hp)) |
827 | if ((trig->stats.hp && (op->type == trig->stats.hp)) |
796 | || (trig->slaying && (op->slaying == trig->slaying)) |
828 | || (trig->slaying && (op->slaying == trig->slaying)) |
797 | || (trig->race && (op->arch->name == trig->race))) |
829 | || (trig->race && (op->arch->archname == trig->race))) |
798 | return op; |
830 | return op; |
799 | |
831 | |
800 | for (tmp = op->inv; tmp; tmp = tmp->below) |
832 | for (tmp = op->inv; tmp; tmp = tmp->below) |
801 | { |
833 | { |
802 | if (tmp->inv) |
834 | if (tmp->inv) |
… | |
… | |
805 | if (ret) |
837 | if (ret) |
806 | return ret; |
838 | return ret; |
807 | } |
839 | } |
808 | else if ((trig->stats.hp && (tmp->type == trig->stats.hp)) |
840 | else if ((trig->stats.hp && (tmp->type == trig->stats.hp)) |
809 | || (trig->slaying && (tmp->slaying == trig->slaying)) |
841 | || (trig->slaying && (tmp->slaying == trig->slaying)) |
810 | || (trig->race && (tmp->arch->name == trig->race))) |
842 | || (trig->race && (tmp->arch->archname == trig->race))) |
811 | return tmp; |
843 | return tmp; |
812 | } |
844 | } |
813 | return NULL; |
845 | return NULL; |
814 | } |
846 | } |
815 | |
847 | |
… | |
… | |
828 | * and has a matching item. Imagine what happens if someone steps on the inventory |
860 | * 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 |
861 | * 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 |
862 | * 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. |
863 | * state in the inventory checker. This won't happen anymore now. |
832 | * |
864 | * |
|
|
865 | * Wed Jan 10 11:34:26 CET 2007 elmex: fixed this function, we now check |
|
|
866 | * whether op is on this mapspace or not, because the value (1|0) depends |
|
|
867 | * on this information. also make sure to only push_button if op has |
|
|
868 | * a matching item (because when we do a push_button with value=0 timed gates |
|
|
869 | * will still open)! (i hope i got the semantics right this time) |
|
|
870 | * |
833 | */ |
871 | */ |
834 | void |
872 | void |
835 | check_inv (object *op, object *trig) |
873 | check_inv (object *op, object *trig) |
836 | { |
874 | { |
837 | sint32 prev_state = trig->value; |
|
|
838 | trig->value = 0; // deactivate if none of the following conditions apply |
875 | trig->value = 0; // deactivate if none of the following conditions apply |
839 | |
876 | |
840 | if (object *pl = trig->ms ().player ()) |
877 | object *pl = trig->ms ().player (); |
841 | { |
|
|
842 | object *match = check_inv_recursive (pl, trig); |
878 | object *match = check_inv_recursive (op, trig); |
843 | |
879 | |
|
|
880 | // elmex: a note about (pl == op): |
|
|
881 | // if pl == 0 then the player has left this space |
|
|
882 | // if pl != 0 then a player is on this mapspace, but then |
|
|
883 | // we still have to check whether it's the player that triggered |
|
|
884 | // this inv-checker, because if not, then the op left this inv-checker |
|
|
885 | // and we have to set the value to 0 |
|
|
886 | |
844 | if (match && trig->last_sp) // match == having |
887 | if (match && trig->last_sp) // match == having |
845 | { |
888 | { |
846 | if (trig->last_heal) |
889 | if (trig->last_heal) |
847 | decrease_ob (match); |
890 | decrease_ob (match); |
848 | |
891 | |
849 | trig->value = 1; |
892 | trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left |
850 | } |
893 | push_button (trig); |
|
|
894 | } |
851 | else if (!match && !trig->last_sp) // match == not having |
895 | else if (!match && !trig->last_sp) // match == not having |
852 | trig->value = 1; |
|
|
853 | } |
896 | { |
854 | |
897 | trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left |
855 | if (prev_state != trig->value) |
|
|
856 | push_button (trig); |
898 | push_button (trig); |
|
|
899 | } |
857 | } |
900 | } |
858 | |
901 | |