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.90 by root, Sun Jul 1 05:00:17 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
… …
635 f.get (move_slow_penalty); 653 f.get (move_slow_penalty);
636 break; 654 break;
637 655
638 case KW_face: 656 case KW_face:
639 face = face_find (f.get_str ()); 657 face = face_find (f.get_str ());
658 break;
659
660 case KW_sound:
661 sound = sound_find (f.get_str ());
662 if (!sound)
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");
640 break; 670 break;
641 671
642 case KW_x: f.get (x); break; 672 case KW_x: f.get (x); break;
643 case KW_y: f.get (y); break; 673 case KW_y: f.get (y); break;
644 674
… …
958 randomitems = 0; 988 randomitems = 0;
959 break; 989 break;
960 990
961 case KW_msg: 991 case KW_msg:
962 f.get_ml (KW_endmsg, msg); 992 f.get_ml (KW_endmsg, msg);
963 //TODO: allow longer messages
964 if (strlen (msg) >= HUGE_BUF)
965 {
966 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
967 msg = "ERROR, please report: string too long, winged.\n";
968 }
969 break; 993 break;
970 994
971 case KW_lore: 995 case KW_lore:
972 f.get_ml (KW_endlore, lore); 996 f.get_ml (KW_endlore, lore);
973 //TODO: allow longer messages
974 /* Just print a warning so we can be reasonably safe
975 * about not overflowing the buffer.
976 */
977 if (strlen (lore) > (HUGE_BUF / 2))
978 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
979 HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
980 break; 997 break;
981 998
982 case KW_editable: 999 case KW_editable:
983 case KW_editor_folder: 1000 case KW_editor_folder:
984 break; 1001 break;
… …
1270 char uids[64]; 1287 char uids[64];
1271 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);
1272 f.put (KW_uuid, (const char *)uids); 1289 f.put (KW_uuid, (const char *)uids);
1273 } 1290 }
1274 1291
1275#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)
1276#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 }
1277 1302
1278 CMP_OUT (name); 1303 CMP_OUT (name);
1279 CMP_OUT (name_pl); 1304 CMP_OUT (name_pl);
1280 CMP_OUT (custom_name); 1305 CMP_OUT (custom_name);
1281 CMP_OUT (title); 1306 CMP_OUT (title);
1282 CMP_OUT (race); 1307 CMP_OUT (race);
1283 CMP_OUT (slaying); 1308 CMP_OUT (slaying);
1284
1285 if (op->msg != tmp->msg)
1286 f.put (KW_msg, KW_endmsg, op->msg);
1287 if (op->lore != tmp->lore)
1288 f.put (KW_lore, KW_endlore, op->lore);
1289
1290 CMP_OUT (other_arch); 1309 CMP_OUT (other_arch);
1291 1310
1311 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1312 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1313
1292 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);
1293 1317
1294 if (op->animation_id != tmp->animation_id) 1318 if (op->animation_id != tmp->animation_id)
1295 if (op->animation_id) 1319 if (op->animation_id)
1296 { 1320 {
1297 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1321 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1298 1322
1299 if (!QUERY_FLAG (op, FLAG_ANIMATE)) 1323 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1300 f.put (KW_is_animated, (sint32) 0); 1324 f.put (KW_is_animated, (sint32)0);
1301 } 1325 }
1302 else 1326 else
1303 f.put (KW_animation, (const char *) 0); 1327 f.put (KW_animation, (const char *)0);
1304 1328
1305 CMP_OUT2 (str, stats.Str); 1329 CMP_OUT2 (str, stats.Str);
1306 CMP_OUT2 (dex, stats.Dex); 1330 CMP_OUT2 (dex, stats.Dex);
1307 CMP_OUT2 (con, stats.Con); 1331 CMP_OUT2 (con, stats.Con);
1308 CMP_OUT2 (wis, stats.Wis); 1332 CMP_OUT2 (wis, stats.Wis);
… …
1339 CMP_OUT (type); 1363 CMP_OUT (type);
1340 CMP_OUT (subtype); 1364 CMP_OUT (subtype);
1341 CMP_OUT (attacktype); 1365 CMP_OUT (attacktype);
1342 1366
1343 for (i = 0; i < NROFATTACKS; i++) 1367 for (i = 0; i < NROFATTACKS; i++)
1344 if (op->resist[i] != tmp->resist[i]) 1368 if (expect_false (op->resist[i] != tmp->resist[i]))
1345 f.put (resist_save[i], op->resist[i]); 1369 f.put (resist_save[i], op->resist[i]);
1346 1370
1347 CMP_OUT (path_attuned); 1371 CMP_OUT (path_attuned);
1348 CMP_OUT (path_repelled); 1372 CMP_OUT (path_repelled);
1349 CMP_OUT (path_denied); 1373 CMP_OUT (path_denied);
… …
1391 CMP_OUT (move_slow); 1415 CMP_OUT (move_slow);
1392 CMP_OUT (move_slow_penalty); 1416 CMP_OUT (move_slow_penalty);
1393 1417
1394 if (op->flag != tmp->flag) 1418 if (op->flag != tmp->flag)
1395 for (i = 0; i <= NUM_FLAGS; i++) 1419 for (i = 0; i <= NUM_FLAGS; i++)
1396 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1420 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1397 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1421 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1398 1422
1399 // save body locations 1423 // save body locations
1400 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1424 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1401 if (op->slot[i].info != tmp->slot[i].info) 1425 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1402 f.put (body_locations[i].save_name, op->slot[i].info); 1426 f.put (body_locations[i].save_name, op->slot[i].info);
1403} 1427}
1404 1428
1405/* 1429/*
1406 * Dumps all variables in an object to a file. 1430 * Dumps all variables in an object to a file.
… …
1408 * 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.
1409 */ 1433 */
1410bool 1434bool
1411object::write (object_freezer &f) 1435object::write (object_freezer &f)
1412{ 1436{
1413 /* Even if the object does have an owner, it would seem that we should
1414 * still save it.
1415 */
1416 if (owner)
1417 return true;
1418
1419 archetype *at = arch ? (archetype *)arch : empty_archetype; 1437 archetype *at = arch ? (archetype *)arch : empty_archetype;
1420 1438
1421 f.put (KW_arch, at->archname); 1439 f.put (KW_arch, at->archname);
1422 write_diff (f, this, at); 1440 write_diff (f, this, at);
1423 1441

Diff Legend

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