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.43 by root, Mon Jan 8 12:44:34 2007 UTC

… …
815 CLEAR_FLAG (op, FLAG_WIZCAST); 815 CLEAR_FLAG (op, FLAG_WIZCAST);
816 } 816 }
817 break; 817 break;
818 818
819 case KW_friendly: 819 case KW_friendly:
820 GET_FLAG (op, FLAG_FRIENDLY); 820 if (thawer.get_sint32 ())
821 //TODO: move to check_object or so 821 if (op->type != PLAYER)
822 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
823 add_friendly_object (op); 822 add_friendly_object (op);
823
824 break; 824 break;
825 825
826 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; 826 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;
827 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; 827 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;
828 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; 828 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;
829 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; 829 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
830 case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break;
830 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 831 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
831 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; 832 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; 833 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
833 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 834 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
834 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 835 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
… …
905 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; 906 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;
906 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; 907 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;
907 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; 908 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;
908 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; 909 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;
909 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; 910 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break;
911 case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break;
910 912
911 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; 913 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;
912 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; 914 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;
913 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; 915 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;
914 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; 916 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;
… …
1265 KW_berserk, 1267 KW_berserk,
1266 KW_neutral, 1268 KW_neutral,
1267 /* 100 */ 1269 /* 100 */
1268 KW_no_attack, 1270 KW_no_attack,
1269 KW_no_damage, 1271 KW_no_damage,
1270 KW_NULL, 1272 KW_obj_original,
1271 KW_NULL, 1273 KW_NULL,
1272 KW_activate_on_push, 1274 KW_activate_on_push,
1273 KW_activate_on_release, 1275 KW_activate_on_release,
1274 KW_is_water, 1276 KW_is_water,
1275 KW_use_content_on_gen, 1277 KW_use_content_on_gen,
1276 KW_NULL, 1278 KW_NULL,
1277 KW_is_buildable, 1279 KW_is_buildable,
1278 /* 110 */ 1280 /* 110 */
1281 KW_destroy_on_death,
1279 }; 1282 };
1280 1283
1281 int i; 1284 int i;
1282 1285
1283 /* This saves the key/value lists. We do it first so that any 1286 /* This saves the key/value lists. We do it first so that any

Diff Legend

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