… | |
… | |
339 | */ |
339 | */ |
340 | if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND)) |
340 | if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND)) |
341 | { |
341 | { |
342 | if (!skill) |
342 | if (!skill) |
343 | LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ()); |
343 | LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ()); |
344 | else if ((!strcmp (skill, "one handed weapons") && slot[body_arm].info != -1) || |
344 | else if ((skill == shstr_one_handed_weapons && slot[body_arm].info != -1) || |
345 | (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2)) |
345 | (skill == shstr_two_handed_weapons && slot[body_arm].info != -2)) |
346 | LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill); |
346 | LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill); |
347 | } |
347 | } |
348 | |
348 | |
349 | /* We changed last_heal to gen_sp_armour, which is what it |
349 | /* We changed last_heal to gen_sp_armour, which is what it |
350 | * really does for many objects. Need to catch any in maps |
350 | * really does for many objects. Need to catch any in maps |
… | |
… | |
963 | case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; |
963 | case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; |
964 | case KW_can_apply: |
964 | case KW_can_apply: |
965 | break; |
965 | break; |
966 | |
966 | |
967 | case KW_connected: |
967 | case KW_connected: |
968 | add_button_link (this, map, f.get_sint32 ()); |
968 | { |
|
|
969 | shstr connected; |
|
|
970 | |
|
|
971 | f.get (connected); |
|
|
972 | add_link (map, connected); |
|
|
973 | } |
969 | break; |
974 | break; |
970 | |
975 | |
971 | case KW_randomitems: |
976 | case KW_randomitems: |
972 | if (f.get_str ()) |
977 | if (f.get_str ()) |
973 | { |
978 | { |
… | |
… | |
1378 | CMP_OUT (last_grace); |
1383 | CMP_OUT (last_grace); |
1379 | CMP_OUT (last_eat); |
1384 | CMP_OUT (last_eat); |
1380 | CMP_OUT (glow_radius); |
1385 | CMP_OUT (glow_radius); |
1381 | |
1386 | |
1382 | if (op->flag [FLAG_IS_LINKED]) |
1387 | if (op->flag [FLAG_IS_LINKED]) |
1383 | if (int i = get_button_value (op)) |
1388 | if (auto (ol, op->find_link ())) |
1384 | f.put (KW_connected, i); |
1389 | f.put (KW_connected, ol->id); |
1385 | |
1390 | |
1386 | CMP_OUT (randomitems); |
1391 | CMP_OUT (randomitems); |
1387 | CMP_OUT2 (container, weight_limit); |
1392 | CMP_OUT2 (container, weight_limit); |
1388 | |
1393 | |
1389 | CMP_OUT (run_away); |
1394 | CMP_OUT (run_away); |