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.25 by root, Mon Dec 18 03:00:02 2006 UTC vs.
Revision 1.26 by elmex, Mon Dec 18 17:10:07 2006 UTC

825 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; 825 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
826 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 826 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
827 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; 827 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break;
828 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; 828 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
829 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 829 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
830 case KW_treasure: GET_FLAG (op, FLAG_TREASURE); break;
831 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 830 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
832 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; 831 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break;
833 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; 832 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break;
834 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; 833 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break;
835 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break; 834 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break;
1182 KW_monster, 1181 KW_monster,
1183 KW_friendly, 1182 KW_friendly,
1184 KW_generator, 1183 KW_generator,
1185 KW_is_thrown, 1184 KW_is_thrown,
1186 KW_auto_apply, 1185 KW_auto_apply,
1187 KW_treasure, 1186 KW_NULL, // was KW_treasure
1188 KW_player_sold, 1187 KW_player_sold,
1189 /* 20 */ 1188 /* 20 */
1190 KW_see_invisible, 1189 KW_see_invisible,
1191 KW_can_roll, 1190 KW_can_roll,
1192 KW_overlay_floor, 1191 KW_overlay_floor,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines