… | |
… | |
28 | #include <global.h> |
28 | #include <global.h> |
29 | #include <loader.h> |
29 | #include <loader.h> |
30 | #include <sproto.h> |
30 | #include <sproto.h> |
31 | |
31 | |
32 | ///////////////////////////////////////////////////////////////////////////// |
32 | ///////////////////////////////////////////////////////////////////////////// |
|
|
33 | |
|
|
34 | extern archetype *loading_arch; |
33 | |
35 | |
34 | /* This table is only necessary to convert objects that existed before the |
36 | /* This table is only necessary to convert objects that existed before the |
35 | * spell object conversion to the new object. It was not practical |
37 | * spell object conversion to the new object. It was not practical |
36 | * to go through every mapping looking for every potion, rod, wand, etc |
38 | * to go through every mapping looking for every potion, rod, wand, etc |
37 | * that had a sp set and update to the new value. So this maps the |
39 | * that had a sp set and update to the new value. So this maps the |
… | |
… | |
249 | "spell_cause_rabies", /* 204 */ |
251 | "spell_cause_rabies", /* 204 */ |
250 | "spell_glyph", /* 205 */ |
252 | "spell_glyph", /* 205 */ |
251 | NULL |
253 | NULL |
252 | }; |
254 | }; |
253 | |
255 | |
254 | extern bool loading_arch; |
|
|
255 | |
|
|
256 | /* This function checks the object after it has been loaded (when we |
256 | /* This function checks the object after it has been loaded (when we |
257 | * get the 'end' in the input stream). This function can be used to |
257 | * get the 'end' in the input stream). This function can be used to |
258 | * deal with legacy objects where fields may have changed. It can also be used |
258 | * deal with legacy objects where fields may have changed. It can also be used |
259 | * to check for objects to make sure there are no common errors. |
259 | * to check for objects to make sure there are no common errors. |
260 | */ |
260 | */ |
… | |
… | |
394 | /* Old spellcasting object - need to load in the appropiate object */ |
394 | /* Old spellcasting object - need to load in the appropiate object */ |
395 | if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || |
395 | if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || |
396 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
396 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
397 | ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) |
397 | ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) |
398 | { |
398 | { |
399 | /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' |
399 | /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' |
400 | * in that spell was stored in sp. |
400 | * in that spell was stored in sp. |
401 | */ |
401 | */ |
402 | object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); |
402 | object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); |
403 | insert_ob_in_ob (tmp, this); |
403 | insert_ob_in_ob (tmp, this); |
404 | randomitems = NULL; /* So another spell isn't created for this object */ |
404 | randomitems = NULL; /* So another spell isn't created for this object */ |
… | |
… | |
556 | |
556 | |
557 | case KW_attach: f.get_ornull (attach); break; |
557 | case KW_attach: f.get_ornull (attach); break; |
558 | case KW_skill: f.get_ornull (skill); break; |
558 | case KW_skill: f.get_ornull (skill); break; |
559 | case KW_race: f.get_ornull (race); break; |
559 | case KW_race: f.get_ornull (race); break; |
560 | case KW_slaying: f.get_ornull (slaying); break; |
560 | case KW_slaying: f.get_ornull (slaying); break; |
|
|
561 | case KW_tag: f.get_ornull (tag); break; |
561 | |
562 | |
562 | case KW_arch: |
563 | case KW_arch: |
563 | { |
564 | { |
564 | object *tmp = object::read (f); |
565 | object *tmp = object::read (f); |
565 | tmp->deactivate (); |
566 | tmp->deactivate (); |
… | |
… | |
567 | { |
568 | { |
568 | // was: insert_ob_in_ob (tmp, op); |
569 | // was: insert_ob_in_ob (tmp, op); |
569 | // but manually adding it can improve map loading times a lot |
570 | // but manually adding it can improve map loading times a lot |
570 | // also, appending instead of prepending keeps the |
571 | // also, appending instead of prepending keeps the |
571 | // save ordering the same between repeated load/saves. |
572 | // save ordering the same between repeated load/saves. |
|
|
573 | // and finally we do not want any funny effects |
572 | CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); |
574 | CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); |
573 | CLEAR_FLAG (tmp, FLAG_REMOVED); |
575 | CLEAR_FLAG (tmp, FLAG_REMOVED); |
574 | |
576 | |
575 | if (!op_inv) |
577 | if (!op_inv) |
576 | { |
578 | { |
… | |
… | |
599 | ? archetype::get (f.get_str ()) |
601 | ? archetype::get (f.get_str ()) |
600 | : archetype::find (f.get_str ()); |
602 | : archetype::find (f.get_str ()); |
601 | |
603 | |
602 | if (!other_arch) |
604 | if (!other_arch) |
603 | LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); |
605 | LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); |
|
|
606 | break; |
|
|
607 | |
|
|
608 | case KW_owner: |
|
|
609 | f.delayed_deref (this, owner, f.get_str ()); |
604 | break; |
610 | break; |
605 | |
611 | |
606 | case KW_animation: |
612 | case KW_animation: |
607 | { |
613 | { |
608 | CLEAR_FLAG (this, FLAG_ANIMATE); |
614 | CLEAR_FLAG (this, FLAG_ANIMATE); |
… | |
… | |
1047 | int |
1053 | int |
1048 | set_variable (object *op, char *buf) |
1054 | set_variable (object *op, char *buf) |
1049 | { |
1055 | { |
1050 | object_thawer f (buf, (AV *)0); |
1056 | object_thawer f (buf, (AV *)0); |
1051 | |
1057 | |
1052 | f.next (); |
|
|
1053 | return op->parse_kv (f); |
1058 | return op->parse_kv (f); |
1054 | } |
1059 | } |
1055 | |
1060 | |
1056 | /* This returns a string of the integer movement type */ |
1061 | /* This returns a string of the integer movement type */ |
1057 | #if 0 |
1062 | #if 0 |
… | |
… | |
1269 | char uids[64]; |
1274 | char uids[64]; |
1270 | snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq); |
1275 | snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq); |
1271 | f.put (KW_uuid, (const char *)uids); |
1276 | f.put (KW_uuid, (const char *)uids); |
1272 | } |
1277 | } |
1273 | |
1278 | |
1274 | #define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) |
1279 | #define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) |
1275 | #define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) |
1280 | #define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) |
|
|
1281 | |
|
|
1282 | if (object *owner = op->owner) |
|
|
1283 | f.put (KW_owner, static_cast<const char *>(owner->ref ())); |
1276 | |
1284 | |
1277 | CMP_OUT (name); |
1285 | CMP_OUT (name); |
1278 | CMP_OUT (name_pl); |
1286 | CMP_OUT (name_pl); |
1279 | CMP_OUT (custom_name); |
1287 | CMP_OUT (custom_name); |
1280 | CMP_OUT (title); |
1288 | CMP_OUT (title); |
1281 | CMP_OUT (race); |
1289 | CMP_OUT (race); |
1282 | CMP_OUT (slaying); |
1290 | CMP_OUT (slaying); |
|
|
1291 | CMP_OUT (tag); |
1283 | CMP_OUT (other_arch); |
1292 | CMP_OUT (other_arch); |
1284 | |
1293 | |
1285 | if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); |
1294 | if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); |
1286 | if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); |
1295 | if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); |
1287 | |
1296 | |
… | |
… | |
1337 | CMP_OUT (type); |
1346 | CMP_OUT (type); |
1338 | CMP_OUT (subtype); |
1347 | CMP_OUT (subtype); |
1339 | CMP_OUT (attacktype); |
1348 | CMP_OUT (attacktype); |
1340 | |
1349 | |
1341 | for (i = 0; i < NROFATTACKS; i++) |
1350 | for (i = 0; i < NROFATTACKS; i++) |
1342 | if (op->resist[i] != tmp->resist[i]) |
1351 | if (expect_false (op->resist[i] != tmp->resist[i])) |
1343 | f.put (resist_save[i], op->resist[i]); |
1352 | f.put (resist_save[i], op->resist[i]); |
1344 | |
1353 | |
1345 | CMP_OUT (path_attuned); |
1354 | CMP_OUT (path_attuned); |
1346 | CMP_OUT (path_repelled); |
1355 | CMP_OUT (path_repelled); |
1347 | CMP_OUT (path_denied); |
1356 | CMP_OUT (path_denied); |
… | |
… | |
1389 | CMP_OUT (move_slow); |
1398 | CMP_OUT (move_slow); |
1390 | CMP_OUT (move_slow_penalty); |
1399 | CMP_OUT (move_slow_penalty); |
1391 | |
1400 | |
1392 | if (op->flag != tmp->flag) |
1401 | if (op->flag != tmp->flag) |
1393 | for (i = 0; i <= NUM_FLAGS; i++) |
1402 | for (i = 0; i <= NUM_FLAGS; i++) |
1394 | if (flag_names [i] && op->flag [i] != tmp->flag [i]) |
1403 | if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) |
1395 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1404 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1396 | |
1405 | |
1397 | // save body locations |
1406 | // save body locations |
1398 | for (i = 0; i < NUM_BODY_LOCATIONS; i++) |
1407 | for (i = 0; i < NUM_BODY_LOCATIONS; i++) |
1399 | if (op->slot[i].info != tmp->slot[i].info) |
1408 | if (expect_false (op->slot[i].info != tmp->slot[i].info)) |
1400 | f.put (body_locations[i].save_name, op->slot[i].info); |
1409 | f.put (body_locations[i].save_name, op->slot[i].info); |
1401 | } |
1410 | } |
1402 | |
1411 | |
1403 | /* |
1412 | /* |
1404 | * Dumps all variables in an object to a file. |
1413 | * Dumps all variables in an object to a file. |
… | |
… | |
1406 | * the only place this is not set is when saving the player. |
1415 | * the only place this is not set is when saving the player. |
1407 | */ |
1416 | */ |
1408 | bool |
1417 | bool |
1409 | object::write (object_freezer &f) |
1418 | object::write (object_freezer &f) |
1410 | { |
1419 | { |
1411 | /* Even if the object does have an owner, it would seem that we should |
|
|
1412 | * still save it. |
|
|
1413 | */ |
|
|
1414 | if (owner) |
|
|
1415 | return true; |
|
|
1416 | |
|
|
1417 | archetype *at = arch ? (archetype *)arch : empty_archetype; |
1420 | archetype *at = arch ? (archetype *)arch : empty_archetype; |
1418 | |
1421 | |
1419 | f.put (KW_arch, at->archname); |
1422 | f.put (KW_arch, at->archname); |
1420 | write_diff (f, this, at); |
1423 | write_diff (f, this, at); |
1421 | |
1424 | |
… | |
… | |
1437 | object_thawer f (filename); |
1440 | object_thawer f (filename); |
1438 | |
1441 | |
1439 | bool success = false; |
1442 | bool success = false; |
1440 | bool seen_arch = false; |
1443 | bool seen_arch = false; |
1441 | |
1444 | |
1442 | f.next (); |
|
|
1443 | |
|
|
1444 | for (;;) |
1445 | for (;;) |
1445 | { |
1446 | { |
1446 | switch (f.kw) |
1447 | switch (f.kw) |
1447 | { |
1448 | { |
1448 | case KW_region: |
1449 | case KW_region: |