| … | |
… | |
| 130 | * the function that calls this should figure them out. |
130 | * the function that calls this should figure them out. |
| 131 | */ |
131 | */ |
| 132 | void |
132 | void |
| 133 | object::enter_map (maptile *newmap, int x, int y) |
133 | object::enter_map (maptile *newmap, int x, int y) |
| 134 | { |
134 | { |
| 135 | if (destroyed () || !newmap) |
135 | if (destroyed () || !newmap || newmap->in_memory != MAP_IN_MEMORY) |
| 136 | return; |
136 | return; |
| 137 | |
137 | |
| 138 | if (out_of_map (newmap, x, y)) |
138 | if (out_of_map (newmap, x, y)) |
| 139 | { |
139 | { |
| 140 | LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y); |
140 | LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y); |
