ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/loader.C
(Generate patch)

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.98 by root, Wed Aug 1 20:07:06 2007 UTC vs.
Revision 1.100 by root, Tue Sep 4 05:43:20 2007 UTC

… …
601 601
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:
607 f.delayed_deref (this, owner, f.get_str ());
608 break;
609
606 case KW_animation: 610 case KW_animation:
607 { 611 {
608 CLEAR_FLAG (this, FLAG_ANIMATE); 612 CLEAR_FLAG (this, FLAG_ANIMATE);
609 animation_id = 0; 613 animation_id = 0;
610 614
… …
1047int 1051int
1048set_variable (object *op, char *buf) 1052set_variable (object *op, char *buf)
1049{ 1053{
1050 object_thawer f (buf, (AV *)0); 1054 object_thawer f (buf, (AV *)0);
1051 1055
1052 f.next ();
1053 return op->parse_kv (f); 1056 return op->parse_kv (f);
1054} 1057}
1055 1058
1056/* This returns a string of the integer movement type */ 1059/* This returns a string of the integer movement type */
1057#if 0 1060#if 0
… …
1269 char uids[64]; 1272 char uids[64];
1270 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq); 1273 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1271 f.put (KW_uuid, (const char *)uids); 1274 f.put (KW_uuid, (const char *)uids);
1272 } 1275 }
1273 1276
1274#define CMP_OUT(v) if (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)
1275#define CMP_OUT2(k,v) if (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)
1279
1280 if (object *owner = op->owner)
1281 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1276 1282
1277 CMP_OUT (name); 1283 CMP_OUT (name);
1278 CMP_OUT (name_pl); 1284 CMP_OUT (name_pl);
1279 CMP_OUT (custom_name); 1285 CMP_OUT (custom_name);
1280 CMP_OUT (title); 1286 CMP_OUT (title);
… …
1337 CMP_OUT (type); 1343 CMP_OUT (type);
1338 CMP_OUT (subtype); 1344 CMP_OUT (subtype);
1339 CMP_OUT (attacktype); 1345 CMP_OUT (attacktype);
1340 1346
1341 for (i = 0; i < NROFATTACKS; i++) 1347 for (i = 0; i < NROFATTACKS; i++)
1342 if (op->resist[i] != tmp->resist[i]) 1348 if (expect_false (op->resist[i] != tmp->resist[i]))
1343 f.put (resist_save[i], op->resist[i]); 1349 f.put (resist_save[i], op->resist[i]);
1344 1350
1345 CMP_OUT (path_attuned); 1351 CMP_OUT (path_attuned);
1346 CMP_OUT (path_repelled); 1352 CMP_OUT (path_repelled);
1347 CMP_OUT (path_denied); 1353 CMP_OUT (path_denied);
… …
1389 CMP_OUT (move_slow); 1395 CMP_OUT (move_slow);
1390 CMP_OUT (move_slow_penalty); 1396 CMP_OUT (move_slow_penalty);
1391 1397
1392 if (op->flag != tmp->flag) 1398 if (op->flag != tmp->flag)
1393 for (i = 0; i <= NUM_FLAGS; i++) 1399 for (i = 0; i <= NUM_FLAGS; i++)
1394 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1400 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1395 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1401 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1396 1402
1397 // save body locations 1403 // save body locations
1398 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1404 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1399 if (op->slot[i].info != tmp->slot[i].info) 1405 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1400 f.put (body_locations[i].save_name, op->slot[i].info); 1406 f.put (body_locations[i].save_name, op->slot[i].info);
1401} 1407}
1402 1408
1403/* 1409/*
1404 * Dumps all variables in an object to a file. 1410 * Dumps all variables in an object to a file.
… …
1406 * the only place this is not set is when saving the player. 1412 * the only place this is not set is when saving the player.
1407 */ 1413 */
1408bool 1414bool
1409object::write (object_freezer &f) 1415object::write (object_freezer &f)
1410{ 1416{
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; 1417 archetype *at = arch ? (archetype *)arch : empty_archetype;
1418 1418
1419 f.put (KW_arch, at->archname); 1419 f.put (KW_arch, at->archname);
1420 write_diff (f, this, at); 1420 write_diff (f, this, at);
1421 1421
… …
1437 object_thawer f (filename); 1437 object_thawer f (filename);
1438 1438
1439 bool success = false; 1439 bool success = false;
1440 bool seen_arch = false; 1440 bool seen_arch = false;
1441 1441
1442 f.next ();
1443
1444 for (;;) 1442 for (;;)
1445 { 1443 {
1446 switch (f.kw) 1444 switch (f.kw)
1447 { 1445 {
1448 case KW_region: 1446 case KW_region:

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines