| … | |
… | |
| 602 | if (!other_arch) |
602 | if (!other_arch) |
| 603 | LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); |
603 | LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); |
| 604 | break; |
604 | break; |
| 605 | |
605 | |
| 606 | case KW_owner: |
606 | case KW_owner: |
| 607 | if (const char *s = f.get_str ()) |
607 | f.delayed_deref (this, owner, f.get_str ()); |
| 608 | { |
|
|
| 609 | unsigned int version; |
|
|
| 610 | unsigned long long seq; |
|
|
| 611 | char name[256]; |
|
|
| 612 | |
|
|
| 613 | if (3 == sscanf (s, "<%d.%llx>/%256s", &version, &seq, name) && version == 1) |
|
|
| 614 | { |
|
|
| 615 | UUID uuid = seq; |
|
|
| 616 | player *pl = player::find (name); |
|
|
| 617 | |
|
|
| 618 | if (pl && pl->ob->uuid == uuid) |
|
|
| 619 | owner = pl->ob; |
|
|
| 620 | } |
|
|
| 621 | } |
|
|
| 622 | break; |
608 | break; |
| 623 | |
609 | |
| 624 | case KW_animation: |
610 | case KW_animation: |
| 625 | { |
611 | { |
| 626 | CLEAR_FLAG (this, FLAG_ANIMATE); |
612 | CLEAR_FLAG (this, FLAG_ANIMATE); |
| … | |
… | |
| 1065 | int |
1051 | int |
| 1066 | set_variable (object *op, char *buf) |
1052 | set_variable (object *op, char *buf) |
| 1067 | { |
1053 | { |
| 1068 | object_thawer f (buf, (AV *)0); |
1054 | object_thawer f (buf, (AV *)0); |
| 1069 | |
1055 | |
| 1070 | f.next (); |
|
|
| 1071 | return op->parse_kv (f); |
1056 | return op->parse_kv (f); |
| 1072 | } |
1057 | } |
| 1073 | |
1058 | |
| 1074 | /* This returns a string of the integer movement type */ |
1059 | /* This returns a string of the integer movement type */ |
| 1075 | #if 0 |
1060 | #if 0 |
| … | |
… | |
| 1290 | } |
1275 | } |
| 1291 | |
1276 | |
| 1292 | #define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) |
1277 | #define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) |
| 1293 | #define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) |
1278 | #define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) |
| 1294 | |
1279 | |
| 1295 | if (object *pl = op->owner) |
1280 | if (object *owner = op->owner) |
| 1296 | if (pl->contr) |
1281 | f.put (KW_owner, static_cast<const char *>(owner->ref ())); |
| 1297 | { |
|
|
| 1298 | char owner[256]; |
|
|
| 1299 | snprintf (owner, sizeof (owner), "<1.%llx>/%s", (unsigned long long)pl->uuid.seq, &pl->name); |
|
|
| 1300 | f.put (KW_owner, (const char *)owner); |
|
|
| 1301 | } |
|
|
| 1302 | |
1282 | |
| 1303 | CMP_OUT (name); |
1283 | CMP_OUT (name); |
| 1304 | CMP_OUT (name_pl); |
1284 | CMP_OUT (name_pl); |
| 1305 | CMP_OUT (custom_name); |
1285 | CMP_OUT (custom_name); |
| 1306 | CMP_OUT (title); |
1286 | CMP_OUT (title); |
| … | |
… | |
| 1457 | object_thawer f (filename); |
1437 | object_thawer f (filename); |
| 1458 | |
1438 | |
| 1459 | bool success = false; |
1439 | bool success = false; |
| 1460 | bool seen_arch = false; |
1440 | bool seen_arch = false; |
| 1461 | |
1441 | |
| 1462 | f.next (); |
|
|
| 1463 | |
|
|
| 1464 | for (;;) |
1442 | for (;;) |
| 1465 | { |
1443 | { |
| 1466 | switch (f.kw) |
1444 | switch (f.kw) |
| 1467 | { |
1445 | { |
| 1468 | case KW_region: |
1446 | case KW_region: |
