| … | |
… | |
| 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) |
644 | break; |
| 645 | { |
645 | |
| 646 | //TODO: really fall back to face name? |
646 | case KW_sound_die: |
| 647 | char face[128]; |
647 | sound = sound_find (f.get_str ()); |
| 648 | snprintf (face, 128, "sound/%s", f.get_str ()); |
|
|
| 649 | sound = face_find (face); |
|
|
| 650 | } |
|
|
| 651 | break; |
648 | break; |
| 652 | |
649 | |
| 653 | case KW_x: f.get (x); break; |
650 | case KW_x: f.get (x); break; |
| 654 | case KW_y: f.get (y); break; |
651 | case KW_y: f.get (y); break; |
| 655 | |
652 | |
| … | |
… | |
| 1282 | CMP_OUT (other_arch); |
1279 | CMP_OUT (other_arch); |
| 1283 | |
1280 | |
| 1284 | if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); |
1281 | if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); |
| 1285 | if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); |
1282 | if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); |
| 1286 | |
1283 | |
| 1287 | if (op->sound != tmp->sound) f.put (KW_sound, op->sound ? &faces [op->sound] : 0); |
|
|
| 1288 | if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); |
1284 | 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); |
|
|
1286 | if (op->sound_die != tmp->sound_die) f.put (KW_sound_die, op->sound_die ? &faces [op->sound_die] : 0); |
| 1289 | |
1287 | |
| 1290 | if (op->animation_id != tmp->animation_id) |
1288 | if (op->animation_id != tmp->animation_id) |
| 1291 | if (op->animation_id) |
1289 | if (op->animation_id) |
| 1292 | { |
1290 | { |
| 1293 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
1291 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
