| … | |
… | |
| 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 | break; |
|
|
645 | |
|
|
646 | case KW_sound_die: |
|
|
647 | sound_die = sound_find (f.get_str ()); |
|
|
648 | break; |
|
|
649 | |
| 642 | case KW_x: f.get (x); break; |
650 | case KW_x: f.get (x); break; |
| 643 | case KW_y: f.get (y); break; |
651 | case KW_y: f.get (y); break; |
| 644 | |
652 | |
| 645 | case KW_Str: // uppercase alias |
653 | case KW_Str: // uppercase alias |
| 646 | case KW_str: f.get (stats.Str); break; |
654 | case KW_str: f.get (stats.Str); break; |
| … | |
… | |
| 958 | randomitems = 0; |
966 | randomitems = 0; |
| 959 | break; |
967 | break; |
| 960 | |
968 | |
| 961 | case KW_msg: |
969 | case KW_msg: |
| 962 | f.get_ml (KW_endmsg, msg); |
970 | f.get_ml (KW_endmsg, msg); |
| 963 | //TODO: allow longer messages |
|
|
| 964 | if (strlen (msg) >= HUGE_BUF) |
|
|
| 965 | { |
|
|
| 966 | LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg); |
|
|
| 967 | msg = "ERROR, please report: string too long, winged.\n"; |
|
|
| 968 | } |
|
|
| 969 | break; |
971 | break; |
| 970 | |
972 | |
| 971 | case KW_lore: |
973 | case KW_lore: |
| 972 | f.get_ml (KW_endlore, lore); |
974 | f.get_ml (KW_endlore, lore); |
| 973 | //TODO: allow longer messages |
|
|
| 974 | /* Just print a warning so we can be reasonably safe |
|
|
| 975 | * about not overflowing the buffer. |
|
|
| 976 | */ |
|
|
| 977 | if (strlen (lore) > (HUGE_BUF / 2)) |
|
|
| 978 | LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", |
|
|
| 979 | HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore); |
|
|
| 980 | break; |
975 | break; |
| 981 | |
976 | |
| 982 | case KW_editable: |
977 | case KW_editable: |
| 983 | case KW_editor_folder: |
978 | case KW_editor_folder: |
| 984 | break; |
979 | break; |
| … | |
… | |
| 1279 | CMP_OUT (name_pl); |
1274 | CMP_OUT (name_pl); |
| 1280 | CMP_OUT (custom_name); |
1275 | CMP_OUT (custom_name); |
| 1281 | CMP_OUT (title); |
1276 | CMP_OUT (title); |
| 1282 | CMP_OUT (race); |
1277 | CMP_OUT (race); |
| 1283 | CMP_OUT (slaying); |
1278 | CMP_OUT (slaying); |
| 1284 | |
|
|
| 1285 | if (op->msg != tmp->msg) |
|
|
| 1286 | f.put (KW_msg, KW_endmsg, op->msg); |
|
|
| 1287 | if (op->lore != tmp->lore) |
|
|
| 1288 | f.put (KW_lore, KW_endlore, op->lore); |
|
|
| 1289 | |
|
|
| 1290 | CMP_OUT (other_arch); |
1279 | CMP_OUT (other_arch); |
| 1291 | |
1280 | |
|
|
1281 | 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); |
|
|
1283 | |
| 1292 | 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); |
| 1293 | |
1287 | |
| 1294 | if (op->animation_id != tmp->animation_id) |
1288 | if (op->animation_id != tmp->animation_id) |
| 1295 | if (op->animation_id) |
1289 | if (op->animation_id) |
| 1296 | { |
1290 | { |
| 1297 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
1291 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
