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.86 by root, Mon May 28 21:21:40 2007 UTC vs.
Revision 1.87 by root, Mon Jun 4 12:19:08 2007 UTC

1285 1285
1286 if (op->msg != tmp->msg) 1286 if (op->msg != tmp->msg)
1287 f.put (KW_msg, KW_endmsg, op->msg); 1287 f.put (KW_msg, KW_endmsg, op->msg);
1288 if (op->lore != tmp->lore) 1288 if (op->lore != tmp->lore)
1289 f.put (KW_lore, KW_endlore, op->lore); 1289 f.put (KW_lore, KW_endlore, op->lore);
1290 1290 if (op->other_arch != tmp->other_arch)
1291 CMP_OUT (other_arch); 1291 f.put (KW_other_arch, op->other_arch ? &op->other_arch->archname : 0);
1292 1292
1293 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); 1293 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0);
1294 1294
1295 if (op->animation_id != tmp->animation_id) 1295 if (op->animation_id != tmp->animation_id)
1296 if (op->animation_id) 1296 if (op->animation_id)
1417 if (owner) 1417 if (owner)
1418 return true; 1418 return true;
1419 1419
1420 archetype *at = arch ? (archetype *)arch : empty_archetype; 1420 archetype *at = arch ? (archetype *)arch : empty_archetype;
1421 1421
1422 f.put (KW_arch, at->name); 1422 f.put (KW_arch, at->archname);
1423 write_diff (f, this, &at->clone); 1423 write_diff (f, this, &at->clone);
1424 1424
1425 for (object *tmp = inv; tmp; tmp = tmp->below) 1425 for (object *tmp = inv; tmp; tmp = tmp->below)
1426 tmp->write (f); 1426 tmp->write (f);
1427 1427

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines