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.71 by root, Tue Apr 17 18:59:05 2007 UTC vs.
Revision 1.74 by root, Sat Apr 28 18:18:04 2007 UTC

418 { "flying" , MOVE_FLY_LOW | MOVE_FLY_HIGH }, 418 { "flying" , MOVE_FLY_LOW | MOVE_FLY_HIGH },
419 { "fly_low" , MOVE_FLY_LOW }, 419 { "fly_low" , MOVE_FLY_LOW },
420 { "fly_high", MOVE_FLY_HIGH }, 420 { "fly_high", MOVE_FLY_HIGH },
421 { "swim" , MOVE_SWIM }, 421 { "swim" , MOVE_SWIM },
422 { "boat" , MOVE_BOAT }, 422 { "boat" , MOVE_BOAT },
423 { "ship" , MOVE_SHIP },
423 { "all" , MOVE_ALL }, 424 { "all" , MOVE_ALL },
424 }; 425 };
425 426
426 if (!str) 427 if (!str)
427 { 428 {
832 case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break; 833 case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break;
833 case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break; 834 case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break;
834 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; 835 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
835 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 836 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
836 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; 837 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
838 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
839 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
837 840
838 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 841 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
839 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 842 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
840 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 843 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
841 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 844 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
1103 KW_monster, 1106 KW_monster,
1104 KW_friendly, 1107 KW_friendly,
1105 KW_generator, 1108 KW_generator,
1106 KW_is_thrown, 1109 KW_is_thrown,
1107 KW_auto_apply, 1110 KW_auto_apply,
1108 KW_NULL, // was KW_treasure 1111 KW_treasure_env,
1109 KW_player_sold, 1112 KW_player_sold,
1110 /* 20 */ 1113 /* 20 */
1111 KW_see_invisible, 1114 KW_see_invisible,
1112 KW_can_roll, 1115 KW_can_roll,
1113 KW_overlay_floor, 1116 KW_overlay_floor,
1174 KW_can_use_skill, 1177 KW_can_use_skill,
1175 KW_been_applied, 1178 KW_been_applied,
1176 /* 80 */ 1179 /* 80 */
1177 KW_has_ready_scroll, 1180 KW_has_ready_scroll,
1178 KW_can_use_rod, 1181 KW_can_use_rod,
1179 KW_NULL, 1182 KW_precious,
1180 KW_can_use_horn, 1183 KW_can_use_horn,
1181 KW_make_invisible, 1184 KW_make_invisible,
1182 KW_inv_locked, 1185 KW_inv_locked,
1183 KW_is_wooded, 1186 KW_is_wooded,
1184 KW_is_hilly, 1187 KW_is_hilly,
1433 goto finish; 1436 goto finish;
1434 1437
1435 default: 1438 default:
1436 if (!f.parse_error ("resource file")) 1439 if (!f.parse_error ("resource file"))
1437 goto finish; 1440 goto finish;
1441
1442 f.next ();
1443 break;
1438 } 1444 }
1439 } 1445 }
1440 1446
1441finish: 1447finish:
1442 if (seen_arch) 1448 if (seen_arch)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines