| … | |
… | |
| 1485 | * originator: Player, monster or other object that caused 'victim' to move |
1485 | * originator: Player, monster or other object that caused 'victim' to move |
| 1486 | * onto 'trap'. Will receive messages caused by this action. May be NULL. |
1486 | * onto 'trap'. Will receive messages caused by this action. May be NULL. |
| 1487 | * However, some types of traps require an originator to function. |
1487 | * However, some types of traps require an originator to function. |
| 1488 | */ |
1488 | */ |
| 1489 | void |
1489 | void |
| 1490 | move_apply (object *trap, object *victim, object *originator) |
1490 | move_apply (object *trap, object *victim, object *originator, bool move_on) |
| 1491 | { |
1491 | { |
| 1492 | static int recursion_depth = 0; |
1492 | static int recursion_depth = 0; |
| 1493 | |
1493 | |
| 1494 | /* Only exits affect DMs. */ |
1494 | /* Only exits affect DMs. */ |
| 1495 | if (QUERY_FLAG (victim, FLAG_WIZPASS) && trap->type != EXIT && trap->type != SIGN) |
1495 | if (QUERY_FLAG (victim, FLAG_WIZPASS) && trap->type != EXIT && trap->type != SIGN) |
| … | |
… | |
| 1654 | case DEEP_SWAMP: |
1654 | case DEEP_SWAMP: |
| 1655 | walk_on_deep_swamp (trap, victim); |
1655 | walk_on_deep_swamp (trap, victim); |
| 1656 | goto leave; |
1656 | goto leave; |
| 1657 | |
1657 | |
| 1658 | case CHECK_INV: |
1658 | case CHECK_INV: |
| 1659 | check_inv (victim, trap); |
1659 | check_inv (victim, trap, move_on); |
| 1660 | goto leave; |
1660 | goto leave; |
| 1661 | |
1661 | |
| 1662 | case HOLE: |
1662 | case HOLE: |
| 1663 | /* Hole not open? */ |
1663 | /* Hole not open? */ |
| 1664 | if (trap->stats.wc > 0) |
1664 | if (trap->stats.wc > 0) |
