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.48 by root, Mon Sep 29 10:20:48 2008 UTC vs.
Revision 1.58 by root, Thu Oct 15 21:40:42 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * 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 Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
… …
29 30
30/* 31/*
31 * elmex: 32 * elmex:
32 * This function takes a objectlink list with all the objects are going to be activated. 33 * This function takes a objectlink list with all the objects are going to be activated.
33 * state is a true/false flag that will actiavte objects that have FLAG_ACTIVATE_ON_PUSH/RELEASE set. 34 * state is a true/false flag that will actiavte objects that have FLAG_ACTIVATE_ON_PUSH/RELEASE set.
34 * The source argument can be 0 or the source object for this activation. 35 * The activator argument can be 0 or the source object for this activation.
36 * the originator is the player or monster who did something.
35 */ 37 */
36void 38static void
37activate_connection_link (objectlink * ol, bool state, object *source = 0) 39activate_connection_link (objectlink *ol, int state, object *activator, object *originator)
38{ 40{
39 for (; ol; ol = ol->next) 41 for (; ol; ol = ol->next)
40 { 42 {
41 if (!ol->ob) 43 if (!ol->ob)
42 { 44 {
… …
74 : sound_find (tmp->type == GATE ? "trigger_gate" : "trigger_hole")); 76 : sound_find (tmp->type == GATE ? "trigger_gate" : "trigger_hole"));
75 tmp->value = tmp->stats.maxsp ? !state : state; 77 tmp->value = tmp->stats.maxsp ? !state : state;
76 tmp->set_speed (0.5); 78 tmp->set_speed (0.5);
77 break; 79 break;
78 80
79 case CF_HANDLE: 81 case T_HANDLE:
80 SET_ANIMATION (tmp, (tmp->value = tmp->stats.maxsp ? !state : state)); 82 SET_ANIMATION (tmp, (tmp->value = tmp->stats.maxsp ? !state : state));
81 update_object (tmp, UP_OBJ_FACE); 83 update_object (tmp, UP_OBJ_FACE);
82 break; 84 break;
83 85
84 case SIGN: 86 case SIGN:
… …
105 SET_ANIMATION (tmp, tmp->value); 107 SET_ANIMATION (tmp, tmp->value);
106 update_object (tmp, UP_OBJ_FACE); 108 update_object (tmp, UP_OBJ_FACE);
107 break; 109 break;
108 110
109 case MOOD_FLOOR: 111 case MOOD_FLOOR:
110 do_mood_floor (tmp, source); 112 do_mood_floor (tmp, activator);
111 break; 113 break;
112 114
113 case TIMED_GATE: 115 case TIMED_GATE:
114 if (!tmp->active) 116 if (!tmp->active)
115 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_gate")); 117 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_gate"));
118
116 tmp->set_speed (tmp->arch->speed); 119 tmp->set_speed (tmp->arch->speed);
117 tmp->value = tmp->arch->value; 120 tmp->value = tmp->arch->value;
118 tmp->stats.sp = 1; 121 tmp->stats.sp = 1;
119 tmp->stats.hp = tmp->stats.maxhp; 122 tmp->stats.hp = tmp->stats.maxhp;
120 /* Handle multipart gates. We copy the value for the other parts 123 /* Handle multipart gates. We copy the value for the other parts
… …
133 case FIREWALL: 136 case FIREWALL:
134 if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL) 137 if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL)
135 move_firewall (tmp); 138 move_firewall (tmp);
136 else 139 else
137 { 140 {
138 if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */ 141 tmp->stats.sp = absdir (tmp->stats.sp + tmp->stats.maxsp); /* next direction */
139 tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1;
140
141 animate_turning (tmp); 142 animate_turning (tmp);
142 } 143 }
143 break; 144 break;
144 145
145 case TELEPORTER: 146 case TELEPORTER:
… …
155 move_marker (tmp); 156 move_marker (tmp);
156 break; 157 break;
157 158
158 case DUPLICATOR: 159 case DUPLICATOR:
159 move_duplicator (tmp); 160 move_duplicator (tmp);
161 break;
162
163 case MAPSCRIPT:
164 cfperl_mapscript_activate (tmp, state, activator, originator);
160 break; 165 break;
161 } 166 }
162 } 167 }
163} 168}
164 169
… …
173 * Changed the routine to loop through _all_ objects. 178 * Changed the routine to loop through _all_ objects.
174 * Better hurry with that linked list... 179 * Better hurry with that linked list...
175 * 180 *
176 */ 181 */
177void 182void
178push_button (object *op) 183push_button (object *op, object *originator)
179{ 184{
180 oblinkpt *obp = get_button_links (op); 185 if (oblinkpt *obp = op->find_link ())
181 186 {
182 if (!obp) 187 if (INVOKE_MAP (TRIGGER, op->map, ARG_STRING (&obp->id), ARG_INT (op->value), ARG_OBJECT (op), ARG_OBJECT (originator)))
183 return; 188 return;
184 189
185 if (INVOKE_MAP (TRIGGER, op->map, ARG_INT64 (obp->value), ARG_INT (op->value)))
186 return;
187
188 activate_connection_link (obp->link, op->value, op); 190 activate_connection_link (obp->link, op->value, op, originator);
191 }
189} 192}
190 193
191/* 194/*
192 * elmex: 195 * elmex:
193 * This activates a connection, similar to push_button (object *op) but it takes 196 * This activates a connection, similar to push_button (object *op) but it takes
… …
195 * the connection was 'state' or 'released'. So that you can activate objects 198 * the connection was 'state' or 'released'. So that you can activate objects
196 * who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly. 199 * who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly.
197 * 200 *
198 */ 201 */
199void 202void
200activate_connection (maptile *map, long connection, bool state) 203maptile::trigger (shstr_tmp id, int state, object *activator, object *originator)
201{ 204{
202 if (INVOKE_MAP (TRIGGER, map, ARG_INT64 (connection), ARG_INT (state))) 205 if (INVOKE_MAP (TRIGGER, this, ARG_STRING (&id), ARG_INT (state), ARG_OBJECT (originator)))
203 return; 206 return;
204 207
205 oblinkpt *obp = get_connection_links (map, connection); 208 if (oblinkpt *obp = find_link (id))
206
207 if (obp)
208 activate_connection_link (obp->link, state); 209 activate_connection_link (obp->link, state, activator, originator);
209} 210}
210 211
211/* 212/*
212 * Updates everything connected with the button op. 213 * Updates everything connected with the button op.
213 * 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
214 * 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
215 * button reacts to the (eventual) change of state. 216 * button reacts to the (eventual) change of state.
216 */ 217 */
217void 218void
218update_button (object *op) 219update_button (object *op, object *originator)
219{ 220{
220 int any_down = 0, old_value = op->value; 221 int any_down = 0, old_value = op->value;
221 oblinkpt *obp = 0;
222 objectlink *ol;
223 222
224 obp = get_button_links (op); 223 if (oblinkpt *obp = op->find_link ())
225 if (obp)
226 for (ol = obp->link; ol; ol = ol->next) 224 for (objectlink *ol = obp->link; ol; ol = ol->next)
227 { 225 {
228 if (!ol->ob) 226 if (!ol->ob)
229 { 227 {
230 LOG (llevDebug, "Internal error in update_button (%s).\n", &op->name); 228 LOG (llevDebug, "Internal error in update_button (%s).\n", &op->name);
231 continue; 229 continue;
… …
251 249
252 any_down = any_down || tmp->value; 250 any_down = any_down || tmp->value;
253 } 251 }
254 else if (tmp->type == PEDESTAL) 252 else if (tmp->type == PEDESTAL)
255 { 253 {
254 bool is_match = is_match_expr (tmp->slaying);
256 tmp->value = 0; 255 tmp->value = 0;
257 256
258 for (object *ab = tmp->above; ab; ab = ab->above) 257 for (object *ab = tmp->above; ab; ab = ab->above)
259 { 258 {
260 object *head = ab->head_ (); 259 object *head = ab->head_ ();
261 260
262 /* Same note regarding move_type for buttons above apply here. */ 261 /* Same note regarding move_type for buttons above apply here. */
263 if (((ab->move_type & tmp->move_on) || ab->move_type == 0) 262 if (((ab->move_type & tmp->move_on) || ab->move_type == 0))
263 if (is_match
264 ? match (tmp->slaying, head, tmp, originator)
264 && (head->race == tmp->slaying 265 : (head->race == tmp->slaying
265 || (head->type == SPECIAL_KEY && head->slaying == tmp->slaying) 266 || (head->type == SPECIAL_KEY && head->slaying == tmp->slaying)
266 || (tmp->slaying == shstr_player && head->type == PLAYER))) 267 || (tmp->slaying == shstr_player && head->type == PLAYER)))
268 {
267 tmp->value = 1; 269 tmp->value = 1;
270 break;
271 }
268 } 272 }
269 273
270 any_down = any_down || tmp->value; 274 any_down = any_down || tmp->value;
271 } 275 }
272 } 276 }
… …
279 /* If this button hasn't changed, don't do anything */ 283 /* If this button hasn't changed, don't do anything */
280 if (op->value != old_value) 284 if (op->value != old_value)
281 { 285 {
282 SET_ANIMATION (op, op->value); 286 SET_ANIMATION (op, op->value);
283 update_object (op, UP_OBJ_FACE); 287 update_object (op, UP_OBJ_FACE);
284 push_button (op); /* Make all other buttons the same */ 288 push_button (op, originator); /* Make all other buttons the same */
285 } 289 }
286} 290}
287 291
288void 292void
289use_trigger (object *op) 293use_trigger (object *op, object *originator)
290{ 294{
291 /* Toggle value */ 295 /* Toggle value */
292 op->value = !op->value; 296 op->value = !op->value;
297
293 push_button (op); 298 push_button (op, originator);
294} 299}
295 300
296/* 301/*
297 * Note: animate_object should be used instead of this, 302 * Note: animate_object should be used instead of this,
298 * but it can't handle animations in the 8 directions 303 * but it can't handle animations in the 8 directions
… …
319 * sacrificed. This fixes a bug of trying to put multiple altars/related 324 * sacrificed. This fixes a bug of trying to put multiple altars/related
320 * objects on the same space that take the same sacrifice. 325 * objects on the same space that take the same sacrifice.
321 */ 326 */
322 327
323int 328int
324check_altar_sacrifice (const object *altar, const object *sacrifice) 329check_altar_sacrifice (object *altar, object *sacrifice, object *originator)
325{ 330{
331 if (sacrifice->flag [FLAG_UNPAID])
332 return 0;
333
334 if (is_match_expr (ARCH_SACRIFICE (altar)))
335 return match (ARCH_SACRIFICE (altar), altar, originator);
336
326 if (!QUERY_FLAG (sacrifice, FLAG_ALIVE) 337 if (!QUERY_FLAG (sacrifice, FLAG_ALIVE)
327 && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED) 338 && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED)
328 && sacrifice->type != PLAYER) 339 && sacrifice->type != PLAYER)
329 { 340 {
330 if (ARCH_SACRIFICE (altar) == shstr_money 341 if (ARCH_SACRIFICE (altar) == shstr_money
… …
351 * 362 *
352 * If this function returns 1, '*sacrifice' is modified to point to the 363 * If this function returns 1, '*sacrifice' is modified to point to the
353 * remaining sacrifice, or is set to NULL if the sacrifice was used up. 364 * remaining sacrifice, or is set to NULL if the sacrifice was used up.
354 */ 365 */
355int 366int
356operate_altar (object *altar, object **sacrifice) 367operate_altar (object *altar, object **sacrifice, object *originator)
357{ 368{
358 if (!altar->map) 369 if (!altar->map)
359 { 370 {
360 LOG (llevError, "BUG: operate_altar(): altar has no map\n"); 371 LOG (llevError, "BUG: operate_altar(): altar has no map\n");
361 return 0; 372 return 0;
362 } 373 }
363 374
364 if (!altar->slaying || altar->value) 375 if (!altar->slaying || altar->value)
365 return 0; 376 return 0;
366 377
367 if (!check_altar_sacrifice (altar, *sacrifice)) 378 if (!check_altar_sacrifice (altar, *sacrifice, originator))
368 return 0; 379 return 0;
369 380
370 /* check_altar_sacrifice should have already verified that enough money 381 /* check_altar_sacrifice should have already verified that enough money
371 * has been dropped. 382 * has been dropped.
372 */ 383 */
… …
390 401
391 return 1; 402 return 1;
392} 403}
393 404
394void 405void
395trigger_move (object *op, int state) /* 1 down and 0 up */ 406trigger_move (object *op, int state, object *originator) /* 1 down and 0 up */
396{ 407{
397 op->stats.wc = state; 408 op->stats.wc = state;
409
398 if (state) 410 if (state)
399 { 411 {
400 use_trigger (op); 412 use_trigger (op, originator);
401 op->set_speed (op->stats.exp > 0 ? 1. / op->stats.exp : 1.); 413 op->set_speed (op->stats.exp > 0 ? 1. / op->stats.exp : 1.);
402 op->speed_left = -1; 414 op->speed_left = -1;
403 } 415 }
404 else 416 else
405 { 417 {
406 use_trigger (op); 418 use_trigger (op, originator);
407 op->set_speed (0); 419 op->set_speed (0);
408 } 420 }
409} 421}
410 422
411 423
… …
420 * TRIGGER: Returns 1 if handle could be moved, 0 if not. 432 * TRIGGER: Returns 1 if handle could be moved, 0 if not.
421 * 433 *
422 * TRIGGER_BUTTON, TRIGGER_PEDESTAL: Returns 0. 434 * TRIGGER_BUTTON, TRIGGER_PEDESTAL: Returns 0.
423 */ 435 */
424int 436int
425check_trigger (object *op, object *cause) 437check_trigger (object *op, object *cause, object *originator)
426{ 438{
427 object *tmp; 439 object *tmp;
428 int push = 0, tot = 0; 440 int push = 0, tot = 0;
429 int in_movement = op->stats.wc || op->speed; 441 int in_movement = op->stats.wc || op->speed;
430 442
… …
460 } 472 }
461 473
462 if (in_movement || !push) 474 if (in_movement || !push)
463 return 0; 475 return 0;
464 } 476 }
477
465 trigger_move (op, push); 478 trigger_move (op, push, cause);
466 } 479 }
467 480
468 return 0; 481 return 0;
469 482
470 case TRIGGER_PEDESTAL: 483 case TRIGGER_PEDESTAL:
… …
474 { 487 {
475 object *head = tmp->head_ (); 488 object *head = tmp->head_ ();
476 489
477 /* See comment in TRIGGER_BUTTON about move_types */ 490 /* See comment in TRIGGER_BUTTON about move_types */
478 if (((head->move_type & op->move_on) || head->move_type == 0) 491 if (((head->move_type & op->move_on) || head->move_type == 0)
479 && (head->race == op->slaying || (!strcmp (op->slaying, "player") && head->type == PLAYER))) 492 && (head->race == op->slaying || (op->slaying == shstr_player && head->type == PLAYER)))
480 { 493 {
481 push = 1; 494 push = 1;
482 break; 495 break;
483 } 496 }
484 } 497 }
… …
498 511
499 if (in_movement || !push) 512 if (in_movement || !push)
500 return 0; 513 return 0;
501 } 514 }
502 515
503 trigger_move (op, push); 516 trigger_move (op, push, cause);
504 return 0; 517 return 0;
505 518
506 case TRIGGER_ALTAR: 519 case TRIGGER_ALTAR:
507 if (cause) 520 if (cause)
508 { 521 {
509 if (in_movement) 522 if (in_movement)
510 return 0; 523 return 0;
511 524
512 if (operate_altar (op, &cause)) 525 if (operate_altar (op, &cause)) /* TODO: originator? */
513 { 526 {
514 if (NUM_ANIMATIONS (op) > 1) 527 if (NUM_ANIMATIONS (op) > 1)
515 { 528 {
516 SET_ANIMATION (op, 1); 529 SET_ANIMATION (op, 1);
517 update_object (op, UP_OBJ_FACE); 530 update_object (op, UP_OBJ_FACE);
518 } 531 }
519 532
520 if (op->last_sp >= 0) 533 if (op->last_sp >= 0)
521 { 534 {
522 trigger_move (op, 1); 535 trigger_move (op, 1, cause);
536
523 if (op->last_sp > 0) 537 if (op->last_sp > 0)
524 op->last_sp = -op->last_sp; 538 op->last_sp = -op->last_sp;
525 } 539 }
526 else 540 else
527 { 541 {
528 /* for trigger altar with last_sp, the ON/OFF 542 /* for trigger altar with last_sp, the ON/OFF
529 * status (-> +/- value) is "simulated": 543 * status (-> +/- value) is "simulated":
530 */ 544 */
531 op->value = !op->value; 545 op->value = !op->value;
532 trigger_move (op, 1); 546 trigger_move (op, 1, cause);
533 op->last_sp = -op->last_sp; 547 op->last_sp = -op->last_sp;
534 op->value = !op->value; 548 op->value = !op->value;
535 } 549 }
536 550
537 return cause == NULL; 551 return cause == NULL;
… …
551 * it will push the connected value only once per sacrifice. 565 * it will push the connected value only once per sacrifice.
552 * Otherwise (default), the connected value will be 566 * Otherwise (default), the connected value will be
553 * pushed twice: First by sacrifice, second by reset! -AV 567 * pushed twice: First by sacrifice, second by reset! -AV
554 */ 568 */
555 if (!op->last_sp) 569 if (!op->last_sp)
556 trigger_move (op, 0); 570 trigger_move (op, 0, cause);
557 else 571 else
558 { 572 {
559 op->stats.wc = 0; 573 op->stats.wc = 0;
560 op->value = !op->value; 574 op->value = !op->value;
561 op->set_speed (0); 575 op->set_speed (0);
… …
576 { 590 {
577 SET_ANIMATION (op, push); 591 SET_ANIMATION (op, push);
578 update_object (op, UP_OBJ_FACE); 592 update_object (op, UP_OBJ_FACE);
579 } 593 }
580 594
581 trigger_move (op, push); 595 trigger_move (op, push, cause);
582 return 1; 596 return 1;
583 597
584 default: 598 default:
585 LOG (llevDebug, "Unknown trigger type: %s (%d)\n", &op->name, op->type); 599 LOG (llevDebug, "Unknown trigger type: %s (%d)\n", &op->name, op->type);
586 return 0; 600 return 0;
587 } 601 }
588} 602}
589 603
590void 604void
591add_button_link (object *button, maptile *map, int connected) 605object::add_link (maptile *map, shstr_tmp id)
592{ 606{
593 oblinkpt *obp;
594 objectlink *ol = get_objectlink ();
595
596 if (!map) 607 if (!map)
597 { 608 {
598 LOG (llevError, "Tried to add button-link without map.\n"); 609 LOG (llevError, "Tried to add button-link without map.\n");
599 return; 610 return;
600 } 611 }
601 612
602 button->path_attuned = connected; /* peterm: I need this so I can rebuild 613 flag [FLAG_IS_LINKED] = true;
603 a connected map from a template map. */
604 614
605 SET_FLAG (button, FLAG_IS_LINKED); 615 objectlink *ol = get_objectlink ();
606
607 ol->ob = button; 616 ol->ob = this;
608 617
609 for (obp = map->buttons; obp && obp->value != connected; obp = obp->next) 618 for (oblinkpt *obp = map->buttons; obp; obp = obp->next)
610 ; 619 if (obp->id == id)
611
612 if (obp)
613 { 620 {
614 ol->next = obp->link; 621 ol->next = obp->link;
615 obp->link = ol; 622 obp->link = ol;
623 return;
616 } 624 }
617 else 625
618 {
619 obp = get_objectlinkpt (); 626 oblinkpt *obp = get_objectlinkpt ();
620 obp->value = connected; 627 obp->id = id;
621 628
622 obp->next = map->buttons; 629 obp->next = map->buttons;
623 map->buttons = obp; 630 map->buttons = obp;
624 obp->link = ol; 631 obp->link = ol;
625 }
626} 632}
627 633
628/* 634/*
629 * Remove the object from the linked lists of buttons in the map. 635 * Remove the object from the linked lists of buttons in the map.
630 * This is only needed by editors. 636 * This is only needed by editors.
631 */ 637 */
632
633void 638void
634remove_button_link (object *op) 639object::remove_link ()
635{ 640{
636 oblinkpt *obp; 641 if (!map)
637 objectlink **olp, *ol;
638
639 if (op->map == NULL)
640 { 642 {
641 LOG (llevError, "remove_button_link() in object without map.\n"); 643 LOG (llevError, "remove_button_link() in object without map.\n");
642 return; 644 return;
643 } 645 }
644 646
645 if (!QUERY_FLAG (op, FLAG_IS_LINKED)) 647 if (!flag [FLAG_IS_LINKED])
646 { 648 {
647 LOG (llevError, "remove_button_linked() in unlinked object.\n"); 649 LOG (llevError, "remove_button_linked() in unlinked object.\n");
648 return; 650 return;
649 } 651 }
650 652
653 flag [FLAG_IS_LINKED] = false;
654
651 for (obp = op->map->buttons; obp; obp = obp->next) 655 for (oblinkpt *obp = map->buttons; obp; obp = obp->next)
652 for (olp = &obp->link; (ol = *olp); olp = &ol->next) 656 for (objectlink **olp = &obp->link; *olp; olp = &(*olp)->next)
653 if (ol->ob == op) 657 if ((*olp)->ob == this)
654 { 658 {
655 659 objectlink *ol = *olp;
656/* LOG(llevDebug, "Removed link %d in button %s and map %s.\n",
657 obp->value, op->name, op->map->path);
658*/
659 *olp = ol->next; 660 *olp = ol->next;
660 delete ol; 661 delete ol;
661 return; 662 return;
662 } 663 }
663 664
664 LOG (llevError, "remove_button_linked(): couldn't find object.\n"); 665 LOG (llevError, "remove_button_linked(): couldn't find object.\n");
665 CLEAR_FLAG (op, FLAG_IS_LINKED); 666}
667
668/*
669 * Updates every button on the map (by calling update_button() for them).
670 */
671void
672maptile::update_buttons ()
673{
674 for (oblinkpt *obp = buttons; obp; obp = obp->next)
675 for (objectlink *ol = obp->link; ol; ol = ol->next)
676 {
677 if (!ol->ob)
678 {
679 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
680 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, &obp->id);
681 continue;
682 }
683
684 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
685 {
686 update_button (ol->ob, 0);
687 break;
688 }
689 }
666} 690}
667 691
668/* 692/*
669 * Gets the objectlink for this connection from the map. 693 * Gets the objectlink for this connection from the map.
670 */ 694 */
671oblinkpt * 695oblinkpt *
672get_connection_links (maptile *map, long connection) 696maptile::find_link (shstr_tmp id)
673{ 697{
674 for (oblinkpt * obp = map->buttons; obp; obp = obp->next) 698 for (oblinkpt *obp = buttons; obp; obp = obp->next)
675 if (obp->value == connection) 699 if (obp->id == id)
676 return obp; 700 return obp;
677 701
678 return 0; 702 return 0;
679} 703}
680 704
681/* 705/*
682 * Return the first objectlink in the objects linked to this one 706 * Return the first objectlink in the objects linked to this one
683 */ 707 */
684
685oblinkpt * 708oblinkpt *
686get_button_links (const object *button) 709object::find_link () const
687{ 710{
688 oblinkpt *obp; 711 if (map)
689 objectlink *ol;
690
691 if (!button->map)
692 return NULL;
693
694 for (obp = button->map->buttons; obp; obp = obp->next) 712 for (oblinkpt *obp = map->buttons; obp; obp = obp->next)
695 for (ol = obp->link; ol; ol = ol->next) 713 for (objectlink *ol = obp->link; ol; ol = ol->next)
696 if (ol->ob == button) 714 if (ol->ob == this)
697 return obp; 715 return obp;
698 716
699 return NULL;
700}
701
702/*
703 * Made as a separate function to increase efficiency
704 */
705
706int
707get_button_value (const object *button)
708{
709 oblinkpt *obp;
710 objectlink *ol;
711
712 if (!button->map)
713 return 0;
714 for (obp = button->map->buttons; obp; obp = obp->next)
715 for (ol = obp->link; ol; ol = ol->next)
716 if (ol->ob == button)
717 return obp->value;
718 return 0; 717 return 0;
719} 718}
720 719
721/* This routine makes monsters who are 720/* This routine makes monsters who are
722 * standing on the 'mood floor' change their 721 * standing on the 'mood floor' change their
… …
724 * If floor is to be triggered must have 723 * If floor is to be triggered must have
725 * a speed of zero (default is 1 for all 724 * a speed of zero (default is 1 for all
726 * but the charm floor type). 725 * but the charm floor type).
727 * by b.t. thomas@nomad.astro.psu.edu 726 * by b.t. thomas@nomad.astro.psu.edu
728 */ 727 */
729
730void 728void
731do_mood_floor (object *op, object *source) 729do_mood_floor (object *op, object *source)
732{ 730{
733 if (!source) 731 if (!source)
734 source = op; 732 source = op;
… …
811 // FALL THROUGH 809 // FALL THROUGH
812 case 5: // kill all alives 810 case 5: // kill all alives
813 if (!tmp->flag [FLAG_PRECIOUS]) 811 if (!tmp->flag [FLAG_PRECIOUS])
814 { 812 {
815 archetype::get (shstr_burnout)->insert_at (tmp, source); 813 archetype::get (shstr_burnout)->insert_at (tmp, source);
816 tmp->destroy (true); 814 tmp->destroy ();
817 } 815 }
818 break; 816 break;
819 817
820 default: 818 default:
821 break; 819 break;
… …
898 { 896 {
899 if (trig->last_heal) 897 if (trig->last_heal)
900 match->decrease (); 898 match->decrease ();
901 899
902 trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left 900 trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left
903 push_button (trig); 901 push_button (trig, op);
904 } 902 }
905 else if (!match && !trig->last_sp) // match == not having 903 else if (!match && !trig->last_sp) // match == not having
906 { 904 {
907 trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left 905 trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left
908 push_button (trig); 906 push_button (trig, op);
909 } 907 }
910} 908}
911 909

Diff Legend

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