| … | |
… | |
| 637 | |
637 | |
| 638 | case KW_face: |
638 | case KW_face: |
| 639 | face = face_find (f.get_str ()); |
639 | face = face_find (f.get_str ()); |
| 640 | break; |
640 | break; |
| 641 | |
641 | |
|
|
642 | case KW_sound: |
|
|
643 | sound = sound_find (f.get_str ()); |
|
|
644 | if (!sound) |
|
|
645 | sound = face_find (f.get_str ());//TODO: really fall back to face name? |
|
|
646 | break; |
|
|
647 | |
| 642 | case KW_x: f.get (x); break; |
648 | case KW_x: f.get (x); break; |
| 643 | case KW_y: f.get (y); break; |
649 | case KW_y: f.get (y); break; |
| 644 | |
650 | |
| 645 | case KW_Str: // uppercase alias |
651 | case KW_Str: // uppercase alias |
| 646 | case KW_str: f.get (stats.Str); break; |
652 | case KW_str: f.get (stats.Str); break; |
| … | |
… | |
| 1266 | CMP_OUT (name_pl); |
1272 | CMP_OUT (name_pl); |
| 1267 | CMP_OUT (custom_name); |
1273 | CMP_OUT (custom_name); |
| 1268 | CMP_OUT (title); |
1274 | CMP_OUT (title); |
| 1269 | CMP_OUT (race); |
1275 | CMP_OUT (race); |
| 1270 | CMP_OUT (slaying); |
1276 | CMP_OUT (slaying); |
| 1271 | |
|
|
| 1272 | if (op->msg != tmp->msg) |
|
|
| 1273 | f.put (KW_msg, KW_endmsg, op->msg); |
|
|
| 1274 | if (op->lore != tmp->lore) |
|
|
| 1275 | f.put (KW_lore, KW_endlore, op->lore); |
|
|
| 1276 | |
|
|
| 1277 | CMP_OUT (other_arch); |
1277 | CMP_OUT (other_arch); |
| 1278 | |
1278 | |
|
|
1279 | if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); |
|
|
1280 | if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); |
|
|
1281 | |
|
|
1282 | if (op->sound != tmp->sound) f.put (KW_sound, op->sound ? &faces [op->sound] : 0); |
| 1279 | if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); |
1283 | if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); |
| 1280 | |
1284 | |
| 1281 | if (op->animation_id != tmp->animation_id) |
1285 | if (op->animation_id != tmp->animation_id) |
| 1282 | if (op->animation_id) |
1286 | if (op->animation_id) |
| 1283 | { |
1287 | { |
| 1284 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
1288 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
