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.96 by root, Wed Aug 1 01:53:13 2007 UTC vs.
Revision 1.97 by root, Wed Aug 1 19:15:49 2007 UTC

641 641
642 case KW_sound: 642 case KW_sound:
643 sound = sound_find (f.get_str ()); 643 sound = sound_find (f.get_str ());
644 break; 644 break;
645 645
646 case KW_sound_die: 646 case KW_sound_destroy:
647 sound_die = sound_find (f.get_str ()); 647 sound_destroy = sound_find (f.get_str ());
648 break; 648 break;
649 649
650 case KW_x: f.get (x); break; 650 case KW_x: f.get (x); break;
651 case KW_y: f.get (y); break; 651 case KW_y: f.get (y); break;
652 652
1279 CMP_OUT (other_arch); 1279 CMP_OUT (other_arch);
1280 1280
1281 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 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); 1282 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1283 1283
1284 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); 1285 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1286 if (op->sound_die != tmp->sound_die) f.put (KW_sound_die, op->sound_die ? &faces [op->sound_die] : 0); 1286 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1287 1287
1288 if (op->animation_id != tmp->animation_id) 1288 if (op->animation_id != tmp->animation_id)
1289 if (op->animation_id) 1289 if (op->animation_id)
1290 { 1290 {
1291 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