… | |
… | |
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); |
… | |
… | |
488 | SET_FLAG (op, flag); \ |
487 | SET_FLAG (op, flag); \ |
489 | else \ |
488 | else \ |
490 | CLEAR_FLAG (op, flag) \ |
489 | CLEAR_FLAG (op, flag) \ |
491 | |
490 | |
492 | int |
491 | int |
493 | parse_object (object *op, object_thawer & thawer, int map_flags) |
492 | parse_object (object *op, object_thawer &thawer, int map_flags) |
494 | { |
493 | { |
495 | bool ismore = 0; |
494 | bool ismore = 0; |
496 | object *op_inv = op->inv; |
495 | object *op_inv = op->inv; |
497 | |
496 | |
498 | for (;;) |
497 | for (;;) |
… | |
… | |
503 | { |
502 | { |
504 | case KW_Object: // uppercase alias |
503 | case KW_Object: // uppercase alias |
505 | case KW_object: |
504 | case KW_object: |
506 | thawer.get (op->name); |
505 | thawer.get (op->name); |
507 | |
506 | |
508 | if (op->arch != NULL) |
507 | if (op->arch) |
509 | op->arch->name = op->name; |
508 | op->arch->name = op->name; |
510 | |
509 | |
511 | break; |
510 | break; |
512 | |
511 | |
513 | case KW_uuid: |
512 | case KW_uuid: |
… | |
… | |
556 | |
555 | |
557 | if (arch != NULL) |
556 | if (arch != NULL) |
558 | tmp = arch_to_object (arch); |
557 | tmp = arch_to_object (arch); |
559 | else |
558 | else |
560 | { |
559 | { |
561 | tmp = get_object (); |
560 | tmp = object::create (); |
562 | /* record the name of the broken object */ |
561 | /* record the name of the broken object */ |
563 | tmp->name = str; |
562 | tmp->name = str; |
564 | } |
563 | } |
565 | |
564 | |
566 | parse_object (tmp, thawer, map_flags); |
565 | parse_object (tmp, thawer, map_flags); |
… | |
… | |
593 | op_inv = tmp; |
592 | op_inv = tmp; |
594 | } |
593 | } |
595 | else |
594 | else |
596 | { |
595 | { |
597 | LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)"); |
596 | LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)"); |
598 | free_object (tmp); |
597 | tmp->destroy (); |
599 | } |
598 | } |
600 | } |
599 | } |
601 | else |
600 | else |
602 | { |
601 | { |
603 | /* This is the actual archetype definition then */ |
602 | /* This is the actual archetype definition then */ |
604 | op->arch = archetype::find (str); |
603 | op->arch = archetype::find (str); |
605 | |
604 | |
606 | if (op->arch != NULL) |
605 | if (op->arch) |
607 | copy_object (&op->arch->clone, op); |
606 | op->arch->clone.copy_to (op); |
608 | else if (!arch_init) |
607 | else if (!arch_init) |
609 | /* record the name of the broken object */ |
608 | /* record the name of the broken object */ |
610 | op->name = str; |
609 | op->name = str; |
611 | } |
610 | } |
612 | } |
611 | } |
… | |
… | |
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; |
… | |
… | |
1064 | * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should |
1062 | * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should |
1065 | * be reset. |
1063 | * be reset. |
1066 | * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null) |
1064 | * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null) |
1067 | * |
1065 | * |
1068 | */ |
1066 | */ |
1069 | |
|
|
1070 | int |
1067 | int |
1071 | load_object (object_thawer & fp, object *op, int map_flags) |
1068 | load_object (object_thawer &fp, object *op, int map_flags) |
1072 | { |
1069 | { |
1073 | return parse_object (op, fp, map_flags); |
1070 | return parse_object (op, fp, map_flags); |
1074 | } |
1071 | } |
1075 | |
|
|
1076 | |
1072 | |
1077 | /* This takes a buffer, scans it for variables, and sets those variables |
1073 | /* This takes a buffer, scans it for variables, and sets those variables |
1078 | * as appropriate in op. |
1074 | * as appropriate in op. |
1079 | * |
1075 | * |
1080 | * This function appears to be used in only 2 places - in crossedit to |
1076 | * This function appears to be used in only 2 places - in crossedit to |
1081 | * override values and in c_wiz to mutate values. |
1077 | * override values and in c_wiz to mutate values. |
1082 | */ |
1078 | */ |
1083 | int |
1079 | int |
1084 | set_variable (object *op, char *buf) |
1080 | set_variable (object *op, char *buf) |
1085 | { |
1081 | { |
1086 | return 0; |
|
|
1087 | #if 0 |
|
|
1088 | int retval; |
|
|
1089 | object_thawer thawer (0); |
1082 | object_thawer thawer (buf, (AV *)0); |
1090 | |
1083 | |
1091 | strcpy (msgbuf, ""); |
|
|
1092 | strcpy (lorebuf, ""); |
|
|
1093 | retval = parse_object (op, thawer, 0); |
1084 | return parse_object (op, thawer, 0); |
1094 | yy_switch_to_buffer (yycurbuf); |
|
|
1095 | yy_delete_buffer (yybufstate); |
|
|
1096 | yy_pop_state (); |
|
|
1097 | return retval; |
|
|
1098 | #endif |
|
|
1099 | } |
1085 | } |
1100 | |
1086 | |
1101 | /* |
1087 | /* |
1102 | * Initialises the array of variable-names. Needed before any |
1088 | * Initialises the array of variable-names. Needed before any |
1103 | * objects can be loaded. Called by init_library(). |
1089 | * objects can be loaded. Called by init_library(). |
… | |
… | |
1193 | KW_monster, |
1179 | KW_monster, |
1194 | KW_friendly, |
1180 | KW_friendly, |
1195 | KW_generator, |
1181 | KW_generator, |
1196 | KW_is_thrown, |
1182 | KW_is_thrown, |
1197 | KW_auto_apply, |
1183 | KW_auto_apply, |
1198 | KW_treasure, |
1184 | KW_NULL, // was KW_treasure |
1199 | KW_player_sold, |
1185 | KW_player_sold, |
1200 | /* 20 */ |
1186 | /* 20 */ |
1201 | KW_see_invisible, |
1187 | KW_see_invisible, |
1202 | KW_can_roll, |
1188 | KW_can_roll, |
1203 | KW_overlay_floor, |
1189 | KW_overlay_floor, |
… | |
… | |
1313 | if (!arch_field || my_field->value != arch_field->value) |
1299 | if (!arch_field || my_field->value != arch_field->value) |
1314 | f.put (my_field->key, my_field->value); |
1300 | f.put (my_field->key, my_field->value); |
1315 | } |
1301 | } |
1316 | |
1302 | |
1317 | /* We don't need to worry about the arch's extra fields - they |
1303 | /* We don't need to worry about the arch's extra fields - they |
1318 | * will get taken care of the copy_object function. |
1304 | * will get taken care of the copy_to method. |
1319 | */ |
1305 | */ |
1320 | |
1306 | |
1321 | { |
1307 | { |
1322 | char uids[64]; |
1308 | char uids[64]; |
1323 | snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq); |
1309 | snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq); |
… | |
… | |
1440 | CMP_OUT (move_on); |
1426 | CMP_OUT (move_on); |
1441 | CMP_OUT (move_off); |
1427 | CMP_OUT (move_off); |
1442 | CMP_OUT (move_slow); |
1428 | CMP_OUT (move_slow); |
1443 | CMP_OUT (move_slow_penalty); |
1429 | CMP_OUT (move_slow_penalty); |
1444 | |
1430 | |
1445 | if (!COMPARE_FLAGS (op, tmp)) |
1431 | if (op->flag != tmp->flag) |
1446 | for (i = 0; i <= NUM_FLAGS; i++) |
1432 | for (i = 0; i <= NUM_FLAGS; i++) |
1447 | if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i))) |
1433 | if (flag_names [i] && op->flag [i] != tmp->flag [i]) |
1448 | f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0"); |
1434 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1449 | |
1435 | |
1450 | /* Save body locations */ |
1436 | /* Save body locations */ |
1451 | for (i = 0; i < NUM_BODY_LOCATIONS; i++) |
1437 | for (i = 0; i < NUM_BODY_LOCATIONS; i++) |
1452 | if (op->body_info[i] != tmp->body_info[i]) |
1438 | if (op->body_info[i] != tmp->body_info[i]) |
1453 | f.put (body_locations[i].save_name, op->body_info[i]); |
1439 | f.put (body_locations[i].save_name, op->body_info[i]); |
… | |
… | |
1508 | save_object (fp, tmp, flag); |
1494 | save_object (fp, tmp, flag); |
1509 | old = tmp; |
1495 | old = tmp; |
1510 | } |
1496 | } |
1511 | |
1497 | |
1512 | if (!(flag & 2)) |
1498 | if (!(flag & 2)) |
1513 | { |
1499 | op->destroy (); |
1514 | remove_ob (op); |
|
|
1515 | free_object (op); |
|
|
1516 | } |
|
|
1517 | |
1500 | |
1518 | fp.put (op); |
1501 | fp.put (op); |
1519 | fprintf (fp, "end\n"); |
1502 | fprintf (fp, "end\n"); |
1520 | } |
1503 | } |
1521 | |
1504 | |