Changeset 9090

Timestamp:

Apr 16, 2012, 10:29:49 PM (12 years ago)

Author:

jo

Message:

Fighting with the controller. 'Undefined reference to orxonox::OverlayText' won. I don't see the error at the moment.

Location:

code/branches/pCuts

Files:

• data/levels/tetris.oxw (modified) (1 diff)
• src/modules/pong/Pong.cc (modified) (1 diff)
• src/modules/pong/Pong.h (modified) (2 diffs)
• src/modules/pong/PongScore.cc (modified) (1 diff)
• src/modules/tetris/CMakeLists.txt (modified) (1 diff)
• src/modules/tetris/Tetris.cc (modified) (2 diffs)
• src/modules/tetris/TetrisPrereqs.h (modified) (1 diff)

code/branches/pCuts/data/levels/tetris.oxw

@@ -9 +9 @@
   include("HUDTemplates3.oxo")
   include("stats.oxo")
+  include("pongHUD.oxo")
   include("templates/lodInformation.oxt")
 ?>

code/branches/pCuts/src/modules/pong/Pong.cc

@@ -76 +76 @@
         // Set the type of Bots for this particular Gametype.
         this->botclass_ = Class(PongBot);
-        this->scoreLimit_ = 10;
-        this->setConfigValues();
+        this->scoreLimit_ = 10;
+        this->setConfigValues();
     }
 

code/branches/pCuts/src/modules/pong/Pong.h

@@ -83 +83 @@
             void setConfigValues(); //!< Makes scoreLimit configurable.
             
-            PlayerInfo* getLeftPlayer() const; //!< Get the left player.
+            PlayerInfo* getLeftPlayer() const; //!< Get the left player.
             PlayerInfo* getRightPlayer() const; //!< Get the right player.
 
@@ -95 +95 @@
             WeakPtr<PongBall> ball_; //!< The Pong ball.
             WeakPtr<PongBat> bat_[2]; //!< The two bats.
-            Timer starttimer_; //!< A timer to delay the start of the game.
+            Timer starttimer_; //!< A timer to delay the start of the game.
             int scoreLimit_; //!< If a player scored that much points, the game is ended.
     };

code/branches/pCuts/src/modules/pong/PongScore.cc

@@ -61 +61 @@
         this->bShowRightPlayer_ = false;
         this->player1_ = NULL;
-        this->player2_ = NULL;
+        this->player2_ = NULL;
     }
 

code/branches/pCuts/src/modules/tetris/CMakeLists.txt

@@ -4 +4 @@
   TetrisStone.cc
   TetrisBrick.cc
+  TetrisScore.cc
 )
 

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

@@ -31 +31 @@
  *BUG e) multiple rows are not cleared in one round
  *
- *TASK a) give points for winning
+ *
  *TASK b) write a hud (show points gained; new brick)
  *TASK c) end the game in a nicer way
  *TASK d) save the highscore
  *TASK e) eye candy
- *TASK f) increasing speed
  */
 
@@ -409 +408 @@
                     {
                         clearRow(row);
-                        this->playerScored(this->player_);
+                        this->playerScored(this->player_);// add points
+                        //increase the stone's speed
+                        this->center_->setStoneSpeed(this->center_->getStoneSpeed()+1.0f);
                     }
                 }

code/branches/pCuts/src/modules/tetris/TetrisPrereqs.h

@@ -69 +69 @@
     class TetrisStone;
     class TetrisBrick;
+    class TetrisScore;
 }