ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/time.C
(Generate patch)

Comparing deliantra/server/server/time.C (file contents):
Revision 1.86 by elmex, Tue Jan 13 12:07:42 2009 UTC vs.
Revision 1.90 by root, Tue May 5 04:51:56 2009 UTC

816 return; 816 return;
817 } 817 }
818 818
819 /* update object image for new facing */ 819 /* update object image for new facing */
820 /* many thrown objects *don't* have more than one face */ 820 /* many thrown objects *don't* have more than one face */
821 if (GET_ANIM_ID (op)) 821 if (op->has_anim ())
822 SET_ANIMATION (op, op->direction); 822 op->set_anim_frame (op->direction);
823 } /* object is reflected */ 823 } /* object is reflected */
824 } /* object ran into a wall */ 824 } /* object ran into a wall */
825 825
826 /* decrease the speed as it flies. 0.05 means a standard bow will shoot 826 /* decrease the speed as it flies. 0.05 means a standard bow will shoot
827 * about 17 squares. Tune as needed. 827 * about 17 squares. Tune as needed.
1281 // check whether the face might needs to be updated 1281 // check whether the face might needs to be updated
1282 // (currently this is needed to have already switched on torches 1282 // (currently this is needed to have already switched on torches
1283 // on maps, as they just set the glow_radius in the archetype) 1283 // on maps, as they just set the glow_radius in the archetype)
1284 if (op->other_arch 1284 if (op->other_arch
1285 && ( 1285 && (
1286 (op->flag [FLAG_ANIMATE] != op->other_arch->flag [FLAG_ANIMATE])
1286 op->flag [FLAG_ANIMATE] 1287 || (op->flag [FLAG_ANIMATE]
1287 ? (op->animation_id != op->other_arch->animation_id) 1288 ? (op->animation_id != op->other_arch->animation_id)
1288 : (op->face != op->other_arch->face) 1289 : (op->face != op->other_arch->face))
1289 )) 1290 ))
1290 get_animation_from_arch (op, op->other_arch); 1291 get_animation_from_arch (op, op->other_arch);
1291 } 1292 }
1292 1293
1293 // lamps and torches auf maps don't use up their fuel 1294 // lamps and torches auf maps don't use up their fuel

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines