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.101 by root, Tue Sep 4 18:20:35 2007 UTC vs.
Revision 1.102 by root, Mon Sep 10 12:44:06 2007 UTC

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 ();
1284 CMP_OUT (name_pl); 1285 CMP_OUT (name_pl);
1285 CMP_OUT (custom_name); 1286 CMP_OUT (custom_name);
1286 CMP_OUT (title); 1287 CMP_OUT (title);
1287 CMP_OUT (race); 1288 CMP_OUT (race);
1288 CMP_OUT (slaying); 1289 CMP_OUT (slaying);
1290 CMP_OUT (tag);
1289 CMP_OUT (other_arch); 1291 CMP_OUT (other_arch);
1290 1292
1291 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1293 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1292 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); 1294 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1293 1295

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines