… | |
… | |
383 | if (!spaces) |
383 | if (!spaces) |
384 | return false; |
384 | return false; |
385 | |
385 | |
386 | for (int i = 0; i < size (); ++i) |
386 | for (int i = 0; i < size (); ++i) |
387 | { |
387 | { |
388 | int unique = 0; |
388 | bool unique = 0; |
|
|
389 | |
389 | for (object *op = spaces [i].bot; op; op = op->above) |
390 | for (object *op = spaces [i].bot; op; op = op->above) |
390 | { |
391 | { |
391 | if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) |
392 | unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]; |
392 | unique = 1; |
|
|
393 | |
393 | |
394 | if (!op->can_map_save ()) |
394 | if (expect_false (!op->can_map_save ())) |
395 | continue; |
395 | continue; |
396 | |
396 | |
397 | if (unique || op->flag [FLAG_UNIQUE]) |
397 | if (expect_false (unique || op->flag [FLAG_UNIQUE])) |
398 | { |
398 | { |
399 | if (flags & IO_UNIQUES) |
399 | if (flags & IO_UNIQUES) |
400 | op->write (f); |
400 | op->write (f); |
401 | } |
401 | } |
402 | else if (flags & IO_OBJECTS) |
402 | else if (expect_true (flags & IO_OBJECTS)) |
403 | op->write (f); |
403 | op->write (f); |
404 | } |
404 | } |
405 | } |
405 | } |
406 | |
406 | |
407 | coroapi::cede_to_tick (); |
407 | coroapi::cede_to_tick (); |
… | |
… | |
677 | case KW_tile_path_2: thawer.get (tile_path [1]); break; |
677 | case KW_tile_path_2: thawer.get (tile_path [1]); break; |
678 | case KW_tile_path_3: thawer.get (tile_path [2]); break; |
678 | case KW_tile_path_3: thawer.get (tile_path [2]); break; |
679 | case KW_tile_path_4: thawer.get (tile_path [3]); break; |
679 | case KW_tile_path_4: thawer.get (tile_path [3]); break; |
680 | |
680 | |
681 | case KW_ERROR: |
681 | case KW_ERROR: |
682 | set_key (thawer.kw_str, thawer.value); |
682 | set_key_text (thawer.kw_str, thawer.value); |
683 | break; |
683 | break; |
684 | |
684 | |
685 | case KW_end: |
685 | case KW_end: |
686 | return true; |
686 | return true; |
687 | |
687 | |
… | |
… | |
889 | if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) |
889 | if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) |
890 | break; |
890 | break; |
891 | |
891 | |
892 | if (QUERY_FLAG (op, FLAG_IS_FLOOR) |
892 | if (QUERY_FLAG (op, FLAG_IS_FLOOR) |
893 | || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) |
893 | || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) |
894 | || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL) |
|
|
895 | || QUERY_FLAG (op, FLAG_UNIQUE) |
894 | || QUERY_FLAG (op, FLAG_UNIQUE) |
896 | || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) |
895 | || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) |
897 | || QUERY_FLAG (op, FLAG_UNPAID) |
896 | || QUERY_FLAG (op, FLAG_UNPAID) |
898 | || op->is_alive ()) |
897 | || op->is_alive ()) |
899 | ; // do not decay |
898 | ; // do not decay |
… | |
… | |
1358 | adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) |
1357 | adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) |
1359 | { |
1358 | { |
1360 | if (!map1 || !map2) |
1359 | if (!map1 || !map2) |
1361 | return 0; |
1360 | return 0; |
1362 | |
1361 | |
1363 | //TODO: this doesn't actually check corretcly when intermediate maps are not loaded |
1362 | //TODO: this doesn't actually check correctly when intermediate maps are not loaded |
1364 | //fix: compare paths instead (this is likely faster, too!) |
1363 | //fix: compare paths instead (this is likely faster, too!) |
1365 | if (map1 == map2) |
1364 | if (map1 == map2) |
1366 | { |
1365 | { |
1367 | *dx = 0; |
1366 | *dx = 0; |
1368 | *dy = 0; |
1367 | *dy = 0; |