| … | |
… | |
| 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); |
| … | |
… | |
| 1430 | CMP_OUT (move_on); |
1429 | CMP_OUT (move_on); |
| 1431 | CMP_OUT (move_off); |
1430 | CMP_OUT (move_off); |
| 1432 | CMP_OUT (move_slow); |
1431 | CMP_OUT (move_slow); |
| 1433 | CMP_OUT (move_slow_penalty); |
1432 | CMP_OUT (move_slow_penalty); |
| 1434 | |
1433 | |
| 1435 | if (!COMPARE_FLAGS (op, tmp)) |
1434 | if (op->flags != tmp->flags) |
| 1436 | for (i = 0; i <= NUM_FLAGS; i++) |
1435 | for (i = 0; i <= NUM_FLAGS; i++) |
| 1437 | if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i))) |
1436 | if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i))) |
| 1438 | f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0"); |
1437 | f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0"); |
| 1439 | |
1438 | |
| 1440 | /* Save body locations */ |
1439 | /* Save body locations */ |
