Index: /branches/playability/src/world_entities/WorldEntities.am
===================================================================
--- /branches/playability/src/world_entities/WorldEntities.am	(revision 9968)
+++ /branches/playability/src/world_entities/WorldEntities.am	(revision 9969)
@@ -22,4 +22,5 @@
                 world_entities/character_attributes.cc \
                 world_entities/test_entity.cc \
+                world_entities/test_entity2.cc \
                 world_entities/planet.cc \
                 world_entities/bsp_entity.cc \
@@ -125,4 +126,5 @@
                 character_attributes.h \
                 test_entity.h \
+                test_entity2.h \
                 planet.h \
                 bsp_entity.h \
Index: /branches/playability/src/world_entities/projectiles/projectile.cc
===================================================================
--- /branches/playability/src/world_entities/projectiles/projectile.cc	(revision 9968)
+++ /branches/playability/src/world_entities/projectiles/projectile.cc	(revision 9969)
@@ -192,6 +192,6 @@
 void Projectile::tick (float dt)
 {
-  Vector estTargetDir = this->targetPosition + this->targetVelocity * this->eta;
-  //Vector estTargetDir = (this->target.getRelCoor() + this->target.getVelocity()) / this->velocity.len() ;
+  float tti;  //!< time to impact
+  Vector estTargetDir = (this->target->getRelCoor() + this->target->getVelocity());
   this->velocity = this->newDirection(this->velocity, estTargetDir, this->turningSpeed * dt ) * this->velocity.len();
   Vector v = this->velocity * (dt);
Index: /branches/playability/src/world_entities/projectiles/projectile.h
===================================================================
--- /branches/playability/src/world_entities/projectiles/projectile.h	(revision 9968)
+++ /branches/playability/src/world_entities/projectiles/projectile.h	(revision 9969)
@@ -79,7 +79,7 @@
 
     PNode*                  target;                   //!< A target for guided Weapons.
-    Vector                  targetPosition;           //!< current target position relative to projectile
-    Vector                  targetVelocity;           //!< current target speed and direction
-    float                   eta;                      //!< estimated time of arrival == time to kaboom!
+    //Vector                  targetPosition;           //!< current target position relative to projectile
+    //Vector                  targetVelocity;           //!< current target speed and direction
+    //float                   eta;                      //!< estimated time of arrival == time to kaboom!
 
     OrxSound::SoundSource  soundSource;
Index: /branches/playability/src/world_entities/test_entity2.cc
===================================================================
--- /branches/playability/src/world_entities/test_entity2.cc	(revision 9969)
+++ /branches/playability/src/world_entities/test_entity2.cc	(revision 9969)
@@ -0,0 +1,154 @@
+
+
+/*
+   orxonox - the future of 3D-vertical-scrollers
+
+   Copyright (C) 2004 orx
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   ### File Specific
+   main-programmer:
+   co-programmer:
+*/
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
+
+
+#include "executor/executor.h"
+#include "util/loading/factory.h"
+#include "util/loading/load_param.h"
+
+
+#include "test_entity2.h"
+#include "debug.h"
+
+#include "state.h"
+#include "player.h"
+#include "playable.h"
+
+
+#include "state.h"
+
+
+
+#include "class_id_DEPRECATED.h"
+ObjectListDefinition(TestEntity2);
+CREATE_FACTORY(TestEntity2);
+
+
+
+/**
+ *
+ */
+TestEntity2::TestEntity2()
+{
+  this->init();
+}
+
+
+/**
+ *
+ */
+TestEntity2::TestEntity2(const TiXmlElement* root)
+{
+  this->init();
+
+  if( root != NULL)
+    this->loadParams(root);
+}
+
+
+/**
+ *
+ */
+TestEntity2::~TestEntity2 ()
+{}
+
+
+/**
+ *
+ */
+void TestEntity2::init()
+{
+  this->registerObject(this, TestEntity2::_objectList);
+  this->toList(OM_GROUP_00);
+}
+
+
+/**
+ * loads the Settings of a MD2Creature from an XML-element.
+ * @param root the XML-element to load the MD2Creature's properties from
+ */
+void TestEntity2::loadParams(const TiXmlElement* root)
+{
+  WorldEntity::loadParams(root);
+}
+
+void TestEntity2::draw() const
+{
+//   if(!mediaLoaded)
+//     false;
+
+//   glPushAttrib(GL_ENABLE_BIT);
+//   glDisable(GL_LIGHTING);
+//   glDisable(GL_BLEND);
+// 
+//   glEnable(GL_TEXTURE_2D);
+//   glBindTexture(GL_TEXTURE_2D, media_container->getFrameTexture(counter));
+
+    glMatrixMode(GL_MODELVIEW);
+    glPushMatrix();
+
+    /* translate */
+    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 );
+
+//PRINTF(0)("axis: %f\n", axis);
+
+  glColor3f(1.0, 0, 0);
+
+  glBegin(GL_QUADS);
+    glVertex3f( 0.0f, -10.0f, 0.0f);
+    glNormal3f(0.0, 1.0, 0.0);
+//     glTexCoord2f(1.0f, 1.0f);
+    glVertex3f( 0.0f,  -10.0f , 20.0f);
+    glNormal3f(0.0, 1.0, 0.0);
+
+//     glTexCoord2f(0.0f, 1.0f);
+    glVertex3f( 0,  10.0f , 20.0f );
+    glNormal3f(0.0, 1.0, 0.0);
+
+//     glTexCoord2f(0.0f, 0.0f);
+    glVertex3f( 0, 10.0f, 0.0f );
+    glNormal3f(0.0, 1.0, 0.0);
+
+//     glTexCoord2f(1.0f, 0.0f);
+    
+  glEnd();
+
+  glPopMatrix();
+//   glPopAttrib();
+}
+
+/**
+ *
+ */
+void TestEntity2::tick (float time)
+{
+  Player* p = State::getPlayer();
+  Playable* pl = p->getPlayable();
+
+  this->setParent(pl);
+}
+
+
+
+
+
+
Index: /branches/playability/src/world_entities/test_entity2.h
===================================================================
--- /branches/playability/src/world_entities/test_entity2.h	(revision 9969)
+++ /branches/playability/src/world_entities/test_entity2.h	(revision 9969)
@@ -0,0 +1,27 @@
+#ifndef _TEST_ENTITY_H
+#define _TEST_ENTITY_H
+
+#include "world_entity.h"
+
+class TiXmlElement;
+
+
+class TestEntity2 : public WorldEntity
+{
+    ObjectListDeclaration(TestEntity2);
+
+  public:
+    TestEntity2 ();
+    TestEntity2(const TiXmlElement* root);
+    virtual ~TestEntity2 ();
+
+    void init();
+    virtual void loadParams(const TiXmlElement* root);
+
+
+    virtual void tick (float time);
+    virtual void draw() const;
+
+};
+
+#endif /* _TEST_ENTITY_H */
