… | |
… | |
136 | * the function that calls this should figure them out. |
136 | * the function that calls this should figure them out. |
137 | */ |
137 | */ |
138 | void |
138 | void |
139 | object::enter_map (maptile *newmap, int x, int y) |
139 | object::enter_map (maptile *newmap, int x, int y) |
140 | { |
140 | { |
141 | if (!newmap->load ()) |
|
|
142 | return; |
|
|
143 | |
|
|
144 | if (out_of_map (newmap, x, y)) |
141 | if (out_of_map (newmap, x, y)) |
145 | { |
142 | { |
146 | LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y); |
143 | LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y); |
147 | x = newmap->enter_x; |
144 | x = newmap->enter_x; |
148 | y = newmap->enter_y; |
145 | y = newmap->enter_y; |