- Timestamp:
- Jan 10, 2016, 1:54:11 PM (8 years ago)
- Location:
- code/branches/cpp11_v3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v3
- Property svn:mergeinfo changed
-
code/branches/cpp11_v3/src/modules/mini4dgame/Mini4DgameBoard.cc
r10624 r11054 64 64 for(int l=0;l<4;l++){ 65 65 this->board[i][j][k][l]=mini4DgamePlayerColor::none; 66 this->blinkingBillboards[i][j][k][l] = 0;66 this->blinkingBillboards[i][j][k][l] = nullptr; 67 67 } 68 68 } … … 97 97 this->board[move.x][move.y][move.z][move.w] = mini4DgamePlayerColor::none; 98 98 this->blinkingBillboards[move.x][move.y][move.z][move.w]->destroy(); 99 this->blinkingBillboards[move.x][move.y][move.z][move.w] = 0;99 this->blinkingBillboards[move.x][move.y][move.z][move.w] = nullptr; 100 100 if(player_toggle_){ 101 101 this->player_toggle_ = false; … … 905 905 void Mini4DgameBoard::checkGametype() 906 906 { 907 if (this->getGametype() != NULL&& this->getGametype()->isA(Class(Mini4Dgame)))907 if (this->getGametype() != nullptr && this->getGametype()->isA(Class(Mini4Dgame))) 908 908 { 909 909 Mini4Dgame* Mini4DgameGametype = orxonox_cast<Mini4Dgame*>(this->getGametype());
Note: See TracChangeset
for help on using the changeset viewer.