Changeset 8564

Timestamp:

May 24, 2011, 9:24:39 PM (13 years ago)

Author:

dafrick

Message:

Merging tetris branch into presentation branch.

Location:

code/branches/presentation

Files:

• . (modified) (1 prop)
• data/levels/tetris.oxw (copied) (copied from code/branches/tetris/data/levels/tetris.oxw)
• src/modules/CMakeLists.txt (modified) (1 diff)
• src/modules/pong/PongBat.h (modified) (1 diff)
• src/modules/tetris (copied) (copied from code/branches/tetris/src/modules/tetris)
• src/modules/tetris/CMakeLists.txt (copied) (copied from code/branches/tetris/src/modules/tetris/CMakeLists.txt)
• src/modules/tetris/Tetris.cc (copied) (copied from code/branches/tetris/src/modules/tetris/Tetris.cc) (3 diffs)
• src/modules/tetris/Tetris.h (copied) (copied from code/branches/tetris/src/modules/tetris/Tetris.h)
• src/modules/tetris/TetrisCenterpoint.cc (copied) (copied from code/branches/tetris/src/modules/tetris/TetrisCenterpoint.cc)
• src/modules/tetris/TetrisCenterpoint.h (copied) (copied from code/branches/tetris/src/modules/tetris/TetrisCenterpoint.h)
• src/modules/tetris/TetrisPrereqs.h (copied) (copied from code/branches/tetris/src/modules/tetris/TetrisPrereqs.h)
• src/modules/tetris/TetrisStone.cc (copied) (copied from code/branches/tetris/src/modules/tetris/TetrisStone.cc)
• src/modules/tetris/TetrisStone.h (copied) (copied from code/branches/tetris/src/modules/tetris/TetrisStone.h)

code/branches/presentation/src/modules/CMakeLists.txt

@@ -34 +34 @@
 ADD_SUBDIRECTORY(portals)
 ADD_SUBDIRECTORY(questsystem)
+ADD_SUBDIRECTORY(tetris)
 ADD_SUBDIRECTORY(weapons)
 ADD_SUBDIRECTORY(docking)

code/branches/presentation/src/modules/pong/PongBat.h

@@ -100 +100 @@
                 { this->length_ = length; }
             /**
-            @brief get the length of the bat.
+            @brief Get the length of the bat.
             @return Returns the length of the bat (in z-direction) as percentage of the height of the playing field.
             */

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

@@ -62 +62 @@
         this->starttimer_.setTimer(1.0, false, createExecutor(createFunctor(&Tetris::startStone, this)));
         this->starttimer_.stopTimer();
+
+        this->player_ = NULL;
     }
 
@@ -80 +82 @@
     void Tetris::cleanup()
     {
-        
+
     }
 
@@ -212 +214 @@
         assert(player);
 
-        if(this->player_ != NULL)
+        if(this->player_ == NULL)
         {
             this->player_ = player;