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.93 by root, Tue Jul 31 17:33:14 2007 UTC vs.
Revision 1.99 by root, Sat Aug 25 22:19:26 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 if (const char *s = 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;
623
606 case KW_animation: 624 case KW_animation:
607 { 625 {
608 CLEAR_FLAG (this, FLAG_ANIMATE); 626 CLEAR_FLAG (this, FLAG_ANIMATE);
609 animation_id = 0; 627 animation_id = 0;
610 628
… …
640 break; 658 break;
641 659
642 case KW_sound: 660 case KW_sound:
643 sound = sound_find (f.get_str ()); 661 sound = sound_find (f.get_str ());
644 if (!sound) 662 if (!sound)
645 sound = face_find (f.get_str ());//TODO: really fall back to face name? 663 f.parse_warn ("sound not found");
664 break;
665
666 case KW_sound_destroy:
667 sound_destroy = sound_find (f.get_str ());
668 if (!sound_destroy)
669 f.parse_warn ("sound not found");
646 break; 670 break;
647 671
648 case KW_x: f.get (x); break; 672 case KW_x: f.get (x); break;
649 case KW_y: f.get (y); break; 673 case KW_y: f.get (y); break;
650 674
… …
1263 char uids[64]; 1287 char uids[64];
1264 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq); 1288 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1265 f.put (KW_uuid, (const char *)uids); 1289 f.put (KW_uuid, (const char *)uids);
1266 } 1290 }
1267 1291
1268#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) 1292#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
1269#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) 1293#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1294
1295 if (object *pl = op->owner)
1296 if (pl->contr)
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 }
1270 1302
1271 CMP_OUT (name); 1303 CMP_OUT (name);
1272 CMP_OUT (name_pl); 1304 CMP_OUT (name_pl);
1273 CMP_OUT (custom_name); 1305 CMP_OUT (custom_name);
1274 CMP_OUT (title); 1306 CMP_OUT (title);
… …
1277 CMP_OUT (other_arch); 1309 CMP_OUT (other_arch);
1278 1310
1279 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1311 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1280 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); 1312 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1281 1313
1282 if (op->sound != tmp->sound) f.put (KW_sound, op->sound ? &faces [op->sound] : 0);
1283 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1314 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1315 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1316 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1284 1317
1285 if (op->animation_id != tmp->animation_id) 1318 if (op->animation_id != tmp->animation_id)
1286 if (op->animation_id) 1319 if (op->animation_id)
1287 { 1320 {
1288 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1321 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
… …
1330 CMP_OUT (type); 1363 CMP_OUT (type);
1331 CMP_OUT (subtype); 1364 CMP_OUT (subtype);
1332 CMP_OUT (attacktype); 1365 CMP_OUT (attacktype);
1333 1366
1334 for (i = 0; i < NROFATTACKS; i++) 1367 for (i = 0; i < NROFATTACKS; i++)
1335 if (op->resist[i] != tmp->resist[i]) 1368 if (expect_false (op->resist[i] != tmp->resist[i]))
1336 f.put (resist_save[i], op->resist[i]); 1369 f.put (resist_save[i], op->resist[i]);
1337 1370
1338 CMP_OUT (path_attuned); 1371 CMP_OUT (path_attuned);
1339 CMP_OUT (path_repelled); 1372 CMP_OUT (path_repelled);
1340 CMP_OUT (path_denied); 1373 CMP_OUT (path_denied);
… …
1382 CMP_OUT (move_slow); 1415 CMP_OUT (move_slow);
1383 CMP_OUT (move_slow_penalty); 1416 CMP_OUT (move_slow_penalty);
1384 1417
1385 if (op->flag != tmp->flag) 1418 if (op->flag != tmp->flag)
1386 for (i = 0; i <= NUM_FLAGS; i++) 1419 for (i = 0; i <= NUM_FLAGS; i++)
1387 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1420 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1388 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1421 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1389 1422
1390 // save body locations 1423 // save body locations
1391 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1424 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1392 if (op->slot[i].info != tmp->slot[i].info) 1425 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1393 f.put (body_locations[i].save_name, op->slot[i].info); 1426 f.put (body_locations[i].save_name, op->slot[i].info);
1394} 1427}
1395 1428
1396/* 1429/*
1397 * Dumps all variables in an object to a file. 1430 * Dumps all variables in an object to a file.
… …
1399 * the only place this is not set is when saving the player. 1432 * the only place this is not set is when saving the player.
1400 */ 1433 */
1401bool 1434bool
1402object::write (object_freezer &f) 1435object::write (object_freezer &f)
1403{ 1436{
1404 /* Even if the object does have an owner, it would seem that we should
1405 * still save it.
1406 */
1407 if (owner)
1408 return true;
1409
1410 archetype *at = arch ? (archetype *)arch : empty_archetype; 1437 archetype *at = arch ? (archetype *)arch : empty_archetype;
1411 1438
1412 f.put (KW_arch, at->archname); 1439 f.put (KW_arch, at->archname);
1413 write_diff (f, this, at); 1440 write_diff (f, this, at);
1414 1441

Diff Legend

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