| … | |
… | |
| 346 | * |
346 | * |
| 347 | * 0.93.4: Linked objects (ie, objects that are connected) can not be |
347 | * 0.93.4: Linked objects (ie, objects that are connected) can not be |
| 348 | * sacrificed. This fixes a bug of trying to put multiple altars/related |
348 | * sacrificed. This fixes a bug of trying to put multiple altars/related |
| 349 | * objects on the same space that take the same sacrifice. |
349 | * objects on the same space that take the same sacrifice. |
| 350 | */ |
350 | */ |
| 351 | |
|
|
| 352 | int |
351 | int |
| 353 | check_altar_sacrifice (object *altar, object *sacrifice, object *originator) |
352 | check_altar_sacrifice (object *altar, object *sacrifice, object *originator) |
| 354 | { |
353 | { |
| 355 | if (sacrifice->flag [FLAG_UNPAID]) |
354 | if (sacrifice->flag [FLAG_UNPAID]) |
| 356 | return 0; |
355 | return 0; |
| … | |
… | |
| 460 | int |
459 | int |
| 461 | check_trigger (object *op, object *cause, object *originator) |
460 | check_trigger (object *op, object *cause, object *originator) |
| 462 | { |
461 | { |
| 463 | object *tmp; |
462 | object *tmp; |
| 464 | int push = 0, tot = 0; |
463 | int push = 0, tot = 0; |
| 465 | int in_movement = op->stats.wc || op->speed; |
464 | int in_movement = op->stats.wc || op->has_active_speed (); |
| 466 | |
465 | |
| 467 | switch (op->type) |
466 | switch (op->type) |
| 468 | { |
467 | { |
| 469 | case TRIGGER_BUTTON: |
468 | case TRIGGER_BUTTON: |
| 470 | if (op->weight > 0) |
469 | if (op->weight > 0) |
