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