jaildesigner-jailgames/coffee_crisis
1
0
Fork 1
Code Issues Pull Requests Projects Releases 12 Wiki Activity

Actualizadas las librerias comunes

Browse Source
This commit is contained in:
Sergio
2022-12-05 09:55:15 +01:00
parent 09a205a288
commit a32582f1ec
11 changed files with 86 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/game.cpp
View File

@@ -42,7 +42,7 @@ Game::Game(int numPlayers, int currentStage, SDL_Renderer *renderer, Screen *scr
buildingsSprite = new Sprite(0, 0, 256, 160, gameBuildingsTexture, renderer);
skyColorsSprite = new Sprite(0, 0, GAME_WIDTH, GAME_HEIGHT, gameSkyColorsTexture, renderer);
skyColorsSprite = new Sprite(0, 0, GAMECANVAS_WIDTH, GAMECANVAS_HEIGHT, gameSkyColorsTexture, renderer);
grassSprite = new Sprite(0, 0, 256, 6, gameGrassTexture, renderer);
powerMeterSprite = new Sprite(PLAY_AREA_CENTER_X - 20, 170, 40, 7, gamePowerMeterTexture, renderer);
gameOverSprite = new Sprite(16, 80, 128, 96, gameOverTexture, renderer);
@@ -376,10 +376,10 @@ void Game::init()
n5000Sprite->setDestY(0);
// Los fondos
skyColorsRect[0] = {0, 0, GAME_WIDTH, GAME_HEIGHT};
skyColorsRect[1] = {256, 0, GAME_WIDTH, GAME_HEIGHT};
skyColorsRect[2] = {0, 192, GAME_WIDTH, GAME_HEIGHT};
skyColorsRect[3] = {256, 192, GAME_WIDTH, GAME_HEIGHT};
skyColorsRect[0] = {0, 0, GAMECANVAS_WIDTH, GAMECANVAS_HEIGHT};
skyColorsRect[1] = {256, 0, GAMECANVAS_WIDTH, GAMECANVAS_HEIGHT};
skyColorsRect[2] = {0, 192, GAMECANVAS_WIDTH, GAMECANVAS_HEIGHT};
skyColorsRect[3] = {256, 192, GAMECANVAS_WIDTH, GAMECANVAS_HEIGHT};
}
// Carga los recursos necesarios para la sección 'Game'
@@ -1831,7 +1831,7 @@ void Game::renderDeathFade(int counter)
{
rect[i].x = 0;
rect[i].y = i * 16;
rect[i].w = GAME_WIDTH;
rect[i].w = GAMECANVAS_WIDTH;
if (i == 0)
{
rect[i].h = h;
@@ -1845,7 +1845,7 @@ void Game::renderDeathFade(int counter)
}
else
{
SDL_Rect rect = {0, 0, GAME_WIDTH, GAME_HEIGHT};
SDL_Rect rect = {0, 0, GAMECANVAS_WIDTH, GAMECANVAS_HEIGHT};
SDL_RenderFillRect(renderer, &rect);
}
}
@@ -2600,7 +2600,7 @@ void Game::throwCoffee(int x, int y)
ss->setAccelX(0.0f);
ss->setAccelY(0.2f);
ss->setDestX(x + (ss->getVelX() * 50));
ss->setDestY(GAME_HEIGHT + 1);
ss->setDestY(GAMECANVAS_HEIGHT + 1);
ss->setEnabled(true);
ss->setEnabledCounter(1);
ss->setSpriteClip(0, 0, 16, 16);
@@ -3423,7 +3423,7 @@ void Game::renderPausedGame()
if (leavingPauseMenu)
{
textNokiaBig2->writeCentered(SCREEN_CENTER_X, PLAY_AREA_FIRST_QUARTER_Y, std::to_string((pauseCounter / 30) + 1));
textNokiaBig2->writeCentered(GAMECANVAS_CENTER_X, PLAY_AREA_FIRST_QUARTER_Y, std::to_string((pauseCounter / 30) + 1));
}
else
{