Changeset 5002 in orxonox.OLD

Timestamp:

Aug 13, 2005, 10:14:57 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: turret react as before again

Location:

orxonox/trunk/src/world_entities

Files:

• player.cc (modified) (1 diff)
• weapons/turret.cc (modified) (2 diffs)

orxonox/trunk/src/world_entities/player.cc

@@ -121 +121 @@
 void Player::init()
 {
-//  this->setAbsDir(0,1,0);
-
   this->setClassID(CL_PLAYER, "Player");
-
-  //  this->model = (Model*)ResourceManager::getInstance()->load("models/reaplow.obj", OBJ, RP_CAMPAIGN);
   travelSpeed = 15.0;
   velocity = new Vector();

orxonox/trunk/src/world_entities/weapons/turret.cc

@@ -20 +20 @@
 #include "test_bullet.h"
 
+#include "null_parent.h"
 #include "state.h"
 #include "vector.h"
@@ -143 +144 @@
     pj->setVelocity(target->getVelocity());
 
-
+  pj->setParent(NullParent::getInstance());
   pj->setAbsCoor(this->getEmissionPoint());
   pj->setAbsDir(this->getAbsDir());