… | |
… | |
257 | void |
257 | void |
258 | object::post_load_check () |
258 | object::post_load_check () |
259 | { |
259 | { |
260 | if (type >= NUM_TYPES) |
260 | if (type >= NUM_TYPES) |
261 | { |
261 | { |
262 | LOG (llevError, "%s: type out of range, resetting to 0.\n", debug_desc ()); |
262 | LOG (llevError, "ITEMBUG: %s: type out of range, resetting to 0.\n", debug_desc ()); |
263 | type = 0; |
263 | type = 0; |
264 | } |
264 | } |
265 | |
265 | |
266 | switch (type) |
266 | switch (type) |
267 | { |
267 | { |
… | |
… | |
269 | case WAND: |
269 | case WAND: |
270 | case ROD: |
270 | case ROD: |
271 | case HORN: |
271 | case HORN: |
272 | if (slot [body_range].info != -1) |
272 | if (slot [body_range].info != -1) |
273 | { |
273 | { |
274 | LOG (llevError, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info); |
274 | LOG (llevError, "ITEMBUG: %s: body_range %d != -1\n", debug_desc (), slot [body_range].info); |
275 | slot [body_range].info = -1; |
275 | slot [body_range].info = -1; |
276 | } |
276 | } |
277 | break; |
277 | break; |
278 | |
278 | |
279 | case WEAPON: |
279 | case WEAPON: |
280 | if (slot [body_combat].info != -1) |
280 | if (slot [body_combat].info != -1) |
281 | { |
281 | { |
282 | LOG (llevError, "%s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info); |
282 | LOG (llevError, "ITEMBUG: %s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info); |
283 | slot [body_combat].info = -1; |
283 | slot [body_combat].info = -1; |
284 | } |
284 | } |
285 | break; |
285 | break; |
286 | |
286 | |
287 | case SHIELD: |
287 | case SHIELD: |
288 | if (slot [body_shield].info != -1) |
288 | if (slot [body_shield].info != -1) |
289 | { |
289 | { |
290 | LOG (llevError, "%s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info); |
290 | LOG (llevError, "ITEMBUG: %s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info); |
291 | slot [body_shield].info = -1; |
291 | slot [body_shield].info = -1; |
292 | } |
292 | } |
293 | break; |
293 | break; |
294 | |
294 | |
295 | case PLAYER: |
295 | case PLAYER: |
296 | if (slot [body_shield].info != 1) |
296 | if (slot [body_shield].info != 1) |
297 | { |
297 | { |
298 | LOG (llevError, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); |
298 | LOG (llevError, "ITEMBUG: %s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); |
299 | slot [body_shield].info = 1; |
299 | slot [body_shield].info = 1; |
300 | } |
300 | } |
301 | |
301 | |
302 | if (slot [body_combat].info != 1) |
302 | if (slot [body_combat].info != 1) |
303 | { |
303 | { |
304 | LOG (llevError, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info); |
304 | LOG (llevError, "ITEMBUG: %s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info); |
305 | slot [body_combat].info = 1; |
305 | slot [body_combat].info = 1; |
306 | } |
306 | } |
307 | |
307 | |
308 | if (slot [body_range].info != 1) |
308 | if (slot [body_range].info != 1) |
309 | { |
309 | { |
310 | LOG (llevError, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info); |
310 | LOG (llevError, "ITEMBUG: %s: body_range %d != 1\n", debug_desc (), slot [body_range].info); |
311 | slot [body_range].info = 1; |
311 | slot [body_range].info = 1; |
312 | } |
312 | } |
313 | break; |
313 | break; |
314 | } |
314 | } |
315 | |
315 | |
… | |
… | |
338 | * not in the ideal fashion. |
338 | * not in the ideal fashion. |
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, "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, "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 |
351 | * that may have an old value. |
351 | * that may have an old value. |
… | |
… | |
357 | || type == AMULET || type == GIRDLE |
357 | || type == AMULET || type == GIRDLE |
358 | || type == BRACERS || type == CLOAK) |
358 | || type == BRACERS || type == CLOAK) |
359 | { |
359 | { |
360 | if (last_heal) |
360 | if (last_heal) |
361 | { |
361 | { |
362 | LOG (llevError, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ()); |
362 | LOG (llevError, "ITEMBUG: object %s still has last_heal set, not gen_sp_armour\n", debug_desc ()); |
363 | gen_sp_armour = last_heal; |
363 | gen_sp_armour = last_heal; |
364 | last_heal = 0; |
364 | last_heal = 0; |
365 | } |
365 | } |
366 | |
366 | |
367 | int ip = calc_item_power (this, 0); |
367 | int ip = calc_item_power (this, 0); |
368 | |
368 | |
369 | /* Legacy objects from before item power was in the game */ |
369 | /* Legacy objects from before item power was in the game */ |
370 | if (!item_power && ip) |
370 | if (!item_power && ip) |
371 | { |
371 | { |
372 | if (ip > 3) |
372 | if (ip > 3) |
373 | LOG (llevDebug, "Object %s had no item power, using %d\n", debug_desc (), ip); |
373 | LOG (llevDebug, "ITEMBUG: Object %s had no item power, using %d\n", debug_desc (), ip); |
374 | |
374 | |
375 | item_power = ip; |
375 | item_power = ip; |
376 | } |
376 | } |
377 | |
377 | |
378 | /* Check for possibly bogus values. Has to meet both these criteria - |
378 | /* Check for possibly bogus values. Has to meet both these criteria - |
… | |
… | |
385 | if (ip > 2 * item_power && ip > (item_power + 3)) |
385 | if (ip > 2 * item_power && ip > (item_power + 3)) |
386 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); |
386 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); |
387 | #endif |
387 | #endif |
388 | } |
388 | } |
389 | |
389 | |
390 | /* Old spellcasting object - need to load in the appropiate object */ |
390 | /* old style spellcasting object (pretty common) - need to load in the appropiate object */ |
391 | if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || |
391 | /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */ |
|
|
392 | if ((type == ROD |
|
|
393 | || type == WAND |
|
|
394 | || type == SCROLL |
|
|
395 | || type == HORN |
|
|
396 | || type == FIREWALL |
392 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
397 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
393 | ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) |
398 | || ((type == POTION || type == ALTAR) && stats.sp)) // watchout: sp = 0 is still magic bullet. |
|
|
399 | && !inv |
|
|
400 | && !loading_arch |
|
|
401 | && stats.sp) // watchout: old magic bullet stuff directly on the map is going to break here! |
|
|
402 | // TODO: at least one watchout-comments is redundant - investigate/remove |
394 | { |
403 | { |
|
|
404 | // TODO: fix firewall object on map |
395 | /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' |
405 | /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' |
396 | * in that spell was stored in sp. |
406 | * in that spell was stored in sp. |
397 | */ |
407 | */ |
398 | LOG (llevError, "old spellcasting object found: %s", debug_desc ()); |
408 | //LOG (llevError, "old spellcasting object found: %s", debug_desc ()); |
399 | object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); |
409 | object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); |
400 | insert_ob_in_ob (tmp, this); |
410 | insert_ob_in_ob (tmp, this); |
401 | randomitems = NULL; /* So another spell isn't created for this object */ |
411 | randomitems = 0; |
402 | } |
412 | } |
403 | |
413 | |
404 | /* spellbooks & runes use slaying. But not to arch name, but to spell name */ |
414 | /* spellbooks & runes use slaying. But not to arch name, but to spell name */ |
405 | if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) |
415 | if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) |
406 | { |
416 | { |
407 | LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ()); |
417 | LOG (llevError, "ITEMBUG: spellbook/rune found without inv but slaying: %s", debug_desc ()); |
408 | object *tmp = get_archetype_by_object_name (slaying); |
418 | object *tmp = get_archetype_by_object_name (slaying); |
409 | insert_ob_in_ob (tmp, this); |
419 | insert_ob_in_ob (tmp, this); |
410 | randomitems = NULL; /* So another spell isn't created for this object */ |
420 | randomitems = 0; /* So another spell isn't created for this object */ |
411 | /* without this, value is all screwed up */ |
421 | /* without this, value is all screwed up */ |
412 | value = arch->value * inv->value; |
422 | value = arch->value * inv->value; |
413 | } |
423 | } |
414 | |
424 | |
415 | if (QUERY_FLAG (this, FLAG_MONSTER)) |
425 | if (QUERY_FLAG (this, FLAG_MONSTER)) |
416 | { |
426 | { |
417 | if (stats.hp > stats.maxhp) |
427 | if (stats.hp > stats.maxhp) |
418 | { |
428 | { |
419 | LOG (llevInfo, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); |
429 | LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); |
420 | stats.maxhp = stats.hp; |
430 | stats.maxhp = stats.hp; |
421 | } |
431 | } |
422 | |
432 | |
423 | /* The archs just need to be updated for this */ |
433 | /* The archs just need to be updated for this */ |
424 | if (move_type == 0) |
434 | if (move_type == 0) |
… | |
… | |
519 | |
529 | |
520 | bool |
530 | bool |
521 | object::parse_kv (object_thawer &f) |
531 | object::parse_kv (object_thawer &f) |
522 | { |
532 | { |
523 | object *op_inv = inv; |
533 | object *op_inv = inv; |
|
|
534 | key_value *last_kv = key_values; |
524 | |
535 | |
525 | for (;;) |
536 | for (;;) |
526 | { |
537 | { |
527 | switch (f.kw) |
538 | switch (f.kw) |
528 | { |
539 | { |
… | |
… | |
549 | case KW_race: f.get_ornull (race); break; |
560 | case KW_race: f.get_ornull (race); break; |
550 | case KW_slaying: f.get_ornull (slaying); break; |
561 | case KW_slaying: f.get_ornull (slaying); break; |
551 | case KW_tag: f.get_ornull (tag); break; |
562 | case KW_tag: f.get_ornull (tag); break; |
552 | |
563 | |
553 | case KW_arch: |
564 | case KW_arch: |
554 | { |
|
|
555 | object *tmp = object::read (f); |
565 | if (object *tmp = object::read (f)) |
556 | tmp->deactivate (); |
|
|
557 | |
|
|
558 | { |
566 | { |
|
|
567 | tmp->deactivate (); |
|
|
568 | |
559 | // was: insert_ob_in_ob (tmp, op); |
569 | // was: insert_ob_in_ob (tmp, op); |
560 | // but manually adding it can improve map loading times a lot |
570 | // but manually adding it can improve map loading times a lot |
561 | // also, appending instead of prepending keeps the |
571 | // also, appending instead of prepending keeps the |
562 | // save ordering the same between repeated load/saves. |
572 | // save ordering the same between repeated load/saves. |
563 | // and finally we do not want any funny effects |
573 | // and finally we do not want any funny effects |
… | |
… | |
580 | |
590 | |
581 | tmp->below = 0; |
591 | tmp->below = 0; |
582 | tmp->env = this; |
592 | tmp->env = this; |
583 | op_inv = tmp; |
593 | op_inv = tmp; |
584 | } |
594 | } |
585 | } |
595 | else |
|
|
596 | LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n"); |
|
|
597 | |
586 | continue; |
598 | continue; |
587 | |
599 | |
588 | case KW_other_arch: |
600 | case KW_other_arch: |
589 | if (loading_arch == this) |
601 | if (loading_arch == this) |
590 | archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ()); |
602 | archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ()); |
… | |
… | |
606 | CLEAR_FLAG (this, FLAG_ANIMATE); |
618 | CLEAR_FLAG (this, FLAG_ANIMATE); |
607 | animation_id = 0; |
619 | animation_id = 0; |
608 | |
620 | |
609 | const char *str = f.get_str (); |
621 | const char *str = f.get_str (); |
610 | if (str && (animation_id = find_animation (str))) |
622 | if (str && (animation_id = find_animation (str))) |
611 | SET_FLAG (this, FLAG_ANIMATE); |
623 | SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here |
612 | } |
624 | } |
613 | break; |
625 | break; |
614 | |
626 | |
615 | case KW_last_heal: f.get (last_heal); break; |
627 | case KW_last_heal: f.get (last_heal); break; |
616 | case KW_last_sp: f.get (last_sp); break; |
628 | case KW_last_sp: f.get (last_sp); break; |
… | |
… | |
918 | case KW_attack_movement: f.get (attack_movement); break; |
930 | case KW_attack_movement: f.get (attack_movement); break; |
919 | case KW_move_state: f.get (move_status); break; |
931 | case KW_move_state: f.get (move_status); break; |
920 | case KW_expmul: f.get (expmul); break; |
932 | case KW_expmul: f.get (expmul); break; |
921 | case KW_glow_radius: f.get (glow_radius); break; |
933 | case KW_glow_radius: f.get (glow_radius); break; |
922 | case KW_weapontype: f.get (weapontype); break; |
934 | case KW_weapontype: f.get (weapontype); break; |
923 | case KW_tooltype: f.get (tooltype); break; |
|
|
924 | case KW_casting_time: f.get (casting_time); break; |
935 | case KW_casting_time: f.get (casting_time); break; |
|
|
936 | |
|
|
937 | // elevation is deprecated |
925 | case KW_elevation: f.get (elevation); break; |
938 | case KW_elevation: break; |
|
|
939 | |
926 | case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; |
940 | case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; |
927 | case KW_client_type: f.get (client_type); break; |
941 | case KW_client_type: f.get (client_type); break; |
928 | case KW_duration: f.get (duration); break; |
942 | case KW_duration: f.get (duration); break; |
929 | case KW_range: f.get (range); break; |
943 | case KW_range: f.get (range); break; |
930 | case KW_range_modifier: f.get (range_modifier); break; |
944 | case KW_range_modifier: f.get (range_modifier); break; |
… | |
… | |
949 | 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; |
950 | case KW_can_apply: |
964 | case KW_can_apply: |
951 | break; |
965 | break; |
952 | |
966 | |
953 | case KW_connected: |
967 | case KW_connected: |
954 | add_button_link (this, map, f.get_sint32 ()); |
968 | { |
|
|
969 | shstr connected; |
|
|
970 | |
|
|
971 | f.get (connected); |
|
|
972 | add_link (map, connected); |
|
|
973 | } |
955 | break; |
974 | break; |
956 | |
975 | |
957 | case KW_randomitems: |
976 | case KW_randomitems: |
958 | if (f.get_str ()) |
977 | if (f.get_str ()) |
959 | { |
978 | { |
… | |
… | |
987 | |
1006 | |
988 | f.next (); |
1007 | f.next (); |
989 | return true; |
1008 | return true; |
990 | |
1009 | |
991 | case KW_ERROR: |
1010 | case KW_ERROR: |
992 | set_ob_key_value (this, f.kw_str, f.value, true); |
1011 | // append as key value pair (do not use kv_set as it prepends) |
|
|
1012 | // we also do not even try to find old values, duplicate keys stay duplicate |
|
|
1013 | { |
|
|
1014 | key_value *kv = new key_value; |
|
|
1015 | |
|
|
1016 | kv->next = 0; |
|
|
1017 | kv->key = shstr (f.kw_str); |
|
|
1018 | kv->value = shstr (f.value); |
|
|
1019 | |
|
|
1020 | if (!last_kv) |
|
|
1021 | key_values = last_kv = kv; |
|
|
1022 | else |
|
|
1023 | { |
|
|
1024 | while (last_kv->next) |
|
|
1025 | last_kv = last_kv->next; |
|
|
1026 | |
|
|
1027 | last_kv->next = kv; |
|
|
1028 | last_kv = kv; |
|
|
1029 | } |
|
|
1030 | } |
993 | //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D |
1031 | //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D |
994 | break; |
1032 | break; |
995 | |
1033 | |
996 | default: |
1034 | default: |
997 | if (!f.parse_error ("object", name)) |
1035 | if (!f.parse_error ("object", name)) |
… | |
… | |
1018 | |
1056 | |
1019 | assert (arch); //D maybe use exception handling of sorts? |
1057 | assert (arch); //D maybe use exception handling of sorts? |
1020 | |
1058 | |
1021 | f.next (); |
1059 | f.next (); |
1022 | |
1060 | |
1023 | object *op = object::create (); |
1061 | object *op = arch->instance (); |
1024 | |
|
|
1025 | op->map = map; |
1062 | op->map = map; |
1026 | arch->copy_to (op); |
|
|
1027 | // copy_to activates, this should be fixed properly |
1063 | // instance() activates, this should be fixed properly |
1028 | op->deactivate (); |
1064 | op->deactivate (); |
1029 | |
1065 | |
1030 | if (!op->parse_kv (f)) |
1066 | if (!op->parse_kv (f)) |
1031 | { |
1067 | { |
1032 | op->destroy (true); |
1068 | op->destroy (); |
1033 | return 0; |
1069 | return 0; |
1034 | } |
1070 | } |
1035 | |
1071 | |
1036 | op->post_load_check (); |
1072 | op->post_load_check (); |
1037 | return op; |
1073 | return op; |
… | |
… | |
1242 | /* 110 */ |
1278 | /* 110 */ |
1243 | KW_destroy_on_death, |
1279 | KW_destroy_on_death, |
1244 | KW_NULL, |
1280 | KW_NULL, |
1245 | }; |
1281 | }; |
1246 | |
1282 | |
1247 | int i; |
|
|
1248 | |
|
|
1249 | /* This saves the key/value lists. We do it first so that any |
1283 | /* This saves the key/value lists. We do it first so that any |
1250 | * keys that match field names will be overwritten by the loader. |
1284 | * keys that match field names will be overwritten by the loader. |
1251 | */ |
1285 | */ |
1252 | for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) |
1286 | for (key_value *kv = op->key_values; kv; kv = kv->next) |
1253 | { |
1287 | if (!tmp->key_values || tmp->kv (kv->key) != kv->value) |
1254 | /* Find the field in the opposing member. */ |
1288 | f.put (kv->key, kv->value); |
1255 | key_value *arch_field = get_ob_key_link (tmp, my_field->key); |
|
|
1256 | |
|
|
1257 | /* If there's no partnering field, or it's got a different value, save our field. */ |
|
|
1258 | if (!arch_field || my_field->value != arch_field->value) |
|
|
1259 | f.put (my_field->key, my_field->value); |
|
|
1260 | } |
|
|
1261 | |
1289 | |
1262 | /* We don't need to worry about the arch's extra fields - they |
1290 | /* We don't need to worry about the arch's extra fields - they |
1263 | * will get taken care of the copy_to method. |
1291 | * will get taken care of the copy_to method. |
1264 | */ |
1292 | */ |
1265 | |
1293 | |
… | |
… | |
1288 | if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); |
1316 | if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); |
1289 | if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); |
1317 | if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); |
1290 | |
1318 | |
1291 | if (op->animation_id != tmp->animation_id) |
1319 | if (op->animation_id != tmp->animation_id) |
1292 | if (op->animation_id) |
1320 | if (op->animation_id) |
|
|
1321 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
|
|
1322 | else |
1293 | { |
1323 | { |
1294 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
1324 | f.put (KW_animation, (const char *)0); |
1295 | |
1325 | op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? |
1296 | if (!QUERY_FLAG (op, FLAG_ANIMATE)) |
|
|
1297 | f.put (KW_is_animated, (sint32)0); |
|
|
1298 | } |
1326 | } |
1299 | else |
|
|
1300 | f.put (KW_animation, (const char *)0); |
|
|
1301 | |
1327 | |
1302 | CMP_OUT2 (str, stats.Str); |
1328 | CMP_OUT2 (str, stats.Str); |
1303 | CMP_OUT2 (dex, stats.Dex); |
1329 | CMP_OUT2 (dex, stats.Dex); |
1304 | CMP_OUT2 (con, stats.Con); |
1330 | CMP_OUT2 (con, stats.Con); |
1305 | CMP_OUT2 (wis, stats.Wis); |
1331 | CMP_OUT2 (wis, stats.Wis); |
… | |
… | |
1335 | CMP_OUT (direction); |
1361 | CMP_OUT (direction); |
1336 | CMP_OUT (type); |
1362 | CMP_OUT (type); |
1337 | CMP_OUT (subtype); |
1363 | CMP_OUT (subtype); |
1338 | CMP_OUT (attacktype); |
1364 | CMP_OUT (attacktype); |
1339 | |
1365 | |
1340 | for (i = 0; i < NROFATTACKS; i++) |
1366 | for (int i = 0; i < NROFATTACKS; i++) |
1341 | if (expect_false (op->resist[i] != tmp->resist[i])) |
1367 | if (expect_false (op->resist[i] != tmp->resist[i])) |
1342 | f.put (resist_save[i], op->resist[i]); |
1368 | f.put (resist_save[i], op->resist[i]); |
1343 | |
1369 | |
1344 | CMP_OUT (path_attuned); |
1370 | CMP_OUT (path_attuned); |
1345 | CMP_OUT (path_repelled); |
1371 | CMP_OUT (path_repelled); |
… | |
… | |
1356 | CMP_OUT (last_sp); |
1382 | CMP_OUT (last_sp); |
1357 | CMP_OUT (last_grace); |
1383 | CMP_OUT (last_grace); |
1358 | CMP_OUT (last_eat); |
1384 | CMP_OUT (last_eat); |
1359 | CMP_OUT (glow_radius); |
1385 | CMP_OUT (glow_radius); |
1360 | |
1386 | |
1361 | if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) |
1387 | if (op->flag [FLAG_IS_LINKED]) |
|
|
1388 | if (auto (ol, op->find_link ())) |
1362 | f.put (KW_connected, i); |
1389 | f.put (KW_connected, ol->id); |
1363 | |
1390 | |
1364 | CMP_OUT (randomitems); |
1391 | CMP_OUT (randomitems); |
1365 | CMP_OUT2 (container, weight_limit); |
1392 | CMP_OUT2 (container, weight_limit); |
1366 | |
1393 | |
1367 | CMP_OUT (run_away); |
1394 | CMP_OUT (run_away); |
1368 | CMP_OUT (pick_up); |
1395 | CMP_OUT (pick_up); |
1369 | CMP_OUT (will_apply); |
1396 | CMP_OUT (will_apply); |
1370 | CMP_OUT (smoothlevel); |
1397 | CMP_OUT (smoothlevel); |
1371 | CMP_OUT (weapontype); |
1398 | CMP_OUT (weapontype); |
1372 | CMP_OUT (tooltype); |
|
|
1373 | CMP_OUT (elevation); |
|
|
1374 | CMP_OUT (client_type); |
1399 | CMP_OUT (client_type); |
1375 | CMP_OUT (item_power); |
1400 | CMP_OUT (item_power); |
1376 | CMP_OUT (duration); |
1401 | CMP_OUT (duration); |
1377 | CMP_OUT (range); |
1402 | CMP_OUT (range); |
1378 | CMP_OUT (range_modifier); |
1403 | CMP_OUT (range_modifier); |
… | |
… | |
1387 | CMP_OUT (move_off); |
1412 | CMP_OUT (move_off); |
1388 | CMP_OUT (move_slow); |
1413 | CMP_OUT (move_slow); |
1389 | CMP_OUT (move_slow_penalty); |
1414 | CMP_OUT (move_slow_penalty); |
1390 | |
1415 | |
1391 | if (op->flag != tmp->flag) |
1416 | if (op->flag != tmp->flag) |
1392 | for (i = 0; i <= NUM_FLAGS; i++) |
1417 | for (int i = 0; i <= NUM_FLAGS; i++) |
1393 | if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) |
1418 | if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) |
1394 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1419 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1395 | |
1420 | |
1396 | // save body locations |
1421 | // save body locations |
1397 | for (i = 0; i < NUM_BODY_LOCATIONS; i++) |
1422 | for (int i = 0; i < NUM_BODY_LOCATIONS; i++) |
1398 | if (expect_false (op->slot[i].info != tmp->slot[i].info)) |
1423 | if (expect_false (op->slot[i].info != tmp->slot[i].info)) |
1399 | f.put (body_locations[i].save_name, op->slot[i].info); |
1424 | f.put (body_locations[i].save_name, op->slot[i].info); |
1400 | } |
1425 | } |
1401 | |
1426 | |
1402 | /* |
1427 | /* |