From 9f93de1d0629d40542f0551facd87dc26f39d930 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Tue, 4 Oct 2022 14:16:22 +0200 Subject: [PATCH] Resuelto un bug en la colision de balas con globos --- data/gfx/balloon4.png | Bin 13322 -> 13436 bytes source/balloon.cpp | 14 ++++++++++---- source/game.cpp | 6 +++--- source/sprite.cpp | 6 ++++++ source/sprite.h | 3 +++ 5 files changed, 22 insertions(+), 7 deletions(-) diff --git a/data/gfx/balloon4.png b/data/gfx/balloon4.png index ec50a17eb5c6e1d390d3ae79661a9a8c5e83cdea..f5f63da9a98ee484baffcc3bda07b95ac05c93fd 100644 GIT binary patch literal 13436 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 H<5&L!QQR#a diff --git a/source/balloon.cpp b/source/balloon.cpp index 0c3d582..53e0949 100644 --- a/source/balloon.cpp +++ b/source/balloon.cpp @@ -318,6 +318,14 @@ void Balloon::render() { mSprite->render(); } + + if (mKind == POWER_BALL) + { + Sprite *sp = new Sprite(mSprite->getRect() ,mSprite->getTexture(),mSprite->getRenderer()); + sp->setSpriteClip(370,148,37,37); + sp->render(); + delete sp; + } } } @@ -667,10 +675,8 @@ Uint8 Balloon::getClass() { return HEXAGON_CLASS; } - else - { - return 0; - } + + return BALLOON_CLASS; } // Establece el valor de la variable diff --git a/source/game.cpp b/source/game.cpp index bd04039..515d4ca 100644 --- a/source/game.cpp +++ b/source/game.cpp @@ -1877,7 +1877,7 @@ void Game::popBalloon(Balloon *balloon) { balloons.at(index)->setVelY(-2.50f); } - else if (balloons.at(index)->getClass() == HEXAGON_CLASS) + else { balloons.at(index)->setVelY(BALLOON_VELX_NEGATIVE); } @@ -1888,7 +1888,7 @@ void Game::popBalloon(Balloon *balloon) { balloons.at(index2)->setVelY(-2.50f); } - else if (balloons.at(index2)->getClass() == HEXAGON_CLASS) + else { balloons.at(index2)->setVelY(BALLOON_VELX_NEGATIVE); } @@ -2472,7 +2472,7 @@ void Game::updateShakeEffect() // Crea un SmartSprite para arrojar el item café al recibir un impacto void Game::throwCoffee(int x, int y) { - SmartSprite *ss = new SmartSprite(nullptr, mRenderer); + SmartSprite *ss = new SmartSprite(mTextureItems, mRenderer); smartSprites.push_back(ss); ss->setPosX(x - 8); diff --git a/source/sprite.cpp b/source/sprite.cpp index c354b59..795e65b 100644 --- a/source/sprite.cpp +++ b/source/sprite.cpp @@ -148,6 +148,12 @@ void Sprite::setTexture(LTexture *texture) this->texture = texture; } +// Obten el valor de la variable +SDL_Renderer *Sprite::getRenderer() +{ + return renderer; +} + // Establece el valor de la variable void Sprite::setRenderer(SDL_Renderer *renderer) { diff --git a/source/sprite.h b/source/sprite.h index 96e1687..31c16db 100644 --- a/source/sprite.h +++ b/source/sprite.h @@ -74,6 +74,9 @@ public: // Establece el valor de la variable void setTexture(LTexture *texture); + // Obten el valor de la variable + SDL_Renderer *getRenderer(); + // Establece el valor de la variable void setRenderer(SDL_Renderer *renderer);