| version 1.32 | | version 1.33 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_move_c = | | * static char *rcsid_move_c = |
| * "$Id: move.c,v 1.32 2004/04/16 06:23:43 mwedel Exp $"; | | * "$Id: move.c,v 1.33 2004/08/20 20:02:10 akirschbaum Exp $"; |
| */ | | */ |
| | | |
| /* | | /* |
| | |
| object *tmp, *more; | | object *tmp, *more; |
| sint16 tx, ty; | | sint16 tx, ty; |
| int mflags; | | int mflags; |
| | | mapstruct *m2; |
| | | |
| if (op->head) | | if (op->head) |
| op = op->head; | | op = op->head; |
| | |
| tx = x + more->x - op->x; | | tx = x + more->x - op->x; |
| ty = y + more->y - op->y; | | ty = y + more->y - op->y; |
| | | |
| mflags = get_map_flags(m, &m, tx, ty, &tx, &ty); | | mflags = get_map_flags(m, &m2, tx, ty, &tx, &ty); |
| | | |
| if (mflags & P_OUT_OF_MAP) | | if (mflags & P_OUT_OF_MAP) |
| return 1; | | return 1; |
| | | |
| for (tmp = get_map_ob (m, tx, ty); tmp; tmp=tmp->above) { | | for (tmp = get_map_ob (m2, tx, ty); tmp; tmp=tmp->above) { |
| if (tmp->head == op || tmp == op) | | if (tmp->head == op || tmp == op) |
| continue; | | continue; |
| | | |