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.127 by root, Thu Jan 8 03:03:23 2009 UTC vs.
Revision 1.129 by root, Sat Jun 27 08:35:03 2009 UTC

927 case KW_anim_speed: f.get (anim_speed); break; 927 case KW_anim_speed: f.get (anim_speed); break;
928 case KW_container: f.get (weight_limit); break; 928 case KW_container: f.get (weight_limit); break;
929 case KW_will_apply: f.get (will_apply); break; 929 case KW_will_apply: f.get (will_apply); break;
930 case KW_attack_movement: f.get (attack_movement); break; 930 case KW_attack_movement: f.get (attack_movement); break;
931 case KW_move_state: f.get (move_status); break; 931 case KW_move_state: f.get (move_status); break;
932 case KW_expmul: f.get (expmul); break; 932 //case KW_expmul: f.get (expmul); break;//D declared const for the time being
933 case KW_glow_radius: f.get (glow_radius); break; 933 case KW_glow_radius: f.get (glow_radius); break;
934 case KW_weapontype: f.get (weapontype); break; 934 case KW_weapontype: f.get (weapontype); break;
935 case KW_casting_time: f.get (casting_time); break; 935 case KW_casting_time: f.get (casting_time); break;
936 936
937 // elevation is deprecated 937 // elevation is deprecated
1315 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1315 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1316 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1316 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1317 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1317 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1318 1318
1319 if (op->animation_id != tmp->animation_id) 1319 if (op->animation_id != tmp->animation_id)
1320 if (op->animation_id) 1320 if (op->has_anim ())
1321 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1321 f.put (KW_animation, op->anim ().name);
1322 else 1322 else
1323 { 1323 {
1324 f.put (KW_animation, (const char *)0); 1324 f.put (KW_animation, (const char *)0);
1325 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? 1325 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1326 } 1326 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines