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.14 by root, Wed Dec 13 03:28:42 2006 UTC vs.
Revision 1.39 by root, Mon Aug 27 01:13:48 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 if (!tmp->active)
73 tmp->play_sound (tmp->sound
74 ? tmp->sound
75 : sound_find (tmp->type == GATE ? "trigger_gate" : "trigger_hole"));
72 tmp->value = tmp->stats.maxsp ? !state : state; 76 tmp->value = tmp->stats.maxsp ? !state : state;
73 tmp->speed = 0.5; 77 tmp->set_speed (0.5);
74 update_ob_speed (tmp);
75 break; 78 break;
76 79
77 case CF_HANDLE: 80 case CF_HANDLE:
78 SET_ANIMATION (tmp, (tmp->value = tmp->stats.maxsp ? !state : state)); 81 SET_ANIMATION (tmp, (tmp->value = tmp->stats.maxsp ? !state : state));
79 update_object (tmp, UP_OBJ_FACE); 82 update_object (tmp, UP_OBJ_FACE);
80 break; 83 break;
81 84
82 case SIGN: 85 case SIGN:
83 if (!tmp->stats.food || tmp->last_eat < tmp->stats.food) 86 if (!tmp->stats.food || tmp->last_eat < tmp->stats.food)
84 { 87 {
88 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_sign"));
85 new_info_map (NDI_UNIQUE | NDI_NAVY, tmp->map, tmp->msg); 89 new_info_map (NDI_UNIQUE | NDI_NAVY, tmp->map, tmp->msg);
86 if (tmp->stats.food) 90 if (tmp->stats.food)
87 tmp->last_eat++; 91 tmp->last_eat++;
88 } 92 }
89 break; 93 break;
90 94
91 case ALTAR: 95 case ALTAR:
96 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_altar"));
92 tmp->value = 1; 97 tmp->value = 1;
93 SET_ANIMATION (tmp, tmp->value); 98 SET_ANIMATION (tmp, tmp->value);
94 update_object (tmp, UP_OBJ_FACE); 99 update_object (tmp, UP_OBJ_FACE);
95 break; 100 break;
96 101
97 case BUTTON: 102 case BUTTON:
98 case PEDESTAL: 103 case PEDESTAL:
104 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_button"));
99 tmp->value = state; 105 tmp->value = state;
100 SET_ANIMATION (tmp, tmp->value); 106 SET_ANIMATION (tmp, tmp->value);
101 update_object (tmp, UP_OBJ_FACE); 107 update_object (tmp, UP_OBJ_FACE);
102 break; 108 break;
103 109
104 case MOOD_FLOOR: 110 case MOOD_FLOOR:
105 do_mood_floor (tmp, source); 111 do_mood_floor (tmp, source);
106 break; 112 break;
107 113
108 case TIMED_GATE: 114 case TIMED_GATE:
115 if (!tmp->active)
116 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_gate"));
109 tmp->speed = tmp->arch->clone.speed; 117 tmp->set_speed (tmp->arch->speed);
110 update_ob_speed (tmp); /* original values */
111 tmp->value = tmp->arch->clone.value; 118 tmp->value = tmp->arch->value;
112 tmp->stats.sp = 1; 119 tmp->stats.sp = 1;
113 tmp->stats.hp = tmp->stats.maxhp; 120 tmp->stats.hp = tmp->stats.maxhp;
114 /* Handle multipart gates. We copy the value for the other parts 121 /* Handle multipart gates. We copy the value for the other parts
115 * from the head - this ensures that the data will consistent 122 * from the head - this ensures that the data will consistent
116 */ 123 */
117 for (tmp = tmp->more; tmp != NULL; tmp = tmp->more) 124 for (object *part = tmp->more; part; part = part->more)
118 { 125 {
119 tmp->speed = tmp->head->speed; 126 part->value = tmp->value;
120 tmp->value = tmp->head->value; 127 part->stats.sp = tmp->stats.sp;
121 tmp->stats.sp = tmp->head->stats.sp; 128 part->stats.hp = tmp->stats.hp;
122 tmp->stats.hp = tmp->head->stats.hp;
123 update_ob_speed (tmp); 129 part->set_speed (tmp->speed);
124 } 130 }
125 break; 131 break;
126 132
127 case DIRECTOR: 133 case DIRECTOR:
128 case FIREWALL: 134 case FIREWALL:
129 if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL) 135 if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL)
130 move_firewall (tmp); 136 move_firewall (tmp);
131 else 137 else
132 { 138 {
133 if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */ 139 if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */
134 tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1; 140 tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1;
141
135 animate_turning (tmp); 142 animate_turning (tmp);
136 } 143 }
137 break; 144 break;
138 145
139 case TELEPORTER: 146 case TELEPORTER:
140 move_teleporter (tmp); 147 move_teleporter (tmp);
141 break; 148 break;
142 149
143 case CREATOR: 150 case CREATOR:
144 move_creator (tmp); 151 move_creator (tmp);
145 break; 152 break;
146 153
147 case TRIGGER_MARKER: 154 case TRIGGER_MARKER:
155 //tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_marker"));
148 move_marker (tmp); 156 move_marker (tmp);
149 break; 157 break;
150 158
151 case DUPLICATOR: 159 case DUPLICATOR:
152 move_duplicator (tmp); 160 move_duplicator (tmp);
153 break; 161 break;
154 } 162 }
155 } 163 }
156} 164}
157 165
158/* 166/*
… …
205 * Updates everything connected with the button op. 213 * Updates everything connected with the button op.
206 * After changing the state of a button, this function must be called 214 * After changing the state of a button, this function must be called
207 * to make sure that all gates and other buttons connected to the 215 * to make sure that all gates and other buttons connected to the
208 * button reacts to the (eventual) change of state. 216 * button reacts to the (eventual) change of state.
209 */ 217 */
210
211void 218void
212update_button (object *op) 219update_button (object *op)
213{ 220{
214 object *ab, *tmp, *head; 221 object *ab, *tmp, *head;
215 int tot, any_down = 0, old_value = op->value; 222 int tot, any_down = 0, old_value = op->value;
… …
254 else if (tmp->type == PEDESTAL) 261 else if (tmp->type == PEDESTAL)
255 { 262 {
256 tmp->value = 0; 263 tmp->value = 0;
257 for (ab = tmp->above; ab != NULL; ab = ab->above) 264 for (ab = tmp->above; ab != NULL; ab = ab->above)
258 { 265 {
259 head = ab->head ? ab->head : ab; 266 head = ab->head_ ();
260 /* Same note regarding move_type for buttons above apply here. */ 267 /* Same note regarding move_type for buttons above apply here. */
261 if (((head->move_type & tmp->move_on) || ab->move_type == 0) && 268 if (((head->move_type & tmp->move_on) || ab->move_type == 0) &&
262 (head->race == tmp->slaying || 269 (head->race == tmp->slaying ||
263 ((head->type == SPECIAL_KEY) && (head->slaying == tmp->slaying)) || 270 ((head->type == SPECIAL_KEY) && (head->slaying == tmp->slaying)) ||
264 (!strcmp (tmp->slaying, "player") && head->type == PLAYER))) 271 (!strcmp (tmp->slaying, "player") && head->type == PLAYER)))
265 tmp->value = 1; 272 tmp->value = 1;
266 } 273 }
274
267 if (tmp->value) 275 if (tmp->value)
268 any_down = 1; 276 any_down = 1;
269 } 277 }
270 } 278 }
271 if (any_down) /* If any other buttons were down, force this to remain down */ 279 if (any_down) /* If any other buttons were down, force this to remain down */
… …
278 update_object (op, UP_OBJ_FACE); 286 update_object (op, UP_OBJ_FACE);
279 push_button (op); /* Make all other buttons the same */ 287 push_button (op); /* Make all other buttons the same */
280 } 288 }
281} 289}
282 290
283/*
284 * Updates every button on the map (by calling update_button() for them).
285 */
286
287void
288update_buttons (maptile *m)
289{
290 objectlink *ol;
291 oblinkpt *obp;
292
293 for (obp = m->buttons; obp; obp = obp->next)
294 for (ol = obp->link; ol; ol = ol->next)
295 {
296 if (!ol->ob)
297 {
298 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
299 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
300 continue;
301 }
302
303 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
304 {
305 update_button (ol->ob);
306 break;
307 }
308 }
309}
310
311void 291void
312use_trigger (object *op) 292use_trigger (object *op)
313{ 293{
314
315 /* Toggle value */ 294 /* Toggle value */
316 op->value = !op->value; 295 op->value = !op->value;
317 push_button (op); 296 push_button (op);
318} 297}
319 298
320/* 299/*
321 * Note: animate_object should be used instead of this, 300 * Note: animate_object should be used instead of this,
322 * but it can't handle animations in the 8 directions 301 * but it can't handle animations in the 8 directions
323 */ 302 */
324
325void 303void
326animate_turning (object *op) /* only one part objects */ 304animate_turning (object *op) /* only one part objects */
327{ 305{
328 if (++op->state >= NUM_ANIMATIONS (op) / 8) 306 if (++op->state >= NUM_ANIMATIONS (op) / 8)
329 op->state = 0; 307 op->state = 0;
… …
346 */ 324 */
347 325
348int 326int
349check_altar_sacrifice (const object *altar, const object *sacrifice) 327check_altar_sacrifice (const object *altar, const object *sacrifice)
350{ 328{
351 if (!QUERY_FLAG (sacrifice, FLAG_ALIVE) && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED) && sacrifice->type != PLAYER) 329 if (!QUERY_FLAG (sacrifice, FLAG_ALIVE)
330 && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED)
331 && sacrifice->type != PLAYER)
352 { 332 {
333 if (strcmp (ARCH_SACRIFICE (altar), "money") == 0
334 && sacrifice->type == MONEY
335 && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar))
336 return 1;
337
353 if ((ARCH_SACRIFICE (altar) == sacrifice->arch->name || 338 if ((ARCH_SACRIFICE (altar) == sacrifice->arch->archname
354 ARCH_SACRIFICE (altar) == sacrifice->name || 339 || ARCH_SACRIFICE (altar) == sacrifice->name
355 ARCH_SACRIFICE (altar) == sacrifice->slaying || 340 || ARCH_SACRIFICE (altar) == sacrifice->slaying
356 (!strcmp (ARCH_SACRIFICE (altar), query_base_name (sacrifice, 0)))) 341 || strstr (query_base_name (sacrifice, 0), ARCH_SACRIFICE (altar)))
357 && NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1)) 342 && NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1))
358 return 1; 343 return 1;
359 if (strcmp (ARCH_SACRIFICE (altar), "money") == 0
360 && sacrifice->type == MONEY && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar))
361 return 1;
362 } 344 }
345
363 return 0; 346 return 0;
364} 347}
365 348
366/* 349/*
367 * operate_altar checks if sacrifice was accepted and removes sacrificed 350 * operate_altar checks if sacrifice was accepted and removes sacrificed
… …
414{ 397{
415 op->stats.wc = state; 398 op->stats.wc = state;
416 if (state) 399 if (state)
417 { 400 {
418 use_trigger (op); 401 use_trigger (op);
419 if (op->stats.exp > 0) /* check sanity */ 402 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; 403 op->speed_left = -1;
425 } 404 }
426 else 405 else
427 { 406 {
428 use_trigger (op); 407 use_trigger (op);
429 op->speed = 0; 408 op->set_speed (0);
430 update_ob_speed (op);
431 } 409 }
432} 410}
433 411
434 412
435/* 413/*
… …
491 case TRIGGER_PEDESTAL: 469 case TRIGGER_PEDESTAL:
492 if (cause) 470 if (cause)
493 { 471 {
494 for (tmp = op->above; tmp; tmp = tmp->above) 472 for (tmp = op->above; tmp; tmp = tmp->above)
495 { 473 {
496 object *head = tmp->head ? tmp->head : tmp; 474 object *head = tmp->head_ ();
497 475
498 /* See comment in TRIGGER_BUTTON about move_types */ 476 /* See comment in TRIGGER_BUTTON about move_types */
499 if (((head->move_type & op->move_on) || head->move_type == 0) 477 if (((head->move_type & op->move_on) || head->move_type == 0)
500 && (head->race == op->slaying || (!strcmp (op->slaying, "player") && head->type == PLAYER))) 478 && (head->race == op->slaying || (!strcmp (op->slaying, "player") && head->type == PLAYER)))
501 { 479 {
502 push = 1; 480 push = 1;
503 break; 481 break;
504 } 482 }
505 } 483 }
484
506 if (op->stats.ac == push) 485 if (op->stats.ac == push)
507 return 0; 486 return 0;
487
508 op->stats.ac = push; 488 op->stats.ac = push;
489
509 if (NUM_ANIMATIONS (op) > 1) 490 if (NUM_ANIMATIONS (op) > 1)
510 { 491 {
511 SET_ANIMATION (op, push); 492 SET_ANIMATION (op, push);
512 update_object (op, UP_OBJ_FACE); 493 update_object (op, UP_OBJ_FACE);
513 } 494 }
495
514 update_object (op, UP_OBJ_FACE); 496 update_object (op, UP_OBJ_FACE);
497
515 if (in_movement || !push) 498 if (in_movement || !push)
516 return 0; 499 return 0;
517 } 500 }
501
518 trigger_move (op, push); 502 trigger_move (op, push);
519 return 0; 503 return 0;
520 504
521 case TRIGGER_ALTAR: 505 case TRIGGER_ALTAR:
522 if (cause) 506 if (cause)
523 { 507 {
524 if (in_movement) 508 if (in_movement)
525 return 0; 509 return 0;
510
526 if (operate_altar (op, &cause)) 511 if (operate_altar (op, &cause))
527 { 512 {
528 if (NUM_ANIMATIONS (op) > 1) 513 if (NUM_ANIMATIONS (op) > 1)
529 { 514 {
530 SET_ANIMATION (op, 1); 515 SET_ANIMATION (op, 1);
531 update_object (op, UP_OBJ_FACE); 516 update_object (op, UP_OBJ_FACE);
532 } 517 }
518
533 if (op->last_sp >= 0) 519 if (op->last_sp >= 0)
534 { 520 {
535 trigger_move (op, 1); 521 trigger_move (op, 1);
536 if (op->last_sp > 0) 522 if (op->last_sp > 0)
537 op->last_sp = -op->last_sp; 523 op->last_sp = -op->last_sp;
… …
544 op->value = !op->value; 530 op->value = !op->value;
545 trigger_move (op, 1); 531 trigger_move (op, 1);
546 op->last_sp = -op->last_sp; 532 op->last_sp = -op->last_sp;
547 op->value = !op->value; 533 op->value = !op->value;
548 } 534 }
535
549 return cause == NULL; 536 return cause == NULL;
550 } 537 }
551 else 538 else
552 {
553 return 0; 539 return 0;
554 }
555 } 540 }
556 else 541 else
557 { 542 {
558 if (NUM_ANIMATIONS (op) > 1) 543 if (NUM_ANIMATIONS (op) > 1)
559 { 544 {
… …
570 trigger_move (op, 0); 555 trigger_move (op, 0);
571 else 556 else
572 { 557 {
573 op->stats.wc = 0; 558 op->stats.wc = 0;
574 op->value = !op->value; 559 op->value = !op->value;
575 op->speed = 0; 560 op->set_speed (0);
576 update_ob_speed (op);
577 } 561 }
578 } 562 }
579 return 0; 563 return 0;
580 564
581 case TRIGGER: 565 case TRIGGER:
582 if (cause) 566 if (cause)
583 { 567 {
584 if (in_movement) 568 if (in_movement)
585 return 0; 569 return 0;
570
586 push = 1; 571 push = 1;
587 } 572 }
573
588 if (NUM_ANIMATIONS (op) > 1) 574 if (NUM_ANIMATIONS (op) > 1)
589 { 575 {
590 SET_ANIMATION (op, push); 576 SET_ANIMATION (op, push);
591 update_object (op, UP_OBJ_FACE); 577 update_object (op, UP_OBJ_FACE);
592 } 578 }
579
593 trigger_move (op, push); 580 trigger_move (op, push);
594 return 1; 581 return 1;
595 582
596 default: 583 default:
597 LOG (llevDebug, "Unknown trigger type: %s (%d)\n", &op->name, op->type); 584 LOG (llevDebug, "Unknown trigger type: %s (%d)\n", &op->name, op->type);
… …
608 if (!map) 595 if (!map)
609 { 596 {
610 LOG (llevError, "Tried to add button-link without map.\n"); 597 LOG (llevError, "Tried to add button-link without map.\n");
611 return; 598 return;
612 } 599 }
613 if (!editor) 600
614 button->path_attuned = connected; /* peterm: I need this so I can rebuild 601 button->path_attuned = connected; /* peterm: I need this so I can rebuild
615 a connected map from a template map. */ 602 a connected map from a template map. */
616
617/* LOG(llevDebug,"adding button %s (%d)\n", button->name, connected);*/
618 603
619 SET_FLAG (button, FLAG_IS_LINKED); 604 SET_FLAG (button, FLAG_IS_LINKED);
620 605
621 ol->ob = button; 606 ol->ob = button;
622 607
623 for (obp = map->buttons; obp && obp->value != connected; obp = obp->next); 608 for (obp = map->buttons; obp && obp->value != connected; obp = obp->next)
609 ;
624 610
625 if (obp) 611 if (obp)
626 { 612 {
627 ol->next = obp->link; 613 ol->next = obp->link;
628 obp->link = ol; 614 obp->link = ol;
… …
741 */ 727 */
742 728
743void 729void
744do_mood_floor (object *op, object *source) 730do_mood_floor (object *op, object *source)
745{ 731{
746 object *tmp;
747 object *tmp2;
748
749 if (!source) 732 if (!source)
750 source = op; 733 source = op;
751 734
752 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above) 735 mapspace &ms = op->ms ();
736
737 if (!(ms.flags () & P_IS_ALIVE))
738 return;
739
740 object *tmp;
741
742 for (tmp = ms.top; tmp; tmp = tmp->below)
753 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 743 if (QUERY_FLAG (tmp, FLAG_MONSTER))
754 break; 744 break;
755 745
756 /* doesn't effect players, and if there is a player on this space, won't also 746 /* doesn't effect players, and if there is a player on this space, won't also
757 * be a monster here. 747 * be a monster here.
758 */ 748 */
749 //TODO: have players really FLAG_MONSTER? kept it for safety
759 if (!tmp || tmp->type == PLAYER) 750 if (!tmp || tmp->type == PLAYER)
760 return; 751 return;
761 752
762 switch (op->last_sp) 753 switch (op->last_sp)
763 { 754 {
764 case 0: /* furious--make all monsters mad */ 755 case 0: /* furious--make all monsters mad */
765 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) 756 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
766 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); 757 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
758
767 if (QUERY_FLAG (tmp, FLAG_FRIENDLY)) 759 if (QUERY_FLAG (tmp, FLAG_FRIENDLY))
768 { 760 {
769 CLEAR_FLAG (tmp, FLAG_FRIENDLY);
770 remove_friendly_object (tmp);
771 tmp->attack_movement = 0; 761 tmp->attack_movement = 0;
772 /* lots of checks here, but want to make sure we don't 762 /* lots of checks here, but want to make sure we don't
773 * dereference a null value 763 * dereference a null value
774 */ 764 */
775 if (tmp->type == GOLEM && tmp->owner && tmp->owner->type == PLAYER && tmp->owner->contr->ranges[range_golem] == tmp) 765 if (tmp->type == GOLEM
766 && tmp->owner
767 && tmp->owner->type == PLAYER
768 && tmp->owner->contr->golem == tmp)
776 tmp->owner->contr->ranges[range_golem] = 0; 769 tmp->owner->contr->golem = 0;
777 770
778 tmp->owner = 0; 771 tmp->owner = 0;
772
773 remove_friendly_object (tmp);
779 } 774 }
780 break; 775 break;
776
781 case 1: /* angry -- get neutral monsters mad */ 777 case 1: /* angry -- get neutral monsters mad */
782 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY)) 778 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY))
783 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); 779 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
784 break; 780 break;
781
785 case 2: /* calm -- pacify unfriendly monsters */ 782 case 2: /* calm -- pacify unfriendly monsters */
786 if (!QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
787 SET_FLAG (tmp, FLAG_UNAGGRESSIVE); 783 SET_FLAG (tmp, FLAG_UNAGGRESSIVE);
788 break; 784 break;
785
789 case 3: /* make all monsters fall asleep */ 786 case 3: /* make all monsters fall asleep */
790 if (!QUERY_FLAG (tmp, FLAG_SLEEP))
791 SET_FLAG (tmp, FLAG_SLEEP); 787 SET_FLAG (tmp, FLAG_SLEEP);
792 break; 788 break;
789
793 case 4: /* charm all monsters */ 790 case 4: /* charm all monsters */
794 if (op == source) 791 if (op == source)
795 break; /* only if 'connected' */ 792 break; /* only if 'connected' */
796 793
797 for (tmp2 = get_map_ob (source->map, source->x, source->y); /* finding an owner */ 794 if (object *pl = source->ms ().player ())
798 tmp2->type != PLAYER; tmp2 = tmp2->above) 795 {
799 if (tmp2->above == NULL) 796 tmp->set_owner (pl);
797 SET_FLAG (tmp, FLAG_MONSTER);
798
799 tmp->stats.exp = 0;
800
801 add_friendly_object (tmp);
802 tmp->attack_movement = PETMOVE;
803 }
800 break; 804 break;
801 805
802 if (tmp2->type != PLAYER) 806 case 6: // kill monsters
807 if (!QUERY_FLAG (tmp, FLAG_FRIENDLY))
803 break; 808 break;
804 tmp->set_owner (tmp2); 809
805 SET_FLAG (tmp, FLAG_MONSTER); 810 // FALL THROUGH
806 tmp->stats.exp = 0; 811 case 5: // kill all alives
807 SET_FLAG (tmp, FLAG_FRIENDLY); 812 if (!tmp->flag [FLAG_PRECIOUS])
808 add_friendly_object (tmp); 813 {
809 tmp->attack_movement = PETMOVE; 814 get_archetype ("burnout")->insert_at (tmp, source);
815 tmp->destroy ();
816 }
810 break; 817 break;
811 818
812 default: 819 default:
813 break; 820 break;
814 } 821 }
… …
818 * It will descend through containers to find the object. 825 * It will descend through containers to find the object.
819 * slaying = match object slaying flag 826 * slaying = match object slaying flag
820 * race = match object archetype name flag 827 * race = match object archetype name flag
821 * hp = match object type (excpt type '0'== PLAYER) 828 * hp = match object type (excpt type '0'== PLAYER)
822 */ 829 */
823
824object * 830object *
825check_inv_recursive (object *op, const object *trig) 831check_inv_recursive (object *op, const object *trig)
826{ 832{
827 object *tmp, *ret = NULL; 833 object *tmp, *ret = NULL;
828 834
829 /* First check the object itself. */ 835 /* First check the object itself. */
830 if ((trig->stats.hp && (op->type == trig->stats.hp)) 836 if ((trig->stats.hp && (op->type == trig->stats.hp))
831 || (trig->slaying && (op->slaying == trig->slaying)) || (trig->race && (op->arch->name == trig->race))) 837 || (trig->slaying && (op->slaying == trig->slaying))
838 || (trig->race && (op->arch->archname == trig->race)))
832 return op; 839 return op;
833 840
834 for (tmp = op->inv; tmp; tmp = tmp->below) 841 for (tmp = op->inv; tmp; tmp = tmp->below)
835 { 842 {
836 if (tmp->inv) 843 if (tmp->inv)
… …
838 ret = check_inv_recursive (tmp, trig); 845 ret = check_inv_recursive (tmp, trig);
839 if (ret) 846 if (ret)
840 return ret; 847 return ret;
841 } 848 }
842 else if ((trig->stats.hp && (tmp->type == trig->stats.hp)) 849 else if ((trig->stats.hp && (tmp->type == trig->stats.hp))
843 || (trig->slaying && (tmp->slaying == trig->slaying)) || (trig->race && (tmp->arch->name == trig->race))) 850 || (trig->slaying && (tmp->slaying == trig->slaying))
851 || (trig->race && (tmp->arch->archname == trig->race)))
844 return tmp; 852 return tmp;
845 } 853 }
846 return NULL; 854 return NULL;
847} 855}
848 856
… …
851 * the square will activate connected items. 859 * the square will activate connected items.
852 * Monsters can't trigger this square (for now) 860 * Monsters can't trigger this square (for now)
853 * Values are: last_sp = 1/0 obj/no obj triggers 861 * Values are: last_sp = 1/0 obj/no obj triggers
854 * last_heal = 1/0 remove/dont remove obj if triggered 862 * last_heal = 1/0 remove/dont remove obj if triggered
855 * -b.t. (thomas@nomad.astro.psu.edu 863 * -b.t. (thomas@nomad.astro.psu.edu
856 */ 864 *
857 865 * Tue Dec 19 15:34:00 CET 2006 elmex: changed the function to ignore op
866 * because the check-inventory semantic essentially only applies when
867 * something is above the inventory checker.
868 * The semantic prior this change was: trigger if something has moved on or off
869 * and has a matching item. Imagine what happens if someone steps on the inventory
870 * checker with a matching item, has it, activates the connection, throws the item
871 * away, and then leaves the inventory checker. That would've caused an always-enabled
872 * state in the inventory checker. This won't happen anymore now.
873 *
874 * Wed Jan 10 11:34:26 CET 2007 elmex: fixed this function, we now check
875 * whether op is on this mapspace or not, because the value (1|0) depends
876 * on this information. also make sure to only push_button if op has
877 * a matching item (because when we do a push_button with value=0 timed gates
878 * will still open)! (i hope i got the semantics right this time)
879 *
880 */
858void 881void
859check_inv (object *op, object *trig) 882check_inv (object *op, object *trig)
860{ 883{
861 object *match; 884 trig->value = 0; // deactivate if none of the following conditions apply
862 885
863 if (op->type != PLAYER) 886 object *pl = trig->ms ().player ();
864 return;
865 match = check_inv_recursive (op, trig); 887 object *match = check_inv_recursive (op, trig);
888
889 // elmex: a note about (pl == op):
890 // if pl == 0 then the player has left this space
891 // if pl != 0 then a player is on this mapspace, but then
892 // we still have to check whether it's the player that triggered
893 // this inv-checker, because if not, then the op left this inv-checker
894 // and we have to set the value to 0
895
866 if (match && trig->last_sp) 896 if (match && trig->last_sp) // match == having
867 { 897 {
868 if (trig->last_heal) 898 if (trig->last_heal)
869 decrease_ob (match); 899 decrease_ob (match);
870 use_trigger (trig); 900
901 trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left
902 push_button (trig);
903 }
904 else if (!match && !trig->last_sp) // match == not having
871 } 905 {
872 else if (!match && !trig->last_sp) 906 trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left
873 use_trigger (trig); 907 push_button (trig);
908 }
874} 909}
875 910

Diff Legend

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