| … | |
… | |
| 815 | CLEAR_FLAG (op, FLAG_WIZCAST); |
815 | CLEAR_FLAG (op, FLAG_WIZCAST); |
| 816 | } |
816 | } |
| 817 | break; |
817 | break; |
| 818 | |
818 | |
| 819 | case KW_friendly: |
819 | case KW_friendly: |
| 820 | GET_FLAG (op, FLAG_FRIENDLY); |
820 | if (thawer.get_sint32 ()) |
| 821 | //TODO: move to check_object or so |
821 | if (op->type != PLAYER) |
| 822 | if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY)) |
|
|
| 823 | add_friendly_object (op); |
822 | add_friendly_object (op); |
|
|
823 | |
| 824 | break; |
824 | break; |
| 825 | |
825 | |
| 826 | case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; |
826 | case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; |
| 827 | case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; |
827 | case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; |
| 828 | case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; |
828 | case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; |
| … | |
… | |
| 905 | case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; |
905 | case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; |
| 906 | case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; |
906 | case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; |
| 907 | case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; |
907 | case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; |
| 908 | case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; |
908 | case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; |
| 909 | case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; |
909 | case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; |
|
|
910 | case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break; |
| 910 | |
911 | |
| 911 | case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
912 | case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
| 912 | case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
913 | case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
| 913 | case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; |
914 | case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; |
| 914 | case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; |
915 | case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; |
| … | |
… | |
| 1274 | KW_is_water, |
1275 | KW_is_water, |
| 1275 | KW_use_content_on_gen, |
1276 | KW_use_content_on_gen, |
| 1276 | KW_NULL, |
1277 | KW_NULL, |
| 1277 | KW_is_buildable, |
1278 | KW_is_buildable, |
| 1278 | /* 110 */ |
1279 | /* 110 */ |
|
|
1280 | KW_destroy_on_death, |
| 1279 | }; |
1281 | }; |
| 1280 | |
1282 | |
| 1281 | int i; |
1283 | int i; |
| 1282 | |
1284 | |
| 1283 | /* This saves the key/value lists. We do it first so that any |
1285 | /* This saves the key/value lists. We do it first so that any |
