Index: trunk/src/world_entities/weapons/aiming_turret.cc
===================================================================
--- trunk/src/world_entities/weapons/aiming_turret.cc	(revision 5982)
+++ trunk/src/world_entities/weapons/aiming_turret.cc	(revision 5994)
@@ -169,5 +169,5 @@
   glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
 
-  this->model->draw();
+  this->getModel()->draw();
   glPopMatrix();
 }
Index: trunk/src/world_entities/weapons/bomb.cc
===================================================================
--- trunk/src/world_entities/weapons/bomb.cc	(revision 5982)
+++ trunk/src/world_entities/weapons/bomb.cc	(revision 5994)
@@ -147,6 +147,6 @@
   if (this->lifeCycle < .9)
   {
-    if (model)
-      model->draw();
+    if (this->getModel() != NULL)
+      this->getModel()->draw();
   }
   else
Index: trunk/src/world_entities/weapons/cannon.cc
===================================================================
--- trunk/src/world_entities/weapons/cannon.cc	(revision 5982)
+++ trunk/src/world_entities/weapons/cannon.cc	(revision 5994)
@@ -194,5 +194,5 @@
   glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
 
-  this->model->draw();
+  this->getModel()->draw();
   glPopMatrix();
 
Index: trunk/src/world_entities/weapons/ground_turret.cc
===================================================================
--- trunk/src/world_entities/weapons/ground_turret.cc	(revision 5982)
+++ trunk/src/world_entities/weapons/ground_turret.cc	(revision 5994)
@@ -128,6 +128,6 @@
   glMultMatrixf((float*)matrix);
 
-  if (this->model)
-    this->model->draw();
+  if (this->getModel())
+    this->getModel()->draw();
 
   glPopMatrix();
Index: trunk/src/world_entities/weapons/guided_missile.cc
===================================================================
--- trunk/src/world_entities/weapons/guided_missile.cc	(revision 5982)
+++ trunk/src/world_entities/weapons/guided_missile.cc	(revision 5994)
@@ -202,5 +202,5 @@
   glMultMatrixf((float*)matrix);
   glScalef(2.0, 2.0, 2.0);
-  this->model->draw();
+  this->getModel()->draw();
 
   glPopMatrix();
Index: trunk/src/world_entities/weapons/laser.cc
===================================================================
--- trunk/src/world_entities/weapons/laser.cc	(revision 5982)
+++ trunk/src/world_entities/weapons/laser.cc	(revision 5994)
@@ -156,5 +156,5 @@
   glMultMatrixf((float*)matrix);
   glScalef(2.0, 2.0, 2.0);
-  this->model->draw();
+  this->getModel()->draw();
   glPopAttrib();
   glPopMatrix();
Index: trunk/src/world_entities/weapons/projectile.cc
===================================================================
--- trunk/src/world_entities/weapons/projectile.cc	(revision 5982)
+++ trunk/src/world_entities/weapons/projectile.cc	(revision 5994)
@@ -137,17 +137,2 @@
 {}
 
-
-void Projectile::draw () const
-{
-  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
-
-  float matrix[4][4];
-  glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
-  this->getAbsDir().matrix (matrix);
-  glMultMatrixf((float*)matrix);
-  this->model->draw();
-
-  glPopMatrix();
-}
-
Index: trunk/src/world_entities/weapons/projectile.h
===================================================================
--- trunk/src/world_entities/weapons/projectile.h	(revision 5982)
+++ trunk/src/world_entities/weapons/projectile.h	(revision 5994)
@@ -41,5 +41,4 @@
 
     virtual void tick (float time);
-    virtual void draw () const;
 
   protected:
Index: trunk/src/world_entities/weapons/rocket.cc
===================================================================
--- trunk/src/world_entities/weapons/rocket.cc	(revision 5982)
+++ trunk/src/world_entities/weapons/rocket.cc	(revision 5994)
@@ -187,5 +187,5 @@
   glMultMatrixf((float*)matrix);
   glScalef(2.0, 2.0, 2.0);
-  this->model->draw();
+  this->getModel()->draw();
 
   glPopMatrix();
Index: trunk/src/world_entities/weapons/test_bullet.cc
===================================================================
--- trunk/src/world_entities/weapons/test_bullet.cc	(revision 5982)
+++ trunk/src/world_entities/weapons/test_bullet.cc	(revision 5994)
@@ -181,5 +181,5 @@
   glMultMatrixf((float*)matrix);
   glScalef(2.0, 2.0, 2.0);
-  this->model->draw();
+  this->getModel()->draw();
 
   glPopMatrix();
Index: trunk/src/world_entities/weapons/test_gun.cc
===================================================================
--- trunk/src/world_entities/weapons/test_gun.cc	(revision 5982)
+++ trunk/src/world_entities/weapons/test_gun.cc	(revision 5994)
@@ -219,5 +219,5 @@
   if( this->leftRight == W_RIGHT)
     glScalef(1.0, 1.0, -1.0);
-  this->model->draw(1);
+  this->getModel()->draw(1);
   glPopMatrix();
 
@@ -230,5 +230,5 @@
   tmpRot = this->objectComponent1->getAbsDir().getSpacialAxis();
   glRotatef (this->objectComponent1->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
-  this->model->draw(0);
+  this->getModel()->draw(0);
   glPopMatrix();
 }
Index: trunk/src/world_entities/weapons/turret.cc
===================================================================
--- trunk/src/world_entities/weapons/turret.cc	(revision 5982)
+++ trunk/src/world_entities/weapons/turret.cc	(revision 5994)
@@ -147,23 +147,2 @@
 void Turret::destroy ()
 {}
-
-/**
- * draws the Turret
-*/
-void Turret::draw () const
-{
-  if (this->model != NULL)
-  {
-    /* draw gun body */
-    glMatrixMode(GL_MODELVIEW);
-    glPushMatrix();
-    glTranslatef (this->getAbsCoor ().x,
-                  this->getAbsCoor ().y,
-                  this->getAbsCoor ().z);
-    Vector tmpRot = this->getAbsDir().getSpacialAxis();
-    glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
-
-    this->model->draw();
-    glPopMatrix();
-  }
-}
Index: trunk/src/world_entities/weapons/turret.h
===================================================================
--- trunk/src/world_entities/weapons/turret.h	(revision 5982)
+++ trunk/src/world_entities/weapons/turret.h	(revision 5994)
@@ -26,5 +26,4 @@
     virtual void destroy();
 
-    virtual void draw() const;
 
   private:
