Changeset 4382 in orxonox.OLD for orxonox/trunk/src/world_entities

Timestamp:

May 29, 2005, 9:04:17 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: BaseObject virtual public in PNode and Player(for test).
This is, so only one Object of type BaseObject is being created when deriving with multiple inheritance

@patrick: read it in a book at the lake today

Location:

orxonox/trunk/src/world_entities

Files:

• player.h (modified) (2 diffs)
• test_gun.cc (modified) (1 diff)

orxonox/trunk/src/world_entities/player.h

@@ -8 +8 @@
 
 #include "world_entity.h"
+#include "physics_interface.h"
 
 template<class T> class tList;
@@ -16 +17 @@
 
 //! Basic controllable WorldEntity
-class Player : public WorldEntity 
+class Player : public WorldEntity, public PhysicsInterface
 {
   friend class World;

orxonox/trunk/src/world_entities/test_gun.cc

@@ -144 +144 @@
     }
 
-  Projectile* pj = (TestBullet*)ObjectManager::getInstance()->getFromDeadList(CL_TEST_BULLET);
+  Projectile* pj = dynamic_cast<TestBullet*>(ObjectManager::getInstance()->getFromDeadList(CL_TEST_BULLET));
 
   //printf( "object ref %p\n", ObjectManager::getInstance()->getFromDeadList(CL_TEST_BULLET));