Changeset 4301 in orxonox.OLD for orxonox/branches/physics/src/world_entities

Timestamp:

May 26, 2005, 3:20:55 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged the trunk back to the physics-branche
merged with command:
svn merge -4 4283:HEAD ../../trunk/ .
no conflicts

Location:

orxonox/branches/physics/src/world_entities

Files:

• player.cc (modified) (2 diffs)
• test_gun.cc (modified) (2 diffs)

orxonox/branches/physics/src/world_entities/player.cc

@@ -27 +27 @@
 #include "list.h"
 #include "stdincl.h"
+
+#include "object_manager.h"
+#include "projectile.h"
 
 using namespace std;
@@ -59 +62 @@
   this->weaponMan->addWeapon(wpRight, W_CONFIG2);
   this->weaponMan->addWeapon(wpLeft, W_CONFIG2);
-
 }
 

orxonox/branches/physics/src/world_entities/test_gun.cc

@@ -31 +31 @@
 #include "list.h"
 #include "animation3d.h"
+
+#include "object_manager.h"
 
 using namespace std;
@@ -87 +89 @@
     }
 
+  BaseObject* p = new TestBullet(this);
+  ObjectManager::getInstance()->cache(CL_TEST_BULLET, 100, *p);
+  ObjectManager::getInstance()->debug();
 }