… | |
… | |
307 | bool |
307 | bool |
308 | maptile::_load_objects (object_thawer &f) |
308 | maptile::_load_objects (object_thawer &f) |
309 | { |
309 | { |
310 | for (;;) |
310 | for (;;) |
311 | { |
311 | { |
312 | coroapi::cede_to_tick_every (100); // cede once in a while |
312 | coroapi::cede_to_tick (); // cede once in a while |
313 | |
313 | |
314 | switch (f.kw) |
314 | switch (f.kw) |
315 | { |
315 | { |
316 | case KW_arch: |
316 | case KW_arch: |
317 | if (object *op = object::read (f, this)) |
317 | if (object *op = object::read (f, this)) |
… | |
… | |
1221 | maptile::tile_available (int dir, bool load) |
1221 | maptile::tile_available (int dir, bool load) |
1222 | { |
1222 | { |
1223 | if (!tile_path[dir]) |
1223 | if (!tile_path[dir]) |
1224 | return 0; |
1224 | return 0; |
1225 | |
1225 | |
1226 | if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY)) |
1226 | if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE)) |
1227 | return 1; |
1227 | return 1; |
1228 | |
1228 | |
1229 | if ((tile_map[dir] = find_async (tile_path[dir], this, load))) |
1229 | if ((tile_map[dir] = find_async (tile_path[dir], this, load))) |
1230 | return 1; |
1230 | return 1; |
1231 | |
1231 | |