| … | |
… | |
| 298 | /* not much we can do in this case. */ |
298 | /* not much we can do in this case. */ |
| 299 | LOG (llevInfo, "enter_map: Could not find free spot for player - will dump on top of object (%s: %d, %d)\n", newmap->path, x, y); |
299 | LOG (llevInfo, "enter_map: Could not find free spot for player - will dump on top of object (%s: %d, %d)\n", newmap->path, x, y); |
| 300 | } |
300 | } |
| 301 | } /* end if looking for free spot */ |
301 | } /* end if looking for free spot */ |
| 302 | |
302 | |
| 303 | if (op->map != NULL) |
303 | if (op->map) |
| 304 | if (INVOKE_MAP (LEAVE, op->map, ARG_PLAYER (op->contr))) |
304 | if (INVOKE_MAP (LEAVE, op->map, ARG_PLAYER (op->contr))) |
| 305 | return; |
305 | return; |
| 306 | |
306 | |
| 307 | if (INVOKE_PLAYER (MAP_CHANGE, op->contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y))) |
307 | if (INVOKE_PLAYER (MAP_CHANGE, op->contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y))) |
| 308 | return; |
308 | return; |
| … | |
… | |
| 776 | #define PORTAL_DESTINATION_NAME "Town portal destination" /* this one should really be in a header file */ |
776 | #define PORTAL_DESTINATION_NAME "Town portal destination" /* this one should really be in a header file */ |
| 777 | object *tmp; |
777 | object *tmp; |
| 778 | |
778 | |
| 779 | /* It may be nice to support other creatures moving across |
779 | /* It may be nice to support other creatures moving across |
| 780 | * exits, but right now a lot of the code looks at op->contr, |
780 | * exits, but right now a lot of the code looks at op->contr, |
| 781 | * so thta is an RFE. |
781 | * so that is an RFE. |
| 782 | */ |
782 | */ |
| 783 | if (op->type != PLAYER) |
783 | if (op->type != PLAYER) |
| 784 | return; |
784 | return; |
| 785 | |
785 | |
| 786 | /* First, lets figure out what map the player is going to go to */ |
786 | /* First, lets figure out what map the player is going to go to */ |
