Changeset 6074 in orxonox.OLD for trunk/src/world_entities/weapons
- Timestamp:
- Dec 12, 2005, 11:34:02 PM (19 years ago)
- Location:
- trunk/src/world_entities/weapons
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/world_entities/weapons/aiming_turret.cc
r5994 r6074 22 22 23 23 #include "model.h" 24 25 #include "null_parent.h"26 24 27 25 #include "animation3d.h" … … 145 143 146 144 pj->setTarget(this->target->getParent()); 147 pj->setParent( NullParent::getInstance());145 pj->setParent(PNode::getNullParent()); 148 146 pj->setAbsCoor(this->getEmissionPoint()); 149 147 pj->setAbsDir(this->getAbsDir()); -
trunk/src/world_entities/weapons/cannon.cc
r5994 r6074 32 32 #include "list.h" 33 33 #include "animation3d.h" 34 35 #include "null_parent.h"36 34 37 35 #include "fast_factory.h" … … 161 159 return; 162 160 163 pj->setParent( NullParent::getInstance());161 pj->setParent(PNode::getNullParent()); 164 162 165 163 pj->setVelocity(this->getVelocity() + this->getAbsDir().apply(Vector(1,0,0))*15+VECTOR_RAND(5)); -
trunk/src/world_entities/weapons/guided_missile.cc
r6056 r6074 28 28 #include "particle_emitter.h" 29 29 #include "particle_system.h" 30 31 32 #include "null_parent.h"33 30 34 31 using namespace std; … … 153 150 { 154 151 //Vector v = *this->flightDirection * ( this->speed * time * 1000 + 0.1); 155 if (target.getParent() != NullParent::getInstance())152 if (target.getParent() != PNode::getNullParent()) 156 153 { 157 154 velocity += ((target.getAbsCoor() - this->getAbsCoor()).getNormalized())*agility; -
trunk/src/world_entities/weapons/projectile.cc
r6056 r6074 21 21 #include "world_entity.h" 22 22 #include "weapon.h" 23 #include "null_parent.h"24 23 #include "model.h" 25 24 -
trunk/src/world_entities/weapons/test_gun.cc
r6022 r6074 32 32 #include "list.h" 33 33 #include "animation3d.h" 34 35 #include "null_parent.h"36 34 37 35 #include "fast_factory.h" … … 184 182 return; 185 183 186 pj->setParent( NullParent::getInstance());184 pj->setParent(PNode::getNullParent()); 187 185 188 186 pj->setVelocity(this->getVelocity() + this->getAbsDir().apply(Vector(1,0,0))*50+VECTOR_RAND(5)); -
trunk/src/world_entities/weapons/turret.cc
r5994 r6074 22 22 #include "model.h" 23 23 24 #include "null_parent.h"25 24 #include "state.h" 26 25 #include "list.h" … … 139 138 140 139 141 pj->setParent( NullParent::getInstance());140 pj->setParent(PNode::getNullParent()); 142 141 pj->setAbsCoor(this->getEmissionPoint()); 143 142 pj->setAbsDir(this->getAbsDir()); -
trunk/src/world_entities/weapons/weapon_manager.cc
r6056 r6074 27 27 28 28 #include "t_animation.h" 29 #include "null_parent.h"30 31 29 32 30 using namespace std; … … 160 158 { 161 159 if (parent == NULL) 162 parent = NullParent::getInstance();160 parent = PNode::getNullParent(); 163 161 this->parent = parent; 164 162 if (this->parent != NULL)
Note: See TracChangeset
for help on using the changeset viewer.