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.92 by root, Tue Jul 10 05:51:37 2007 UTC vs.
Revision 1.97 by root, Wed Aug 1 19:15:49 2007 UTC

637 637
638 case KW_face: 638 case KW_face:
639 face = face_find (f.get_str ()); 639 face = face_find (f.get_str ());
640 break; 640 break;
641 641
642 case KW_sound:
643 sound = sound_find (f.get_str ());
644 break;
645
646 case KW_sound_destroy:
647 sound_destroy = sound_find (f.get_str ());
648 break;
649
642 case KW_x: f.get (x); break; 650 case KW_x: f.get (x); break;
643 case KW_y: f.get (y); break; 651 case KW_y: f.get (y); break;
644 652
645 case KW_Str: // uppercase alias 653 case KW_Str: // uppercase alias
646 case KW_str: f.get (stats.Str); break; 654 case KW_str: f.get (stats.Str); break;
1266 CMP_OUT (name_pl); 1274 CMP_OUT (name_pl);
1267 CMP_OUT (custom_name); 1275 CMP_OUT (custom_name);
1268 CMP_OUT (title); 1276 CMP_OUT (title);
1269 CMP_OUT (race); 1277 CMP_OUT (race);
1270 CMP_OUT (slaying); 1278 CMP_OUT (slaying);
1271
1272 if (op->msg != tmp->msg)
1273 f.put (KW_msg, KW_endmsg, op->msg);
1274 if (op->lore != tmp->lore)
1275 f.put (KW_lore, KW_endlore, op->lore);
1276
1277 CMP_OUT (other_arch); 1279 CMP_OUT (other_arch);
1278 1280
1281 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1282 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1283
1279 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); 1284 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1285 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1286 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1280 1287
1281 if (op->animation_id != tmp->animation_id) 1288 if (op->animation_id != tmp->animation_id)
1282 if (op->animation_id) 1289 if (op->animation_id)
1283 { 1290 {
1284 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1291 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines