… | |
… | |
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 | f.parse_warn ("sound not found"); |
|
|
646 | break; |
|
|
647 | |
|
|
648 | case KW_sound_destroy: |
|
|
649 | sound_destroy = sound_find (f.get_str ()); |
|
|
650 | if (!sound_destroy) |
|
|
651 | f.parse_warn ("sound not found"); |
|
|
652 | break; |
|
|
653 | |
642 | case KW_x: f.get (x); break; |
654 | case KW_x: f.get (x); break; |
643 | case KW_y: f.get (y); break; |
655 | case KW_y: f.get (y); break; |
644 | |
656 | |
645 | case KW_Str: // uppercase alias |
657 | case KW_Str: // uppercase alias |
646 | case KW_str: f.get (stats.Str); break; |
658 | case KW_str: f.get (stats.Str); break; |
… | |
… | |
958 | randomitems = 0; |
970 | randomitems = 0; |
959 | break; |
971 | break; |
960 | |
972 | |
961 | case KW_msg: |
973 | case KW_msg: |
962 | f.get_ml (KW_endmsg, msg); |
974 | 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; |
975 | break; |
970 | |
976 | |
971 | case KW_lore: |
977 | case KW_lore: |
972 | f.get_ml (KW_endlore, lore); |
978 | 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; |
979 | break; |
981 | |
980 | |
982 | case KW_editable: |
981 | case KW_editable: |
983 | case KW_editor_folder: |
982 | case KW_editor_folder: |
984 | break; |
983 | break; |
… | |
… | |
1279 | CMP_OUT (name_pl); |
1278 | CMP_OUT (name_pl); |
1280 | CMP_OUT (custom_name); |
1279 | CMP_OUT (custom_name); |
1281 | CMP_OUT (title); |
1280 | CMP_OUT (title); |
1282 | CMP_OUT (race); |
1281 | CMP_OUT (race); |
1283 | CMP_OUT (slaying); |
1282 | 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); |
1283 | CMP_OUT (other_arch); |
1291 | |
1284 | |
|
|
1285 | if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); |
|
|
1286 | if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); |
|
|
1287 | |
1292 | 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); |
|
|
1289 | if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); |
|
|
1290 | if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); |
1293 | |
1291 | |
1294 | if (op->animation_id != tmp->animation_id) |
1292 | if (op->animation_id != tmp->animation_id) |
1295 | if (op->animation_id) |
1293 | if (op->animation_id) |
1296 | { |
1294 | { |
1297 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
1295 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |