| … | |
… | |
| 487 | SET_FLAG (op, flag); \ |
487 | SET_FLAG (op, flag); \ |
| 488 | else \ |
488 | else \ |
| 489 | CLEAR_FLAG (op, flag) \ |
489 | CLEAR_FLAG (op, flag) \ |
| 490 | |
490 | |
| 491 | int |
491 | int |
| 492 | parse_object (object *op, object_thawer & thawer, int map_flags) |
492 | parse_object (object *op, object_thawer &thawer, int map_flags) |
| 493 | { |
493 | { |
| 494 | bool ismore = 0; |
494 | bool ismore = 0; |
| 495 | object *op_inv = op->inv; |
495 | object *op_inv = op->inv; |
| 496 | |
496 | |
| 497 | for (;;) |
497 | for (;;) |
| … | |
… | |
| 502 | { |
502 | { |
| 503 | case KW_Object: // uppercase alias |
503 | case KW_Object: // uppercase alias |
| 504 | case KW_object: |
504 | case KW_object: |
| 505 | thawer.get (op->name); |
505 | thawer.get (op->name); |
| 506 | |
506 | |
| 507 | if (op->arch != NULL) |
507 | if (op->arch) |
| 508 | op->arch->name = op->name; |
508 | op->arch->name = op->name; |
| 509 | |
509 | |
| 510 | break; |
510 | break; |
| 511 | |
511 | |
| 512 | case KW_uuid: |
512 | case KW_uuid: |
| … | |
… | |
| 1062 | * 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 |
| 1063 | * be reset. |
1063 | * be reset. |
| 1064 | * 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) |
| 1065 | * |
1065 | * |
| 1066 | */ |
1066 | */ |
| 1067 | |
|
|
| 1068 | int |
1067 | int |
| 1069 | load_object (object_thawer & fp, object *op, int map_flags) |
1068 | load_object (object_thawer &fp, object *op, int map_flags) |
| 1070 | { |
1069 | { |
| 1071 | return parse_object (op, fp, map_flags); |
1070 | return parse_object (op, fp, map_flags); |
| 1072 | } |
1071 | } |
| 1073 | |
|
|
| 1074 | |
1072 | |
| 1075 | /* 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 |
| 1076 | * as appropriate in op. |
1074 | * as appropriate in op. |
| 1077 | * |
1075 | * |
| 1078 | * 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 |
| … | |
… | |
| 1443 | |
1441 | |
| 1444 | /* |
1442 | /* |
| 1445 | * Dumps all variables in an object to a file. |
1443 | * Dumps all variables in an object to a file. |
| 1446 | * If bit 0 of flag is set, unpaid objects will be saved. As of now, |
1444 | * If bit 0 of flag is set, unpaid objects will be saved. As of now, |
| 1447 | * the only place this is not set is when saving the player. |
1445 | * the only place this is not set is when saving the player. |
| 1448 | * If bit 1 of flag is set, don't remove the object after save. As of now, |
|
|
| 1449 | * all of the callers are setting this. |
|
|
| 1450 | */ |
1446 | */ |
| 1451 | |
|
|
| 1452 | void |
1447 | void |
| 1453 | save_object (object_freezer & fp, object *op, int flag) |
1448 | save_object (object_freezer &fp, object *op, int flag) |
| 1454 | { |
1449 | { |
| 1455 | archetype *at; |
|
|
| 1456 | object *tmp, *old; |
|
|
| 1457 | |
|
|
| 1458 | /* Even if the object does have an owner, it would seem that we should |
1450 | /* Even if the object does have an owner, it would seem that we should |
| 1459 | * still save it. |
1451 | * still save it. |
| 1460 | */ |
1452 | */ |
| 1461 | if (op->owner) |
1453 | if (op->owner) |
| 1462 | return; |
1454 | return; |
| 1463 | |
1455 | |
| 1464 | /* If it is unpaid and we don't want to save those, just return. */ |
1456 | /* If it is unpaid and we don't want to save those, just return. */ |
| 1465 | if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID))) |
1457 | if (!(flag & 1) && op->flag [FLAG_UNPAID]) |
| 1466 | return; |
1458 | return; |
| 1467 | |
1459 | |
| 1468 | if ((at = op->arch) == NULL) |
1460 | archetype *at = op->arch ? (archetype *)op->arch : empty_archetype; |
| 1469 | at = empty_archetype; |
|
|
| 1470 | |
1461 | |
| 1471 | fp.put (KW_arch, at->name); |
1462 | fp.put (KW_arch, at->name); |
| 1472 | |
|
|
| 1473 | put (fp, op, &at->clone); |
1463 | put (fp, op, &at->clone); |
| 1474 | |
1464 | |
| 1475 | /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */ |
1465 | /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */ |
| 1476 | |
1466 | |
| 1477 | old = NULL; |
|
|
| 1478 | |
|
|
| 1479 | if (flag & 2) |
|
|
| 1480 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1467 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
| 1481 | save_object (fp, tmp, flag); |
1468 | save_object (fp, tmp, flag); |
| 1482 | else |
|
|
| 1483 | /* Slightly different logic because tmp/op will be removed by |
|
|
| 1484 | * the save_object we call. So we just keep looking at op->inv |
|
|
| 1485 | * until there is nothing left. In theory, the variable old |
|
|
| 1486 | * should not be needed, as recursive loops shouldn't happen. |
|
|
| 1487 | */ |
|
|
| 1488 | while ((tmp = op->inv) != NULL) |
|
|
| 1489 | { |
|
|
| 1490 | if (old == tmp) |
|
|
| 1491 | { |
|
|
| 1492 | LOG (llevError, " Recursive loop in inventory\n"); |
|
|
| 1493 | break; |
|
|
| 1494 | } |
|
|
| 1495 | |
|
|
| 1496 | save_object (fp, tmp, flag); |
|
|
| 1497 | old = tmp; |
|
|
| 1498 | } |
|
|
| 1499 | |
|
|
| 1500 | if (!(flag & 2)) |
|
|
| 1501 | op->destroy (); |
|
|
| 1502 | |
1469 | |
| 1503 | fp.put (op); |
1470 | fp.put (op); |
| 1504 | fprintf (fp, "end\n"); |
1471 | fprintf (fp, "end\n"); |
| 1505 | } |
1472 | } |
| 1506 | |
1473 | |
