Changeset 4885 in orxonox.OLD for orxonox/trunk/src/util/animation

Timestamp:

Jul 18, 2005, 3:36:18 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the weaponSystem back to the trunk, because it seems safe
merged with command:
svn merge -r 4847:HEAD branches/weaponSystem/ trunk/
conflict in file src/world-entities/weapons/weapon.h resolved in favor of the weaponSystem

File:

• orxonox/trunk/src/util/animation/t_animation.h (modified) (1 diff)

orxonox/trunk/src/util/animation/t_animation.h

@@ -205 +205 @@
               this->nextKeyFrame = this->keyFrameList->nextElement(this->currentKeyFrame);
 
-              printf("%p from:%f to:%f\n", this->currentKeyFrame,this->currentKeyFrame->value, this->nextKeyFrame->value);
+              //printf("%p from:%f to:%f\n", this->currentKeyFrame,this->currentKeyFrame->value, this->nextKeyFrame->value);
               this->setAnimFunc(this->currentKeyFrame->animFunc);
             }