| … | |
… | |
| 639 | face = face_find (f.get_str ()); |
639 | face = face_find (f.get_str ()); |
| 640 | break; |
640 | break; |
| 641 | |
641 | |
| 642 | case KW_sound: |
642 | case KW_sound: |
| 643 | sound = sound_find (f.get_str ()); |
643 | sound = sound_find (f.get_str ()); |
|
|
644 | if (!sound) |
|
|
645 | f.parse_warn ("sound not found"); |
| 644 | break; |
646 | break; |
| 645 | |
647 | |
| 646 | case KW_sound_die: |
648 | case KW_sound_destroy: |
| 647 | sound = sound_find (f.get_str ()); |
649 | sound_destroy = sound_find (f.get_str ()); |
|
|
650 | if (!sound_destroy) |
|
|
651 | f.parse_warn ("sound not found"); |
| 648 | break; |
652 | break; |
| 649 | |
653 | |
| 650 | case KW_x: f.get (x); break; |
654 | case KW_x: f.get (x); break; |
| 651 | case KW_y: f.get (y); break; |
655 | case KW_y: f.get (y); break; |
| 652 | |
656 | |
| … | |
… | |
| 1279 | CMP_OUT (other_arch); |
1283 | CMP_OUT (other_arch); |
| 1280 | |
1284 | |
| 1281 | if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); |
1285 | if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); |
| 1282 | if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); |
1286 | if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); |
| 1283 | |
1287 | |
| 1284 | if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); |
1288 | if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); |
| 1285 | if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); |
1289 | if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); |
| 1286 | if (op->sound_die != tmp->sound_die) f.put (KW_sound_die, op->sound_die ? &faces [op->sound_die] : 0); |
1290 | if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); |
| 1287 | |
1291 | |
| 1288 | if (op->animation_id != tmp->animation_id) |
1292 | if (op->animation_id != tmp->animation_id) |
| 1289 | if (op->animation_id) |
1293 | if (op->animation_id) |
| 1290 | { |
1294 | { |
| 1291 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
1295 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
