Changeset 2391 for code/branches/weapon2/src/orxonox/objects/worldentities

Timestamp:

Dec 10, 2008, 5:30:39 PM (16 years ago)

Author:

polakma

Message:

fixed projectile, particle effect, reloadingTimer and magazineTimer

Location:

code/branches/weapon2/src/orxonox/objects/worldentities

Files:

• MovableEntity.cc (modified) (1 diff)
• pawns/Pawn.cc (modified) (1 diff)

code/branches/weapon2/src/orxonox/objects/worldentities/MovableEntity.cc

@@ -75 +75 @@
         {
             this->velocity_ += (dt * this->acceleration_);
-            this->node_->translate(dt * this->velocity_);
+            this->node_->translate(dt * this->velocity_, Ogre::Node::TS_LOCAL);
 
             this->rotationRate_ += (dt * this->momentum_);

code/branches/weapon2/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -153 +153 @@
     {   
 COUT(0) << "Pawn::setWeaponSlot" << std::endl;
+        this->attach(wSlot);
         this->weaponSystem_->attachWeaponSlot(wSlot);   }
+
     WeaponSlot * Pawn::getWeaponSlot(unsigned int index) const
     {   return this->weaponSystem_->getWeaponSlotPointer(index);    }