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.10 by root, Thu Sep 14 22:33:58 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 || ol->ob->count != ol->id) 42 if (!ol->ob)
45 { 43 {
46 LOG (llevError, "Internal error in activate_connection_link (%ld).\n", ol->id); 44 LOG (llevError, "Internal error in activate_connection_link.\n");
47 continue; 45 continue;
48 } 46 }
47
49 /* a button link object can become freed when the map is saving. As 48 /* a button link object can become freed when the map is saving. As
50 * a map is saved, objects are removed and freed, and if an object is 49 * a map is saved, objects are removed and freed, and if an object is
51 * on top of a button, this function is eventually called. If a map 50 * on top of a button, this function is eventually called. If a map
52 * is getting moved out of memory, the status of buttons and levers 51 * is getting moved out of memory, the status of buttons and levers
53 * probably isn't important - it will get sorted out when the map is 52 * probably isn't important - it will get sorted out when the map is
54 * 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.
55 */ 54 */
56 55
57 if (QUERY_FLAG (ol->ob, FLAG_FREED)) 56 if (QUERY_FLAG (ol->ob, FLAG_FREED))
58 return; 57 return;
58
59 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:
72 if (!tmp->active)
73 tmp->play_sound (tmp->sound
74 ? tmp->sound
75 : sound_find (tmp->type == GATE ? "trigger_gate" : "trigger_hole"));
71 tmp->value = tmp->stats.maxsp ? !state : state; 76 tmp->value = tmp->stats.maxsp ? !state : state;
72 tmp->speed = 0.5; 77 tmp->set_speed (0.5);
73 update_ob_speed (tmp);
74 break; 78 break;
75 79
76 case CF_HANDLE: 80 case CF_HANDLE:
77 SET_ANIMATION (tmp, (tmp->value = tmp->stats.maxsp ? !state : state)); 81 SET_ANIMATION (tmp, (tmp->value = tmp->stats.maxsp ? !state : state));
78 update_object (tmp, UP_OBJ_FACE); 82 update_object (tmp, UP_OBJ_FACE);
79 break; 83 break;
80 84
81 case SIGN: 85 case SIGN:
82 if (!tmp->stats.food || tmp->last_eat < tmp->stats.food) 86 if (!tmp->stats.food || tmp->last_eat < tmp->stats.food)
83 { 87 {
88 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_sign"));
84 new_info_map (NDI_UNIQUE | NDI_NAVY, tmp->map, tmp->msg); 89 new_info_map (NDI_UNIQUE | NDI_NAVY, tmp->map, tmp->msg);
85 if (tmp->stats.food) 90 if (tmp->stats.food)
86 tmp->last_eat++; 91 tmp->last_eat++;
87 } 92 }
88 break; 93 break;
89 94
90 case ALTAR: 95 case ALTAR:
96 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_altar"));
91 tmp->value = 1; 97 tmp->value = 1;
92 SET_ANIMATION (tmp, tmp->value); 98 SET_ANIMATION (tmp, tmp->value);
93 update_object (tmp, UP_OBJ_FACE); 99 update_object (tmp, UP_OBJ_FACE);
94 break; 100 break;
95 101
96 case BUTTON: 102 case BUTTON:
97 case PEDESTAL: 103 case PEDESTAL:
104 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_button"));
98 tmp->value = state; 105 tmp->value = state;
99 SET_ANIMATION (tmp, tmp->value); 106 SET_ANIMATION (tmp, tmp->value);
100 update_object (tmp, UP_OBJ_FACE); 107 update_object (tmp, UP_OBJ_FACE);
101 break; 108 break;
102 109
103 case MOOD_FLOOR: 110 case MOOD_FLOOR:
104 do_mood_floor (tmp, source); 111 do_mood_floor (tmp, source);
105 break; 112 break;
106 113
107 case TIMED_GATE: 114 case TIMED_GATE:
115 if (!tmp->active)
116 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_gate"));
108 tmp->speed = tmp->arch->clone.speed; 117 tmp->set_speed (tmp->arch->speed);
109 update_ob_speed (tmp); /* original values */
110 tmp->value = tmp->arch->clone.value; 118 tmp->value = tmp->arch->value;
111 tmp->stats.sp = 1; 119 tmp->stats.sp = 1;
112 tmp->stats.hp = tmp->stats.maxhp; 120 tmp->stats.hp = tmp->stats.maxhp;
113 /* Handle multipart gates. We copy the value for the other parts 121 /* Handle multipart gates. We copy the value for the other parts
114 * from the head - this ensures that the data will consistent 122 * from the head - this ensures that the data will consistent
115 */ 123 */
116 for (tmp = tmp->more; tmp != NULL; tmp = tmp->more) 124 for (object *part = tmp->more; part; part = part->more)
117 { 125 {
118 tmp->speed = tmp->head->speed; 126 part->value = tmp->value;
119 tmp->value = tmp->head->value; 127 part->stats.sp = tmp->stats.sp;
120 tmp->stats.sp = tmp->head->stats.sp; 128 part->stats.hp = tmp->stats.hp;
121 tmp->stats.hp = tmp->head->stats.hp;
122 update_ob_speed (tmp); 129 part->set_speed (tmp->speed);
123 } 130 }
124 break; 131 break;
125 132
126 case DIRECTOR: 133 case DIRECTOR:
127 case FIREWALL: 134 case FIREWALL:
128 if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL) 135 if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL)
129 move_firewall (tmp); 136 move_firewall (tmp);
130 else 137 else
131 { 138 {
132 if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */ 139 if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */
133 tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1; 140 tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1;
141
134 animate_turning (tmp); 142 animate_turning (tmp);
135 } 143 }
136 break; 144 break;
137 145
138 case TELEPORTER: 146 case TELEPORTER:
139 move_teleporter (tmp); 147 move_teleporter (tmp);
140 break; 148 break;
141 149
142 case CREATOR: 150 case CREATOR:
143 move_creator (tmp); 151 move_creator (tmp);
144 break; 152 break;
145 153
146 case TRIGGER_MARKER: 154 case TRIGGER_MARKER:
155 //tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_marker"));
147 move_marker (tmp); 156 move_marker (tmp);
148 break; 157 break;
149 158
150 case DUPLICATOR: 159 case DUPLICATOR:
151 move_duplicator (tmp); 160 move_duplicator (tmp);
152 break; 161 break;
153 } 162 }
154 } 163 }
155} 164}
156 165
157/* 166/*
… …
187 * the connection was 'state' or 'released'. So that you can activate objects 196 * the connection was 'state' or 'released'. So that you can activate objects
188 * who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly. 197 * who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly.
189 * 198 *
190 */ 199 */
191void 200void
192activate_connection (mapstruct *map, long connection, bool state) 201activate_connection (maptile *map, long connection, bool state)
193{ 202{
194 if (INVOKE_MAP (TRIGGER, map, ARG_INT64 (connection), ARG_INT (state))) 203 if (INVOKE_MAP (TRIGGER, map, ARG_INT64 (connection), ARG_INT (state)))
195 return; 204 return;
196 205
197 oblinkpt *obp = get_connection_links (map, connection); 206 oblinkpt *obp = get_connection_links (map, connection);
… …
204 * Updates everything connected with the button op. 213 * Updates everything connected with the button op.
205 * 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
206 * 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
207 * button reacts to the (eventual) change of state. 216 * button reacts to the (eventual) change of state.
208 */ 217 */
209
210void 218void
211update_button (object *op) 219update_button (object *op)
212{ 220{
213 object *ab, *tmp, *head; 221 object *ab, *tmp, *head;
214 int tot, any_down = 0, old_value = op->value; 222 int tot, any_down = 0, old_value = op->value;
… …
218 obp = get_button_links (op); 226 obp = get_button_links (op);
219 /* LOG(llevDebug, "update_button: %s (%d)\n", op->name, op->count); */ 227 /* LOG(llevDebug, "update_button: %s (%d)\n", op->name, op->count); */
220 if (obp) 228 if (obp)
221 for (ol = obp->link; ol; ol = ol->next) 229 for (ol = obp->link; ol; ol = ol->next)
222 { 230 {
223 if (!ol->ob || ol->ob->count != ol->id) 231 if (!ol->ob)
224 { 232 {
225 LOG (llevDebug, "Internal error in update_button (%s).\n", &op->name); 233 LOG (llevDebug, "Internal error in update_button (%s).\n", &op->name);
226 continue; 234 continue;
227 } 235 }
236
228 tmp = ol->ob; 237 tmp = ol->ob;
229 if (tmp->type == BUTTON) 238 if (tmp->type == BUTTON)
230 { 239 {
231 for (ab = tmp->above, tot = 0; ab != NULL; ab = ab->above) 240 for (ab = tmp->above, tot = 0; ab != NULL; ab = ab->above)
232 /* Bug? The pedestal code below looks for the head of 241 /* Bug? The pedestal code below looks for the head of
… …
252 else if (tmp->type == PEDESTAL) 261 else if (tmp->type == PEDESTAL)
253 { 262 {
254 tmp->value = 0; 263 tmp->value = 0;
255 for (ab = tmp->above; ab != NULL; ab = ab->above) 264 for (ab = tmp->above; ab != NULL; ab = ab->above)
256 { 265 {
257 head = ab->head ? ab->head : ab; 266 head = ab->head_ ();
258 /* Same note regarding move_type for buttons above apply here. */ 267 /* Same note regarding move_type for buttons above apply here. */
259 if (((head->move_type & tmp->move_on) || ab->move_type == 0) && 268 if (((head->move_type & tmp->move_on) || ab->move_type == 0) &&
260 (head->race == tmp->slaying || 269 (head->race == tmp->slaying ||
261 ((head->type == SPECIAL_KEY) && (head->slaying == tmp->slaying)) || 270 ((head->type == SPECIAL_KEY) && (head->slaying == tmp->slaying)) ||
262 (!strcmp (tmp->slaying, "player") && head->type == PLAYER))) 271 (!strcmp (tmp->slaying, "player") && head->type == PLAYER)))
263 tmp->value = 1; 272 tmp->value = 1;
264 } 273 }
274
265 if (tmp->value) 275 if (tmp->value)
266 any_down = 1; 276 any_down = 1;
267 } 277 }
268 } 278 }
269 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 */
… …
276 update_object (op, UP_OBJ_FACE); 286 update_object (op, UP_OBJ_FACE);
277 push_button (op); /* Make all other buttons the same */ 287 push_button (op); /* Make all other buttons the same */
278 } 288 }
279} 289}
280 290
281/*
282 * Updates every button on the map (by calling update_button() for them).
283 */
284
285void
286update_buttons (mapstruct *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 || ol->ob->count != ol->id)
295 {
296 LOG (llevError, "Internal error in update_button (%s (%dx%d):%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, ol->id, obp->value);
298 continue;
299 }
300 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
301 {
302 update_button (ol->ob);
303 break;
304 }
305 }
306}
307
308void 291void
309use_trigger (object *op) 292use_trigger (object *op)
310{ 293{
311
312 /* Toggle value */ 294 /* Toggle value */
313 op->value = !op->value; 295 op->value = !op->value;
314 push_button (op); 296 push_button (op);
315} 297}
316 298
317/* 299/*
318 * Note: animate_object should be used instead of this, 300 * Note: animate_object should be used instead of this,
319 * but it can't handle animations in the 8 directions 301 * but it can't handle animations in the 8 directions
320 */ 302 */
321
322void 303void
323animate_turning (object *op) /* only one part objects */ 304animate_turning (object *op) /* only one part objects */
324{ 305{
325 if (++op->state >= NUM_ANIMATIONS (op) / 8) 306 if (++op->state >= NUM_ANIMATIONS (op) / 8)
326 op->state = 0; 307 op->state = 0;
… …
343 */ 324 */
344 325
345int 326int
346check_altar_sacrifice (const object *altar, const object *sacrifice) 327check_altar_sacrifice (const object *altar, const object *sacrifice)
347{ 328{
348 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)
349 { 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
350 if ((ARCH_SACRIFICE (altar) == sacrifice->arch->name || 338 if ((ARCH_SACRIFICE (altar) == sacrifice->arch->archname
351 ARCH_SACRIFICE (altar) == sacrifice->name || 339 || ARCH_SACRIFICE (altar) == sacrifice->name
352 ARCH_SACRIFICE (altar) == sacrifice->slaying || 340 || ARCH_SACRIFICE (altar) == sacrifice->slaying
353 (!strcmp (ARCH_SACRIFICE (altar), query_base_name (sacrifice, 0)))) 341 || strstr (query_base_name (sacrifice, 0), ARCH_SACRIFICE (altar)))
354 && NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1)) 342 && NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1))
355 return 1; 343 return 1;
356 if (strcmp (ARCH_SACRIFICE (altar), "money") == 0
357 && sacrifice->type == MONEY && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar))
358 return 1;
359 } 344 }
345
360 return 0; 346 return 0;
361} 347}
362 348
363/* 349/*
364 * operate_altar checks if sacrifice was accepted and removes sacrificed 350 * operate_altar checks if sacrifice was accepted and removes sacrificed
… …
411{ 397{
412 op->stats.wc = state; 398 op->stats.wc = state;
413 if (state) 399 if (state)
414 { 400 {
415 use_trigger (op); 401 use_trigger (op);
416 if (op->stats.exp > 0) /* check sanity */ 402 op->set_speed (op->stats.exp > 0 ? 1. / op->stats.exp : 1.);
417 op->speed = 1.0 / op->stats.exp;
418 else
419 op->speed = 1.0;
420 update_ob_speed (op);
421 op->speed_left = -1; 403 op->speed_left = -1;
422 } 404 }
423 else 405 else
424 { 406 {
425 use_trigger (op); 407 use_trigger (op);
426 op->speed = 0; 408 op->set_speed (0);
427 update_ob_speed (op);
428 } 409 }
429} 410}
430 411
431 412
432/* 413/*
… …
488 case TRIGGER_PEDESTAL: 469 case TRIGGER_PEDESTAL:
489 if (cause) 470 if (cause)
490 { 471 {
491 for (tmp = op->above; tmp; tmp = tmp->above) 472 for (tmp = op->above; tmp; tmp = tmp->above)
492 { 473 {
493 object *head = tmp->head ? tmp->head : tmp; 474 object *head = tmp->head_ ();
494 475
495 /* See comment in TRIGGER_BUTTON about move_types */ 476 /* See comment in TRIGGER_BUTTON about move_types */
496 if (((head->move_type & op->move_on) || head->move_type == 0) 477 if (((head->move_type & op->move_on) || head->move_type == 0)
497 && (head->race == op->slaying || (!strcmp (op->slaying, "player") && head->type == PLAYER))) 478 && (head->race == op->slaying || (!strcmp (op->slaying, "player") && head->type == PLAYER)))
498 { 479 {
499 push = 1; 480 push = 1;
500 break; 481 break;
501 } 482 }
502 } 483 }
484
503 if (op->stats.ac == push) 485 if (op->stats.ac == push)
504 return 0; 486 return 0;
487
505 op->stats.ac = push; 488 op->stats.ac = push;
489
506 if (NUM_ANIMATIONS (op) > 1) 490 if (NUM_ANIMATIONS (op) > 1)
507 { 491 {
508 SET_ANIMATION (op, push); 492 SET_ANIMATION (op, push);
509 update_object (op, UP_OBJ_FACE); 493 update_object (op, UP_OBJ_FACE);
510 } 494 }
495
511 update_object (op, UP_OBJ_FACE); 496 update_object (op, UP_OBJ_FACE);
497
512 if (in_movement || !push) 498 if (in_movement || !push)
513 return 0; 499 return 0;
514 } 500 }
501
515 trigger_move (op, push); 502 trigger_move (op, push);
516 return 0; 503 return 0;
517 504
518 case TRIGGER_ALTAR: 505 case TRIGGER_ALTAR:
519 if (cause) 506 if (cause)
520 { 507 {
521 if (in_movement) 508 if (in_movement)
522 return 0; 509 return 0;
510
523 if (operate_altar (op, &cause)) 511 if (operate_altar (op, &cause))
524 { 512 {
525 if (NUM_ANIMATIONS (op) > 1) 513 if (NUM_ANIMATIONS (op) > 1)
526 { 514 {
527 SET_ANIMATION (op, 1); 515 SET_ANIMATION (op, 1);
528 update_object (op, UP_OBJ_FACE); 516 update_object (op, UP_OBJ_FACE);
529 } 517 }
518
530 if (op->last_sp >= 0) 519 if (op->last_sp >= 0)
531 { 520 {
532 trigger_move (op, 1); 521 trigger_move (op, 1);
533 if (op->last_sp > 0) 522 if (op->last_sp > 0)
534 op->last_sp = -op->last_sp; 523 op->last_sp = -op->last_sp;
… …
541 op->value = !op->value; 530 op->value = !op->value;
542 trigger_move (op, 1); 531 trigger_move (op, 1);
543 op->last_sp = -op->last_sp; 532 op->last_sp = -op->last_sp;
544 op->value = !op->value; 533 op->value = !op->value;
545 } 534 }
535
546 return cause == NULL; 536 return cause == NULL;
547 } 537 }
548 else 538 else
549 {
550 return 0; 539 return 0;
551 }
552 } 540 }
553 else 541 else
554 { 542 {
555 if (NUM_ANIMATIONS (op) > 1) 543 if (NUM_ANIMATIONS (op) > 1)
556 { 544 {
… …
567 trigger_move (op, 0); 555 trigger_move (op, 0);
568 else 556 else
569 { 557 {
570 op->stats.wc = 0; 558 op->stats.wc = 0;
571 op->value = !op->value; 559 op->value = !op->value;
572 op->speed = 0; 560 op->set_speed (0);
573 update_ob_speed (op);
574 } 561 }
575 } 562 }
576 return 0; 563 return 0;
577 564
578 case TRIGGER: 565 case TRIGGER:
579 if (cause) 566 if (cause)
580 { 567 {
581 if (in_movement) 568 if (in_movement)
582 return 0; 569 return 0;
570
583 push = 1; 571 push = 1;
584 } 572 }
573
585 if (NUM_ANIMATIONS (op) > 1) 574 if (NUM_ANIMATIONS (op) > 1)
586 { 575 {
587 SET_ANIMATION (op, push); 576 SET_ANIMATION (op, push);
588 update_object (op, UP_OBJ_FACE); 577 update_object (op, UP_OBJ_FACE);
589 } 578 }
579
590 trigger_move (op, push); 580 trigger_move (op, push);
591 return 1; 581 return 1;
592 582
593 default: 583 default:
594 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);
595 return 0; 585 return 0;
596 } 586 }
597} 587}
598 588
599void 589void
600add_button_link (object *button, mapstruct *map, int connected) 590add_button_link (object *button, maptile *map, int connected)
601{ 591{
602 oblinkpt *obp; 592 oblinkpt *obp;
603 objectlink *ol = get_objectlink (); 593 objectlink *ol = get_objectlink ();
604 594
605 if (!map) 595 if (!map)
606 { 596 {
607 LOG (llevError, "Tried to add button-link without map.\n"); 597 LOG (llevError, "Tried to add button-link without map.\n");
608 return; 598 return;
609 } 599 }
610 if (!editor) 600
611 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
612 a connected map from a template map. */ 602 a connected map from a template map. */
613
614/* LOG(llevDebug,"adding button %s (%d)\n", button->name, connected);*/
615 603
616 SET_FLAG (button, FLAG_IS_LINKED); 604 SET_FLAG (button, FLAG_IS_LINKED);
617 605
618 ol->ob = button; 606 ol->ob = button;
619 ol->id = button->count;
620 607
621 for (obp = map->buttons; obp && obp->value != connected; obp = obp->next); 608 for (obp = map->buttons; obp && obp->value != connected; obp = obp->next)
609 ;
622 610
623 if (obp) 611 if (obp)
624 { 612 {
625 ol->next = obp->link; 613 ol->next = obp->link;
626 obp->link = ol; 614 obp->link = ol;
… …
650 if (op->map == NULL) 638 if (op->map == NULL)
651 { 639 {
652 LOG (llevError, "remove_button_link() in object without map.\n"); 640 LOG (llevError, "remove_button_link() in object without map.\n");
653 return; 641 return;
654 } 642 }
643
655 if (!QUERY_FLAG (op, FLAG_IS_LINKED)) 644 if (!QUERY_FLAG (op, FLAG_IS_LINKED))
656 { 645 {
657 LOG (llevError, "remove_button_linked() in unlinked object.\n"); 646 LOG (llevError, "remove_button_linked() in unlinked object.\n");
658 return; 647 return;
659 } 648 }
649
660 for (obp = op->map->buttons; obp; obp = obp->next) 650 for (obp = op->map->buttons; obp; obp = obp->next)
661 for (olp = &obp->link; (ol = *olp); olp = &ol->next) 651 for (olp = &obp->link; (ol = *olp); olp = &ol->next)
662 if (ol->ob == op) 652 if (ol->ob == op)
663 { 653 {
664 654
665/* LOG(llevDebug, "Removed link %d in button %s and map %s.\n", 655/* LOG(llevDebug, "Removed link %d in button %s and map %s.\n",
666 obp->value, op->name, op->map->path); 656 obp->value, op->name, op->map->path);
667*/ 657*/
668 *olp = ol->next; 658 *olp = ol->next;
669 free (ol); 659 delete ol;
670 return; 660 return;
671 } 661 }
662
672 LOG (llevError, "remove_button_linked(): couldn't find object.\n"); 663 LOG (llevError, "remove_button_linked(): couldn't find object.\n");
673 CLEAR_FLAG (op, FLAG_IS_LINKED); 664 CLEAR_FLAG (op, FLAG_IS_LINKED);
674} 665}
675 666
676/* 667/*
677 * Gets the objectlink for this connection from the map. 668 * Gets the objectlink for this connection from the map.
678 */ 669 */
679oblinkpt * 670oblinkpt *
680get_connection_links (mapstruct *map, long connection) 671get_connection_links (maptile *map, long connection)
681{ 672{
682 for (oblinkpt * obp = map->buttons; obp; obp = obp->next) 673 for (oblinkpt * obp = map->buttons; obp; obp = obp->next)
683 if (obp->value == connection) 674 if (obp->value == connection)
684 return obp; 675 return obp;
676
685 return 0; 677 return 0;
686} 678}
687 679
688/* 680/*
689 * Return the first objectlink in the objects linked to this one 681 * Return the first objectlink in the objects linked to this one
… …
695 oblinkpt *obp; 687 oblinkpt *obp;
696 objectlink *ol; 688 objectlink *ol;
697 689
698 if (!button->map) 690 if (!button->map)
699 return NULL; 691 return NULL;
692
700 for (obp = button->map->buttons; obp; obp = obp->next) 693 for (obp = button->map->buttons; obp; obp = obp->next)
701 for (ol = obp->link; ol; ol = ol->next) 694 for (ol = obp->link; ol; ol = ol->next)
702 if (ol->ob == button && ol->id == button->count) 695 if (ol->ob == button)
703 return obp; 696 return obp;
697
704 return NULL; 698 return NULL;
705} 699}
706 700
707/* 701/*
708 * Made as a separate function to increase efficiency 702 * Made as a separate function to increase efficiency
… …
716 710
717 if (!button->map) 711 if (!button->map)
718 return 0; 712 return 0;
719 for (obp = button->map->buttons; obp; obp = obp->next) 713 for (obp = button->map->buttons; obp; obp = obp->next)
720 for (ol = obp->link; ol; ol = ol->next) 714 for (ol = obp->link; ol; ol = ol->next)
721 if (ol->ob == button && ol->id == button->count) 715 if (ol->ob == button)
722 return obp->value; 716 return obp->value;
723 return 0; 717 return 0;
724} 718}
725 719
726/* This routine makes monsters who are 720/* This routine makes monsters who are
… …
733 */ 727 */
734 728
735void 729void
736do_mood_floor (object *op, object *source) 730do_mood_floor (object *op, object *source)
737{ 731{
738 object *tmp;
739 object *tmp2;
740
741 if (!source) 732 if (!source)
742 source = op; 733 source = op;
743 734
744 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)
745 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 743 if (QUERY_FLAG (tmp, FLAG_MONSTER))
746 break; 744 break;
747 745
748 /* 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
749 * be a monster here. 747 * be a monster here.
750 */ 748 */
749 //TODO: have players really FLAG_MONSTER? kept it for safety
751 if (!tmp || tmp->type == PLAYER) 750 if (!tmp || tmp->type == PLAYER)
752 return; 751 return;
753 752
754 switch (op->last_sp) 753 switch (op->last_sp)
755 { 754 {
756 case 0: /* furious--make all monsters mad */ 755 case 0: /* furious--make all monsters mad */
757 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) 756 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
758 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); 757 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
758
759 if (QUERY_FLAG (tmp, FLAG_FRIENDLY)) 759 if (QUERY_FLAG (tmp, FLAG_FRIENDLY))
760 { 760 {
761 CLEAR_FLAG (tmp, FLAG_FRIENDLY);
762 remove_friendly_object (tmp);
763 tmp->attack_movement = 0; 761 tmp->attack_movement = 0;
764 /* 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
765 * dereference a null value 763 * dereference a null value
766 */ 764 */
767 if (tmp->type == GOLEM && tmp->owner && tmp->owner->type == PLAYER && tmp->owner->contr->ranges[range_golem] == tmp) 765 if (tmp->type == GOLEM
768 { 766 && tmp->owner
769 tmp->owner->contr->ranges[range_golem] = NULL; 767 && tmp->owner->type == PLAYER
768 && tmp->owner->contr->golem == tmp)
770 tmp->owner->contr->golem_count = 0; 769 tmp->owner->contr->golem = 0;
771 } 770
772 tmp->owner = 0; 771 tmp->owner = 0;
772
773 remove_friendly_object (tmp);
773 } 774 }
774 break; 775 break;
776
775 case 1: /* angry -- get neutral monsters mad */ 777 case 1: /* angry -- get neutral monsters mad */
776 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY)) 778 if (QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (tmp, FLAG_FRIENDLY))
777 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); 779 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
778 break; 780 break;
781
779 case 2: /* calm -- pacify unfriendly monsters */ 782 case 2: /* calm -- pacify unfriendly monsters */
780 if (!QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
781 SET_FLAG (tmp, FLAG_UNAGGRESSIVE); 783 SET_FLAG (tmp, FLAG_UNAGGRESSIVE);
782 break; 784 break;
785
783 case 3: /* make all monsters fall asleep */ 786 case 3: /* make all monsters fall asleep */
784 if (!QUERY_FLAG (tmp, FLAG_SLEEP))
785 SET_FLAG (tmp, FLAG_SLEEP); 787 SET_FLAG (tmp, FLAG_SLEEP);
786 break; 788 break;
789
787 case 4: /* charm all monsters */ 790 case 4: /* charm all monsters */
788 if (op == source) 791 if (op == source)
789 break; /* only if 'connected' */ 792 break; /* only if 'connected' */
790 793
791 for (tmp2 = get_map_ob (source->map, source->x, source->y); /* finding an owner */ 794 if (object *pl = source->ms ().player ())
792 tmp2->type != PLAYER; tmp2 = tmp2->above) 795 {
793 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 }
794 break; 804 break;
795 805
796 if (tmp2->type != PLAYER) 806 case 6: // kill monsters
807 if (!QUERY_FLAG (tmp, FLAG_FRIENDLY))
797 break; 808 break;
798 set_owner (tmp, tmp2); 809
799 SET_FLAG (tmp, FLAG_MONSTER); 810 // FALL THROUGH
800 tmp->stats.exp = 0; 811 case 5: // kill all alives
801 SET_FLAG (tmp, FLAG_FRIENDLY); 812 if (!tmp->flag [FLAG_PRECIOUS])
802 add_friendly_object (tmp); 813 {
803 tmp->attack_movement = PETMOVE; 814 get_archetype ("burnout")->insert_at (tmp, source);
815 tmp->destroy ();
816 }
804 break; 817 break;
805 818
806 default: 819 default:
807 break; 820 break;
808 } 821 }
… …
812 * It will descend through containers to find the object. 825 * It will descend through containers to find the object.
813 * slaying = match object slaying flag 826 * slaying = match object slaying flag
814 * race = match object archetype name flag 827 * race = match object archetype name flag
815 * hp = match object type (excpt type '0'== PLAYER) 828 * hp = match object type (excpt type '0'== PLAYER)
816 */ 829 */
817
818object * 830object *
819check_inv_recursive (object *op, const object *trig) 831check_inv_recursive (object *op, const object *trig)
820{ 832{
821 object *tmp, *ret = NULL; 833 object *tmp, *ret = NULL;
822 834
823 /* First check the object itself. */ 835 /* First check the object itself. */
824 if ((trig->stats.hp && (op->type == trig->stats.hp)) 836 if ((trig->stats.hp && (op->type == trig->stats.hp))
825 || (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)))
826 return op; 839 return op;
827 840
828 for (tmp = op->inv; tmp; tmp = tmp->below) 841 for (tmp = op->inv; tmp; tmp = tmp->below)
829 { 842 {
830 if (tmp->inv) 843 if (tmp->inv)
… …
832 ret = check_inv_recursive (tmp, trig); 845 ret = check_inv_recursive (tmp, trig);
833 if (ret) 846 if (ret)
834 return ret; 847 return ret;
835 } 848 }
836 else if ((trig->stats.hp && (tmp->type == trig->stats.hp)) 849 else if ((trig->stats.hp && (tmp->type == trig->stats.hp))
837 || (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)))
838 return tmp; 852 return tmp;
839 } 853 }
840 return NULL; 854 return NULL;
841} 855}
842 856
… …
845 * the square will activate connected items. 859 * the square will activate connected items.
846 * Monsters can't trigger this square (for now) 860 * Monsters can't trigger this square (for now)
847 * Values are: last_sp = 1/0 obj/no obj triggers 861 * Values are: last_sp = 1/0 obj/no obj triggers
848 * last_heal = 1/0 remove/dont remove obj if triggered 862 * last_heal = 1/0 remove/dont remove obj if triggered
849 * -b.t. (thomas@nomad.astro.psu.edu 863 * -b.t. (thomas@nomad.astro.psu.edu
850 */ 864 *
851 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 */
852void 881void
853check_inv (object *op, object *trig) 882check_inv (object *op, object *trig)
854{ 883{
855 object *match; 884 trig->value = 0; // deactivate if none of the following conditions apply
856 885
857 if (op->type != PLAYER) 886 object *pl = trig->ms ().player ();
858 return;
859 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
860 if (match && trig->last_sp) 896 if (match && trig->last_sp) // match == having
861 { 897 {
862 if (trig->last_heal) 898 if (trig->last_heal)
863 decrease_ob (match); 899 decrease_ob (match);
864 use_trigger (trig);
865 }
866 else if (!match && !trig->last_sp)
867 use_trigger (trig);
868}
869 900
870 901 trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left
871/* This does a minimal check of the button link consistency for object 902 push_button (trig);
872 * map. All it really does it much sure the object id link that is set
873 * matches what the object has.
874 */
875void
876verify_button_links (const mapstruct *map)
877{
878 oblinkpt *obp;
879 objectlink *ol;
880
881 if (!map)
882 return;
883
884 for (obp = map->buttons; obp; obp = obp->next)
885 { 903 }
886 for (ol = obp->link; ol; ol = ol->next) 904 else if (!match && !trig->last_sp) // match == not having
887 {
888 if (ol->id != ol->ob->count)
889 LOG (llevError, "verify_button_links: object %s on list is corrupt (%d!=%d)\n", &ol->ob->name, ol->id, ol->ob->count);
890 }
891 } 905 {
906 trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left
907 push_button (trig);
908 }
892} 909}
910

Diff Legend

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