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.39 by root, Mon Aug 27 01:13:48 2007 UTC vs.
Revision 1.51 by root, Thu Jan 8 03:03:23 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 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 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
… …
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#include <funcpoint.h>
26 25
27/* 26/*
28 * This code is no longer highly inefficient 8) 27 * This code is no longer highly inefficient 8)
29 */ 28 */
30 29
… …
33 * This function takes a objectlink list with all the objects are going to be activated. 32 * This function takes a objectlink list with all the objects are going to be activated.
34 * state is a true/false flag that will actiavte objects that have FLAG_ACTIVATE_ON_PUSH/RELEASE set. 33 * state is a true/false flag that will actiavte objects that have FLAG_ACTIVATE_ON_PUSH/RELEASE set.
35 * The source argument can be 0 or the source object for this activation. 34 * The source argument can be 0 or the source object for this activation.
36 */ 35 */
37void 36void
38activate_connection_link (objectlink * ol, bool state, object *source = 0) 37activate_connection_link (objectlink *ol, bool state, object *source = 0)
39{ 38{
40 for (; ol; ol = ol->next) 39 for (; ol; ol = ol->next)
41 { 40 {
42 if (!ol->ob) 41 if (!ol->ob)
43 { 42 {
… …
112 break; 111 break;
113 112
114 case TIMED_GATE: 113 case TIMED_GATE:
115 if (!tmp->active) 114 if (!tmp->active)
116 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_gate")); 115 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_gate"));
116
117 tmp->set_speed (tmp->arch->speed); 117 tmp->set_speed (tmp->arch->speed);
118 tmp->value = tmp->arch->value; 118 tmp->value = tmp->arch->value;
119 tmp->stats.sp = 1; 119 tmp->stats.sp = 1;
120 tmp->stats.hp = tmp->stats.maxhp; 120 tmp->stats.hp = tmp->stats.maxhp;
121 /* Handle multipart gates. We copy the value for the other parts 121 /* Handle multipart gates. We copy the value for the other parts
… …
157 break; 157 break;
158 158
159 case DUPLICATOR: 159 case DUPLICATOR:
160 move_duplicator (tmp); 160 move_duplicator (tmp);
161 break; 161 break;
162
163 case MAPSCRIPT:
164 cfperl_mapscript_activate (tmp, source, state);
165 break;
162 } 166 }
163 } 167 }
164} 168}
165 169
166/* 170/*
… …
176 * 180 *
177 */ 181 */
178void 182void
179push_button (object *op) 183push_button (object *op)
180{ 184{
181 oblinkpt *obp = get_button_links (op); 185 if (oblinkpt *obp = op->find_link ())
182 186 {
183 if (!obp) 187 if (INVOKE_MAP (TRIGGER, op->map, ARG_STRING (&obp->id), ARG_INT (op->value)))
184 return; 188 return;
185 189
186 if (INVOKE_MAP (TRIGGER, op->map, ARG_INT64 (obp->value), ARG_INT (op->value)))
187 return;
188
189 activate_connection_link (obp->link, op->value, op); 190 activate_connection_link (obp->link, op->value, op);
191 }
190} 192}
191 193
192/* 194/*
193 * elmex: 195 * elmex:
194 * 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
… …
196 * 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
197 * who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly. 199 * who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly.
198 * 200 *
199 */ 201 */
200void 202void
201activate_connection (maptile *map, long connection, bool state) 203maptile::trigger (shstr_tmp id, bool state, object *originator)
202{ 204{
203 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)))
204 return; 206 return;
205 207
206 oblinkpt *obp = get_connection_links (map, connection); 208 if (oblinkpt *obp = find_link (id))
207
208 if (obp)
209 activate_connection_link (obp->link, state); 209 activate_connection_link (obp->link, state, originator);
210} 210}
211 211
212/* 212/*
213 * Updates everything connected with the button op. 213 * Updates everything connected with the button op.
214 * 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
… …
216 * button reacts to the (eventual) change of state. 216 * button reacts to the (eventual) change of state.
217 */ 217 */
218void 218void
219update_button (object *op) 219update_button (object *op)
220{ 220{
221 object *ab, *tmp, *head;
222 int tot, any_down = 0, old_value = op->value; 221 int any_down = 0, old_value = op->value;
223 oblinkpt *obp = 0;
224 objectlink *ol;
225 222
226 obp = get_button_links (op); 223 if (oblinkpt *obp = op->find_link ())
227 /* LOG(llevDebug, "update_button: %s (%d)\n", op->name, op->count); */
228 if (obp)
229 for (ol = obp->link; ol; ol = ol->next) 224 for (objectlink *ol = obp->link; ol; ol = ol->next)
230 { 225 {
231 if (!ol->ob) 226 if (!ol->ob)
232 { 227 {
233 LOG (llevDebug, "Internal error in update_button (%s).\n", &op->name); 228 LOG (llevDebug, "Internal error in update_button (%s).\n", &op->name);
234 continue; 229 continue;
235 } 230 }
236 231
237 tmp = ol->ob; 232 object *tmp = ol->ob;
233
238 if (tmp->type == BUTTON) 234 if (tmp->type == BUTTON)
239 { 235 {
236 sint32 total = 0;
237
240 for (ab = tmp->above, tot = 0; ab != NULL; ab = ab->above) 238 for (object *ab = tmp->above; ab; ab = ab->above)
241 /* Bug? The pedestal code below looks for the head of
242 * the object, this bit doesn't. I'd think we should check
243 * for head here also. Maybe it also makese sense to
244 * make the for ab=tmp->above loop common, and alter
245 * behaviour based on object within that loop?
246 */
247
248 /* Basically, if the move_type matches that on what the 239 /* Basically, if the move_type matches that on what the
249 * button wants, we count it. The second check is so that 240 * button wants, we count it. The second check is so that
250 * objects don't move (swords, etc) will count. Note that 241 * objects who don't move (swords, etc) will count. Note that
251 * this means that more work is needed to make buttons 242 * this means that more work is needed to make buttons
252 * that are only triggered by flying objects. 243 * that are only triggered by flying objects.
253 */ 244 */
254 if ((ab->move_type & tmp->move_on) || ab->move_type == 0) 245 if ((ab->move_type & tmp->move_on) || ab->move_type == 0)
255 tot += ab->weight * (ab->nrof ? ab->nrof : 1) + ab->carrying; 246 total += ab->head_ ()->total_weight ();
256 247
257 tmp->value = (tot >= tmp->weight) ? 1 : 0; 248 tmp->value = total >= tmp->weight;
258 if (tmp->value) 249
259 any_down = 1; 250 any_down = any_down || tmp->value;
260 } 251 }
261 else if (tmp->type == PEDESTAL) 252 else if (tmp->type == PEDESTAL)
262 { 253 {
263 tmp->value = 0; 254 tmp->value = 0;
255
264 for (ab = tmp->above; ab != NULL; ab = ab->above) 256 for (object *ab = tmp->above; ab; ab = ab->above)
265 { 257 {
266 head = ab->head_ (); 258 object *head = ab->head_ ();
259
267 /* Same note regarding move_type for buttons above apply here. */ 260 /* Same note regarding move_type for buttons above apply here. */
268 if (((head->move_type & tmp->move_on) || ab->move_type == 0) && 261 if (((ab->move_type & tmp->move_on) || ab->move_type == 0)
269 (head->race == tmp->slaying || 262 && (head->race == tmp->slaying
270 ((head->type == SPECIAL_KEY) && (head->slaying == tmp->slaying)) || 263 || (head->type == SPECIAL_KEY && head->slaying == tmp->slaying)
271 (!strcmp (tmp->slaying, "player") && head->type == PLAYER))) 264 || (tmp->slaying == shstr_player && head->type == PLAYER)))
272 tmp->value = 1; 265 tmp->value = 1;
273 } 266 }
274 267
275 if (tmp->value) 268 any_down = any_down || tmp->value;
276 any_down = 1;
277 } 269 }
278 } 270 }
271
279 if (any_down) /* If any other buttons were down, force this to remain down */ 272 if (any_down) /* If any other buttons were down, force this to remain down */
280 op->value = 1; 273 op->value = 1;
274
275 //LOG(llevDebug, "update_button: %s (%d, %d=%d)\n", &op->name, op->count, op->value, old_value);
281 276
282 /* If this button hasn't changed, don't do anything */ 277 /* If this button hasn't changed, don't do anything */
283 if (op->value != old_value) 278 if (op->value != old_value)
284 { 279 {
285 SET_ANIMATION (op, op->value); 280 SET_ANIMATION (op, op->value);
… …
328{ 323{
329 if (!QUERY_FLAG (sacrifice, FLAG_ALIVE) 324 if (!QUERY_FLAG (sacrifice, FLAG_ALIVE)
330 && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED) 325 && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED)
331 && sacrifice->type != PLAYER) 326 && sacrifice->type != PLAYER)
332 { 327 {
333 if (strcmp (ARCH_SACRIFICE (altar), "money") == 0 328 if (ARCH_SACRIFICE (altar) == shstr_money
334 && sacrifice->type == MONEY 329 && sacrifice->type == MONEY
335 && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar)) 330 && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar))
336 return 1; 331 return 1;
337 332
338 if ((ARCH_SACRIFICE (altar) == sacrifice->arch->archname 333 if ((ARCH_SACRIFICE (altar) == sacrifice->arch->archname
339 || ARCH_SACRIFICE (altar) == sacrifice->name 334 || ARCH_SACRIFICE (altar) == sacrifice->name
340 || ARCH_SACRIFICE (altar) == sacrifice->slaying 335 || ARCH_SACRIFICE (altar) == sacrifice->slaying
341 || strstr (query_base_name (sacrifice, 0), ARCH_SACRIFICE (altar))) 336 || strstr (query_base_name (sacrifice, 0), ARCH_SACRIFICE (altar)))
342 && NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1)) 337 && NROF_SACRIFICE (altar) <= sacrifice->number_of ())
343 return 1; 338 return 1;
344 } 339 }
345 340
346 return 0; 341 return 0;
347} 342}
… …
371 return 0; 366 return 0;
372 367
373 /* check_altar_sacrifice should have already verified that enough money 368 /* check_altar_sacrifice should have already verified that enough money
374 * has been dropped. 369 * has been dropped.
375 */ 370 */
376 if (!strcmp (ARCH_SACRIFICE (altar), "money")) 371 if (ARCH_SACRIFICE (altar) == shstr_money)
377 { 372 {
378 int number = NROF_SACRIFICE (altar) / (*sacrifice)->value; 373 int number = NROF_SACRIFICE (altar) / (*sacrifice)->value;
379 374
380 /* Round up any sacrifices. Altars don't make change either */ 375 /* Round up any sacrifices. Altars don't make change either */
381 if (NROF_SACRIFICE (altar) % (*sacrifice)->value) 376 if (NROF_SACRIFICE (altar) % (*sacrifice)->value)
382 number++; 377 number++;
383 378
384 *sacrifice = decrease_ob_nr (*sacrifice, number); 379 if (!(*sacrifice)->decrease (number))
380 *sacrifice = 0;
385 } 381 }
386 else 382 else
387 *sacrifice = decrease_ob_nr (*sacrifice, NROF_SACRIFICE (altar)); 383 if (!(*sacrifice)->decrease (NROF_SACRIFICE (altar)))
384 *sacrifice = 0;
388 385
389 if (altar->msg) 386 if (altar->msg)
390 new_info_map (NDI_BLACK, altar->map, altar->msg); 387 new_info_map (NDI_BLACK, altar->map, altar->msg);
391 388
392 return 1; 389 return 1;
… …
429 int push = 0, tot = 0; 426 int push = 0, tot = 0;
430 int in_movement = op->stats.wc || op->speed; 427 int in_movement = op->stats.wc || op->speed;
431 428
432 switch (op->type) 429 switch (op->type)
433 { 430 {
434 case TRIGGER_BUTTON: 431 case TRIGGER_BUTTON:
435 if (op->weight > 0) 432 if (op->weight > 0)
436 { 433 {
437 if (cause) 434 if (cause)
438 { 435 {
439 for (tmp = op->above; tmp; tmp = tmp->above) 436 for (tmp = op->above; tmp; tmp = tmp->above)
440 /* Comment reproduced from update_buttons(): */ 437 /* Comment reproduced from update_buttons(): */
441 /* Basically, if the move_type matches that on what the 438 /* Basically, if the move_type matches that on what the
442 * button wants, we count it. The second check is so that 439 * button wants, we count it. The second check is so that
443 * objects that don't move (swords, etc) will count. Note that 440 * objects that don't move (swords, etc) will count. Note that
444 * this means that more work is needed to make buttons 441 * this means that more work is needed to make buttons
445 * that are only triggered by flying objects. 442 * that are only triggered by flying objects.
443 */
444 if ((tmp->move_type & op->move_on) || tmp->move_type == 0)
445 tot += tmp->head_ ()->total_weight ();
446
447 if (tot >= op->weight)
448 push = 1;
449
450 if (op->stats.ac == push)
451 return 0;
452
453 op->stats.ac = push;
454 if (NUM_ANIMATIONS (op) > 1)
455 {
456 SET_ANIMATION (op, push);
457 update_object (op, UP_OBJ_FACE);
458 }
459
460 if (in_movement || !push)
461 return 0;
462 }
463 trigger_move (op, push);
464 }
465
466 return 0;
467
468 case TRIGGER_PEDESTAL:
469 if (cause)
470 {
471 for (tmp = op->above; tmp; tmp = tmp->above)
472 {
473 object *head = tmp->head_ ();
474
475 /* See comment in TRIGGER_BUTTON about move_types */
476 if (((head->move_type & op->move_on) || head->move_type == 0)
477 && (head->race == op->slaying || (op->slaying == shstr_player && head->type == PLAYER)))
478 {
479 push = 1;
480 break;
481 }
482 }
483
484 if (op->stats.ac == push)
485 return 0;
486
487 op->stats.ac = push;
488
489 if (NUM_ANIMATIONS (op) > 1)
490 {
491 SET_ANIMATION (op, push);
492 update_object (op, UP_OBJ_FACE);
493 }
494
495 update_object (op, UP_OBJ_FACE);
496
497 if (in_movement || !push)
498 return 0;
499 }
500
501 trigger_move (op, push);
502 return 0;
503
504 case TRIGGER_ALTAR:
505 if (cause)
506 {
507 if (in_movement)
508 return 0;
509
510 if (operate_altar (op, &cause))
511 {
512 if (NUM_ANIMATIONS (op) > 1)
513 {
514 SET_ANIMATION (op, 1);
515 update_object (op, UP_OBJ_FACE);
516 }
517
518 if (op->last_sp >= 0)
519 {
520 trigger_move (op, 1);
521 if (op->last_sp > 0)
522 op->last_sp = -op->last_sp;
523 }
524 else
525 {
526 /* for trigger altar with last_sp, the ON/OFF
527 * status (-> +/- value) is "simulated":
446 */ 528 */
447 529 op->value = !op->value;
448 if ((tmp->move_type & op->move_on) || tmp->move_type == 0) 530 trigger_move (op, 1);
449 { 531 op->last_sp = -op->last_sp;
450 tot += tmp->weight * (tmp->nrof ? tmp->nrof : 1) + tmp->carrying; 532 op->value = !op->value;
451 }
452 if (tot >= op->weight)
453 push = 1;
454 if (op->stats.ac == push)
455 return 0;
456 op->stats.ac = push;
457 if (NUM_ANIMATIONS (op) > 1)
458 {
459 SET_ANIMATION (op, push);
460 update_object (op, UP_OBJ_FACE);
461 } 533 }
462 if (in_movement || !push) 534
463 return 0; 535 return cause == NULL;
464 } 536 }
465 trigger_move (op, push);
466 } 537 else
467 return 0;
468
469 case TRIGGER_PEDESTAL:
470 if (cause)
471 {
472 for (tmp = op->above; tmp; tmp = tmp->above)
473 {
474 object *head = tmp->head_ ();
475
476 /* See comment in TRIGGER_BUTTON about move_types */
477 if (((head->move_type & op->move_on) || head->move_type == 0)
478 && (head->race == op->slaying || (!strcmp (op->slaying, "player") && head->type == PLAYER)))
479 {
480 push = 1;
481 break;
482 }
483 }
484
485 if (op->stats.ac == push)
486 return 0; 538 return 0;
487 539 }
488 op->stats.ac = push; 540 else
489 541 {
490 if (NUM_ANIMATIONS (op) > 1) 542 if (NUM_ANIMATIONS (op) > 1)
491 { 543 {
492 SET_ANIMATION (op, push); 544 SET_ANIMATION (op, 0);
493 update_object (op, UP_OBJ_FACE); 545 update_object (op, UP_OBJ_FACE);
494 } 546 }
495 547
496 update_object (op, UP_OBJ_FACE);
497
498 if (in_movement || !push)
499 return 0;
500 }
501
502 trigger_move (op, push);
503 return 0;
504
505 case TRIGGER_ALTAR:
506 if (cause)
507 {
508 if (in_movement)
509 return 0;
510
511 if (operate_altar (op, &cause))
512 {
513 if (NUM_ANIMATIONS (op) > 1)
514 {
515 SET_ANIMATION (op, 1);
516 update_object (op, UP_OBJ_FACE);
517 }
518
519 if (op->last_sp >= 0)
520 {
521 trigger_move (op, 1);
522 if (op->last_sp > 0)
523 op->last_sp = -op->last_sp;
524 }
525 else
526 {
527 /* for trigger altar with last_sp, the ON/OFF
528 * status (-> +/- value) is "simulated":
529 */
530 op->value = !op->value;
531 trigger_move (op, 1);
532 op->last_sp = -op->last_sp;
533 op->value = !op->value;
534 }
535
536 return cause == NULL;
537 }
538 else
539 return 0;
540 }
541 else
542 {
543 if (NUM_ANIMATIONS (op) > 1)
544 {
545 SET_ANIMATION (op, 0);
546 update_object (op, UP_OBJ_FACE);
547 }
548
549 /* If trigger_altar has "last_sp > 0" set on the map, 548 /* If trigger_altar has "last_sp > 0" set on the map,
550 * it will push the connected value only once per sacrifice. 549 * it will push the connected value only once per sacrifice.
551 * Otherwise (default), the connected value will be 550 * Otherwise (default), the connected value will be
552 * pushed twice: First by sacrifice, second by reset! -AV 551 * pushed twice: First by sacrifice, second by reset! -AV
553 */ 552 */
554 if (!op->last_sp) 553 if (!op->last_sp)
555 trigger_move (op, 0); 554 trigger_move (op, 0);
556 else 555 else
557 { 556 {
558 op->stats.wc = 0; 557 op->stats.wc = 0;
559 op->value = !op->value; 558 op->value = !op->value;
560 op->set_speed (0); 559 op->set_speed (0);
561 } 560 }
562 } 561 }
563 return 0; 562 return 0;
564 563
565 case TRIGGER: 564 case TRIGGER:
566 if (cause) 565 if (cause)
567 { 566 {
568 if (in_movement) 567 if (in_movement)
569 return 0; 568 return 0;
570 569
571 push = 1; 570 push = 1;
572 } 571 }
573 572
574 if (NUM_ANIMATIONS (op) > 1) 573 if (NUM_ANIMATIONS (op) > 1)
575 { 574 {
576 SET_ANIMATION (op, push); 575 SET_ANIMATION (op, push);
577 update_object (op, UP_OBJ_FACE); 576 update_object (op, UP_OBJ_FACE);
578 } 577 }
579 578
580 trigger_move (op, push); 579 trigger_move (op, push);
581 return 1; 580 return 1;
582 581
583 default: 582 default:
584 LOG (llevDebug, "Unknown trigger type: %s (%d)\n", &op->name, op->type); 583 LOG (llevDebug, "Unknown trigger type: %s (%d)\n", &op->name, op->type);
585 return 0; 584 return 0;
586 } 585 }
587} 586}
588 587
589void 588void
590add_button_link (object *button, maptile *map, int connected) 589object::add_link (maptile *map, shstr_tmp id)
591{ 590{
592 oblinkpt *obp;
593 objectlink *ol = get_objectlink ();
594
595 if (!map) 591 if (!map)
596 { 592 {
597 LOG (llevError, "Tried to add button-link without map.\n"); 593 LOG (llevError, "Tried to add button-link without map.\n");
598 return; 594 return;
599 } 595 }
600 596
601 button->path_attuned = connected; /* peterm: I need this so I can rebuild 597 flag [FLAG_IS_LINKED] = true;
602 a connected map from a template map. */
603 598
604 SET_FLAG (button, FLAG_IS_LINKED); 599 objectlink *ol = get_objectlink ();
605
606 ol->ob = button; 600 ol->ob = this;
607 601
608 for (obp = map->buttons; obp && obp->value != connected; obp = obp->next) 602 for (oblinkpt *obp = map->buttons; obp; obp = obp->next)
609 ; 603 if (obp->id == id)
610
611 if (obp)
612 { 604 {
613 ol->next = obp->link; 605 ol->next = obp->link;
614 obp->link = ol; 606 obp->link = ol;
607 return;
615 } 608 }
616 else 609
617 {
618 obp = get_objectlinkpt (); 610 oblinkpt *obp = get_objectlinkpt ();
619 obp->value = connected; 611 obp->id = id;
620 612
621 obp->next = map->buttons; 613 obp->next = map->buttons;
622 map->buttons = obp; 614 map->buttons = obp;
623 obp->link = ol; 615 obp->link = ol;
624 }
625} 616}
626 617
627/* 618/*
628 * Remove the object from the linked lists of buttons in the map. 619 * Remove the object from the linked lists of buttons in the map.
629 * This is only needed by editors. 620 * This is only needed by editors.
630 */ 621 */
631
632void 622void
633remove_button_link (object *op) 623object::remove_link ()
634{ 624{
635 oblinkpt *obp; 625 if (!map)
636 objectlink **olp, *ol;
637
638 if (op->map == NULL)
639 { 626 {
640 LOG (llevError, "remove_button_link() in object without map.\n"); 627 LOG (llevError, "remove_button_link() in object without map.\n");
641 return; 628 return;
642 } 629 }
643 630
644 if (!QUERY_FLAG (op, FLAG_IS_LINKED)) 631 if (!flag [FLAG_IS_LINKED])
645 { 632 {
646 LOG (llevError, "remove_button_linked() in unlinked object.\n"); 633 LOG (llevError, "remove_button_linked() in unlinked object.\n");
647 return; 634 return;
648 } 635 }
649 636
637 flag [FLAG_IS_LINKED] = false;
638
650 for (obp = op->map->buttons; obp; obp = obp->next) 639 for (oblinkpt *obp = map->buttons; obp; obp = obp->next)
651 for (olp = &obp->link; (ol = *olp); olp = &ol->next) 640 for (objectlink **olp = &obp->link; *olp; olp = &(*olp)->next)
652 if (ol->ob == op) 641 if ((*olp)->ob == this)
653 { 642 {
654 643 objectlink *ol = *olp;
655/* LOG(llevDebug, "Removed link %d in button %s and map %s.\n",
656 obp->value, op->name, op->map->path);
657*/
658 *olp = ol->next; 644 *olp = ol->next;
659 delete ol; 645 delete ol;
660 return; 646 return;
661 } 647 }
662 648
663 LOG (llevError, "remove_button_linked(): couldn't find object.\n"); 649 LOG (llevError, "remove_button_linked(): couldn't find object.\n");
664 CLEAR_FLAG (op, FLAG_IS_LINKED); 650}
651
652/*
653 * Updates every button on the map (by calling update_button() for them).
654 */
655void
656maptile::update_buttons ()
657{
658 for (oblinkpt *obp = buttons; obp; obp = obp->next)
659 for (objectlink *ol = obp->link; ol; ol = ol->next)
660 {
661 if (!ol->ob)
662 {
663 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
664 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, &obp->id);
665 continue;
666 }
667
668 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
669 {
670 update_button (ol->ob);
671 break;
672 }
673 }
665} 674}
666 675
667/* 676/*
668 * Gets the objectlink for this connection from the map. 677 * Gets the objectlink for this connection from the map.
669 */ 678 */
670oblinkpt * 679oblinkpt *
671get_connection_links (maptile *map, long connection) 680maptile::find_link (shstr_tmp id)
672{ 681{
673 for (oblinkpt * obp = map->buttons; obp; obp = obp->next) 682 for (oblinkpt *obp = buttons; obp; obp = obp->next)
674 if (obp->value == connection) 683 if (obp->id == id)
675 return obp; 684 return obp;
676 685
677 return 0; 686 return 0;
678} 687}
679 688
680/* 689/*
681 * Return the first objectlink in the objects linked to this one 690 * Return the first objectlink in the objects linked to this one
682 */ 691 */
683
684oblinkpt * 692oblinkpt *
685get_button_links (const object *button) 693object::find_link () const
686{ 694{
687 oblinkpt *obp; 695 if (map)
688 objectlink *ol;
689
690 if (!button->map)
691 return NULL;
692
693 for (obp = button->map->buttons; obp; obp = obp->next) 696 for (oblinkpt *obp = map->buttons; obp; obp = obp->next)
694 for (ol = obp->link; ol; ol = ol->next) 697 for (objectlink *ol = obp->link; ol; ol = ol->next)
695 if (ol->ob == button) 698 if (ol->ob == this)
696 return obp; 699 return obp;
697 700
698 return NULL;
699}
700
701/*
702 * Made as a separate function to increase efficiency
703 */
704
705int
706get_button_value (const object *button)
707{
708 oblinkpt *obp;
709 objectlink *ol;
710
711 if (!button->map)
712 return 0;
713 for (obp = button->map->buttons; obp; obp = obp->next)
714 for (ol = obp->link; ol; ol = ol->next)
715 if (ol->ob == button)
716 return obp->value;
717 return 0; 701 return 0;
718} 702}
719 703
720/* This routine makes monsters who are 704/* This routine makes monsters who are
721 * standing on the 'mood floor' change their 705 * standing on the 'mood floor' change their
… …
723 * If floor is to be triggered must have 707 * If floor is to be triggered must have
724 * a speed of zero (default is 1 for all 708 * a speed of zero (default is 1 for all
725 * but the charm floor type). 709 * but the charm floor type).
726 * by b.t. thomas@nomad.astro.psu.edu 710 * by b.t. thomas@nomad.astro.psu.edu
727 */ 711 */
728
729void 712void
730do_mood_floor (object *op, object *source) 713do_mood_floor (object *op, object *source)
731{ 714{
732 if (!source) 715 if (!source)
733 source = op; 716 source = op;
… …
809 792
810 // FALL THROUGH 793 // FALL THROUGH
811 case 5: // kill all alives 794 case 5: // kill all alives
812 if (!tmp->flag [FLAG_PRECIOUS]) 795 if (!tmp->flag [FLAG_PRECIOUS])
813 { 796 {
814 get_archetype ("burnout")->insert_at (tmp, source); 797 archetype::get (shstr_burnout)->insert_at (tmp, source);
815 tmp->destroy (); 798 tmp->destroy ();
816 } 799 }
817 break; 800 break;
818 801
819 default: 802 default:
… …
894 // and we have to set the value to 0 877 // and we have to set the value to 0
895 878
896 if (match && trig->last_sp) // match == having 879 if (match && trig->last_sp) // match == having
897 { 880 {
898 if (trig->last_heal) 881 if (trig->last_heal)
899 decrease_ob (match); 882 match->decrease ();
900 883
901 trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left 884 trig->value = (pl == op ? 1 : 0); // 1 if matching player entered, and 0 if he left
902 push_button (trig); 885 push_button (trig);
903 } 886 }
904 else if (!match && !trig->last_sp) // match == not having 887 else if (!match && !trig->last_sp) // match == not having

Diff Legend

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