| version 1.90 | | version 1.91 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_object_c = | | * static char *rcsid_object_c = |
| * "$Id: object.c,v 1.90 2004/08/18 07:02:19 mwedel Exp $"; | | * "$Id: object.c,v 1.91 2004/09/03 06:43:42 mwedel Exp $"; |
| */ | | */ |
| | | |
| /* | | /* |
| | |
| /* this has to be done after we translate the coordinates. | | /* 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(op->map,x,y);tmp!=NULL;tmp=tmp->above) |
| if (CAN_MERGE(op,tmp)) { | | if (CAN_MERGE(op,tmp)) { |
| op->nrof+=tmp->nrof; | | op->nrof+=tmp->nrof; |
| remove_ob(tmp); | | remove_ob(tmp); |