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

Started fixing positioning and scaling making it more accurate to the original

Browse Source
This commit is contained in:
Rene Kievits
2024-10-17 23:05:52 +02:00
parent d2597784d4
commit 13fbc3fe3d
13 changed files with 215 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@@ -2,7 +2,6 @@
## TODO
- Game Over screen
- Add Gamemodes
- Gamemode selection screen
- Save score

BIN
assets/sprites/scoreboard.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 10 KiB

BIN
assets/sprites/title.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
assets/sprites/title_bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

12
src/Game.cpp
View File

@@ -45,7 +45,6 @@ void Game::run( ) {
}
sound->PlayMusic(MusicName::MAIN_THEME);
lastUpdateTime = SDL_GetTicks( );
while (!gameState.gameover && !gameBoard->isCollision( )) {
if (gameState.quit) return;
@@ -57,7 +56,6 @@ void Game::run( ) {
gameState.gameover = true;
sound->PauseMusic( );
sound->PlaySound(SoundName::GAME_OVER);
while (gameState.gameover) {
if (gameState.quit) return;
SDL_SetRenderDrawColor(renderer.get( ), 248, 248, 248, 255);
@@ -124,10 +122,7 @@ void Game::inputHandler( ) {
Mix_VolumeMusic(Mix_GetMusicVolume(bgm.get( )) - 8);
break;
case SDLK_m:
if (true)
sound->ResumeMusic( );
else
sound->PauseMusic( );
sound->IsMusicPlaying( ) ? sound->PauseMusic( ) : sound->ResumeMusic( );
break;
default:
break;
@@ -154,11 +149,8 @@ void Game::handleWindowResize( ) {
int windowWidth, windowHeight;
SDL_GetWindowSize(window.get( ), &windowWidth, &windowHeight);
gameRenderer->setBlockSize(windowHeight / gameBoard->getHeight( ));
//gameRenderer->setScale(windowHeight / gameBoard->getHeight( ));
int offsetX = (windowWidth - gameBoard->getWidth( ) * gameRenderer->getBlockSize( )) / 2;
int offsetY = (windowHeight - gameBoard->getHeight( ) * gameRenderer->getBlockSize( )) / 2;
gameRenderer->setOffset(offsetX, offsetY);
gameRenderer->setWindowSize(windowWidth, windowHeight);
}

2
src/Game.hpp
View File

@@ -34,6 +34,8 @@ private:
struct GameState {
bool gameover = false;
bool singlePlayer = false;
bool multiPlayer = false;
bool startSequence = false;
bool quit = false;
} gameState;

6
src/GameBoard.cpp
View File

@@ -2,8 +2,8 @@
#include <iostream>
GameBoard::GameBoard( )
: lockedTetrominos(20, vector<int>(10, 0)),
lockedColors(20, std::vector<SDL_Color>(10, { 0, 0, 0, 255 })), score(0), level(0), lines(0), collision(false),
: lockedTetrominos(18, vector<int>(10, 0)),
lockedColors(18, std::vector<SDL_Color>(10, { 0, 0, 0, 255 })), score(0), level(0), lines(0), collision(false),
sound(make_unique<Sound>( )) {
spawnNewTetromino( );
}
@@ -162,7 +162,7 @@ void GameBoard::spawnNewTetromino( ) {
}
currentTetromino = move(nextTetromino);
currentTetromino->move(width / 2 - 1, 0);
currentTetromino->move(4, 0);
// Generate next tetromino
random_device dev;

4
src/GameBoard.hpp
View File

@@ -22,7 +22,7 @@ private:
shared_ptr<Tetromino> currentTetromino;
shared_ptr<Tetromino> nextTetromino;
const int width = 10;
const int height = 20;
const int height = 18;
bool collision;
int score;
int level;
@@ -36,7 +36,7 @@ public:
bool tryMoveCurrentTetromino(int dx, int dy);
bool tryRotateCurrentTetromino( );
bool isValidPosition(const vector<vector<int>>& shape, int x, int y) const;
bool moveToBottom( );
void moveToBottom( );
const bool isCollision( ) const;
const int getScore( ) const;

277
src/Renderer.cpp
View File

@@ -1,7 +1,8 @@
#include "Renderer.hpp"
#include <iostream>
#include <cmath>
Renderer::Renderer(shared_ptr<SDL_Renderer> renderer, int w, int h) : renderer(renderer), blockSize(30), windowHeight(h), windowWidth(w) {
Renderer::Renderer(shared_ptr<SDL_Renderer> renderer, int w, int h) : renderer(renderer), windowHeight(h), windowWidth(w) {
textures[TetrisAssets::SINGLE] = "assets/sprites/single.png";
textures[TetrisAssets::BORDER] = "assets/sprites/border.png";
textures[TetrisAssets::J] = "assets/sprites/J.png";
@@ -20,33 +21,80 @@ Renderer::Renderer(shared_ptr<SDL_Renderer> renderer, int w, int h) : renderer(r
}
void Renderer::renderBoard(const shared_ptr<GameBoard> gameBoard) {
drawScoreboard(gameBoard->getScore( ), gameBoard->getLevel( ), gameBoard->getLines( ));
drawWall(gameBoard->getWidth( ), gameBoard->getHeight( ));
drawLockedBlocks(gameBoard);
drawTetromino(gameBoard->getCurrentTetromino( ));
drawScoreboard(gameBoard->getScore( ), gameBoard->getLevel( ), gameBoard->getLines( ));
}
void Renderer::drawScoreboard(int score, int level, int lines) {
// 6 Because the gameBoard is 10 blocks, half that is 5 + 1 for the wall = 6
SDL_Rect blackRect = { 0, 0, (windowWidth / 2) - (blockSize * 6) - blockSize / 8, windowHeight };
SDL_Rect blackRect = { 0, 0, 7 * scale, windowHeight };
SDL_SetRenderDrawColor(renderer.get( ), 0, 0, 0, 255);
SDL_RenderFillRect(renderer.get( ), &blackRect);
SDL_Color col{ 255,255,255 };
auto surf = unique_ptr<SDL_Surface, decltype(&SDL_FreeSurface)>(IMG_Load("assets/sprites/scoreboard.png"), SDL_FreeSurface);
renderTexture("assets/sprites/scoreboard.png", windowWidth - surf->w * static_cast<float>(windowHeight) / surf->h, 0, surf->w * static_cast<float>(windowHeight) / surf->h, windowHeight);
scoreBoardDimensions = renderTexture(
"assets/sprites/scoreboard.png",
windowWidth,
0,
surf->w * scale,
surf->h * scale,
col,
1.0f,
HAlign::RIGHT
);
renderText(fmt::format("{0}", score), windowWidth - 30, 97, 32, SDL_Color{ 0,0,0 }, HAlign::RIGHT);
renderText(fmt::format("{0}", level), windowWidth - 92, 230, 32, SDL_Color{ 0,0,0 });
renderText(fmt::format("{0}", lines), windowWidth - 92, 330, 32, SDL_Color{ 0,0,0 });
renderText(
fmt::format("{0}", score),
windowWidth - (7 * scale),
23 * scale,
8 * scale,
SDL_Color{ 0,0,0 },
HAlign::RIGHT,
VAlign::TOP
);
renderText(
fmt::format("{0}", level),
windowWidth - (15 * scale),
55 * scale,
8 * scale,
SDL_Color{ 0,0,0 },
HAlign::RIGHT,
VAlign::TOP
);
renderText(
fmt::format("{0}", lines),
windowWidth - (15 * scale),
79 * scale,
8 * scale,
SDL_Color{ 0,0,0 },
HAlign::RIGHT,
VAlign::TOP
);
}
void Renderer::drawWall(const int w, const int h) {
int innerBorderThickness = blockSize / 4;
SDL_Color color{ 165, 42, 42 }, gapColor{ 0,0,0 };
SDL_SetRenderDrawColor(renderer.get( ), color.r, color.g, color.b, 255);
for (int y = 0; y < (h + (innerBorderThickness * h)); ++y) {
SDL_Color color{ 165, 42, 42 };
renderTexture(textures[TetrisAssets::BORDER], offsetX - blockSize, (offsetY + y * blockSize) - (innerBorderThickness * y + 1), blockSize, blockSize, color);
renderTexture(textures[TetrisAssets::BORDER], offsetX + w * blockSize, (offsetY + y * blockSize) - (innerBorderThickness * y + 1), blockSize, blockSize, color);
for (int y = 0; y <= windowHeight; y += ((gridSize - 2) * scale)) {
leftBorder = renderTexture(
textures[TetrisAssets::BORDER],
gridSize * scale,
y,
gridSize * scale,
(gridSize * scale),
color
);
int t = ceil(static_cast<float>(scoreBoardDimensions->w) / scale / gridSize);
rightBorder = renderTexture(
textures[TetrisAssets::BORDER],
windowWidth - (ceil(static_cast<float>(scoreBoardDimensions->w) / scale / gridSize) + 1) * 8 * scale,
y,
gridSize * scale,
gridSize * scale,
color
);
}
}
@@ -61,10 +109,10 @@ void Renderer::drawLockedBlocks(const shared_ptr<GameBoard> gameBoard) {
SDL_Color color = lockedColors[row][col];
renderTexture(
textures[shapeToAsset(static_cast<TetrominoShape>(blockType - 1))],
offsetX + col * blockSize,
offsetY + row * blockSize,
blockSize,
blockSize,
(col + 2) * gridSize * scale,
row * gridSize * scale,
gridSize * scale,
gridSize * scale,
color);
}
}
@@ -83,60 +131,60 @@ void Renderer::drawTetromino(const shared_ptr<Tetromino> tetromino) {
for (int i = 0; i < 4; ++i) {
renderTexture(
textures[TetrisAssets::I_MIDR],
offsetX + (x + i) * blockSize,
offsetY + y * blockSize,
blockSize,
blockSize,
(2 + x + i) * gridSize * scale,
y * gridSize * scale,
gridSize * scale,
gridSize * scale,
tetromino->getColor( )
);
}
renderTexture(
textures[TetrisAssets::I_ENDR],
offsetX + (x + 0) * blockSize,
offsetY + y * blockSize,
blockSize,
blockSize,
(2 + x) * gridSize * scale,
y * gridSize * scale,
gridSize * scale,
gridSize * scale,
tetromino->getColor( )
);
renderTexture(
textures[TetrisAssets::I_STARTR],
offsetX + (x + 3) * blockSize,
offsetY + y * blockSize,
blockSize,
blockSize,
(2 + x + 3) * gridSize * scale,
y * gridSize * scale,
gridSize * scale,
gridSize * scale,
tetromino->getColor( )
);
} else {
renderTexture(
textures[TetrisAssets::I_END],
offsetX + x * blockSize,
offsetY + y * blockSize,
blockSize,
blockSize,
(2 + x) * gridSize * scale,
y * gridSize * scale,
gridSize * scale,
gridSize * scale,
tetromino->getColor( )
);
renderTexture(
textures[TetrisAssets::I_MID],
offsetX + x * blockSize,
offsetY + (y + 1) * blockSize,
blockSize,
blockSize,
(2 + x) * gridSize * scale,
(y + 1) * gridSize * scale,
gridSize * scale,
gridSize * scale,
tetromino->getColor( )
);
renderTexture(
textures[TetrisAssets::I_MID],
offsetX + x * blockSize,
offsetY + (y + 2) * blockSize,
blockSize,
blockSize,
(2 + x) * gridSize * scale,
(y + 2) * gridSize * scale,
gridSize * scale,
gridSize * scale,
tetromino->getColor( )
);
renderTexture(
textures[TetrisAssets::I_START],
offsetX + x * blockSize,
offsetY + (y + 3) * blockSize,
blockSize,
blockSize,
(2 + x) * gridSize * scale,
(y + 3) * gridSize * scale,
gridSize * scale,
gridSize * scale,
tetromino->getColor( )
);
}
@@ -147,10 +195,10 @@ void Renderer::drawTetromino(const shared_ptr<Tetromino> tetromino) {
if (shape[row][col] != 0) {
renderTexture(
textures[shapeToAsset(tetromino->getShapeEnumn( ))],
offsetX + (x + col) * blockSize,
offsetY + (y + row) * blockSize,
blockSize,
blockSize,
((x + col) * gridSize * scale) + leftBorder->x + leftBorder->w,
(y + row) * gridSize * scale,
gridSize * scale,
gridSize * scale,
tetromino->getColor( )
);
}
@@ -194,43 +242,76 @@ const TetrisAssets Renderer::shapeToAsset(const TetrominoShape shape) const {
}
void Renderer::renderStartScreen( ) {
SDL_SetRenderDrawColor(renderer.get( ), 248, 248, 248, 255);
SDL_SetRenderDrawColor(renderer.get( ), 0, 0, 0, 255);
SDL_RenderClear(renderer.get( ));
int borderThickness = 20;
SDL_Rect borderRect = {
borderThickness,
borderThickness,
windowWidth - 2 * borderThickness,
windowHeight - 2 * borderThickness
};
SDL_SetRenderDrawColor(renderer.get( ), 0, 0, 0, 255);
SDL_RenderDrawRect(renderer.get( ), &borderRect);
auto title = unique_ptr<SDL_Surface, decltype(&SDL_FreeSurface)>(IMG_Load("assets/sprites/title.png"), SDL_FreeSurface);
int titleWidth = static_cast<int>(windowWidth * 0.8f);
int titleHeight = static_cast<int>(titleWidth * 0.315f);
int titlePaddingX = 3, titlePaddingY = 8;
renderTexture(
TextureDimensions* titleDimensions = renderTexture(
"assets/sprites/title.png",
(windowWidth / 2) - (titleWidth / 2),
static_cast<int>(windowHeight * 0.160f),
titleWidth,
titleHeight
titlePaddingX * scale,
titlePaddingY * scale,
title->w * scale,
title->h * scale
);
auto titleBg = unique_ptr<SDL_Surface, decltype(&SDL_FreeSurface)>(IMG_Load("assets/sprites/title_bg.png"), SDL_FreeSurface);
int titleBgWidth = static_cast<int>(windowWidth * 0.8f);
int titleBgHeight = static_cast<int>(titleBgWidth * (static_cast<float>(titleBg->h) / titleBg->w));
SDL_Color col = { 255,255,255 };
renderTexture(
TextureDimensions* titleBgDimensions = renderTexture(
"assets/sprites/title_bg.png",
(windowWidth / 2) - (titleBgWidth / 2),
static_cast<int>(windowHeight * 0.5f),
titleBgWidth,
titleBgHeight
windowWidth / 2,
titleDimensions->y + titleDimensions->h,
titleBg->w * scale,
titleBg->h * scale,
col,
1.0f,
HAlign::CENTER
);
SDL_SetRenderDrawColor(renderer.get( ), 248, 248, 248, 255);
int titleBgBottomPadding = 6;
int y = titleBgDimensions->y + titleBgDimensions->h + titleBgBottomPadding * scale;
SDL_Rect rect{
0,
y,
windowWidth,
windowHeight - y,
};
SDL_RenderFillRect(renderer.get( ), &rect);
TextDimensions player1TextDimendions = renderText(
"1player",
windowWidth / 4,
y + (1 * scale),
8 * scale,
SDL_Color{ 0, 0, 0 },
HAlign::CENTER
);
renderText(
"2player",
windowWidth * 3 / 4,
y + (1 * scale),
8 * scale,
SDL_Color{ 0, 0, 0 },
HAlign::CENTER
);
renderText(
"©1989 ®",
windowWidth / 2,
windowHeight - (14 * scale),
8 * scale,
SDL_Color{ 0, 0, 0 },
HAlign::CENTER
);
renderText("press G to start", (windowWidth / 2), windowHeight - 70, 16, SDL_Color{ 0, 0, 0 }, HAlign::CENTER);
SDL_RenderPresent(renderer.get( ));
}
@@ -268,29 +349,29 @@ void Renderer::renderTetrominoPreview(const shared_ptr<Tetromino> nextTetromino)
for (int i = 0; i < 4; ++i) {
renderTexture(
textures[TetrisAssets::I_MIDR],
(windowWidth - 155) + (x + i) * blockSize,
(windowHeight - 120) + y * blockSize,
blockSize,
blockSize,
(windowWidth - 155) + (x + i) * gridSize * scale,
(windowHeight - 120) + y * gridSize * scale,
gridSize * scale,
gridSize * scale,
nextTetromino->getColor( )
);
}
renderTexture(
textures[TetrisAssets::I_ENDR],
(windowWidth - 155) + x * blockSize,
(windowHeight - 120) + y * blockSize,
blockSize,
blockSize,
(windowWidth - 155) + x * gridSize * scale,
(windowHeight - 120) + y * gridSize * scale,
gridSize * scale,
gridSize * scale,
nextTetromino->getColor( )
);
renderTexture(
textures[TetrisAssets::I_STARTR],
(windowWidth - 155) + (x + 3) * blockSize,
(windowHeight - 120) + y * blockSize,
blockSize,
blockSize,
(windowWidth - 155) + (x + 3) * gridSize * scale,
(windowHeight - 120) + y * gridSize * scale,
gridSize * scale,
gridSize * scale,
nextTetromino->getColor( )
);
@@ -300,10 +381,10 @@ void Renderer::renderTetrominoPreview(const shared_ptr<Tetromino> nextTetromino)
if (nextTetromino->getShape( )[row][col] != 0) {
renderTexture(
textures[shapeToAsset(nextTetromino->getShapeEnumn( ))],
(windowWidth - 140) + col * blockSize,
(windowHeight - 130) + row * blockSize,
blockSize,
blockSize,
(windowWidth - 140) + col * gridSize * scale,
(windowHeight - 130) + row * gridSize * scale,
gridSize * scale,
gridSize * scale,
nextTetromino->getColor( )
);
}
@@ -312,7 +393,7 @@ void Renderer::renderTetrominoPreview(const shared_ptr<Tetromino> nextTetromino)
}
}
const Renderer::TextDimensions Renderer::renderText(const string& text, int x, int y, int fontSize, SDL_Color color, HAlign hAlign, VAlign vAlign) {
Renderer::TextDimensions Renderer::renderText(const string& text, int x, int y, int fontSize, SDL_Color color, HAlign hAlign, VAlign vAlign) {
auto font = unique_ptr<TTF_Font, decltype(&TTF_CloseFont)>(TTF_OpenFont("assets/font/tetris-gb.ttf", fontSize), TTF_CloseFont);
if (!font) { SDL_Log("Failed to create font: %s", TTF_GetError( )); return{ 0,0,0,0 }; }
@@ -342,15 +423,15 @@ const Renderer::TextDimensions Renderer::renderText(const string& text, int x, i
return TextDimensions{ x, y, width, height };
}
const Renderer::TextureDimensions Renderer::renderTexture(
Renderer::TextureDimensions* Renderer::renderTexture(
const string& texturePath, int x, int y, int width, int height,
SDL_Color color, float scale, HAlign textHAlign, VAlign textVAlign) {
auto surface = unique_ptr <SDL_Surface, decltype(&SDL_FreeSurface)>(IMG_Load(texturePath.c_str( )), SDL_FreeSurface);
if (!surface) { SDL_Log("Failed to load surface from %s: %s", texturePath, SDL_GetError( ));return{ 0,0,0,0 }; }
if (!surface) { SDL_Log("Failed to load surface from %s: %s", texturePath, SDL_GetError( ));return nullptr; }
auto texture = unique_ptr<SDL_Texture, decltype(&SDL_DestroyTexture)>(SDL_CreateTextureFromSurface(renderer.get( ), surface.get( )), SDL_DestroyTexture);
if (!texture) { SDL_Log("Failed to create texture from surface: %s", SDL_GetError( )); return{ 0,0,0,0 }; }
if (!texture) { SDL_Log("Failed to create texture from surface: %s", SDL_GetError( )); return nullptr; }
SDL_SetTextureBlendMode(texture.get( ), SDL_BLENDMODE_BLEND);
SDL_SetTextureColorMod(texture.get( ), color.r, color.g, color.b);
@@ -372,12 +453,12 @@ const Renderer::TextureDimensions Renderer::renderTexture(
SDL_Rect rect{ x,y,textureWidth,textureHeight };
SDL_RenderCopy(renderer.get( ), texture.get( ), nullptr, &rect);
return { x,y,textureWidth, textureHeight };
return new TextureDimensions{ x,y,textureWidth, textureHeight };
}
const int Renderer::getBlockSize( ) const { return blockSize; }
const int Renderer::getScale( ) const { return scale; }
void Renderer::setBlockSize(int newBlockSize) { blockSize = newBlockSize; }
void Renderer::setScale(int newScale) { scale = newScale; }
void Renderer::setOffset(int newX, int newY) {
offsetX = newX;

15
src/Renderer.hpp
View File

@@ -37,13 +37,11 @@ private:
void drawTetromino(const shared_ptr<Tetromino> tetromino);
void drawScoreboard(int score, int level, int lines);
const bool loadTexture(const string& filePath, const TetrisAssets shape);
const TetrisAssets shapeToAsset(const TetrominoShape shape) const;
const shared_ptr<SDL_Renderer> renderer;
int blockSize;
int scale = 5, gridSize = 8;
int offsetX, offsetY;
int windowHeight = 0, windowWidth = 0;
@@ -71,6 +69,9 @@ private:
const SDL_Color color;
};
TextureDimensions* scoreBoardDimensions;
TextureDimensions* leftBorder, * rightBorder;
public:
Renderer(shared_ptr<SDL_Renderer> renderer, int w, int h);
@@ -78,18 +79,18 @@ public:
void renderStartScreen( );
void renderGameOver(shared_ptr<GameBoard> gameBoard);
const TextDimensions renderText(
TextDimensions renderText(
const string& text, int x, int y, int fontSize,
SDL_Color color, HAlign textHAlign = HAlign::LEFT, VAlign textVAlign = VAlign::TOP
);
const TextureDimensions renderTexture(
TextureDimensions* renderTexture(
const string& texturePath, int x, int y, int width = 0, int height = 0,
SDL_Color color = { 255,255,255 }, float scale = 1.0f, HAlign textHAlign = HAlign::LEFT, VAlign textVAlign = VAlign::TOP
);
void renderTetrominoPreview(const shared_ptr<Tetromino> nextTetromino);
const int getBlockSize( ) const;
void setBlockSize(int newBlockSize);
const int getScale( ) const;
void setScale(int newBlockSize);
void setOffset(int newX, int newY);
const int getOffsetX( ) const;
const int getOffsetY( ) const;

25
src/Sound.cpp
View File

@@ -1,5 +1,8 @@
#include "Sound.hpp"
unique_ptr<unordered_map<SoundName, shared_ptr<Mix_Chunk>>> Sound::cachedSounds = nullptr;
unique_ptr<unordered_map<MusicName, shared_ptr<Mix_Music>>> Sound::cachedMusic = nullptr;
Sound::Sound( ) {
if (!cachedSounds) {
cachedSounds = make_unique<unordered_map<SoundName, shared_ptr<Mix_Chunk>>>( );
@@ -80,30 +83,26 @@ bool Sound::PlayMusic(MusicName musicName, int loop) {
return true;
}
bool Sound::PauseMusic( ) {
void Sound::PauseMusic( ) {
if (Mix_PlayingMusic( ) != 0)
Mix_PauseMusic( );
}
bool Sound::ResumeMusic( ) {
if (Mix_PausedMusic( ) == 0)
void Sound::ResumeMusic( ) {
if (Mix_PausedMusic( ))
Mix_ResumeMusic( );
}
bool Sound::IncreaseVolume( ) {
void Sound::IncreaseVolume( ) {
int currentVolume = Mix_Volume(-1, -1);
if (currentVolume < MIX_MAX_VOLUME) {
if (currentVolume < MIX_MAX_VOLUME)
Mix_Volume(-1, currentVolume + 2);
return true;
}
return false;
}
bool Sound::DecreaseVolume( ) {
void Sound::DecreaseVolume( ) {
int currentVolume = Mix_Volume(-1, -1);
if (currentVolume > 0) {
if (currentVolume > 0)
Mix_Volume(-1, currentVolume - 2);
return true;
}
return false;
}
bool Sound::IsMusicPlaying( ) { return Mix_PlayingMusic( ) && !Mix_PausedMusic( ); }

10
src/Sound.hpp
View File

@@ -38,9 +38,9 @@ public:
bool PlaySound(SoundName soundName, int loop = 0);
bool PlayMusic(MusicName musicName, int loop = -1);
bool PauseMusic( );
bool ResumeMusic( );
bool IncreaseVolume( );
bool DecreaseVolume( );
void PauseMusic( );
void ResumeMusic( );
void IncreaseVolume( );
void DecreaseVolume( );
bool IsMusicPlaying( );
};

4
src/main.cpp
View File

@@ -30,8 +30,8 @@ int main( ) {
return 1;
}
Game game;
if (!game.init("Tetris", 810, 600)) {
Game game; // 810:600
if (!game.init("Tetris", 800, 720)) {
SDL_Log("Failed to init game");
SDL_Quit( );
return 1;