ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/loader.C
(Generate patch)

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.40 by pippijn, Sat Jan 6 14:42:29 2007 UTC vs.
Revision 1.45 by root, Sun Jan 14 23:15:57 2007 UTC

… …
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;
… …
815 CLEAR_FLAG (op, FLAG_WIZCAST); 812 CLEAR_FLAG (op, FLAG_WIZCAST);
816 } 813 }
817 break; 814 break;
818 815
819 case KW_friendly: 816 case KW_friendly:
820 GET_FLAG (op, FLAG_FRIENDLY); 817 if (thawer.get_sint32 ())
821 //TODO: move to check_object or so 818 if (op->type != PLAYER)
822 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
823 add_friendly_object (op); 819 add_friendly_object (op);
820
824 break; 821 break;
825 822
826 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; 823 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;
827 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; 824 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;
828 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; 825 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;
829 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; 826 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
827 case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break;
830 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 828 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
831 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; 829 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break;
832 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; 830 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
833 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 831 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
834 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 832 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
… …
905 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; 903 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;
906 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; 904 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;
907 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; 905 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;
908 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; 906 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;
909 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; 907 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break;
908 case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break;
910 909
911 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; 910 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;
912 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; 911 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;
913 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; 912 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;
914 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; 913 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;
… …
1265 KW_berserk, 1264 KW_berserk,
1266 KW_neutral, 1265 KW_neutral,
1267 /* 100 */ 1266 /* 100 */
1268 KW_no_attack, 1267 KW_no_attack,
1269 KW_no_damage, 1268 KW_no_damage,
1270 KW_NULL, 1269 KW_obj_original,
1271 KW_NULL, 1270 KW_NULL,
1272 KW_activate_on_push, 1271 KW_activate_on_push,
1273 KW_activate_on_release, 1272 KW_activate_on_release,
1274 KW_is_water, 1273 KW_is_water,
1275 KW_use_content_on_gen, 1274 KW_use_content_on_gen,
1276 KW_NULL, 1275 KW_NULL,
1277 KW_is_buildable, 1276 KW_is_buildable,
1278 /* 110 */ 1277 /* 110 */
1278 KW_destroy_on_death,
1279 KW_NULL,
1279 }; 1280 };
1280 1281
1281 int i; 1282 int i;
1282 1283
1283 /* 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
1284 * keys that match field names will be overwritten by the loader. 1285 * keys that match field names will be overwritten by the loader.
1285 */ 1286 */
1286 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)
1287 { 1288 {
1288 /* Find the field in the opposing member. */ 1289 /* Find the field in the opposing member. */
1289 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);
1290 1291
1291 /* 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. */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines