| … | |
… | |
| 1400 | CMP_OUT (move_slow); |
1400 | CMP_OUT (move_slow); |
| 1401 | CMP_OUT (move_slow_penalty); |
1401 | CMP_OUT (move_slow_penalty); |
| 1402 | |
1402 | |
| 1403 | // obj_original is the only commonly differing flag between archetype |
1403 | // obj_original is the only commonly differing flag between archetype |
| 1404 | // and object, so special-case it here to be able to skip the loop |
1404 | // and object, so special-case it here to be able to skip the loop |
| 1405 | object::flags_t diff = op->flags ^ arch->flags; |
1405 | object::flags_t diff = op->flag ^ arch->flag; |
| 1406 | |
1406 | |
| 1407 | if (expect_true (diff.any ())) |
1407 | if (expect_true (diff.any ())) |
| 1408 | { |
1408 | { |
| 1409 | if (expect_false (diff.reset (FLAG_OBJ_ORIGINAL).any ())) |
1409 | if (expect_false (diff.reset (FLAG_OBJ_ORIGINAL).any ()) || 1) |
| 1410 | { |
1410 | { |
| 1411 | // some other flags differ, too |
1411 | // some other flags differ, too |
| 1412 | for (int i = 0; i < NUM_FLAGS; i++) |
1412 | for (int i = 0; i < NUM_FLAGS; i++) |
| 1413 | if (expect_false (flag_names [i] && op->flag [i] != arch->flag [i])) |
1413 | if (expect_false (flag_names [i] && op->flag [i] != arch->flag [i])) |
| 1414 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1414 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
