Changeset 4827 in orxonox.OLD for orxonox/trunk/src/world_entities/weapons/weapon.cc

Timestamp:

Jul 9, 2005, 12:48:50 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: state is no more singleton, but static class.
This is faster, and easier to handle, because one can just say State::getBLA() and not State::getInstance()→getBLA(); ——→>> less redundant

File:

• orxonox/trunk/src/world_entities/weapons/weapon.cc (modified) (3 diffs)

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

@@ -17 +17 @@
 #include "weapon_manager.h"
 #include "weapon.h"
-#include "stdincl.h"
-#include "world_entity.h"
 #include "vector.h"
-#include "model.h"
 #include "projectile.h"
 #include "list.h"
@@ -31 +28 @@
 */
 Weapon::Weapon (PNode* parent, const Vector& coordinate, const Quaternion& direction)
-  : WorldEntity()
 {
   parent->addChild(this, PNODE_ALL);
@@ -38 +34 @@
   WorldInterface* wi = WorldInterface::getInstance();
   this->worldEntities = wi->getEntityList();
-
-  this->objectComponent1 = NULL;
-  this->objectComponent2 = NULL;
-  this->objectComponent3 = NULL;
-
-  this->animation1 = NULL;
-  this->animation2 = NULL;
-  this->animation3 = NULL;
 }