| … | |
… | |
| 397 | remove (); |
397 | remove (); |
| 398 | *this = pos; |
398 | *this = pos; |
| 399 | insert_at (this, this); |
399 | insert_at (this, this); |
| 400 | } |
400 | } |
| 401 | |
401 | |
| 402 | // high-level move functions, return true if successful |
402 | // high-level move method. |
|
|
403 | // object op is trying to move in direction dir. |
|
|
404 | // originator is typically the same as op, but |
|
|
405 | // can be different if originator is causing op to |
|
|
406 | // move (originator is pushing op) |
|
|
407 | // returns 0 if the object is not able to move to the |
|
|
408 | // desired space, 1 otherwise (in which case we also |
|
|
409 | // move the object accordingly. This function is |
|
|
410 | // very similiar to move_object. |
| 403 | int move (int dir, object *originator); |
411 | int move (int dir, object *originator); |
| 404 | |
412 | |
| 405 | int move (int dir) |
413 | int move (int dir) |
| 406 | { |
414 | { |
| 407 | return move (dir, this); |
415 | return move (dir, this); |
| 408 | } |
416 | } |
| 409 | |
417 | |
| 410 | // changes move_type to a new value - handles move_on/move_off effects |
418 | // changes move_type to a new value - handles move_on/move_off effects |
| 411 | void change_move_type (MoveType mt); |
419 | MTH void change_move_type (MoveType mt); |
| 412 | |
420 | |
| 413 | static bool can_merge_slow (object *op1, object *op2); |
421 | static bool can_merge_slow (object *op1, object *op2); |
| 414 | |
422 | |
| 415 | // this is often used in time-critical code, so optimise |
423 | // this is often used in time-critical code, so optimise |
| 416 | MTH static bool can_merge (object *op1, object *op2) |
424 | MTH static bool can_merge (object *op1, object *op2) |
