| … | |
… | |
| 424 | new_info_map (NDI_BLACK, altar->map, altar->msg); |
424 | new_info_map (NDI_BLACK, altar->map, altar->msg); |
| 425 | |
425 | |
| 426 | return 1; |
426 | return 1; |
| 427 | } |
427 | } |
| 428 | |
428 | |
| 429 | void |
429 | static void |
| 430 | trigger_move (object *op, int state, object *originator) /* 1 down and 0 up */ |
430 | trigger_move (object *op, int state, object *originator) /* 1 down and 0 up */ |
| 431 | { |
431 | { |
| 432 | op->stats.wc = state; |
432 | op->stats.wc = state; |
| 433 | |
433 | |
| 434 | if (state) |
434 | if (state) |
| … | |
… | |
| 460 | int |
460 | int |
| 461 | check_trigger (object *op, object *cause, object *originator) |
461 | check_trigger (object *op, object *cause, object *originator) |
| 462 | { |
462 | { |
| 463 | object *tmp; |
463 | object *tmp; |
| 464 | int push = 0, tot = 0; |
464 | int push = 0, tot = 0; |
| 465 | int in_movement = op->stats.wc || op->speed; |
465 | int in_movement = op->stats.wc || op->has_active_speed (); |
| 466 | |
466 | |
| 467 | switch (op->type) |
467 | switch (op->type) |
| 468 | { |
468 | { |
| 469 | case TRIGGER_BUTTON: |
469 | case TRIGGER_BUTTON: |
| 470 | if (op->weight > 0) |
470 | if (op->weight > 0) |
