Changeset 9323 for code/branches

Timestamp:

Jul 21, 2012, 6:32:02 PM (12 years ago)

Author:

landauf

Message:

replaced tabs with spaces

File:

• code/branches/presentation2012merge/src/modules/tetris/Tetris.cc (modified) (7 diffs)

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

@@ -108 +108 @@
         if((this->activeBrick_ != NULL)&&(!this->hasEnded()))
         {
-                this->endGameCriteria_ += dt;
+            this->endGameCriteria_ += dt;
             if(!this->isValidBrickPosition(this->activeBrick_, this->activeBrick_->getPosition()))
             {
@@ -160 +160 @@
             Vector3 stonePosition; //the current stone's offset to position
             if(isRotation)
-                stonePosition = rotateVector(stone->getPosition(), brick->getRotationCount()+1);
+                stonePosition = rotateVector(stone->getPosition(), brick->getRotationCount()+1);
             else
                 stonePosition = rotateVector(stone->getPosition(), brick->getRotationCount());
@@ -204 +204 @@
                 float y_offset = static_cast<int>((this->activeBrick_->getPosition().y-currentStonePosition.y+10)/10)*10 + currentStonePosition.y;
                 if(y_offset < 0) //filter out extreme cases (very rare bug)
-                        y_offset = 0;
+                    y_offset = 0;
                 this->activeBrick_->setPosition(Vector3(this->activeBrick_->getPosition().x, y_offset, this->activeBrick_->getPosition().z));
                 return false;
@@ -213 +213 @@
         if(position.y < this->center_->getStoneSize()/2.0f) //!< If the stone has reached the bottom of the level
         {
-                float yOffset = stone->getPosition().y + this->center_->getStoneSize()/2.0f;//calculate offset
-                if(yOffset < 0) //catch brake-throughs
-                    yOffset = 0;
-                this->activeBrick_->setPosition(Vector3(this->activeBrick_->getPosition().x, yOffset, this->activeBrick_->getPosition().z));
+            float yOffset = stone->getPosition().y + this->center_->getStoneSize()/2.0f;//calculate offset
+            if(yOffset < 0) //catch brake-throughs
+                yOffset = 0;
+            this->activeBrick_->setPosition(Vector3(this->activeBrick_->getPosition().x, yOffset, this->activeBrick_->getPosition().z));
             return false;
         }
@@ -246 +246 @@
     Vector3 Tetris::rotateVector(Vector3 position, unsigned int amount)
     {
-        float temp = 0;
+        float temp = 0;
         for(unsigned int i = 0; i < amount; i++)
         {
@@ -421 +421 @@
     void Tetris::findFullRows()
     {
-        unsigned int correctPosition = 0;
-        unsigned int stonesPerRow = 0;
-        for (unsigned int row = 0; row < this->center_->getHeight(); row++)
-        {
-            stonesPerRow = 0;
+        unsigned int correctPosition = 0;
+        unsigned int stonesPerRow = 0;
+        for (unsigned int row = 0; row < this->center_->getHeight(); row++)
+        {
+            stonesPerRow = 0;
             for(std::vector<TetrisStone*>::iterator it = this->stones_.begin(); it != this->stones_.end(); ++it)
             {
-                correctPosition = static_cast<unsigned int>(((*it)->getPosition().y - 5)/this->center_->getStoneSize());
+                correctPosition = static_cast<unsigned int>(((*it)->getPosition().y - 5)/this->center_->getStoneSize());
                 if(correctPosition == row)
                 {
@@ -450 +450 @@
         {
             if(static_cast<unsigned int>(((*it)->getPosition().y - 5)/this->center_->getStoneSize()) == row)
-                (*it)->setPosition(Vector3(-50,-50,100));
-                //{(*it)->destroy(); this->stones_.erase(it); orxout()<< "destroy row "<<endl;}//experimental
+                (*it)->setPosition(Vector3(-50,-50,100));
+                //{(*it)->destroy(); this->stones_.erase(it); orxout()<< "destroy row "<<endl;}//experimental
         }
       // adjust height of stones above the deleted row //TODO: check if this could be a source of a bug.