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

Timestamp:

Jan 3, 2014, 1:50:22 PM (11 years ago)

Author:

landauf

Message:

replaced tabs with spaces. no changes in code

Location:

code/trunk/src/modules/tetris

Files:

• TetrisBrick.cc (modified) (5 diffs)
• TetrisScore.cc (modified) (1 diff)

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

@@ -87 +87 @@
                     stone->addTemplate(this->tetris_->getCenterpoint()->getStoneTemplate());
                 else
-                        orxout()<< "tetris_->getCenterpoint == NULL in TetrisBrick.cc"<< endl;
+                    orxout()<< "tetris_->getCenterpoint == NULL in TetrisBrick.cc"<< endl;
             }
             else
@@ -116 +116 @@
             if(this->shapeIndex_ == 1 || this->shapeIndex_ == 6 || this->shapeIndex_ == 7)
             {
-                stone->setPosition(0.0f, 2*size_, 0.0f);
+                stone->setPosition(0.0f, 2*size_, 0.0f);
             }
             else if(this->shapeIndex_ == 3 || this->shapeIndex_ == 4|| this->shapeIndex_ == 5)
             {
-                stone->setPosition(size_, 0, 0.0f);
+                stone->setPosition(size_, 0, 0.0f);
             }
             else if(this->shapeIndex_ == 2)
             {
-                stone->setPosition(-size_, 0, 0.0f);
+                stone->setPosition(-size_, 0, 0.0f);
             }
         }
@@ -131 +131 @@
             if(this->shapeIndex_ == 2 || this->shapeIndex_ == 5)
             {
-                stone->setPosition(size_, size_, 0.0f);
+                stone->setPosition(size_, size_, 0.0f);
             }
             else if(this->shapeIndex_ == 1)
             {
-                stone->setPosition(0, 3*size_, 0.0f);
+                stone->setPosition(0, 3*size_, 0.0f);
             }
             else if(this->shapeIndex_ == 3 || this->shapeIndex_ == 7)
             {
-                stone->setPosition(-size_, 0, 0.0f);
+                stone->setPosition(-size_, 0, 0.0f);
             }
             else if(this->shapeIndex_ == 4)
             {
-                stone->setPosition(-size_, size_, 0.0f);
+                stone->setPosition(-size_, size_, 0.0f);
             }
             else if(this->shapeIndex_ == 6)
             {
-                stone->setPosition(size_, 0, 0.0f);
+                stone->setPosition(size_, 0, 0.0f);
             }
         }
@@ -154 +154 @@
     bool TetrisBrick::isValidMove(const Vector3& position, bool isRotation = false)
     {
-        return this->tetris_->isValidMove(this,position, isRotation);
+        return this->tetris_->isValidMove(this,position, isRotation);
     }
 
     TetrisStone* TetrisBrick::getStone(unsigned int i)
     {
-        if(i < this->brickStones_.size())
+        if(i < this->brickStones_.size())
             return this->brickStones_[i];
-        else return NULL;
+        else return NULL;
     }
 
@@ -192 +192 @@
         else if(!this->lockRotation_) //rotate when key up is pressed
         {
-                if(!isValidMove(this->getPosition(), true)) //catch illegal rotations
-                    return;
+            if(!isValidMove(this->getPosition(), true)) //catch illegal rotations
+                return;
             this->lockRotation_ = true; // multiple calls of this function have to be filtered out.
             this->rotationTimer_.setTimer(0.1f, false, createExecutor(createFunctor(&TetrisBrick::unlockRotation, this)));

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

@@ -92 +92 @@
         {
             std::string score("0");
-                if(!this->owner_->hasEnded())
+            if(!this->owner_->hasEnded())
             {
                 //get the player