Skip to content

fix: hardDrop should use actual piece height, not fixed 4x4 matrix height #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SKYJAMES777 wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −1
Open

fix: hardDrop should use actual piece height, not fixed 4x4 matrix height #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion tetris/src/game/tetromino.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,13 +211,25 @@ void Tetromino::moveRight(std::vector<std::vector<std::string>> grid)

void Tetromino::hardDrop(const std::vector<Coords>& boardBaseline)
{
// Trim empty rows at bottom of the 4x4 bounding box
std::int16_t pieceBottom = y.begin;
for (auto row = y.begin; row <= y.end; ++row) {
for (auto col = x.begin; col <= x.end; ++col) {
if (matrix[row - y.begin][col - x.begin] != " ") {
pieceBottom = row;
break;
}
}
}
std::int16_t pieceHeight = pieceBottom - y.begin + 1;

std::int16_t highestY = boardBaseline[0].y;
for (const auto& coord : boardBaseline)
{
if (coord.y < highestY) highestY = coord.y;
}
y.end = highestY;
y.begin = static_cast<std::int16_t>(y.end - matrix.size() + 1);
y.begin = static_cast<std::int16_t>(y.end - pieceHeight + 1);
}

void Tetromino::softDrop()
Expand Down