Index: /trunk/src/world_entities/space_ships/hover.cc
===================================================================
--- /trunk/src/world_entities/space_ships/hover.cc	(revision 6799)
+++ /trunk/src/world_entities/space_ships/hover.cc	(revision 6800)
@@ -97,4 +97,6 @@
   this->getWeaponManager()->changeWeaponConfig(1);
   dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
+
+  this->loadModel("models/ships/hoverglider_mainbody.obj");
 }
 
@@ -126,4 +128,5 @@
 
   // cameraissue
+  this->cameraNode.addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
   this->cameraNode.setParent(this);
   this->cameraNode.setParentMode(PNODE_ALL);
@@ -131,16 +134,21 @@
 
   // rotors
-  this->topRotor.addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
-  this->tailRotor.addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
-
-  this->topRotor.setParent(this);
-  this->tailRotor.setParent(this);
-
-  this->topRotor.setRelCoor(Vector(-0.877,0.627,0));
-  this->tailRotor.setRelCoor(Vector(-4.43,0.297,0.068));
-  this->tailRotor.setAbsDir(Quaternion(M_PI_2,Vector(1,0,0)));
-
-  this->loadModel("models/ships/rotor.obj",1.0,3);
-  this->loadModel("models/ships/rotor.obj",0.2,4);
+  this->wingNodeLeft.addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
+  this->wingNodeRight.addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
+
+  this->rotorNodeLeft.addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
+  this->rotorNodeRight.addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
+
+  this->wingNodeLeft.setParent(this);
+  this->wingNodeRight.setParent(this);
+
+  this->wingNodeLeft.setRelCoor(-1, .5, -.5);
+  this->wingNodeRight.setRelCoor(-1, .5, .5);
+
+  this->rotorNodeLeft.setParent(&this->wingNodeLeft);
+  this->rotorNodeRight.setParent(&this->wingNodeRight);
+
+  this->loadModel("models/ships/hoverglider_wing.obj", 1.0f, 3);
+  this->loadModel("models/ships/hoverglider_rotor.obj", 1.0f, 4);
 
 
@@ -259,9 +267,5 @@
 void Hover::collidesWith(WorldEntity* entity, const Vector& location)
 {
-  if (entity->isA(CL_TURRET_POWER_UP))
-  {
-    this->ADDWEAPON();
-    }
-//  PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassName(), entity->getClassName(), location.x, location.y, location.z);
+
 }
 
@@ -283,6 +287,6 @@
 
   // rotorrotation
-  this->topRotor.shiftDir(Quaternion(time*10, Vector(0,1,0)));
-  this->tailRotor.shiftDir(Quaternion(time*10, Vector(0,1,0)));
+//   this->topRotor.shiftDir(Quaternion(time*10, Vector(0,1,0)));
+//   this->tailRotor.shiftDir(Quaternion(time*10, Vector(0,1,0)));
 
   // spaceship controlled movement
@@ -451,21 +455,10 @@
 
     /* translate */
-    glTranslatef (this->topRotor.getAbsCoor ().x,
-                  this->topRotor.getAbsCoor ().y,
-                  this->topRotor.getAbsCoor ().z);
-    Vector tmpRot = this->topRotor.getAbsDir().getSpacialAxis();
-    glRotatef (this->topRotor.getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
+    glTranslatef (this->wingNodeLeft.getAbsCoor ().x,
+                  this->wingNodeLeft.getAbsCoor ().y,
+                  this->wingNodeLeft.getAbsCoor ().z);
+    Vector tmpRot = this->wingNodeLeft.getAbsDir().getSpacialAxis();
+    glRotatef (this->wingNodeLeft.getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
     this->getModel(3)->draw();
-
-    glPopMatrix ();
-    glPushMatrix();
-
-    /* translate */
-    glTranslatef (this->tailRotor.getAbsCoor ().x,
-                  this->tailRotor.getAbsCoor ().y,
-                  this->tailRotor.getAbsCoor ().z);
-    tmpRot = this->tailRotor.getAbsDir().getSpacialAxis();
-    glRotatef (this->tailRotor.getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
-    this->getModel(4)->draw();
 
     glPopMatrix ();
@@ -535,35 +528,2 @@
     }
 }
-
-#include "weapons/aiming_turret.h"
-// FIXME THIS MIGHT BE CONSIDERED EITHER A FEATURE, OR A BUG
-void Hover::ADDWEAPON()
-{
-  Weapon* turret = NULL;
-
-  if ((float)rand()/RAND_MAX < .1)
-  {
-    //if (this->getWeaponManager()->hasFreeSlot(2, WTYPE_TURRET))
-    {
-      turret = new Turret();
-      this->addWeapon(turret, 2);
-      this->getWeaponManager()->changeWeaponConfig(2);
-    }
-  }
-  else
-  {
-    //if (this->getWeaponManager()->hasFreeSlot(3))
-    {
-      turret = new AimingTurret();
-      this->addWeapon(turret, 3);
-
-      this->getWeaponManager()->changeWeaponConfig(3);
-    }
-  }
-
-  if(turret != NULL)
-  {
-    turret->setName("Turret");
-    turret->setStateDuration(WS_SHOOTING, (float)rand()/RAND_MAX*.5+.1);
-  }
-}
Index: /trunk/src/world_entities/space_ships/hover.h
===================================================================
--- /trunk/src/world_entities/space_ships/hover.h	(revision 6799)
+++ /trunk/src/world_entities/space_ships/hover.h	(revision 6800)
@@ -10,8 +10,6 @@
 #include "playable.h"
 
-
 class Hover : public Playable
 {
-
   public:
 
@@ -37,12 +35,7 @@
     virtual void process(const Event &event);
 
-
-
   private:
     void calculateVelocity(float time);
     void weaponAction();
-
-    // !! temporary !!
-    void ADDWEAPON();
 
     bool                  bUp;                //!< up button pressed.
@@ -64,6 +57,8 @@
     //float                 cycle;              //!< hovercycle
 
-    PNode                 topRotor;
-    PNode                 tailRotor;
+    PNode                 wingNodeLeft;
+    PNode                 wingNodeRight;
+    PNode                 rotorNodeLeft;
+    PNode                 rotorNodeRight;
 
     PNode                 cameraNode;
