| … | |
… | |
| 522 | { |
522 | { |
| 523 | negate = 1; |
523 | negate = 1; |
| 524 | str++; |
524 | str++; |
| 525 | } |
525 | } |
| 526 | |
526 | |
| 527 | for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f) |
527 | for (const flagstr *f = move_flags; f < move_flags + array_length (move_flags); ++f) |
| 528 | { |
528 | { |
| 529 | if (!strcmp (f->name, str)) |
529 | if (!strcmp (f->name, str)) |
| 530 | { |
530 | { |
| 531 | if (negate) |
531 | if (negate) |
| 532 | mt &= ~f->flags; |
532 | mt &= ~f->flags; |
| … | |
… | |
| 736 | case KW_invisible: f.get (invisible); break; |
736 | case KW_invisible: f.get (invisible); break; |
| 737 | case KW_magic: f.get (magic); break; |
737 | case KW_magic: f.get (magic); break; |
| 738 | case KW_state: f.get (state); break; |
738 | case KW_state: f.get (state); break; |
| 739 | case KW_move_slow_penalty: f.get (move_slow_penalty); break; |
739 | case KW_move_slow_penalty: f.get (move_slow_penalty); break; |
| 740 | case KW_material: f.get (materials); break; //TODO: nuke |
740 | case KW_material: f.get (materials); break; //TODO: nuke |
| 741 | |
741 | case KW_materialname: f.get (material); break; |
| 742 | case KW_materialname: |
|
|
| 743 | { |
|
|
| 744 | shstr sh; |
|
|
| 745 | f.get (sh); |
|
|
| 746 | material = name_to_material (sh); |
|
|
| 747 | } |
|
|
| 748 | break; |
|
|
| 749 | |
742 | |
| 750 | /* These are the new values */ |
743 | /* These are the new values */ |
| 751 | case KW_move_block: set_move (move_block, f); break; |
744 | case KW_move_block: set_move (move_block, f); break; |
| 752 | case KW_move_allow: set_move (move_allow, f); break; |
745 | case KW_move_allow: set_move (move_allow, f); break; |
| 753 | case KW_move_type: set_move (move_type , f); break; |
746 | case KW_move_type: set_move (move_type , f); break; |
| … | |
… | |
| 1513 | { |
1506 | { |
| 1514 | object_thawer f (filename); |
1507 | object_thawer f (filename); |
| 1515 | |
1508 | |
| 1516 | for (;;) |
1509 | for (;;) |
| 1517 | { |
1510 | { |
|
|
1511 | coroapi.cede_to_tick (); |
|
|
1512 | |
| 1518 | switch (f.kw) |
1513 | switch (f.kw) |
| 1519 | { |
1514 | { |
| 1520 | case KW_region: |
1515 | case KW_region: |
| 1521 | if (!region::read (f)) |
1516 | if (!region::read (f)) |
| 1522 | return false; |
1517 | return false; |
