Changeset 9327 for code/branches/presentation2012merge

Timestamp:

Jul 22, 2012, 5:12:29 PM (12 years ago)

Author:

landauf

Message:

changed parent of TetrisStone from Pawn to MovableEntity which is totally sufficient

Location:

code/branches/presentation2012merge/src/modules/tetris

Files:

• TetrisBrick.cc (modified) (1 diff)
• TetrisStone.cc (modified) (1 diff)
• TetrisStone.h (modified) (2 diffs)

code/branches/presentation2012merge/src/modules/tetris/TetrisBrick.cc

@@ -78 +78 @@
             // 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);

code/branches/presentation2012merge/src/modules/tetris/TetrisStone.cc

@@ -48 +48 @@
         Constructor. Registers and initializes the object.
     */
-    TetrisStone::TetrisStone(BaseObject* creator) : Pawn(creator)
+    TetrisStone::TetrisStone(BaseObject* creator) : MovableEntity(creator)
     {
         RegisterObject(TetrisStone);

code/branches/presentation2012merge/src/modules/tetris/TetrisStone.h

@@ -38 +38 @@
 #include "tetris/TetrisPrereqs.h"
 
-#include "worldentities/pawns/Pawn.h"
+#include "worldentities/MovableEntity.h"
 #include "tools/Timer.h"
 
@@ -51 +51 @@
     @ingroup Tetris
     */
-    class _TetrisExport TetrisStone : public Pawn
+    class _TetrisExport TetrisStone : public MovableEntity
     {
         public: