Changeset 9322 for code/branches/presentation2012merge

Timestamp:

Jul 21, 2012, 6:29:07 PM (12 years ago)

Author:

landauf

Message:

fixed some warnings

File:

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

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

@@ -202 +202 @@
             if((position.x == currentStonePosition.x) && (position.y < currentStonePosition.y + this->center_->getStoneSize()))
             {
-                int y_offset = static_cast<int>((this->activeBrick_->getPosition().y-currentStonePosition.y+10)/10)*10 + currentStonePosition.y;
+                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;
@@ -213 +213 @@
         if(position.y < this->center_->getStoneSize()/2.0f) //!< If the stone has reached the bottom of the level
         {
-                int yOffset = stone->getPosition().y + this->center_->getStoneSize()/2.0f;//calculate offset
+                float yOffset = stone->getPosition().y + this->center_->getStoneSize()/2.0f;//calculate offset
                 if(yOffset < 0) //catch brake-throughs
                     yOffset = 0;
@@ -246 +246 @@
     Vector3 Tetris::rotateVector(Vector3 position, unsigned int amount)
     {
-        int temp = 0;
+        float temp = 0;
         for(unsigned int i = 0; i < amount; i++)
         {
@@ -383 +383 @@
         // Attach the brick to the Centerpoint and set the position of the brick to be at the left side.
         this->center_->attach(this->futureBrick_);
-        float xPos = (this->center_->getWidth()*1.6 + ((this->center_->getWidth() % 2)*2-1)/2.0f)*this->center_->getStoneSize();
+        float xPos = (this->center_->getWidth()*1.6f + ((this->center_->getWidth() % 2)*2-1)/2.0f)*this->center_->getStoneSize();
         float yPos = (this->center_->getHeight()-5.1f)*this->center_->getStoneSize();
         this->futureBrick_->setPosition(xPos, yPos, 0.0f);