Changeset 8564 for code/branches/presentation
- Timestamp:
- May 24, 2011, 9:24:39 PM (14 years ago)
- Location:
- code/branches/presentation
- Files:
-
- 3 edited
- 10 copied
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation
- Property svn:mergeinfo changed
/code/branches/tetris merged: 8246-8249,8488,8537,8563
- Property svn:mergeinfo changed
-
code/branches/presentation/src/modules/CMakeLists.txt
r8561 r8564 34 34 ADD_SUBDIRECTORY(portals) 35 35 ADD_SUBDIRECTORY(questsystem) 36 ADD_SUBDIRECTORY(tetris) 36 37 ADD_SUBDIRECTORY(weapons) 37 38 ADD_SUBDIRECTORY(docking) -
code/branches/presentation/src/modules/pong/PongBat.h
r8108 r8564 100 100 { this->length_ = length; } 101 101 /** 102 @brief get the length of the bat.102 @brief Get the length of the bat. 103 103 @return Returns the length of the bat (in z-direction) as percentage of the height of the playing field. 104 104 */ -
code/branches/presentation/src/modules/tetris/Tetris.cc
r8563 r8564 62 62 this->starttimer_.setTimer(1.0, false, createExecutor(createFunctor(&Tetris::startStone, this))); 63 63 this->starttimer_.stopTimer(); 64 65 this->player_ = NULL; 64 66 } 65 67 … … 80 82 void Tetris::cleanup() 81 83 { 82 84 83 85 } 84 86 … … 212 214 assert(player); 213 215 214 if(this->player_ != NULL)216 if(this->player_ == NULL) 215 217 { 216 218 this->player_ = player;
Note: See TracChangeset
for help on using the changeset viewer.