| … | |
… | |
| 630 | if (!str) |
630 | if (!str) |
| 631 | { |
631 | { |
| 632 | op->animation_id = 0; |
632 | op->animation_id = 0; |
| 633 | CLEAR_FLAG (op, FLAG_ANIMATE); |
633 | CLEAR_FLAG (op, FLAG_ANIMATE); |
| 634 | } |
634 | } |
| 635 | else |
|
|
| 636 | { |
|
|
| 637 | op->animation_id = find_animation (str); |
635 | else if ((op->animation_id = find_animation (str))) |
| 638 | SET_FLAG (op, FLAG_ANIMATE); |
636 | SET_FLAG (op, FLAG_ANIMATE); |
| 639 | } |
|
|
| 640 | } |
637 | } |
| 641 | |
638 | |
| 642 | break; |
639 | break; |
| 643 | |
640 | |
| 644 | case KW_last_heal: thawer.get (op->last_heal); break; |
641 | case KW_last_heal: thawer.get (op->last_heal); break; |
| … | |
… | |
| 1277 | KW_use_content_on_gen, |
1274 | KW_use_content_on_gen, |
| 1278 | KW_NULL, |
1275 | KW_NULL, |
| 1279 | KW_is_buildable, |
1276 | KW_is_buildable, |
| 1280 | /* 110 */ |
1277 | /* 110 */ |
| 1281 | KW_destroy_on_death, |
1278 | KW_destroy_on_death, |
|
|
1279 | KW_NULL, |
| 1282 | }; |
1280 | }; |
| 1283 | |
1281 | |
| 1284 | int i; |
1282 | int i; |
| 1285 | |
1283 | |
| 1286 | /* This saves the key/value lists. We do it first so that any |
1284 | /* This saves the key/value lists. We do it first so that any |
| 1287 | * keys that match field names will be overwritten by the loader. |
1285 | * keys that match field names will be overwritten by the loader. |
| 1288 | */ |
1286 | */ |
| 1289 | for (key_value *my_field = op->key_values; my_field != NULL; my_field = my_field->next) |
1287 | for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) |
| 1290 | { |
1288 | { |
| 1291 | /* Find the field in the opposing member. */ |
1289 | /* Find the field in the opposing member. */ |
| 1292 | key_value *arch_field = get_ob_key_link (tmp, my_field->key); |
1290 | key_value *arch_field = get_ob_key_link (tmp, my_field->key); |
| 1293 | |
1291 | |
| 1294 | /* If there's no partnering field, or it's got a different value, save our field. */ |
1292 | /* If there's no partnering field, or it's got a different value, save our field. */ |
