… | |
… | |
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: |
… | |
… | |
552 | */ |
551 | */ |
553 | archetype *arch = archetype::find (str); |
552 | archetype *arch = archetype::find (str); |
554 | |
553 | |
555 | object *tmp; |
554 | object *tmp; |
556 | |
555 | |
557 | if (arch != NULL) |
556 | if (arch) |
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 | } |
|
|
564 | |
|
|
565 | // decativate the object we, as we are still going |
|
|
566 | // to read the speed value. Objects should be activated |
|
|
567 | // when the map, object or player is completly loaded. |
|
|
568 | tmp->deactivate (); |
565 | |
569 | |
566 | parse_object (tmp, thawer, map_flags); |
570 | parse_object (tmp, thawer, map_flags); |
567 | |
571 | |
568 | if (tmp->arch) |
572 | if (tmp->arch) |
569 | { |
573 | { |
… | |
… | |
593 | op_inv = tmp; |
597 | op_inv = tmp; |
594 | } |
598 | } |
595 | else |
599 | else |
596 | { |
600 | { |
597 | LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)"); |
601 | LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)"); |
598 | tmp->destroy (0); |
602 | tmp->destroy (); |
599 | } |
603 | } |
600 | } |
604 | } |
601 | else |
605 | else |
602 | { |
606 | { |
603 | /* This is the actual archetype definition then */ |
607 | /* This is the actual archetype definition then */ |
604 | op->arch = archetype::find (str); |
608 | op->arch = archetype::find (str); |
605 | |
609 | |
606 | if (op->arch != NULL) |
610 | if (op->arch) |
607 | copy_object (&op->arch->clone, op); |
611 | { |
|
|
612 | op->arch->clone.copy_to (op); |
|
|
613 | // copy_to activates, this should be fixed properly |
|
|
614 | op->deactivate (); |
|
|
615 | } |
608 | else if (!arch_init) |
616 | else if (!arch_init) |
609 | /* record the name of the broken object */ |
617 | /* record the name of the broken object */ |
610 | op->name = str; |
618 | op->name = str; |
611 | } |
619 | } |
612 | } |
620 | } |
… | |
… | |
642 | |
650 | |
643 | case KW_speed: |
651 | case KW_speed: |
644 | thawer.get (op->speed); |
652 | thawer.get (op->speed); |
645 | |
653 | |
646 | //TODO: maybe do in check_object |
654 | //TODO: maybe do in check_object |
647 | if (!(map_flags & MAP_STYLE)) |
655 | // removed check for style maps |
648 | { |
|
|
649 | if (op->speed < 0) |
656 | if (op->speed < 0) |
650 | op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; |
657 | op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; |
651 | |
|
|
652 | update_ob_speed (op); |
|
|
653 | } |
|
|
654 | |
658 | |
655 | break; |
659 | break; |
656 | |
660 | |
657 | case KW_slow_move: |
661 | case KW_slow_move: |
658 | op->move_slow |= MOVE_WALK; |
662 | op->move_slow |= MOVE_WALK; |
… | |
… | |
826 | case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; |
830 | case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; |
827 | case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; |
831 | case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; |
828 | case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; |
832 | 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; |
833 | case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; |
830 | case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; |
834 | 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; |
835 | case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; |
833 | case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; |
836 | case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; |
834 | case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; |
837 | case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; |
835 | case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; |
838 | 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; |
839 | case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break; |
… | |
… | |
982 | case KW_randomitems: |
985 | case KW_randomitems: |
983 | op->randomitems = find_treasurelist (thawer.get_str ()); |
986 | op->randomitems = find_treasurelist (thawer.get_str ()); |
984 | break; |
987 | break; |
985 | |
988 | |
986 | case KW_msg: |
989 | case KW_msg: |
987 | { |
|
|
988 | thawer.get_ml (KW_endmsg, op->msg); |
990 | thawer.get_ml (KW_endmsg, op->msg); |
989 | //TODO: allow longer messages |
991 | //TODO: allow longer messages |
990 | if (strlen (op->msg) >= HUGE_BUF) |
992 | if (strlen (op->msg) >= HUGE_BUF) |
991 | { |
993 | { |
992 | LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); |
994 | LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); |
993 | op->msg = "ERROR, please report: string too long, winged.\n"; |
995 | op->msg = "ERROR, please report: string too long, winged.\n"; |
994 | } |
996 | } |
995 | } |
|
|
996 | break; |
997 | break; |
997 | |
998 | |
998 | case KW_lore: |
999 | case KW_lore: |
999 | { |
|
|
1000 | shstr msgbuf; |
|
|
1001 | |
|
|
1002 | thawer.get_ml (KW_endlore, op->lore); |
1000 | thawer.get_ml (KW_endlore, op->lore); |
1003 | //TODO: allow longer messages |
1001 | //TODO: allow longer messages |
1004 | /* Just print a warning so we can be reasonably safe |
1002 | /* Just print a warning so we can be reasonably safe |
1005 | * about not overflowing the buffer. |
1003 | * about not overflowing the buffer. |
1006 | */ |
1004 | */ |
1007 | if (strlen (op->lore) > (HUGE_BUF / 2)) |
1005 | if (strlen (op->lore) > (HUGE_BUF / 2)) |
1008 | LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", |
1006 | LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", |
1009 | HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); |
1007 | HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); |
1010 | } |
|
|
1011 | break; |
1008 | break; |
1012 | |
1009 | |
1013 | case KW_editable: |
1010 | case KW_editable: |
1014 | case KW_editor_folder: |
1011 | case KW_editor_folder: |
1015 | break; |
1012 | break; |
… | |
… | |
1032 | |
1029 | |
1033 | case KW_EOF: |
1030 | case KW_EOF: |
1034 | return LL_EOF; |
1031 | return LL_EOF; |
1035 | |
1032 | |
1036 | case KW_ERROR: |
1033 | case KW_ERROR: |
1037 | set_ob_key_value (op, thawer.line, thawer.last_value, true); |
1034 | set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); |
1038 | //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D |
1035 | //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D |
1039 | |
|
|
1040 | //TODO: skip line, ugly, factor parsing better |
|
|
1041 | if (thawer.last_value) |
|
|
1042 | thawer.line = thawer.last_value; |
|
|
1043 | |
|
|
1044 | thawer.line += strlen (thawer.line) + 1; |
|
|
1045 | |
|
|
1046 | break; |
1036 | break; |
1047 | |
1037 | |
1048 | default: |
1038 | default: |
1049 | LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); |
1039 | LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); |
1050 | break; |
1040 | break; |
… | |
… | |
1064 | * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should |
1054 | * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should |
1065 | * be reset. |
1055 | * be reset. |
1066 | * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null) |
1056 | * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null) |
1067 | * |
1057 | * |
1068 | */ |
1058 | */ |
1069 | |
|
|
1070 | int |
1059 | int |
1071 | load_object (object_thawer & fp, object *op, int map_flags) |
1060 | load_object (object_thawer &fp, object *op, int map_flags) |
1072 | { |
1061 | { |
|
|
1062 | coroapi::cede_every (1000); // cede once in a while |
|
|
1063 | |
1073 | return parse_object (op, fp, map_flags); |
1064 | return parse_object (op, fp, map_flags); |
1074 | } |
1065 | } |
1075 | |
|
|
1076 | |
1066 | |
1077 | /* This takes a buffer, scans it for variables, and sets those variables |
1067 | /* This takes a buffer, scans it for variables, and sets those variables |
1078 | * as appropriate in op. |
1068 | * as appropriate in op. |
1079 | * |
1069 | * |
1080 | * This function appears to be used in only 2 places - in crossedit to |
1070 | * This function appears to be used in only 2 places - in crossedit to |
… | |
… | |
1183 | KW_monster, |
1173 | KW_monster, |
1184 | KW_friendly, |
1174 | KW_friendly, |
1185 | KW_generator, |
1175 | KW_generator, |
1186 | KW_is_thrown, |
1176 | KW_is_thrown, |
1187 | KW_auto_apply, |
1177 | KW_auto_apply, |
1188 | KW_treasure, |
1178 | KW_NULL, // was KW_treasure |
1189 | KW_player_sold, |
1179 | KW_player_sold, |
1190 | /* 20 */ |
1180 | /* 20 */ |
1191 | KW_see_invisible, |
1181 | KW_see_invisible, |
1192 | KW_can_roll, |
1182 | KW_can_roll, |
1193 | KW_overlay_floor, |
1183 | KW_overlay_floor, |
… | |
… | |
1303 | if (!arch_field || my_field->value != arch_field->value) |
1293 | if (!arch_field || my_field->value != arch_field->value) |
1304 | f.put (my_field->key, my_field->value); |
1294 | f.put (my_field->key, my_field->value); |
1305 | } |
1295 | } |
1306 | |
1296 | |
1307 | /* We don't need to worry about the arch's extra fields - they |
1297 | /* We don't need to worry about the arch's extra fields - they |
1308 | * will get taken care of the copy_object function. |
1298 | * will get taken care of the copy_to method. |
1309 | */ |
1299 | */ |
1310 | |
1300 | |
1311 | { |
1301 | { |
1312 | char uids[64]; |
1302 | char uids[64]; |
1313 | snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq); |
1303 | snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq); |
… | |
… | |
1430 | CMP_OUT (move_on); |
1420 | CMP_OUT (move_on); |
1431 | CMP_OUT (move_off); |
1421 | CMP_OUT (move_off); |
1432 | CMP_OUT (move_slow); |
1422 | CMP_OUT (move_slow); |
1433 | CMP_OUT (move_slow_penalty); |
1423 | CMP_OUT (move_slow_penalty); |
1434 | |
1424 | |
1435 | if (!COMPARE_FLAGS (op, tmp)) |
1425 | if (op->flag != tmp->flag) |
1436 | for (i = 0; i <= NUM_FLAGS; i++) |
1426 | for (i = 0; i <= NUM_FLAGS; i++) |
1437 | if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i))) |
1427 | if (flag_names [i] && op->flag [i] != tmp->flag [i]) |
1438 | f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0"); |
1428 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1439 | |
1429 | |
1440 | /* Save body locations */ |
1430 | /* Save body locations */ |
1441 | for (i = 0; i < NUM_BODY_LOCATIONS; i++) |
1431 | for (i = 0; i < NUM_BODY_LOCATIONS; i++) |
1442 | if (op->body_info[i] != tmp->body_info[i]) |
1432 | if (op->body_info[i] != tmp->body_info[i]) |
1443 | f.put (body_locations[i].save_name, op->body_info[i]); |
1433 | f.put (body_locations[i].save_name, op->body_info[i]); |
… | |
… | |
1445 | |
1435 | |
1446 | /* |
1436 | /* |
1447 | * Dumps all variables in an object to a file. |
1437 | * Dumps all variables in an object to a file. |
1448 | * If bit 0 of flag is set, unpaid objects will be saved. As of now, |
1438 | * If bit 0 of flag is set, unpaid objects will be saved. As of now, |
1449 | * the only place this is not set is when saving the player. |
1439 | * the only place this is not set is when saving the player. |
1450 | * If bit 1 of flag is set, don't remove the object after save. As of now, |
|
|
1451 | * all of the callers are setting this. |
|
|
1452 | */ |
1440 | */ |
1453 | |
|
|
1454 | void |
1441 | void |
1455 | save_object (object_freezer & fp, object *op, int flag) |
1442 | save_object (object_freezer &fp, object *op, int flag) |
1456 | { |
1443 | { |
1457 | archetype *at; |
|
|
1458 | object *tmp, *old; |
|
|
1459 | |
|
|
1460 | /* Even if the object does have an owner, it would seem that we should |
1444 | /* Even if the object does have an owner, it would seem that we should |
1461 | * still save it. |
1445 | * still save it. |
1462 | */ |
1446 | */ |
1463 | if (op->owner) |
1447 | if (op->owner) |
1464 | return; |
1448 | return; |
1465 | |
1449 | |
1466 | /* If it is unpaid and we don't want to save those, just return. */ |
1450 | /* If it is unpaid and we don't want to save those, just return. */ |
1467 | if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID))) |
1451 | if (!(flag & 1) && op->flag [FLAG_UNPAID]) |
1468 | return; |
1452 | return; |
1469 | |
1453 | |
1470 | if ((at = op->arch) == NULL) |
1454 | archetype *at = op->arch ? (archetype *)op->arch : empty_archetype; |
1471 | at = empty_archetype; |
|
|
1472 | |
1455 | |
1473 | fp.put (KW_arch, at->name); |
1456 | fp.put (KW_arch, at->name); |
1474 | |
|
|
1475 | put (fp, op, &at->clone); |
1457 | put (fp, op, &at->clone); |
1476 | |
1458 | |
1477 | /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */ |
1459 | /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */ |
1478 | |
1460 | |
1479 | old = NULL; |
|
|
1480 | |
|
|
1481 | if (flag & 2) |
|
|
1482 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1461 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1483 | save_object (fp, tmp, flag); |
1462 | save_object (fp, tmp, flag); |
1484 | else |
|
|
1485 | /* Slightly different logic because tmp/op will be removed by |
|
|
1486 | * the save_object we call. So we just keep looking at op->inv |
|
|
1487 | * until there is nothing left. In theory, the variable old |
|
|
1488 | * should not be needed, as recursive loops shouldn't happen. |
|
|
1489 | */ |
|
|
1490 | while ((tmp = op->inv) != NULL) |
|
|
1491 | { |
|
|
1492 | if (old == tmp) |
|
|
1493 | { |
|
|
1494 | LOG (llevError, " Recursive loop in inventory\n"); |
|
|
1495 | break; |
|
|
1496 | } |
|
|
1497 | |
|
|
1498 | save_object (fp, tmp, flag); |
|
|
1499 | old = tmp; |
|
|
1500 | } |
|
|
1501 | |
|
|
1502 | if (!(flag & 2)) |
|
|
1503 | { |
|
|
1504 | op->remove (); |
|
|
1505 | op->destroy (0); |
|
|
1506 | } |
|
|
1507 | |
1463 | |
1508 | fp.put (op); |
1464 | fp.put (op); |
1509 | fprintf (fp, "end\n"); |
1465 | fp.put (KW_end); |
1510 | } |
1466 | } |
1511 | |
1467 | |