[Orxonox-commit 4656] r9327 - code/branches/presentation2012merge/src/modules/tetris

[landauf at orxonox.net]

Author: landauf
Date: 2012-07-22 17:12:29 +0200 (Sun, 22 Jul 2012)
New Revision: 9327

Modified:
   code/branches/presentation2012merge/src/modules/tetris/TetrisBrick.cc
   code/branches/presentation2012merge/src/modules/tetris/TetrisStone.cc
   code/branches/presentation2012merge/src/modules/tetris/TetrisStone.h
Log:
changed parent of TetrisStone from Pawn to MovableEntity which is totally sufficient

Modified: code/branches/presentation2012merge/src/modules/tetris/TetrisBrick.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/tetris/TetrisBrick.cc	2012-07-22 15:06:56 UTC (rev 9326)
+++ code/branches/presentation2012merge/src/modules/tetris/TetrisBrick.cc	2012-07-22 15:12:29 UTC (rev 9327)
@@ -77,7 +77,6 @@
         {
             // Create a new stone and add it to the brick.
             TetrisStone* stone = new TetrisStone(this);
-            stone->setHealth(1.0f);
             this->brickStones_.push_back(stone);
             this->attach(stone);
             this->formBrick(stone, i);

Modified: code/branches/presentation2012merge/src/modules/tetris/TetrisStone.cc
===================================================================
--- code/branches/presentation2012merge/src/modules/tetris/TetrisStone.cc	2012-07-22 15:06:56 UTC (rev 9326)
+++ code/branches/presentation2012merge/src/modules/tetris/TetrisStone.cc	2012-07-22 15:12:29 UTC (rev 9327)
@@ -47,7 +47,7 @@
     @brief
         Constructor. Registers and initializes the object.
     */
-    TetrisStone::TetrisStone(BaseObject* creator) : Pawn(creator)
+    TetrisStone::TetrisStone(BaseObject* creator) : MovableEntity(creator)
     {
         RegisterObject(TetrisStone);
 

Modified: code/branches/presentation2012merge/src/modules/tetris/TetrisStone.h
===================================================================
--- code/branches/presentation2012merge/src/modules/tetris/TetrisStone.h	2012-07-22 15:06:56 UTC (rev 9326)
+++ code/branches/presentation2012merge/src/modules/tetris/TetrisStone.h	2012-07-22 15:12:29 UTC (rev 9327)
@@ -37,7 +37,7 @@
 
 #include "tetris/TetrisPrereqs.h"
 
-#include "worldentities/pawns/Pawn.h"
+#include "worldentities/MovableEntity.h"
 #include "tools/Timer.h"
 
 namespace orxonox
@@ -50,7 +50,7 @@
 
     @ingroup Tetris
     */
-    class _TetrisExport TetrisStone : public Pawn
+    class _TetrisExport TetrisStone : public MovableEntity
     {
         public:
             TetrisStone(BaseObject* creator); //!< Constructor. Registers and initializes the object.