Tetris v.1#10
Open
S-V-N wants to merge 1 commit into
Open
Conversation
hBuzzy
requested changes
Dec 4, 2023
hBuzzy
left a comment
hBuzzy
left a comment
Owner
There was a problem hiding this comment.
Исправить замечания.
Доп. задание - принято.
Comment on lines
+2
to
+7
| Figures::Figures() | ||
| { | ||
| } | ||
| Figures::~Figures() | ||
| { | ||
| } |
Owner
There was a problem hiding this comment.
Скобки либо везде не переносим (как принято у нас в стиле), либо везде переносим, если принципиально, но всегда в одном стиле. Исправьте во всем проекте в единый стиль.
| @@ -0,0 +1,84 @@ | |||
| #include "figures.h" | |||
| Figures::Figures() | |||
Owner
There was a problem hiding this comment.
Блоки Include Отделяем от всего остального пустой строкой
| Figures::~Figures() | ||
| { | ||
| } | ||
| std::vector<std::vector<int> > Figures::getFigure(int figure, int state) { |
Owner
There was a problem hiding this comment.
Методы отделяем друг от друга пустой строкой. Лишний пробел <int> > -> <int>>
Comment on lines
+9
to
+14
| if ( figure < 1 ) figure = 1; | ||
| else if ( figure > 7 ) figure = 7; | ||
| if ( state < 1 ) state = 1; | ||
| else if ( state > 4 ) state = 4; | ||
| std::vector<std::vector<int> > v; | ||
| for ( int i = 0; i < 4; i++ ) { |
Owner
There was a problem hiding this comment.
1, 4, 7 и т.д. в коде ниже - магические значения. Что это ? Как понять? Выделите в поля / переменные.
Comment on lines
+19
to
+79
| } else if ( figure == 2 ) { | ||
| if ( state == 1 ) { | ||
| a.push_back(Figures::figure2_1[i][j]); | ||
| } else if ( state == 2 ) { | ||
| a.push_back(Figures::figure2_2[i][j]); | ||
| } else if ( state == 3 ) { | ||
| a.push_back(Figures::figure2_3[i][j]); | ||
| } else if ( state == 4 ) { | ||
| a.push_back(Figures::figure2_4[i][j]); | ||
| } | ||
| } else if ( figure == 3 ) { | ||
| if ( state == 1 ) { | ||
| a.push_back(Figures::figure3_1[i][j]); | ||
| } else if ( state == 2 ) { | ||
| a.push_back(Figures::figure3_2[i][j]); | ||
| } else if ( state == 3 ) { | ||
| a.push_back(Figures::figure3_3[i][j]); | ||
| } else if ( state == 4 ) { | ||
| a.push_back(Figures::figure3_4[i][j]); | ||
| } | ||
| } else if ( figure == 4 ) { | ||
| if ( state == 1 ) { | ||
| a.push_back(Figures::figure4_1[i][j]); | ||
| } else if ( state == 2 ) { | ||
| a.push_back(Figures::figure4_2[i][j]); | ||
| } else if ( state == 3 ) { | ||
| a.push_back(Figures::figure4_3[i][j]); | ||
| } else if ( state == 4 ) { | ||
| a.push_back(Figures::figure4_4[i][j]); | ||
| } | ||
| } else if ( figure == 5 ) { | ||
| if ( state == 1 ) { | ||
| a.push_back(Figures::figure5_1[i][j]); | ||
| } else if ( state == 2 ) { | ||
| a.push_back(Figures::figure5_2[i][j]); | ||
| } else if ( state == 3 ) { | ||
| a.push_back(Figures::figure5_3[i][j]); | ||
| } else if ( state == 4 ) { | ||
| a.push_back(Figures::figure5_4[i][j]); | ||
| } | ||
| } else if ( figure == 6 ) { | ||
| if ( state == 1 ) { | ||
| a.push_back(Figures::figure6_1[i][j]); | ||
| } else if ( state == 2 ) { | ||
| a.push_back(Figures::figure6_2[i][j]); | ||
| } else if ( state == 3 ) { | ||
| a.push_back(Figures::figure6_3[i][j]); | ||
| } else if ( state == 4 ) { | ||
| a.push_back(Figures::figure6_4[i][j]); | ||
| } | ||
| } else if ( figure == 7 ) { | ||
| if ( state == 1 ) { | ||
| a.push_back(Figures::figure7_1[i][j]); | ||
| } else if ( state == 2 ) { | ||
| a.push_back(Figures::figure7_2[i][j]); | ||
| } else if ( state == 3 ) { | ||
| a.push_back(Figures::figure7_1[i][j]); | ||
| } else if ( state == 4 ) { | ||
| a.push_back(Figures::figure7_2[i][j]); | ||
| } | ||
| } |
Owner
There was a problem hiding this comment.
Весь блок явно должен быть левее по отступам.
Comment on lines
+191
to
+192
| if (i + CurrentPiece.Y > 19) return false; | ||
| if (j + CurrentPiece.X > 9) return false; |
Comment on lines
+171
to
+172
| for (int i = 0; i < 4; i++) | ||
| for (int j = 0; j < 4; j++) |
| score += 100; | ||
| k++; | ||
| num_lines++; | ||
| if (num_lines % 5 == 0) |
Comment on lines
+119
to
+129
| for (int k = 19; k >= 1; k--) | ||
| { | ||
| int c = 0; | ||
| for (int i = 0; i < 10; i++) | ||
| if (Board[k][i] != 0) | ||
| c++; | ||
| if (c == 10) | ||
| { | ||
| for (int i = k; i >= 1; i--) | ||
| for (int j = 0; j < 10; j++) | ||
| Board[i][j] = Board[i - 1][j]; |
Comment on lines
+93
to
+104
| if (!PieceIsBlocked() && !gameover) | ||
| CurrentPiece.Y++; | ||
| else if (gameover) | ||
| { | ||
| } | ||
| else | ||
| { | ||
| BlockPiece(); | ||
| Gameover(); | ||
| RowFull(); | ||
| InitPiece(); | ||
| } |
Owner
There was a problem hiding this comment.
Раз дальше идут скобки, то и в первом блоке сделайте их.
else if (gameover)
{
}Тело пустое. к чему тогда вообще условие?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.