| … | |
… | |
| 279 | |
279 | |
| 280 | if (!op->name_pl) |
280 | if (!op->name_pl) |
| 281 | op->name_pl = op->name; |
281 | op->name_pl = op->name; |
| 282 | |
282 | |
| 283 | /* objects now have a materialname. try to patch it in */ |
283 | /* objects now have a materialname. try to patch it in */ |
| 284 | if (!(IS_WEAPON (op) && op->level > 0)) |
284 | if (!(op->is_weapon () && op->level > 0)) |
| 285 | { |
285 | { |
| 286 | if (op->map != NULL) |
286 | if (op->map != NULL) |
| 287 | set_materialname (op, op->map->difficulty, NULL); |
287 | set_materialname (op, op->map->difficulty, NULL); |
| 288 | else |
288 | else |
| 289 | set_materialname (op, 5, NULL); |
289 | set_materialname (op, 5, NULL); |
| … | |
… | |
| 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, |
| … | |
… | |
| 1429 | CMP_OUT (move_on); |
1428 | CMP_OUT (move_on); |
| 1430 | CMP_OUT (move_off); |
1429 | CMP_OUT (move_off); |
| 1431 | CMP_OUT (move_slow); |
1430 | CMP_OUT (move_slow); |
| 1432 | CMP_OUT (move_slow_penalty); |
1431 | CMP_OUT (move_slow_penalty); |
| 1433 | |
1432 | |
| 1434 | if (!COMPARE_FLAGS (op, tmp)) |
1433 | if (op->flag != tmp->flag) |
| 1435 | for (i = 0; i <= NUM_FLAGS; i++) |
1434 | for (i = 0; i <= NUM_FLAGS; i++) |
| 1436 | if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i))) |
1435 | if (flag_names [i] && op->flag [i] != tmp->flag [i]) |
| 1437 | f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0"); |
1436 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
| 1438 | |
1437 | |
| 1439 | /* Save body locations */ |
1438 | /* Save body locations */ |
| 1440 | for (i = 0; i < NUM_BODY_LOCATIONS; i++) |
1439 | for (i = 0; i < NUM_BODY_LOCATIONS; i++) |
| 1441 | if (op->body_info[i] != tmp->body_info[i]) |
1440 | if (op->body_info[i] != tmp->body_info[i]) |
| 1442 | f.put (body_locations[i].save_name, op->body_info[i]); |
1441 | f.put (body_locations[i].save_name, op->body_info[i]); |
