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.42 by root, Mon Jan 8 01:19:02 2007 UTC vs.
Revision 1.43 by root, Mon Jan 8 12:44:34 2007 UTC

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;
1266 KW_berserk, 1267 KW_berserk,
1267 KW_neutral, 1268 KW_neutral,
1268 /* 100 */ 1269 /* 100 */
1269 KW_no_attack, 1270 KW_no_attack,
1270 KW_no_damage, 1271 KW_no_damage,
1271 KW_NULL, 1272 KW_obj_original,
1272 KW_NULL, 1273 KW_NULL,
1273 KW_activate_on_push, 1274 KW_activate_on_push,
1274 KW_activate_on_release, 1275 KW_activate_on_release,
1275 KW_is_water, 1276 KW_is_water,
1276 KW_use_content_on_gen, 1277 KW_use_content_on_gen,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines