Changeset 9330 for code/branches

Timestamp:

Jul 22, 2012, 7:23:51 PM (12 years ago)

Author:

landauf

Message:

added deterministic stop criterion to end tetris match (independent of time)

Location:

code/branches/presentation2012merge/src/modules/tetris

Files:

• Tetris.cc (modified) (4 diffs)
• Tetris.h (modified) (1 diff)

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

@@ -74 +74 @@
 
         this->player_ = NULL;
-        this->endGameCriteria_ = 0.0f;
         this->setHUDTemplate("TetrisHUD");
         this->futureBrick_ = 0;
@@ -117 +116 @@
         if((this->activeBrick_ != NULL)&&(!this->hasEnded()))
         {
-            this->endGameCriteria_ += dt;
             if(!this->isValidBrickPosition(this->activeBrick_))
             {
@@ -125 +123 @@
                 this->activeBrick_->releaseStones(this->center_);
                 this->findFullRows();
-                if(this->endGameCriteria_ < 0.1f) //end game if two bricks are created within a 0.1s interval.
-                    this->end();
-                else
-                    this->startBrick();
-                this->endGameCriteria_ = 0.0f;
+                this->startBrick();
             }
         }
@@ -378 +372 @@
         // create a new future brick
         this->createBrick();
+
+        // check if the new brick is in a valid position, otherwise end the game
+        if (!this->isValidBrickPosition(this->activeBrick_))
+            this->end();
     }
 

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

@@ -97 +97 @@
 
             Timer starttimer_; //!< A timer to delay the start of the game.
-            float endGameCriteria_; //<! Works as a timer which is resetted, whenever a brick is created.
     };
 }