| … | |
… | |
| 404 | |
404 | |
| 405 | int move (int dir) |
405 | int move (int dir) |
| 406 | { |
406 | { |
| 407 | return move (dir, this); |
407 | return move (dir, this); |
| 408 | } |
408 | } |
|
|
409 | |
|
|
410 | // changes move_type to a new value - handles move_on/move_off effects |
|
|
411 | void change_move_type (MoveType mt); |
| 409 | |
412 | |
| 410 | static bool can_merge_slow (object *op1, object *op2); |
413 | static bool can_merge_slow (object *op1, object *op2); |
| 411 | |
414 | |
| 412 | // this is often used in time-critical code, so optimise |
415 | // this is often used in time-critical code, so optimise |
| 413 | MTH static bool can_merge (object *op1, object *op2) |
416 | MTH static bool can_merge (object *op1, object *op2) |
