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

Timestamp:

Jan 21, 2016, 1:59:04 PM (9 years ago)

Author:

muemart

Message:

Fix some clang-tidy warnings.
Also, Serialise.h was doing some C-style casts that ended up being const casts. I moved those const casts as close to the source as possible and changed the loadAndIncrease functions to not do that.

Location:

code/trunk/src/modules/tetris

Files:

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

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

@@ -140 +140 @@
             const Vector3& currentStonePosition = someStone->getPosition(); //!< Saves the position of the currentStone
 
-            if((position.x == currentStonePosition.x) && abs(position.y-currentStonePosition.y) < this->center_->getStoneSize())
+            if((position.x == currentStonePosition.x) && std::abs(position.y-currentStonePosition.y) < this->center_->getStoneSize())
                 return false;
         }
@@ -222 +222 @@
         if(position.y < this->center_->getStoneSize()/2.0f) //!< If the stone has reached the bottom of the level
         {
-            float baseOffset = abs(stone->getPosition().y);
+            float baseOffset = std::abs(stone->getPosition().y);
             if (this->activeBrick_->getRotationCount() == 1 || this->activeBrick_->getRotationCount() == 3)
-                baseOffset = abs(stone->getPosition().x);
+                baseOffset = std::abs(stone->getPosition().x);
             float yOffset = baseOffset + this->center_->getStoneSize()/2.0f;//calculate offset
             if(yOffset < 0) //catch brake-throughs

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

@@ -213 +213 @@
         {
             const Vector3& position = this->getPosition();
-            Vector3 newPos = Vector3(position.x+value.x/abs(value.x)*this->size_, position.y, position.z);
+            Vector3 newPos = Vector3(position.x+value.x/std::abs(value.x)*this->size_, position.y, position.z);
             if(!this->isValidMove(newPos))
                 return;

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

@@ -92 +92 @@
         {
             const Vector3& position = this->getPosition();
-            Vector3 newPos = Vector3(position.x+value.x/abs(value.x)*this->size_, position.y, position.z);
+            Vector3 newPos = Vector3(position.x+value.x/std::abs(value.x)*this->size_, position.y, position.z);
             if(!this->tetris_->isValidMove(this, newPos))
                 return;