Index: branches/world_entities/src/world_entities/player.cc
===================================================================
--- branches/world_entities/src/world_entities/player.cc	(revision 5744)
+++ branches/world_entities/src/world_entities/player.cc	(revision 5745)
@@ -79,10 +79,10 @@
 
   //weapons:
-  Weapon* wpRight = new TestGun(this->weaponMan, 0);
+  Weapon* wpRight = new TestGun(0);
   wpRight->setName("testGun Right");
-  Weapon* wpLeft = new TestGun(this->weaponMan, 1);
+  Weapon* wpLeft = new TestGun(1);
   wpLeft->setName("testGun Left");
   Weapon* cannon = dynamic_cast<Weapon*>(Factory::getFirst()->fabricate(CL_CANNON));
-  cannon->setWeaponManager(this->weaponMan);
+
   cannon->setName("BFG");
 
@@ -344,5 +344,5 @@
     //if (this->weaponMan->hasFreeSlot(2, WTYPE_TURRET))
     {
-      turret = new Turret(this->weaponMan);
+      turret = new Turret();
       this->weaponMan->addWeapon(turret, 2);
       this->weaponMan->changeWeaponConfig(2);
@@ -353,5 +353,5 @@
     //if (this->weaponMan->hasFreeSlot(3))
     {
-      turret = new AimingTurret(this->weaponMan);
+      turret = new AimingTurret();
       this->weaponMan->addWeapon(turret, 3);
 
Index: branches/world_entities/src/world_entities/weapons/aiming_turret.cc
===================================================================
--- branches/world_entities/src/world_entities/weapons/aiming_turret.cc	(revision 5744)
+++ branches/world_entities/src/world_entities/weapons/aiming_turret.cc	(revision 5745)
@@ -40,6 +40,6 @@
    creates a new weapon
 */
-AimingTurret::AimingTurret (WeaponManager* weaponManager)
-  : Weapon(weaponManager)
+AimingTurret::AimingTurret ()
+  : Weapon()
 {
   this->init();
@@ -143,13 +143,6 @@
     return;
 
-  PNode* target = this->getWeaponManager()->getFixedTarget();
-
-  if (target != NULL)
-  {
     pj->setVelocity(/*this->getVelocity()+*/(this->getAbsDir().apply(Vector(1,0,0))*250.0 + VECTOR_RAND(13)
             /*target->getAbsCoor() - this->getAbsCoor()*/)*.5);//this->getVelocity());
-  }
-  else
-    pj->setVelocity(target->getVelocity());
 
   pj->setParent(NullParent::getInstance());
@@ -168,6 +161,4 @@
 void AimingTurret::draw () const
 {
-  this->getWeaponManager()->getFixedTarget()->debugDraw(10);
-
   /* draw gun body */
   glMatrixMode(GL_MODELVIEW);
Index: branches/world_entities/src/world_entities/weapons/aiming_turret.h
===================================================================
--- branches/world_entities/src/world_entities/weapons/aiming_turret.h	(revision 5744)
+++ branches/world_entities/src/world_entities/weapons/aiming_turret.h	(revision 5745)
@@ -15,5 +15,5 @@
   {
   public:
-    AimingTurret (WeaponManager* weaponManager);
+    AimingTurret ();
     AimingTurret(const TiXmlElement* root);
     virtual ~AimingTurret ();
Index: branches/world_entities/src/world_entities/weapons/cannon.cc
===================================================================
--- branches/world_entities/src/world_entities/weapons/cannon.cc	(revision 5744)
+++ branches/world_entities/src/world_entities/weapons/cannon.cc	(revision 5745)
@@ -48,6 +48,6 @@
    creates a new weapon
 */
-Cannon::Cannon (WeaponManager* weaponManager)
-  : Weapon(weaponManager)
+Cannon::Cannon ()
+  : Weapon()
 {
   this->init();
Index: branches/world_entities/src/world_entities/weapons/cannon.h
===================================================================
--- branches/world_entities/src/world_entities/weapons/cannon.h	(revision 5744)
+++ branches/world_entities/src/world_entities/weapons/cannon.h	(revision 5745)
@@ -13,5 +13,5 @@
   {
   public:
-    Cannon (WeaponManager* weaponManager);
+    Cannon ();
     Cannon (const TiXmlElement* root);
     virtual ~Cannon ();
Index: branches/world_entities/src/world_entities/weapons/test_gun.cc
===================================================================
--- branches/world_entities/src/world_entities/weapons/test_gun.cc	(revision 5744)
+++ branches/world_entities/src/world_entities/weapons/test_gun.cc	(revision 5745)
@@ -48,6 +48,6 @@
    creates a new weapon
 */
-TestGun::TestGun (WeaponManager* weaponManager, int leftRight)
-  : Weapon(weaponManager)
+TestGun::TestGun ( int leftRight)
+  : Weapon()
 {
   this->init();
Index: branches/world_entities/src/world_entities/weapons/test_gun.h
===================================================================
--- branches/world_entities/src/world_entities/weapons/test_gun.h	(revision 5744)
+++ branches/world_entities/src/world_entities/weapons/test_gun.h	(revision 5745)
@@ -38,5 +38,5 @@
   {
   public:
-    TestGun (WeaponManager* weaponManager, int leftRight);
+    TestGun (int leftRight);
     TestGun (const TiXmlElement* root);
     virtual ~TestGun ();
Index: branches/world_entities/src/world_entities/weapons/turret.cc
===================================================================
--- branches/world_entities/src/world_entities/weapons/turret.cc	(revision 5744)
+++ branches/world_entities/src/world_entities/weapons/turret.cc	(revision 5745)
@@ -40,6 +40,6 @@
    creates a new weapon
 */
-Turret::Turret (WeaponManager* weaponManager)
-  : Weapon(weaponManager)
+Turret::Turret ()
+  : Weapon()
 {
   this->init();
@@ -117,5 +117,5 @@
 {
   Quaternion quat;
-  Vector direction = this->getWeaponManager()->getFixedTarget()->getAbsCoor() - this->getAbsCoor();
+  Vector direction = this->getAbsCoor();/*this->getWeaponManager()->getFixedTarget()->getAbsCoor() - this->getAbsCoor();*/
 
   direction.normalize();
@@ -135,13 +135,6 @@
     return;
 
-  PNode* target = this->getWeaponManager()->getFixedTarget();
-
-  if (target != NULL)
-  {
     pj->setVelocity(this->getVelocity()+(this->getAbsDir().apply(Vector(1,0,0))*100.0 + VECTOR_RAND(13)
             /*target->getAbsCoor() - this->getAbsCoor()*/)*.5);//this->getVelocity());
-  }
-  else
-    pj->setVelocity(target->getVelocity());
 
   pj->setParent(NullParent::getInstance());
@@ -159,6 +152,4 @@
 void Turret::draw () const
 {
-  this->getWeaponManager()->getFixedTarget()->debugDraw(10);
-
   /* draw gun body */
   glMatrixMode(GL_MODELVIEW);
Index: branches/world_entities/src/world_entities/weapons/turret.h
===================================================================
--- branches/world_entities/src/world_entities/weapons/turret.h	(revision 5744)
+++ branches/world_entities/src/world_entities/weapons/turret.h	(revision 5745)
@@ -12,5 +12,5 @@
   {
   public:
-    Turret (WeaponManager* weaponManager = NULL);
+    Turret ();
     Turret(const TiXmlElement* root);
     virtual ~Turret ();
Index: branches/world_entities/src/world_entities/weapons/weapon.cc
===================================================================
--- branches/world_entities/src/world_entities/weapons/weapon.cc	(revision 5744)
+++ branches/world_entities/src/world_entities/weapons/weapon.cc	(revision 5745)
@@ -41,8 +41,7 @@
  * creates a new weapon
 */
-Weapon::Weapon (WeaponManager* weaponManager)
+Weapon::Weapon ()
 {
   this->init();
-  this->setWeaponManager(weaponManager);
 }
 
@@ -97,6 +96,4 @@
   this->energyMax = 10.0;                          //< How much energy can be carried
   this->capability = WTYPE_ALL;                    //< The Weapon has all capabilities @see W_Capability.
-
-  this->setWeaponManager(NULL);                    //< By default the Weapon is free, and unhandled by a WeaponManager (this is good for small enemies).
 }
 
Index: branches/world_entities/src/world_entities/weapons/weapon.h
===================================================================
--- branches/world_entities/src/world_entities/weapons/weapon.h	(revision 5744)
+++ branches/world_entities/src/world_entities/weapons/weapon.h	(revision 5745)
@@ -81,5 +81,5 @@
   public:
     // INITIALISATION //
-    Weapon (WeaponManager* weaponManager = NULL);
+    Weapon ();
     virtual ~Weapon ();
 
@@ -92,9 +92,4 @@
     float increaseEnergy(float energyToAdd);
     ///////////////////
-
-    /** @param weaponManager sets the WeaponManager for this Weapon (NULL if free)) */
-    inline void setWeaponManager(WeaponManager* weaponManager) { this->weaponManager = weaponManager; };
-    /** @returns the WeaponManager of this Weapon (or NULL if it is free) */
-    inline WeaponManager* getWeaponManager() const { return this->weaponManager; };
 
     /** @returns true if the Weapon is Active  (this is used to check if the weapon must be drawn)*/
@@ -220,6 +215,4 @@
     ClassID              projectile;                      //!< the projectile used for this weapon (since they should be generated via macro and the FastFactory, only the ClassID must be known.)
     FastFactory*         projectileFactory;               //!< A factory, that produces and handles the projectiles.
-
-    WeaponManager*       weaponManager;                   //!< The weaponManager this weapon is connected to. if NULL it is assumed, that the weapon is freely connected to an entity without a binding WeaponManager.
   };
 
