| version 1.87 | | version 1.88 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_object_c = | | * static char *rcsid_object_c = |
| * "$Id: object.c,v 1.87 2004/05/18 16:11:52 akirschbaum Exp $"; | | * "$Id: object.c,v 1.88 2004/06/11 06:12:57 mwedel Exp $"; |
| */ | | */ |
| | | |
| /* | | /* |
| | |
| } | | } |
| CLEAR_FLAG(op,FLAG_REMOVED); | | CLEAR_FLAG(op,FLAG_REMOVED); |
| | | |
| | | /* Debugging information so you can see the last coordinates this object had */ |
| | | op->ox=op->x; |
| | | op->oy=op->y; |
| | | x = op->x; |
| | | y = op->y; |
| | | op->map=get_map_from_coord(m, &x, &y); |
| | | |
| | | /* this has to be done after we translate the coordinates. |
| | | */ |
| if(op->nrof && !(flag & INS_NO_MERGE)) { | | if(op->nrof && !(flag & INS_NO_MERGE)) { |
| for(tmp=GET_MAP_OB(m,op->x,op->y);tmp!=NULL;tmp=tmp->above) | | for(tmp=GET_MAP_OB(m,op->x,op->y);tmp!=NULL;tmp=tmp->above) |
| if (CAN_MERGE(op,tmp)) { | | if (CAN_MERGE(op,tmp)) { |
| | |
| free_object(tmp); | | free_object(tmp); |
| } | | } |
| } | | } |
| /* Debugging information so you can see the last coordinates this object had */ | | |
| op->ox=op->x; | | |
| op->oy=op->y; | | |
| x = op->x; | | |
| y = op->y; | | |
| op->map=get_map_from_coord(m, &x, &y); | | |
| /* Ideally, the caller figures this out. However, it complicates a lot | | /* Ideally, the caller figures this out. However, it complicates a lot |
| * of areas of callers (eg, anything that uses find_free_spot would now | | * of areas of callers (eg, anything that uses find_free_spot would now |
| * need extra work | | * need extra work |