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.172 by root, Tue Jan 3 11:25:31 2012 UTC vs.
Revision 1.174 by root, Fri Feb 3 02:04:11 2012 UTC

475 } 475 }
476 476
477 // if the object has an animation, try to provide a default face 477 // if the object has an animation, try to provide a default face
478 if (has_anim ()) 478 if (has_anim ())
479 { 479 {
480 const animation &anim_ob = anim ();
481
482 if (anim_speed) 480 if (anim_speed)
483 // if this item is time-animated, force the last frame 481 // if this item is time-animated, force the last frame
484 animate_object (this, 0); 482 animate_object (this, 0);
485 else if (flag [FLAG_MONSTER]) 483 else if (flag [FLAG_MONSTER])
486 // if it is a monster, set appropriate facing 484 // if it is a monster, set appropriate facing
550 548
551bool 549bool
552object::parse_kv (object_thawer &f) 550object::parse_kv (object_thawer &f)
553{ 551{
554 object *op_inv = inv; 552 object *op_inv = inv;
555 key_value *last_kv = kv.first;
556 553
557 for (;;) 554 for (;;)
558 { 555 {
559 switch (f.kw) 556 switch (f.kw)
560 { 557 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines