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.17 by root, Wed Dec 20 09:14:21 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/*
… …
35 * The source argument can be 0 or the source object for this activation. 35 * The source argument can be 0 or the source object for this activation.
36 */ 36 */
37void 37void
38activate_connection_link (objectlink * ol, bool state, object *source = 0) 38activate_connection_link (objectlink * ol, bool state, object *source = 0)
39{ 39{
40 object *tmp = 0;
41
42 for (; ol; ol = ol->next) 40 for (; ol; ol = ol->next)
43 { 41 {
44 if (!ol->ob) 42 if (!ol->ob)
45 { 43 {
46 LOG (llevError, "Internal error in activate_connection_link.\n"); 44 LOG (llevError, "Internal error in activate_connection_link.\n");
… …
55 * re-loaded. As such, just exit this function if that is the case. 53 * re-loaded. As such, just exit this function if that is the case.
56 */ 54 */
57 55
58 if (QUERY_FLAG (ol->ob, FLAG_FREED)) 56 if (QUERY_FLAG (ol->ob, FLAG_FREED))
59 return; 57 return;
58
60 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 {
70 case GATE: 70 case GATE:
71 case HOLE: 71 case HOLE:
72 tmp->value = tmp->stats.maxsp ? !state : state; 72 tmp->value = tmp->stats.maxsp ? !state : state;
73 tmp->speed = 0.5; 73 tmp->set_speed (0.5);
74 update_ob_speed (tmp);
75 break; 74 break;
76 75
77 case CF_HANDLE: 76 case CF_HANDLE:
78 SET_ANIMATION (tmp, (tmp->value = tmp->stats.maxsp ? !state : state)); 77 SET_ANIMATION (tmp, (tmp->value = tmp->stats.maxsp ? !state : state));
79 update_object (tmp, UP_OBJ_FACE); 78 update_object (tmp, UP_OBJ_FACE);
80 break; 79 break;
81 80
82 case SIGN: 81 case SIGN:
83 if (!tmp->stats.food || tmp->last_eat < tmp->stats.food) 82 if (!tmp->stats.food || tmp->last_eat < tmp->stats.food)
84 { 83 {
84 tmp->play_sound (tmp->sound);
85 new_info_map (NDI_UNIQUE | NDI_NAVY, tmp->map, tmp->msg); 85 new_info_map (NDI_UNIQUE | NDI_NAVY, tmp->map, tmp->msg);
86 if (tmp->stats.food) 86 if (tmp->stats.food)
87 tmp->last_eat++; 87 tmp->last_eat++;
88 } 88 }
89 break; 89 break;
90 90
91 case ALTAR: 91 case ALTAR:
92 tmp->value = 1; 92 tmp->value = 1;
93 SET_ANIMATION (tmp, tmp->value); 93 SET_ANIMATION (tmp, tmp->value);
94 update_object (tmp, UP_OBJ_FACE); 94 update_object (tmp, UP_OBJ_FACE);
95 break; 95 break;
96 96
97 case BUTTON: 97 case BUTTON:
98 case PEDESTAL: 98 case PEDESTAL:
99 tmp->value = state; 99 tmp->value = state;
100 SET_ANIMATION (tmp, tmp->value); 100 SET_ANIMATION (tmp, tmp->value);
101 update_object (tmp, UP_OBJ_FACE); 101 update_object (tmp, UP_OBJ_FACE);
102 break; 102 break;
103 103
104 case MOOD_FLOOR: 104 case MOOD_FLOOR:
105 do_mood_floor (tmp, source); 105 do_mood_floor (tmp, source);
106 break; 106 break;
107 107
108 case TIMED_GATE: 108 case TIMED_GATE:
109 tmp->speed = tmp->arch->clone.speed; 109 tmp->set_speed (tmp->arch->speed);
110 update_ob_speed (tmp); /* original values */
111 tmp->value = tmp->arch->clone.value; 110 tmp->value = tmp->arch->value;
112 tmp->stats.sp = 1; 111 tmp->stats.sp = 1;
113 tmp->stats.hp = tmp->stats.maxhp; 112 tmp->stats.hp = tmp->stats.maxhp;
114 /* Handle multipart gates. We copy the value for the other parts 113 /* Handle multipart gates. We copy the value for the other parts
115 * from the head - this ensures that the data will consistent 114 * from the head - this ensures that the data will consistent
116 */ 115 */
117 for (tmp = tmp->more; tmp != NULL; tmp = tmp->more) 116 for (object *part = tmp->more; part; part = part->more)
118 { 117 {
119 tmp->speed = tmp->head->speed; 118 part->value = tmp->value;
120 tmp->value = tmp->head->value; 119 part->stats.sp = tmp->stats.sp;
121 tmp->stats.sp = tmp->head->stats.sp; 120 part->stats.hp = tmp->stats.hp;
122 tmp->stats.hp = tmp->head->stats.hp;
123 update_ob_speed (tmp); 121 part->set_speed (tmp->speed);
124 } 122 }
125 break; 123 break;
126 124
127 case DIRECTOR: 125 case DIRECTOR:
128 case FIREWALL: 126 case FIREWALL:
129 if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL) 127 if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL)
130 move_firewall (tmp); 128 move_firewall (tmp);
131 else 129 else
132 { 130 {
133 if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */ 131 if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */
134 tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1; 132 tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1;
133
135 animate_turning (tmp); 134 animate_turning (tmp);
136 } 135 }
137 break; 136 break;
138 137
139 case TELEPORTER: 138 case TELEPORTER:
140 move_teleporter (tmp); 139 move_teleporter (tmp);
141 break; 140 break;
142 141
143 case CREATOR: 142 case CREATOR:
144 move_creator (tmp); 143 move_creator (tmp);
145 break; 144 break;
146 145
147 case TRIGGER_MARKER: 146 case TRIGGER_MARKER:
148 move_marker (tmp); 147 move_marker (tmp);
149 break; 148 break;
150 149
151 case DUPLICATOR: 150 case DUPLICATOR:
152 move_duplicator (tmp); 151 move_duplicator (tmp);
153 break; 152 break;
154 } 153 }
155 } 154 }
156} 155}
157 156
158/* 157/*
… …
253 else if (tmp->type == PEDESTAL) 252 else if (tmp->type == PEDESTAL)
254 { 253 {
255 tmp->value = 0; 254 tmp->value = 0;
256 for (ab = tmp->above; ab != NULL; ab = ab->above) 255 for (ab = tmp->above; ab != NULL; ab = ab->above)
257 { 256 {
258 head = ab->head ? ab->head : ab; 257 head = ab->head_ ();
259 /* Same note regarding move_type for buttons above apply here. */ 258 /* Same note regarding move_type for buttons above apply here. */
260 if (((head->move_type & tmp->move_on) || ab->move_type == 0) && 259 if (((head->move_type & tmp->move_on) || ab->move_type == 0) &&
261 (head->race == tmp->slaying || 260 (head->race == tmp->slaying ||
262 ((head->type == SPECIAL_KEY) && (head->slaying == tmp->slaying)) || 261 ((head->type == SPECIAL_KEY) && (head->slaying == tmp->slaying)) ||
263 (!strcmp (tmp->slaying, "player") && head->type == PLAYER))) 262 (!strcmp (tmp->slaying, "player") && head->type == PLAYER)))
264 tmp->value = 1; 263 tmp->value = 1;
265 } 264 }
265
266 if (tmp->value) 266 if (tmp->value)
267 any_down = 1; 267 any_down = 1;
268 } 268 }
269 } 269 }
270 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 */
… …
277 update_object (op, UP_OBJ_FACE); 277 update_object (op, UP_OBJ_FACE);
278 push_button (op); /* Make all other buttons the same */ 278 push_button (op); /* Make all other buttons the same */
279 } 279 }
280} 280}
281 281
282/*
283 * Updates every button on the map (by calling update_button() for them).
284 */
285
286void
287update_buttons (maptile *m)
288{
289 objectlink *ol;
290 oblinkpt *obp;
291
292 for (obp = m->buttons; obp; obp = obp->next)
293 for (ol = obp->link; ol; ol = ol->next)
294 {
295 if (!ol->ob)
296 {
297 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
298 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
299 continue;
300 }
301
302 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
303 {
304 update_button (ol->ob);
305 break;
306 }
307 }
308}
309
310void 282void
311use_trigger (object *op) 283use_trigger (object *op)
312{ 284{
313
314 /* Toggle value */ 285 /* Toggle value */
315 op->value = !op->value; 286 op->value = !op->value;
316 push_button (op); 287 push_button (op);
317} 288}
318 289
319/* 290/*
320 * Note: animate_object should be used instead of this, 291 * Note: animate_object should be used instead of this,
321 * but it can't handle animations in the 8 directions 292 * but it can't handle animations in the 8 directions
322 */ 293 */
323
324void 294void
325animate_turning (object *op) /* only one part objects */ 295animate_turning (object *op) /* only one part objects */
326{ 296{
327 if (++op->state >= NUM_ANIMATIONS (op) / 8) 297 if (++op->state >= NUM_ANIMATIONS (op) / 8)
328 op->state = 0; 298 op->state = 0;
… …
347int 317int
348check_altar_sacrifice (const object *altar, const object *sacrifice) 318check_altar_sacrifice (const object *altar, const object *sacrifice)
349{ 319{
350 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)
351 { 321 {
352 if ((ARCH_SACRIFICE (altar) == sacrifice->arch->name || 322 if ((ARCH_SACRIFICE (altar) == sacrifice->arch->archname
353 ARCH_SACRIFICE (altar) == sacrifice->name || 323 || ARCH_SACRIFICE (altar) == sacrifice->name
354 ARCH_SACRIFICE (altar) == sacrifice->slaying || 324 || ARCH_SACRIFICE (altar) == sacrifice->slaying
355 (!strcmp (ARCH_SACRIFICE (altar), query_base_name (sacrifice, 0)))) 325 || (!strcmp (ARCH_SACRIFICE (altar), query_base_name (sacrifice, 0))))
356 && NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1)) 326 && NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1))
357 return 1; 327 return 1;
358 328
359 if (strcmp (ARCH_SACRIFICE (altar), "money") == 0 329 if (strcmp (ARCH_SACRIFICE (altar), "money") == 0
360 && sacrifice->type == MONEY && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar)) 330 && sacrifice->type == MONEY && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar))
… …
415{ 385{
416 op->stats.wc = state; 386 op->stats.wc = state;
417 if (state) 387 if (state)
418 { 388 {
419 use_trigger (op); 389 use_trigger (op);
420 if (op->stats.exp > 0) /* check sanity */ 390 op->set_speed (op->stats.exp > 0 ? 1. / op->stats.exp : 1.);
421 op->speed = 1.0 / op->stats.exp;
422 else
423 op->speed = 1.0;
424 update_ob_speed (op);
425 op->speed_left = -1; 391 op->speed_left = -1;
426 } 392 }
427 else 393 else
428 { 394 {
429 use_trigger (op); 395 use_trigger (op);
430 op->speed = 0; 396 op->set_speed (0);
431 update_ob_speed (op);
432 } 397 }
433} 398}
434 399
435 400
436/* 401/*
… …
492 case TRIGGER_PEDESTAL: 457 case TRIGGER_PEDESTAL:
493 if (cause) 458 if (cause)
494 { 459 {
495 for (tmp = op->above; tmp; tmp = tmp->above) 460 for (tmp = op->above; tmp; tmp = tmp->above)
496 { 461 {
497 object *head = tmp->head ? tmp->head : tmp; 462 object *head = tmp->head_ ();
498 463
499 /* See comment in TRIGGER_BUTTON about move_types */ 464 /* See comment in TRIGGER_BUTTON about move_types */
500 if (((head->move_type & op->move_on) || head->move_type == 0) 465 if (((head->move_type & op->move_on) || head->move_type == 0)
501 && (head->race == op->slaying || (!strcmp (op->slaying, "player") && head->type == PLAYER))) 466 && (head->race == op->slaying || (!strcmp (op->slaying, "player") && head->type == PLAYER)))
502 { 467 {
503 push = 1; 468 push = 1;
504 break; 469 break;
505 } 470 }
506 } 471 }
472
507 if (op->stats.ac == push) 473 if (op->stats.ac == push)
508 return 0; 474 return 0;
475
509 op->stats.ac = push; 476 op->stats.ac = push;
477
510 if (NUM_ANIMATIONS (op) > 1) 478 if (NUM_ANIMATIONS (op) > 1)
511 { 479 {
512 SET_ANIMATION (op, push); 480 SET_ANIMATION (op, push);
513 update_object (op, UP_OBJ_FACE); 481 update_object (op, UP_OBJ_FACE);
514 } 482 }
483
515 update_object (op, UP_OBJ_FACE); 484 update_object (op, UP_OBJ_FACE);
485
516 if (in_movement || !push) 486 if (in_movement || !push)
517 return 0; 487 return 0;
518 } 488 }
489
519 trigger_move (op, push); 490 trigger_move (op, push);
520 return 0; 491 return 0;
521 492
522 case TRIGGER_ALTAR: 493 case TRIGGER_ALTAR:
523 if (cause) 494 if (cause)
524 { 495 {
525 if (in_movement) 496 if (in_movement)
526 return 0; 497 return 0;
498
527 if (operate_altar (op, &cause)) 499 if (operate_altar (op, &cause))
528 { 500 {
529 if (NUM_ANIMATIONS (op) > 1) 501 if (NUM_ANIMATIONS (op) > 1)
530 { 502 {
531 SET_ANIMATION (op, 1); 503 SET_ANIMATION (op, 1);
532 update_object (op, UP_OBJ_FACE); 504 update_object (op, UP_OBJ_FACE);
533 } 505 }
506
534 if (op->last_sp >= 0) 507 if (op->last_sp >= 0)
535 { 508 {
536 trigger_move (op, 1); 509 trigger_move (op, 1);
537 if (op->last_sp > 0) 510 if (op->last_sp > 0)
538 op->last_sp = -op->last_sp; 511 op->last_sp = -op->last_sp;
… …
545 op->value = !op->value; 518 op->value = !op->value;
546 trigger_move (op, 1); 519 trigger_move (op, 1);
547 op->last_sp = -op->last_sp; 520 op->last_sp = -op->last_sp;
548 op->value = !op->value; 521 op->value = !op->value;
549 } 522 }
523
550 return cause == NULL; 524 return cause == NULL;
551 } 525 }
552 else 526 else
553 {
554 return 0; 527 return 0;
555 }
556 } 528 }
557 else 529 else
558 { 530 {
559 if (NUM_ANIMATIONS (op) > 1) 531 if (NUM_ANIMATIONS (op) > 1)
560 { 532 {
… …
571 trigger_move (op, 0); 543 trigger_move (op, 0);
572 else 544 else
573 { 545 {
574 op->stats.wc = 0; 546 op->stats.wc = 0;
575 op->value = !op->value; 547 op->value = !op->value;
576 op->speed = 0; 548 op->set_speed (0);
577 update_ob_speed (op);
578 } 549 }
579 } 550 }
580 return 0; 551 return 0;
581 552
582 case TRIGGER: 553 case TRIGGER:
583 if (cause) 554 if (cause)
584 { 555 {
585 if (in_movement) 556 if (in_movement)
586 return 0; 557 return 0;
558
587 push = 1; 559 push = 1;
588 } 560 }
561
589 if (NUM_ANIMATIONS (op) > 1) 562 if (NUM_ANIMATIONS (op) > 1)
590 { 563 {
591 SET_ANIMATION (op, push); 564 SET_ANIMATION (op, push);
592 update_object (op, UP_OBJ_FACE); 565 update_object (op, UP_OBJ_FACE);
593 } 566 }
567
594 trigger_move (op, push); 568 trigger_move (op, push);
595 return 1; 569 return 1;
596 570
597 default: 571 default:
598 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);
… …
609 if (!map) 583 if (!map)
610 { 584 {
611 LOG (llevError, "Tried to add button-link without map.\n"); 585 LOG (llevError, "Tried to add button-link without map.\n");
612 return; 586 return;
613 } 587 }
614 if (!editor) 588
615 button->path_attuned = connected; /* peterm: I need this so I can rebuild 589 button->path_attuned = connected; /* peterm: I need this so I can rebuild
616 a connected map from a template map. */ 590 a connected map from a template map. */
617
618/* LOG(llevDebug,"adding button %s (%d)\n", button->name, connected);*/
619 591
620 SET_FLAG (button, FLAG_IS_LINKED); 592 SET_FLAG (button, FLAG_IS_LINKED);
621 593
622 ol->ob = button; 594 ol->ob = button;
623 595
624 for (obp = map->buttons; obp && obp->value != connected; obp = obp->next); 596 for (obp = map->buttons; obp && obp->value != connected; obp = obp->next)
597 ;
625 598
626 if (obp) 599 if (obp)
627 { 600 {
628 ol->next = obp->link; 601 ol->next = obp->link;
629 obp->link = ol; 602 obp->link = ol;
… …
742 */ 715 */
743 716
744void 717void
745do_mood_floor (object *op, object *source) 718do_mood_floor (object *op, object *source)
746{ 719{
747 object *tmp;
748 object *tmp2;
749
750 if (!source) 720 if (!source)
751 source = op; 721 source = op;
752 722
753 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)
754 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 731 if (QUERY_FLAG (tmp, FLAG_MONSTER))
755 break; 732 break;
756 733
757 /* 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
758 * be a monster here. 735 * be a monster here.
759 */ 736 */
737 //TODO: have players really FLAG_MONSTER? kept it for safety
760 if (!tmp || tmp->type == PLAYER) 738 if (!tmp || tmp->type == PLAYER)
761 return; 739 return;
762 740
763 switch (op->last_sp) 741 switch (op->last_sp)
764 { 742 {
765 case 0: /* furious--make all monsters mad */ 743 case 0: /* furious--make all monsters mad */
766 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) 744 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
767 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); 745 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
746
768 if (QUERY_FLAG (tmp, FLAG_FRIENDLY)) 747 if (QUERY_FLAG (tmp, FLAG_FRIENDLY))
769 { 748 {
770 CLEAR_FLAG (tmp, FLAG_FRIENDLY);
771 remove_friendly_object (tmp);
772 tmp->attack_movement = 0; 749 tmp->attack_movement = 0;
773 /* 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
774 * dereference a null value 751 * dereference a null value
775 */ 752 */
776 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)
777 tmp->owner->contr->ranges[range_golem] = 0; 757 tmp->owner->contr->golem = 0;
778 758
779 tmp->owner = 0; 759 tmp->owner = 0;
760
761 remove_friendly_object (tmp);
780 } 762 }
781 break; 763 break;
764
782 case 1: /* angry -- get neutral monsters mad */ 765 case 1: /* angry -- get neutral monsters mad */
783 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY)) 766 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY))
784 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); 767 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
785 break; 768 break;
769
786 case 2: /* calm -- pacify unfriendly monsters */ 770 case 2: /* calm -- pacify unfriendly monsters */
787 if (!QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
788 SET_FLAG (tmp, FLAG_UNAGGRESSIVE); 771 SET_FLAG (tmp, FLAG_UNAGGRESSIVE);
789 break; 772 break;
773
790 case 3: /* make all monsters fall asleep */ 774 case 3: /* make all monsters fall asleep */
791 if (!QUERY_FLAG (tmp, FLAG_SLEEP))
792 SET_FLAG (tmp, FLAG_SLEEP); 775 SET_FLAG (tmp, FLAG_SLEEP);
793 break; 776 break;
777
794 case 4: /* charm all monsters */ 778 case 4: /* charm all monsters */
795 if (op == source) 779 if (op == source)
796 break; /* only if 'connected' */ 780 break; /* only if 'connected' */
797 781
798 for (tmp2 = GET_MAP_OB (source->map, source->x, source->y); /* finding an owner */ 782 if (object *pl = source->ms ().player ())
799 tmp2->type != PLAYER; tmp2 = tmp2->above) 783 {
800 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 }
801 break; 792 break;
802 793
803 if (tmp2->type != PLAYER) 794 case 6: // kill monsters
795 if (!QUERY_FLAG (tmp, FLAG_FRIENDLY))
804 break; 796 break;
805 797
806 tmp->set_owner (tmp2); 798 // FALL THROUGH
807 SET_FLAG (tmp, FLAG_MONSTER); 799 case 5: // kill all alives
808 800 if (!tmp->flag [FLAG_PRECIOUS])
809 tmp->stats.exp = 0; 801 {
810 SET_FLAG (tmp, FLAG_FRIENDLY); 802 get_archetype ("burnout")->insert_at (tmp, source);
811 803 tmp->destroy ();
812 add_friendly_object (tmp); 804 }
813 tmp->attack_movement = PETMOVE;
814 break; 805 break;
815 806
816 default: 807 default:
817 break; 808 break;
818 } 809 }
… …
830 object *tmp, *ret = NULL; 821 object *tmp, *ret = NULL;
831 822
832 /* First check the object itself. */ 823 /* First check the object itself. */
833 if ((trig->stats.hp && (op->type == trig->stats.hp)) 824 if ((trig->stats.hp && (op->type == trig->stats.hp))
834 || (trig->slaying && (op->slaying == trig->slaying)) 825 || (trig->slaying && (op->slaying == trig->slaying))
835 || (trig->race && (op->arch->name == trig->race))) 826 || (trig->race && (op->arch->archname == trig->race)))
836 return op; 827 return op;
837 828
838 for (tmp = op->inv; tmp; tmp = tmp->below) 829 for (tmp = op->inv; tmp; tmp = tmp->below)
839 { 830 {
840 if (tmp->inv) 831 if (tmp->inv)
… …
843 if (ret) 834 if (ret)
844 return ret; 835 return ret;
845 } 836 }
846 else if ((trig->stats.hp && (tmp->type == trig->stats.hp)) 837 else if ((trig->stats.hp && (tmp->type == trig->stats.hp))
847 || (trig->slaying && (tmp->slaying == trig->slaying)) 838 || (trig->slaying && (tmp->slaying == trig->slaying))
848 || (trig->race && (tmp->arch->name == trig->race))) 839 || (trig->race && (tmp->arch->archname == trig->race)))
849 return tmp; 840 return tmp;
850 } 841 }
851 return NULL; 842 return NULL;
852} 843}
853 844
… …
866 * 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
867 * 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
868 * 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
869 * state in the inventory checker. This won't happen anymore now. 860 * state in the inventory checker. This won't happen anymore now.
870 * 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)
871 */ 867 *
872 868 */
873void 869void
874check_inv (object *op, object *trig) 870check_inv (object *op, object *trig)
875{ 871{
876 object *match = 0;
877
878 trig->value = 0; // deactivate if none of the following conditions apply 872 trig->value = 0; // deactivate if none of the following conditions apply
879 873
880 for (object *tmp = trig->above; tmp; tmp = tmp->above) 874 object *pl = trig->ms ().player ();
881 if (tmp->type == PLAYER)
882 {
883 object *match = check_inv_recursive (tmp, trig); 875 object *match = check_inv_recursive (op, trig);
884 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
885 if (match && trig->last_sp) // match == having 884 if (match && trig->last_sp) // match == having
886 { 885 {
887 if (trig->last_heal) 886 if (trig->last_heal)
888 decrease_ob (match); 887 decrease_ob (match);
889 888
890 trig->value = 1; 889 trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left
891 } 890 push_button (trig);
891 }
892 else if (!match && !trig->last_sp) // match == not having 892 else if (!match && !trig->last_sp) // match == not having
893 trig->value = 1; 893 {
894 894 trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left
895 break;
896 }
897
898 push_button (trig); 895 push_button (trig);
896 }
899} 897}
900 898

Diff Legend

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