Changeset 6074 in orxonox.OLD for trunk/src/world_entities/weapons/cannon.cc

Timestamp:

Dec 12, 2005, 11:34:02 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: taken out NullParent.
THE TRUNK IS NOT RUNNING FOR THE TIME BEING. DO NOT BE ALARMED, THIS IS TEMPORARY

File:

• trunk/src/world_entities/weapons/cannon.cc (modified) (2 diffs)

trunk/src/world_entities/weapons/cannon.cc

@@ -32 +32 @@
 #include "list.h"
 #include "animation3d.h"
-
-#include "null_parent.h"
 
 #include "fast_factory.h"
@@ -161 +159 @@
     return;
 
-  pj->setParent(NullParent::getInstance());
+  pj->setParent(PNode::getNullParent());
 
   pj->setVelocity(this->getVelocity() + this->getAbsDir().apply(Vector(1,0,0))*15+VECTOR_RAND(5));