| … | |
… | |
| 606 | * UP_OBJ_FACE: only the objects face has changed. |
606 | * UP_OBJ_FACE: only the objects face has changed. |
| 607 | */ |
607 | */ |
| 608 | void |
608 | void |
| 609 | update_object (object *op, int action) |
609 | update_object (object *op, int action) |
| 610 | { |
610 | { |
| 611 | MoveType move_on, move_off, move_block, move_slow; |
|
|
| 612 | |
|
|
| 613 | if (op == NULL) |
611 | if (op == NULL) |
| 614 | { |
612 | { |
| 615 | /* this should never happen */ |
613 | /* this should never happen */ |
| 616 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
614 | LOG (llevDebug, "update_object() called for NULL object.\n"); |
| 617 | return; |
615 | return; |
| … | |
… | |
| 1431 | tmp1->x = op->x; |
1429 | tmp1->x = op->x; |
| 1432 | tmp1->y = op->y; |
1430 | tmp1->y = op->y; |
| 1433 | insert_ob_in_map (tmp1, op->map, op, 0); |
1431 | insert_ob_in_map (tmp1, op->map, op, 0); |
| 1434 | } |
1432 | } |
| 1435 | |
1433 | |
|
|
1434 | // XXX: function not returning object* |
| 1436 | object * |
1435 | object * |
| 1437 | object::insert_at (object *where, object *originator, int flags) |
1436 | object::insert_at (object *where, object *originator, int flags) |
| 1438 | { |
1437 | { |
| 1439 | where->map->insert (this, where->x, where->y, originator, flags); |
1438 | where->map->insert (this, where->x, where->y, originator, flags); |
| 1440 | } |
1439 | } |
