Crylia/Tetris_SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix compile error

Browse Source
This commit is contained in:
Crylia
2024-10-16 15:00:43 +02:00
parent ed6a78316e
commit 7f011067ca
8 changed files with 110 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Game.cpp
View File

@@ -7,7 +7,7 @@ bool Game::init(const char* title, int w, int h) {
title,
SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
w, h,
SDL_WINDOW_SHOWN | SDL_WINDOW_VULKAN
SDL_WINDOW_SHOWN
));
if (!window) {
@@ -74,8 +74,10 @@ void Game::run( ) {
while (gameState.gameover) {
if (gameState.quit) return;
SDL_SetRenderDrawColor(renderer.get( ), 248, 248, 248, 255);
SDL_RenderClear(renderer.get( ));
inputHandler( );
gameRenderer->renderGameOver(gameBoard->getWidth( ), gameBoard->getHeight( ));
gameRenderer->renderGameOver(gameBoard);
}
}

2
src/GameBoard.cpp
View File

@@ -7,7 +7,7 @@ GameBoard::GameBoard( )
}
bool GameBoard::tryMoveCurrentTetromino(int dx, int dy) {
if (!currentTetromino) return;
if (!currentTetromino) return false;
currentTetromino->move(dx, dy);
if (checkCollision(*currentTetromino)) {
currentTetromino->move(-dx, -dy);

5
src/Renderer.cpp
View File

@@ -235,9 +235,10 @@ void Renderer::renderStartScreen( ) {
SDL_RenderPresent(renderer.get( ));
}
void Renderer::renderGameOver(int gbWidth, int gbHeight) {
void Renderer::renderGameOver(const shared_ptr<GameBoard> gameBoard) {
//Needed to draw the Walls again
drawWall(gbWidth, gbHeight);
drawWall(gameBoard->getWidth( ), gameBoard->getHeight( ));
drawScoreboard(gameBoard->getScore( ), gameBoard->getLevel( ), gameBoard->getLines( ));
auto gameOver = unique_ptr<SDL_Surface, decltype(&SDL_FreeSurface)>(IMG_Load("assets/sprites/game_over.png"), SDL_FreeSurface);

2
src/Renderer.hpp
View File

@@ -77,7 +77,7 @@ public:
void renderBoard(const shared_ptr<GameBoard> gameBoard);
void renderStartScreen( );
void renderGameOver(int gbWidth, int gbHeight);
void renderGameOver(shared_ptr<GameBoard> gameBoard);
const TextDimensions renderText(
const string& text, int x, int y, int fontSize,
SDL_Color color, HAlign textHAlign = HAlign::LEFT, VAlign textVAlign = VAlign::TOP