… | |
… | |
26 | variable. */ |
26 | variable. */ |
27 | |
27 | |
28 | |
28 | |
29 | #include <global.h> |
29 | #include <global.h> |
30 | #include <loader.h> |
30 | #include <loader.h> |
31 | #include <newserver.h> |
|
|
32 | #include <sproto.h> |
31 | #include <sproto.h> |
33 | |
32 | |
34 | /* Maps the MOVE_* values to names */ |
33 | /* Maps the MOVE_* values to names */ |
35 | static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; |
34 | static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; |
36 | |
35 | |
… | |
… | |
280 | |
279 | |
281 | if (!op->name_pl) |
280 | if (!op->name_pl) |
282 | op->name_pl = op->name; |
281 | op->name_pl = op->name; |
283 | |
282 | |
284 | /* objects now have a materialname. try to patch it in */ |
283 | /* objects now have a materialname. try to patch it in */ |
285 | if (!(IS_WEAPON (op) && op->level > 0)) |
284 | if (!(op->is_weapon () && op->level > 0)) |
286 | { |
285 | { |
287 | if (op->map != NULL) |
286 | if (op->map != NULL) |
288 | set_materialname (op, op->map->difficulty, NULL); |
287 | set_materialname (op, op->map->difficulty, NULL); |
289 | else |
288 | else |
290 | set_materialname (op, 5, NULL); |
289 | set_materialname (op, 5, NULL); |
… | |
… | |
826 | case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; |
825 | case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; |
827 | case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; |
826 | case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; |
828 | 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; |
829 | case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; |
828 | case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; |
830 | case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; |
829 | case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; |
831 | case KW_treasure: GET_FLAG (op, FLAG_TREASURE); break; |
|
|
832 | case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; |
830 | case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; |
833 | case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; |
831 | case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; |
834 | case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; |
832 | case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; |
835 | case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; |
833 | case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; |
836 | 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; |
… | |
… | |
1183 | KW_monster, |
1181 | KW_monster, |
1184 | KW_friendly, |
1182 | KW_friendly, |
1185 | KW_generator, |
1183 | KW_generator, |
1186 | KW_is_thrown, |
1184 | KW_is_thrown, |
1187 | KW_auto_apply, |
1185 | KW_auto_apply, |
1188 | KW_treasure, |
1186 | KW_NULL, // was KW_treasure |
1189 | KW_player_sold, |
1187 | KW_player_sold, |
1190 | /* 20 */ |
1188 | /* 20 */ |
1191 | KW_see_invisible, |
1189 | KW_see_invisible, |
1192 | KW_can_roll, |
1190 | KW_can_roll, |
1193 | KW_overlay_floor, |
1191 | KW_overlay_floor, |
… | |
… | |
1430 | CMP_OUT (move_on); |
1428 | CMP_OUT (move_on); |
1431 | CMP_OUT (move_off); |
1429 | CMP_OUT (move_off); |
1432 | CMP_OUT (move_slow); |
1430 | CMP_OUT (move_slow); |
1433 | CMP_OUT (move_slow_penalty); |
1431 | CMP_OUT (move_slow_penalty); |
1434 | |
1432 | |
1435 | if (!COMPARE_FLAGS (op, tmp)) |
1433 | if (op->flags != tmp->flags) |
1436 | for (i = 0; i <= NUM_FLAGS; i++) |
1434 | for (i = 0; i <= NUM_FLAGS; i++) |
1437 | if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i))) |
1435 | if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i))) |
1438 | f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0"); |
1436 | f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0"); |
1439 | |
1437 | |
1440 | /* Save body locations */ |
1438 | /* Save body locations */ |