| version 1.120 | | version 1.121 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_object_c = | | * static char *rcsid_object_c = |
| * "$Id: object.c,v 1.120 2006/02/05 05:27:07 mwedel Exp $"; | | * "$Id: object.c,v 1.121 2006/02/07 07:54:45 mwedel Exp $"; |
| */ | | */ |
| | | |
| /* | | /* |
| | |
| | | |
| object *more = op->more; | | object *more = op->more; |
| | | |
| | | /* We really need the caller to normalize coordinates - if |
| | | * we set the map, that doesn't work if the location is within |
| | | * a map and this is straddling an edge. So only if coordinate |
| | | * is clear wrong do we normalize it. |
| | | */ |
| | | if (OUT_OF_REAL_MAP(more->map, more->x, more->y)) { |
| /* Debugging information so you can see the last coordinates this object had */ | | /* Debugging information so you can see the last coordinates this object had */ |
| more->ox = more->x; | | more->ox = more->x; |
| more->oy = more->y; | | more->oy = more->y; |
| more->map = get_map_from_coord(m, &more->x, &more->y); | | more->map = get_map_from_coord(m, &more->x, &more->y); |
| | | } else if (!more->map) { |
| | | /* For backwards compatibility - when not dealing with tiled maps, |
| | | * more->map should always point to the parent. |
| | | */ |
| | | more->map = m; |
| | | } |
| | | |
| if (insert_ob_in_map(more, more->map, originator, flag) == NULL) { | | if (insert_ob_in_map(more, more->map, originator, flag) == NULL) { |
| if ( ! op->head) | | if ( ! op->head) |