Changeset 9667 for code/trunk/src/modules/tetris

Timestamp:

Aug 25, 2013, 9:08:42 PM (11 years ago)

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/tetris/Tetris.cc (modified) (3 diffs)
• src/modules/tetris/Tetris.h (modified) (1 diff)
• src/modules/tetris/TetrisBrick.cc (modified) (3 diffs)
• src/modules/tetris/TetrisBrick.h (modified) (1 diff)
• src/modules/tetris/TetrisCenterpoint.cc (modified) (2 diffs)
• src/modules/tetris/TetrisCenterpoint.h (modified) (1 diff)
• src/modules/tetris/TetrisScore.cc (modified) (2 diffs)
• src/modules/tetris/TetrisScore.h (modified) (1 diff)
• src/modules/tetris/TetrisStone.cc (modified) (2 diffs)
• src/modules/tetris/TetrisStone.h (modified) (1 diff)

code/trunk/src/modules/tetris/Tetris.cc

@@ -54 +54 @@
 {
 
-    CreateUnloadableFactory(Tetris);
+    RegisterUnloadableClass(Tetris);
 
     /**
@@ -61 +61 @@
     @ingroup Tetris
     */
-    Tetris::Tetris(BaseObject* creator) : Deathmatch(creator)
+    Tetris::Tetris(Context* context) : Deathmatch(context)
     {
         RegisterObject(Tetris);
@@ -379 +379 @@
     {
         // create new futureBrick_
-        this->futureBrick_ = new TetrisBrick(this->center_);
+        this->futureBrick_ = new TetrisBrick(this->center_->getContext());
 
 

code/trunk/src/modules/tetris/Tetris.h

@@ -55 +55 @@
     {
         public:
-            Tetris(BaseObject* creator); //!< Constructor. Registers and initializes the object.
+            Tetris(Context* context); //!< Constructor. Registers and initializes the object.
             virtual ~Tetris(); //!< Destructor. Cleans up, if initialized.
 

code/trunk/src/modules/tetris/TetrisBrick.cc

@@ -44 +44 @@
 namespace orxonox
 {
-    CreateFactory(TetrisBrick);
+    RegisterClass(TetrisBrick);
 
     /**
@@ -51 +51 @@
     @ingroup Tetris
     */
-    TetrisBrick::TetrisBrick(BaseObject* creator): ControllableEntity(creator)
+    TetrisBrick::TetrisBrick(Context* context): ControllableEntity(context)
     {
         RegisterObject(TetrisBrick);
@@ -77 +77 @@
         {
             // Create a new stone and add it to the brick.
-            TetrisStone* stone = new TetrisStone(this);
+            TetrisStone* stone = new TetrisStone(this->getContext());
             this->brickStones_.push_back(stone);
             this->attach(stone);

code/trunk/src/modules/tetris/TetrisBrick.h

@@ -54 +54 @@
     {
         public:
-            TetrisBrick(BaseObject* creator); //!< Constructor. Registers and initializes the object.
+            TetrisBrick(Context* context); //!< Constructor. Registers and initializes the object.
             virtual ~TetrisBrick() {}
 

code/trunk/src/modules/tetris/TetrisCenterpoint.cc

@@ -42 +42 @@
 namespace orxonox
 {
-    CreateFactory(TetrisCenterpoint);
+    RegisterClass(TetrisCenterpoint);
 
     /**
@@ -48 +48 @@
         Constructor. Registers and initializes the object and checks whether the gametype is actually Tetris.
     */
-    TetrisCenterpoint::TetrisCenterpoint(BaseObject* creator) : StaticEntity(creator)
+    TetrisCenterpoint::TetrisCenterpoint(Context* context) : StaticEntity(context)
     {
         RegisterObject(TetrisCenterpoint);

code/trunk/src/modules/tetris/TetrisCenterpoint.h

@@ -59 +59 @@
     {
         public:
-            TetrisCenterpoint(BaseObject* creator); //!< Constructor. Registers and initializes the object and checks whether the gametype is actually Tetris.
+            TetrisCenterpoint(Context* context); //!< Constructor. Registers and initializes the object and checks whether the gametype is actually Tetris.
             virtual ~TetrisCenterpoint() {}
 

code/trunk/src/modules/tetris/TetrisScore.cc

@@ -45 +45 @@
 namespace orxonox
 {
-    CreateFactory(TetrisScore);
+    RegisterClass(TetrisScore);
 
     /**
@@ -52 +52 @@
     @ingroup Tetris
     */
-    TetrisScore::TetrisScore(BaseObject* creator) : OverlayText(creator)
+    TetrisScore::TetrisScore(Context* context) : OverlayText(context)
     {
         RegisterObject(TetrisScore);

code/trunk/src/modules/tetris/TetrisScore.h

@@ -57 +57 @@
     {
         public:
-            TetrisScore(BaseObject* creator);
+            TetrisScore(Context* context);
             virtual ~TetrisScore();
 

code/trunk/src/modules/tetris/TetrisStone.cc

@@ -42 +42 @@
 namespace orxonox
 {
-    CreateFactory(TetrisStone);
+    RegisterClass(TetrisStone);
 
     /**
@@ -48 +48 @@
         Constructor. Registers and initializes the object.
     */
-    TetrisStone::TetrisStone(BaseObject* creator) : MovableEntity(creator)
+    TetrisStone::TetrisStone(Context* context) : MovableEntity(context)
     {
         RegisterObject(TetrisStone);

code/trunk/src/modules/tetris/TetrisStone.h

@@ -54 +54 @@
     {
         public:
-            TetrisStone(BaseObject* creator); //!< Constructor. Registers and initializes the object.
+            TetrisStone(Context* context); //!< Constructor. Registers and initializes the object.
             virtual ~TetrisStone() {}